This commit was manufactured by cvs2svn to create tag 'v20070504-1000'.

commit: 4d1ec07a80d41ae7a78cb0de70edf155abff04d8 [log] [tgz]
author: ahunter <ahunter> Wed May 02 17:38:40 2007 +0000
committer: ahunter <ahunter> Wed May 02 17:38:40 2007 +0000
tree: aee11a63de061d3d0d3cc80337013ca5e9e6b79a
parent: 2ca737bd1aa4bb85a0df5eec7c983fad558c459b [diff]
diff --git a/org.eclipse.gmf.examples.runtime.common.service/.classpath b/org.eclipse.gmf.examples.runtime.common.service/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.examples.runtime.common.service/.cvsignore b/org.eclipse.gmf.examples.runtime.common.service/.cvsignore
deleted file mode 100644
index f9f8e3f..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-doc
-bin
-serviceExample.zip

diff --git a/org.eclipse.gmf.examples.runtime.common.service/.externalToolBuilders/New_Builder.launch b/org.eclipse.gmf.examples.runtime.common.service/.externalToolBuilders/New_Builder.launch
deleted file mode 100644
index 29b310d..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/.externalToolBuilders/New_Builder.launch
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.decorator&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.decorator&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.common.service}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.common.service/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.common.service/.project b/org.eclipse.gmf.examples.runtime.common.service/.project
deleted file mode 100644
index 541f14c..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/.project
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.common.service</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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/New_Builder.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.common.service/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.common.service/META-INF/MANIFEST.MF
deleted file mode 100644
index 2264231..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.common.service; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.common.service.ServicePlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.common.service,
- org.eclipse.gmf.examples.runtime.common.service.application,
- org.eclipse.gmf.examples.runtime.common.service.client,
- org.eclipse.gmf.examples.runtime.common.service.providers
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.examples.runtime.common.service/about.html b/org.eclipse.gmf.examples.runtime.common.service/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.common.service/build.properties b/org.eclipse.gmf.examples.runtime.common.service/build.properties
deleted file mode 100644
index 2471cca..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/build.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = META-INF/,\
-               plugin.properties,\
-               plugin.xml,\
-               schema/,\
-               about.html,\
-               build.properties,\
-               .project,\
-               .classpath
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties,\
-               plugin.xml,\
-               schema/,\
-               about.html

diff --git a/org.eclipse.gmf.examples.runtime.common.service/buildZip.xml b/org.eclipse.gmf.examples.runtime.common.service/buildZip.xml
deleted file mode 100644
index c764afa..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.exsd,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-				
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\serviceExample.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.common.service/plugin.properties b/org.eclipse.gmf.examples.runtime.common.service/plugin.properties
deleted file mode 100644
index 3b61341..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/plugin.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-Plugin.name = GMF Service Example Plug-in
-Plugin.providerName = Eclipse.org
-
-WidgetProviders = Widget Providers
-
-widgetServiceActionSet = Widget Service ActionSet
-sampleMenu = &Sample
-runwidget.label = Run &Widget Example

diff --git a/org.eclipse.gmf.examples.runtime.common.service/plugin.xml b/org.eclipse.gmf.examples.runtime.common.service/plugin.xml
deleted file mode 100644
index e8bd44d..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/plugin.xml
+++ /dev/null

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<plugin>
-
-     <extension-point id="widgetProviders" name="%WidgetProviders" schema="schema/widgetProviders.exsd"/>   
-   
-	<!--
-	Note: The providers are put in the same plugin project for simplicity.  
-	-->   
-   <extension point="org.eclipse.gmf.examples.runtime.common.service.widgetProviders">
-      <widgetProvider class="org.eclipse.gmf.examples.runtime.common.service.providers.WidgetProvider">
-         <Priority name="Low"/>
-         <orderSize max="5000" min="50"/>
-      </widgetProvider>
-   </extension>      
-   
-   <extension point="org.eclipse.gmf.examples.runtime.common.service.widgetProviders">
-      <widgetProvider class="org.eclipse.gmf.examples.runtime.common.service.providers.SuperWidgetProvider">
-         <Priority name="High"/>
-         <orderSize max="10000" min="100"/> 
-      </widgetProvider>     
-   </extension>   
-   
-   <extension point="org.eclipse.ui.actionSets">
-      <actionSet 
-         label="%widgetServiceActionSet"
-         visible="true"
-         id="org.eclipse.gmf.examples.runtime.common.service.client.actionSet">
-         <action id="org.eclipse.gmf.examples.runtime.common.service.client.RunExampleAction"
-            label="%runwidget.label"
-            menubarPath="org.eclipse.gmf.examples.runtime.menu/additions"
-            class="org.eclipse.gmf.examples.runtime.common.service.client.RunExampleAction">
-         </action>
-         <menu
-               label="%sampleMenu"
-               id="org.eclipse.gmf.examples.runtime.menu">
-         </menu>            
-      </actionSet>
-   </extension>     
-  
-</plugin>

diff --git a/org.eclipse.gmf.examples.runtime.common.service/schema/widgetProviders.exsd b/org.eclipse.gmf.examples.runtime.common.service/schema/widgetProviders.exsd
deleted file mode 100644
index 13f1822..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/schema/widgetProviders.exsd
+++ /dev/null

@@ -1,163 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<schema targetNamespace="org.eclipse.gmf.examples.runtime.common.service">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.examples.runtime.common.service" id="widgetProviders" name="Widget Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="widgetProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="widgetProvider">
-      <annotation>
-         <documentation>
-            The widget provider description tag. A provider&apos;s description outlines zero or more objects to be referenced by the provider&apos;s contexts, and then lists zero or more contexts supported by the provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="orderSize"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of the widget provider class
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the widget provider
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The priority of the provider. It can be one of the following values: Lowest, Low, Medium, High, Highest. Consideration of dependencies has to be done when choosing the priority. A provider at a higher priority will take a chance first at deciding provision.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="orderSize">
-      <complexType>
-         <attribute name="max" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The maximum order size that this provider can handle.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="min" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The minimum order size that this provider will take.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/ServicePlugin.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/ServicePlugin.java
deleted file mode 100644
index 8464f05..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/ServicePlugin.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.common.service;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ServicePlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static ServicePlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public ServicePlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.gmf.examples.runtime.common.service.ServicePluginResources");//$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the shared instance of <code>ServicePlugin</code>
-	 */
-	public static ServicePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 * 
-	 * @param key resource key
-	 * @return resource, 'key' if not found
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = ServicePlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle.
-	 * 
-	 * @return plugin's resource bundle
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-	
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/CreateWidgetOperation.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/CreateWidgetOperation.java
deleted file mode 100644
index e7dfb39..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/CreateWidgetOperation.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.common.service.application;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * Concrete operation for creating Widgets.
- * 
- */
-public class CreateWidgetOperation
-	implements IOperation {
-
-	private int orderSize;
-
-	/**
-	 * Creates an instance of the CreateWidgetOperation with the specified 
-	 * order size.
-	 * @param orderSize the order size requested.
-	 */
-	public CreateWidgetOperation(int orderSize) {
-		this.orderSize = orderSize;
-	}
-
-	/**
-	 * Delegates the creation of the Widgets to the Provider.
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IWidgetProvider) provider).createWidget(orderSize);
-	}
-
-	/**
-	 * Returns the order size for this CreateWidgetOperation.
-	 * @return Returns the orderSize.
-	 */
-	public int getOrderSize() {
-		return orderSize;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/IWidgetProvider.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/IWidgetProvider.java
deleted file mode 100644
index 9801e18..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/IWidgetProvider.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.common.service.application;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The interface for Widget providers.  Defines the messages between the WidgetService and 
- * Widget providers.
- * 
- */
-public interface IWidgetProvider
-	extends IProvider {
-	
-	Object createWidget(int orderSize);	
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/WidgetService.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/WidgetService.java
deleted file mode 100644
index 22f1812..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/WidgetService.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.common.service.application;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.examples.runtime.common.service.ServicePlugin;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-
-/**
- * Widget Service class. Service which provides the creation of Widgets.
- *
- * @see org.eclipse.gmf.runtime.common.core.service
- */
-public class WidgetService
-	extends Service
-	implements IWidgetProvider {
-
-	/**
-	 * The singleton instance of the WidgetService.
-	 */
-	private final static WidgetService service = new WidgetService();
-
-	static {
-		service.configureProviders(ServicePlugin.getPluginId(), "widgetProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Retrieves the singleton instance of the WidgetService.
-	 *
-	 * @return The WidgetService service singleton.
-	 */
-	public static WidgetService getInstance() {
-		return service;
-	}
-
-	/**
-	 * Returns a <code>List</code> containing the Widgets requested or null if no Widget
-	 * providers are found that can create orderSize Widgets.
-	 * @see org.eclipse.gmf.examples.runtime.common.service.application.IWidgetProvider#createWidget(int)
-	 */
-	public Object createWidget(int orderSize) {
-		return execute(new CreateWidgetOperation(orderSize));
-	}
-
-	/**
-	 * Executes the operation using a <code>ExecutingStrategy.FIRST</code>
-	 * @param operation the operation to execute
-	 * @return the results of the operation
-	 */
-	public Object execute(IOperation operation) {
-		 List results = execute(ExecutionStrategy.FIRST, operation);
-		 return results.isEmpty() ? null : results;
-	}
-
-	/**
-	 * Creates a new ProvderDescriptor based on the <code>IConfigurationElement</code>.
-	 * @see org.eclipse.gmf.runtime.common.core.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	protected Service.ProviderDescriptor newProviderDescriptor(IConfigurationElement element) {
-		return new WidgetProviderDescriptor(element);
-	}
-
-	/**
-	 * WidgetProviderDescriptor. Provides convenient access to
-	 * WidgetProvider configuration information.
-	 *
-	 */
-	protected static class WidgetProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/** the provider configuration parsed from XML */
-		private WidgetServiceProviderConfiguration providerConfiguration;
-
-		/**
-		 * Constructs a <code>IWidgetProvider</code> descriptor for
-		 * the specified configuration element.
-		 *
-		 * @param element The configuration element describing the provider.
-		 */
-		public WidgetProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-			this.providerConfiguration =
-				WidgetServiceProviderConfiguration.parse(element);
-			assert null != element : "NULL configuration element"; //$NON-NLS-1$
-		}
-
-		/**
-		 * Returns <code>true</code> if the given ProviderDescriptor
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		public boolean provides(IOperation operation) {
-			if (getPolicy() != null)
-				return getPolicy().provides(operation);
-			if (provider == null) {
-				if (isSupportedInExtention(operation)) {
-					providerConfiguration = null;
-					return getProvider().provides(operation);
-				}
-				return false;
-			}
-			return getProvider().provides(operation);
-		}
-
-		/**
-		 * Checks if the operation is supported by the XML extension
-		 * @param operation
-		 * @return
-		 */
-		private boolean isSupportedInExtention(IOperation operation) {
-			if (operation instanceof CreateWidgetOperation) {
-				return providerConfiguration.supports(((CreateWidgetOperation)operation).getOrderSize());
-			}
-			return false;
-		}
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/WidgetServiceProviderConfiguration.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/WidgetServiceProviderConfiguration.java
deleted file mode 100644
index e478130..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/application/WidgetServiceProviderConfiguration.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.common.service.application;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-
-/** 
- * Provider configuration for the WidgetService. It helps in filtering out
- * and delay loading unrelated providers.
- * 
- */
-public class WidgetServiceProviderConfiguration
-	extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String ORDER_SIZE = "orderSize";//$NON-NLS-1$
-	private static final String MAX = "max"; //$NON-NLS-1$
-	private static final String MIN = "min"; //$NON-NLS-1$	
-	
-	private int minOrder;
-	private int maxOrder;
-	
-	/**
-	 * Builds a new provider contribution descriptor by parsing its configuration element
-	 * 
-	 * @param configElement A provider configuration element
-	 * @return A provider XML contribution descriptor
-	 */
-	public static WidgetServiceProviderConfiguration parse(IConfigurationElement configElement) {
-		assert null != configElement : "null provider configuration element"; //$NON-NLS-1$
-		return new WidgetServiceProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private WidgetServiceProviderConfiguration(IConfigurationElement configElement) {
-		IConfigurationElement configChildren[];
-
-		configChildren = configElement.getChildren(ORDER_SIZE);
-			String max_id = configChildren[0].getAttribute(MAX);
-			String min_id = configChildren[0].getAttribute(MIN);			
-			if (max_id != null)
-				maxOrder = Integer.parseInt(max_id);
-			if (min_id != null)
-				maxOrder = Integer.parseInt(max_id);
-
-	}
-	
-	/**
-	 * This provider will support the operation if it supports the order size.
-	 * @param orderSize
-	 * @return
-	 */
-	public boolean supports(int orderSize) {
-		return (orderSize >= minOrder && orderSize <= maxOrder);
-	}	
-}

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/client/RunExampleAction.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/client/RunExampleAction.java
deleted file mode 100644
index 97f853c..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/client/RunExampleAction.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.common.service.client;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.gmf.examples.runtime.common.service.application.WidgetService;
-
-/**
- * Simple action to run the Widget Service example.
- * 
- */
-public class RunExampleAction
-	implements IWorkbenchWindowActionDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	/**
-	 * Uses the WidgetService instance to process a variety of Widget requests.
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		Object widgets = WidgetService.getInstance().createWidget(1000);
-		System.out.println(widgets == null ? "No widgets created" : "Created " + unwrapWidgets((List)widgets).size() + " widgets");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		widgets = WidgetService.getInstance().createWidget(30);
-		System.out.println(widgets == null ? "No widgets created" : "Created " + unwrapWidgets((List)widgets).size() + " widgets");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		widgets = WidgetService.getInstance().createWidget(76);
-		System.out.println(widgets == null ? "No widgets created" : "Created " + unwrapWidgets((List)widgets).size() + " widgets");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	/**
-	 * Helper method to unwrap a List of Lists
-	 * @param widgets
-	 * @return
-	 */
-	private List unwrapWidgets(List widgets) {
-		List unwrappedList = new ArrayList();
-		Iterator i = widgets.iterator();
-		while(i.hasNext()) {
-			Object o = i.next();
-			if (o instanceof List) {
-				unwrappedList.addAll((List)o);
-			} else {
-				unwrappedList.addAll(widgets);
-				break;
-			}
-		}		
-		return unwrappedList;		
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/providers/SuperWidgetProvider.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/providers/SuperWidgetProvider.java
deleted file mode 100644
index b95c9a1..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/providers/SuperWidgetProvider.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.common.service.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.examples.runtime.common.service.application.CreateWidgetOperation;
-import org.eclipse.gmf.examples.runtime.common.service.application.IWidgetProvider;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-
-/**
- * Super Widget provider which provides for Widget order sizes between 50 and 5000.
- * 
- */
-public class SuperWidgetProvider
-	extends AbstractProvider
-	implements IWidgetProvider {
-
-	/** 
-	 * Returns <code>true</code> if the operation is a CreateWidgetOperation with
-	 * an order size between 100 and 10000 widgets.
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateWidgetOperation) {
-			int orderSize = ((CreateWidgetOperation)operation).getOrderSize();
-			return (orderSize >= 100 && orderSize <= 10000);
-		}
-		return false;
-	}
-	
-	/**
-	 * Create the number of Widgets requested.
-	 * @see org.eclipse.gmf.examples.runtime.common.service.application.IWidgetProvider#createWidget(int)
-	 */
-	public Object createWidget(int orderSize) {
-		List widgets = new ArrayList(orderSize);
-		for (int i = 0; i < orderSize; i++) {
-			widgets.add(i, "Widget");//$NON-NLS-1$
-		}
-		return widgets;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/providers/WidgetProvider.java b/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/providers/WidgetProvider.java
deleted file mode 100644
index 9bf53f9..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/src/org/eclipse/gmf/examples/runtime/common/service/providers/WidgetProvider.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.common.service.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.examples.runtime.common.service.application.CreateWidgetOperation;
-import org.eclipse.gmf.examples.runtime.common.service.application.IWidgetProvider;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-/**
- * Widget provider which provides for Widget order sizes between 50 and 5000.
- * 
- */
-public class WidgetProvider
-	extends AbstractProvider
-	implements IWidgetProvider {
-
-	/** 
-	 * Returns <code>true</code> if the operation is a CreateWidgetOperation with
-	 * an order size between 50 and 5000 widgets.
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateWidgetOperation) {
-			int orderSize = ((CreateWidgetOperation)operation).getOrderSize();
-			return (orderSize >= 50 && orderSize <= 5000);
-		}
-		return false;
-	}
-
-	/**
-	 * Create the number of Widgets requested.
-	 * @see org.eclipse.gmf.examples.runtime.common.service.application.IWidgetProvider#createWidget(int)
-	 */
-	public Object createWidget(int orderSize) {
-		List widgets = new ArrayList(orderSize);
-		for (int i = 0; i < orderSize; i++) {
-			widgets.add(i, "Widget");//$NON-NLS-1$
-		}
-		return widgets;		
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/.classpath b/org.eclipse.gmf.examples.runtime.diagram.decorator/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.examples.runtime.diagram.decorator/.cvsignore b/org.eclipse.gmf.examples.runtime.diagram.decorator/.cvsignore
deleted file mode 100644
index 8a21687..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-servicesDecorator.zip

diff --git "a/org.eclipse.gmf.examples.runtime.diagram.decorator/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.decorator Build Example Zip \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.diagram.decorator/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.decorator Build Example Zip \133Builder\135.launch"
deleted file mode 100644
index fc5dfeb..0000000
--- "a/org.eclipse.gmf.examples.runtime.diagram.decorator/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.decorator Build Example Zip \133Builder\135.launch"
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.decorator&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.decorator&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.decorator}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.decorator/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/.project b/org.eclipse.gmf.examples.runtime.diagram.decorator/.project
deleted file mode 100644
index 7662d17..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/.project
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.diagram.decorator</name>
-	<comment></comment>
-	<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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.decorator Build Example Zip [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.diagram.decorator/META-INF/MANIFEST.MF
deleted file mode 100644
index 1576793..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.diagram.decorator; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.diagram.decorator.DecoratorPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.diagram.decorator,
- org.eclipse.gmf.examples.runtime.diagram.decorator.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/about.html b/org.eclipse.gmf.examples.runtime.diagram.decorator/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/build.properties b/org.eclipse.gmf.examples.runtime.diagram.decorator/build.properties
deleted file mode 100644
index 2bafa9f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/build.properties
+++ /dev/null

@@ -1,32 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = *.jar,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               build.properties,\
-               META-INF/,\
-               about.html
-src.includes = *.jar,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               build.properties,\
-               META-INF/,\
-               about.html,\
-               .project,\
-               .classpath
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/buildZip.xml b/org.eclipse.gmf.examples.runtime.diagram.decorator/buildZip.xml
deleted file mode 100644
index 9243066..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-				
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\servicesDecorator.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/diagram.gif b/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/diagram.gif
deleted file mode 100644
index b385e8c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/diagram.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/failed.gif b/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/failed.gif
deleted file mode 100644
index 9b048d6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/failed.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/passed.gif b/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/passed.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/icons/passed.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/plugin.properties b/org.eclipse.gmf.examples.runtime.diagram.decorator/plugin.properties
deleted file mode 100644
index fd8018c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2003, 2004  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-Plugin.name = GMF Diagram Decoration Example Plug-in
-Plugin.providerName = Eclipse.org
-
-
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/plugin.xml b/org.eclipse.gmf.examples.runtime.diagram.decorator/plugin.xml
deleted file mode 100644
index 6b40f57..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/plugin.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         id="org.eclipse.gmf.examples.runtime.diagram.decorator.provider.ReviewDecoratorProvider"
-         name="%ext.reviewDecoratorProvider"
-         point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-      <decoratorProvider
-            class="org.eclipse.gmf.examples.runtime.diagram.decorator.provider.ReviewDecoratorProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <object
-               class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-               id="NODE">
-         </object>
-         <context
-               decoratorTargets="NODE">
-         </context>
-      </decoratorProvider>
-   </extension>
-
-</plugin>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/DecoratorPlugin.java b/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/DecoratorPlugin.java
deleted file mode 100644
index 1efc846..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/DecoratorPlugin.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.decorator;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DecoratorPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared plug-in instance
-	 */
-	private static DecoratorPlugin plugin;
-
-	/**
-	 * The plug-in resource bundle
-	 */
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * Constructor
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#AbstractUIPlugin()
-	 */
-	public DecoratorPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle
-				.getBundle("org.eclipse.gmf.examples.runtime.diagram.decorator.DiagramPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DecoratorPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = DecoratorPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/DecoratorPluginResources.properties b/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/DecoratorPluginResources.properties
deleted file mode 100644
index e0f93fe..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/DecoratorPluginResources.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-diagramNamePrefix = Contents
-diagramOperationTitle = Create Package Contents Diagram
-squareLayoutTitle = Arrange Diagram as Square
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/provider/ReviewDecorator.java b/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/provider/ReviewDecorator.java
deleted file mode 100644
index 15ebca5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/provider/ReviewDecorator.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.decorator.provider;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.examples.runtime.diagram.decorator.DecoratorPlugin;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
-import org.eclipse.gmf.runtime.notation.DescriptionStyle;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author sshaw
- * 
- * Example provider for the Decorator service that will selectively decorate
- * depending on what the content of the description style field is.
- * 
- * The example will annotate a node view with an icon on the top middle of the shape
- * depending on the following conditions:
- * 
- * 1. If the description style contains the word "Passed" a checkbox will appear on top of the shape
- * 2. If the description style contains the word "Failed" an error box will appear on top of the shape
- * 3. If the description style doesn't meet the conditions in (1.) or (2.) then no decoration will appear.
- */
-public class ReviewDecorator implements IDecorator { 
-
-	/** the object to be decorated */
-	private IDecoratorTarget decoratorTarget;
-
-	/** the decoration being displayed */
-	private IDecoration decoration;
-
-	private static final Image ICON_FAILED;
-
-	private static final Image ICON_PASSED;
-
-	static {
-		/*
-		 * prefix path with "$nl$" and use Plugin.find() to search for the
-		 * locale specific file
-		 */
-		IPath path = new Path("$nl$").append( //$NON-NLS-1$
-				"icons//failed.gif"); //$NON-NLS-1$
-        URL url = FileLocator.find(DecoratorPlugin.getDefault().getBundle(), path, null);
-        ImageDescriptor imgDesc = ImageDescriptor.createFromURL(url);
-		ICON_FAILED = imgDesc.createImage();
-
-		path = new Path("$nl$").append( //$NON-NLS-1$
-				"icons//passed.gif"); //$NON-NLS-1$
-     
-        url = FileLocator.find(DecoratorPlugin.getDefault().getBundle(), path, null);
-		imgDesc = ImageDescriptor.createFromURL(url);
-		ICON_PASSED = imgDesc.createImage();
-	}
-
-	/**
-	 * Creates a new <code>AbstractDecorator</code> for the decorator target
-	 * passed in.
-	 * 
-	 * @param decoratorTarget
-	 *            the object to be decorated
-	 */
-	public ReviewDecorator(IDecoratorTarget decoratorTarget) {
-		this.decoratorTarget = decoratorTarget;
-	}
-
-	/**
-	 * Gets the object to be decorated.
-	 * 
-	 * @return Returns the object to be decorated
-	 */
-	protected IDecoratorTarget getDecoratorTarget() {
-		return decoratorTarget;
-	}
-
-	/**
-	 * @return Returns the decoration.
-	 */
-	public IDecoration getDecoration() {
-		return decoration;
-	}
-
-	/**
-	 * @param decoration
-	 *            The decoration to set.
-	 */
-	public void setDecoration(IDecoration decoration) {
-		this.decoration = decoration;
-	}
-
-	/**
-	 * Removes the decoration if it exists and sets it to null.
-	 */
-	protected void removeDecoration() {
-		if (decoration != null) {
-			decoratorTarget.removeDecoration(decoration);
-			decoration = null;
-		}
-	}
-
-	/**
-	 * getDecoratorTargetClassifier Utility method to determine if the
-	 * decoratorTarget is a supported type for this decorator and return the
-	 * associated Classifier element.
-	 * 
-	 * @param decoratorTarget
-	 *            IDecoratorTarget to check and return valid Classifier target.
-	 * @return node Node if IDecoratorTarget can be supported, null
-	 *         otherwise.
-	 */
-	static public Node getDecoratorTargetNode(
-			IDecoratorTarget decoratorTarget) {
-		DescriptionStyle descStyle = null;
-		View node = (View) decoratorTarget.getAdapter(View.class);
-		if (node != null && node.eContainer() instanceof Diagram) { 
-			descStyle = (DescriptionStyle)node.getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());			 
-			
-			if (descStyle != null) {
-				return (Node)node;
-			}
-		}
-		return null;
-
-	}
-
-
-	/**
-	 * Creates the appropriate review decoration if all the criteria is
-	 * satisfied by the view passed in.
-	 */
-	public void refresh() {
-		removeDecoration();
-
-		Node node = getDecoratorTargetNode(getDecoratorTarget());
-
-		if (node != null) {
-			DescriptionStyle descStyle = getDescriptionStyle(node);
-			if (descStyle != null) {
-				boolean passed = descStyle.getDescription().matches("Passed*"); //$NON-NLS-1$
-				boolean failed = descStyle.getDescription().matches("Failed*"); //$NON-NLS-1$
-				if (passed || failed)
-					setDecoration(getDecoratorTarget().addShapeDecoration(
-							passed ? ICON_PASSED : ICON_FAILED,
-							IDecoratorTarget.Direction.NORTH, 75, false));
-			}
-		}
-	}
-
-	/**
-	 * getDescriptionStyle
-	 * Accessor to retrieve the description style from a Node.
-	 * 
-	 * @param node Node to retrieve the description style from.
-	 * @return DescriptionStyle style object
-	 */
-	private DescriptionStyle getDescriptionStyle(Node node) {
-		return (DescriptionStyle)node.getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());			 
-	}
-
-	private NotificationListener notificationListener = new NotificationListener() {
-
-        /* (non-Javadoc)
-         * @see org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener#notifyChanged(org.eclipse.emf.common.notify.Notification)
-         */
-        public void notifyChanged(Notification notification) {
-            refresh();
-        }
-	};
-	
-	/**
-	 * Adds decoration if applicable.
-	 */
-	public void activate() {
-        
-        IGraphicalEditPart gep = (IGraphicalEditPart)getDecoratorTarget().getAdapter(IGraphicalEditPart.class);
-        assert gep != null;
-        
-        DiagramEventBroker.getInstance(gep.getEditingDomain()).addNotificationListener(gep.getNotationView(), 
-                NotationPackage.eINSTANCE.getDescriptionStyle_Description(), notificationListener);
-	}
-
-	/**
-	 * Removes the decoration.
-	 */
-	public void deactivate() {
-		removeDecoration();
-
-        IGraphicalEditPart gep = (IGraphicalEditPart)getDecoratorTarget().getAdapter(IGraphicalEditPart.class);
-        assert gep != null;
-        
-        DiagramEventBroker.getInstance(gep.getEditingDomain()).removeNotificationListener(gep.getNotationView(),NotationPackage.eINSTANCE.getDescriptionStyle_Description(), notificationListener);
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/provider/ReviewDecoratorProvider.java b/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/provider/ReviewDecoratorProvider.java
deleted file mode 100644
index 9c6d243..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/provider/ReviewDecoratorProvider.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.decorator.provider;
-
-import org.eclipse.jface.util.Assert;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
-import org.eclipse.gmf.runtime.notation.Node;
-
-
-/**
- * @author sshaw
- *
- * Decorator provider for the review decorator class
- */
-public class ReviewDecoratorProvider
-	extends AbstractProvider
-	implements IDecoratorProvider {
-
-	/** The key used for the mood decoration */
-	public static final String REVIEW = "Review_Decorator"; //$NON-NLS-1$
-	
-	public void createDecorators(IDecoratorTarget decoratorTarget) {
-		Node node = ReviewDecorator.getDecoratorTargetNode(decoratorTarget);
-		if (node != null) {
-			decoratorTarget.installDecorator(REVIEW, new ReviewDecorator(decoratorTarget));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.internal.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-		Assert.isNotNull(operation);
-
-		if (!(operation instanceof CreateDecoratorsOperation)) {
-			return false;
-		}
-
-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation)
-			.getDecoratorTarget();
-		return ReviewDecorator.getDecoratorTargetNode(decoratorTarget) != null;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.classpath b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.cvsignore b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.cvsignore
deleted file mode 100644
index 6d88b9a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-geoshapes.zip

diff --git "a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.geoshapes Build Example Zip \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.geoshapes Build Example Zip \133Builder\135.launch"
deleted file mode 100644
index c82e543..0000000
--- "a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.geoshapes Build Example Zip \133Builder\135.launch"
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.geoshapes&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.geoshapes&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.geoshapes}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.geoshapes/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.project b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.project
deleted file mode 100644
index e7bdf8c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.project
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.diagram.geoshapes</name>
-	<comment></comment>
-	<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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.geoshapes Build Example Zip [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/META-INF/MANIFEST.MF
deleted file mode 100644
index ab55ff4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.diagram.geoshapes; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.DiagramPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal,
- org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.l10n,
- org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.nonactivating,
- org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.parts,
- org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.providers,
- org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.util,
- org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.views.factories,
- org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.wizards
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing.render;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true; exceptions="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.nonactivating"

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/about.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/build.properties b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/build.properties
deleted file mode 100644
index 482662e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/build.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = .,\
-               properties/,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               about.html
-src.includes = properties/,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               about.html,\
-               .project,\
-               build.properties,\
-               .classpath
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/buildZip.xml b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/buildZip.xml
deleted file mode 100644
index 485283e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-			
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\geoshapes.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/icons/geoshape.gif b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/icons/geoshape.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/icons/geoshape.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/icons/wizards/geoshapes_wiz.gif b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/icons/wizards/geoshapes_wiz.gif
deleted file mode 100644
index 519895c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/icons/wizards/geoshapes_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.properties b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.properties
deleted file mode 100644
index bb22325..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.properties
+++ /dev/null

@@ -1,45 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Geoshape Diagram - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Geometric Shapes
-Plugin.providerName = Eclipse.org
-
-ext.globalActionHandlerProviders = Geoshapes Editor Global Action Handler Providers
-
-# ==============================================================================
-# Geometric Shapes - Wizards -  Translation Instruction:  section to be 
-# translated
-# ==============================================================================
-GMF_example_wizard_category_name = GMF (Graphical Modeling Framework) Diagrams
-
-Geoshape_example_wizard_description = An example of a wizard that creates sample geoshape file
-
-Geoshape_example_graphical_editor_name = Geoshape editor
-
-CreateGeoshapePage1.Title = Create geoshape file
-
-CreateGeoshapePage1.Description = Create a new geoshape file resource.
-
-CreateGeoshapePage1.ModelNames.GroupName = Geoshape Model Samples
-
-CreateGeoshapePage1.ModelNames.EmptyModelName = Empty Model
-
-# ==============================================================================
-#  Diagram UI Properties - section to be translated
-# ==============================================================================
-General=General
-Appearance=Appearance
-Advanced= Advanced

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.xml b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.xml
deleted file mode 100644
index d761182..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.xml
+++ /dev/null

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension point="org.eclipse.ui.editors">   
-      <editor
-            class="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDiagramEditorWithFlyoutPalette"
-            contributorClass="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.parts.DiagramActionBarContributor"
-            default="true"
-            extensions="geo"
-            icon="icons/geoshape.gif"
-            id="GeoshapeEditor"
-            matchingStrategy="org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditorMatchingStrategy"
-            name="%Geoshape_example_graphical_editor_name">
-      </editor>
-   </extension>
-  
-   <extension point="org.eclipse.ui.newWizards">
-  	  <category name="%GMF_example_wizard_category_name" parentCategory="org.eclipse.ui.Examples" id="org.eclipse.gmf.examples"/> 
-  	  <wizard name="Geoshape Diagram" icon="icons/geoshape.gif" category="org.eclipse.ui.Examples/org.eclipse.gmf.examples" class="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.wizards.DiagramCreationWizard" id="org.eclipse.gmf.examples.runtime.diagram.geoshapes.wizard.new.file">
-  	  	 <description>
-  	  		%Geoshape_example_wizard_description
-  	  	 </description>  
-  	  </wizard>
-  </extension>
-  
-  <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-      <viewProvider class="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.providers.DiagramViewProvider">
-         <Priority name="Low">
-         </Priority>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="Geoshape">
-         </context>         
-      </viewProvider>
-   </extension>
-  
-  <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider class="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.nonactivating.DiagramEditPartProvider">
-         <Priority name="Medium">
-         </Priority>     
-	      <context providesRootEditPart="true"/>
-      </editpartProvider>
-   </extension>
-  
-  <extension id="GeoUiProperties" name="Geoshape UI Properties" point="org.eclipse.gmf.runtime.common.core.propertiesConfiguration">
-      <PropertiesConfiguration path="properties/geoshape.properties"/>
-   </extension>
-   
-   
-  
-
-  
-  <extension id="globalActionHandlerProviders" 
-  	name="%ext.globalActionHandlerProviders" 
-  	point="org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders">
-      <GlobalActionHandlerProvider 
-      	class="org.eclipse.gmf.runtime.diagram.ui.render.providers.DiagramUIRenderGlobalActionHandlerProvider" 
-      	id="geoshapesGlobalActionHandlerProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <ViewId id="GeoshapeEditor">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="delete">
-               </GlobalActionId>         
-               <GlobalActionId actionId="cut">
-               </GlobalActionId>
-               <GlobalActionId actionId="copy">
-               </GlobalActionId>
-               <GlobalActionId actionId="paste">
-               </GlobalActionId>   
-            </ElementType>
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-               <GlobalActionId actionId="save">
-               </GlobalActionId>
-            </ElementType>
-          </ViewId>
-      </GlobalActionHandlerProvider>
-      <GlobalActionHandlerProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers.DiagramIDEGlobalActionHandlerProvider"
-            id="geoshapesIDEGlobalActionHandlerProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <ViewId
-               id="GeoshapeEditor">
-            <ElementType
-                  class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId
-                     actionId="bookmark">
-               </GlobalActionId>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-      
-      <!--Printing -->
-      <GlobalActionHandlerProvider class="org.eclipse.gmf.runtime.diagram.ui.printing.render.providers.DiagramWithPrintGlobalActionHandlerProvider" id="logicPrintGlobalActionHandlerProvider">
-         <Priority name="Lowest"/>
-         <ViewId id="GeoshapeEditor">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="print"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-  </extension>
-  
-  <extension id="GeoshapesExampleContributionItemProvider" name="%ext.contributionItemProvider" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider class="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.providers.GeoshapesContributionItemProvider">
-         <Priority name="Low"/>
-         <partContribution id="GeoshapeEditor">
-            <partAction menubarPath="/file/print" id="printPreviewAction">
-            </partAction>
-         </partContribution>
-       </contributionItemProvider>
-   </extension>
-  
-  
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-      <parser type="geo" class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
-      </parser>
-  </extension>
-  <extension
-     point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-       <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority name="Medium">
-         </Priority>
-         <editor id="GeoshapeEditor">
-         </editor>
-         <contribution>
-            <predefinedEntry
-                  id="geoshapeDrawer"
-                  path="/">
-               <expand force="true"/>
-            </predefinedEntry>
-         </contribution>
-      </paletteProvider>
-   </extension>
-  <extension
-        point="org.eclipse.core.runtime.preferences">
-     <initializer class="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.preferences.GeoshapesPreferenceInitializer"/>
-  </extension>
-</plugin>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/properties/geoshape.properties b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/properties/geoshape.properties
deleted file mode 100644
index 5c63754..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/properties/geoshape.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# DO NOT TRANSLATE THIS FILE
-GEOSHAPE_EXT=geo
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/DiagramPlugin.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/DiagramPlugin.java
deleted file mode 100644
index 00880c5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/DiagramPlugin.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * Geoshapes Diagram Example Plug-in
- * 
- * @author qili
- */
-public class DiagramPlugin extends AbstractUIPlugin {
-    
-    /**
-     * The geo shapes diagram editor ID. This matches the id used in this
-     * plugin's XML for the editor extension point.
-     */
-    public static final String EDITOR_ID = "GeoshapeEditor"; //$NON-NLS-1$
-
-	/**
-	 * The shared instance.
-	 */
-	private static DiagramPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramPlugin() {
-		super();
-		plugin = this;
-	}
-	
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the plugin instance
-	 */
-	public static DiagramPlugin getInstance() {
-		return plugin;
-	}	
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-    public void start(BundleContext context)
-        throws Exception {
-        super.start(context);
-         PreferencesHint.registerPreferenceStore(
-             new PreferencesHint(EDITOR_ID), getPreferenceStore());
-    }
-    
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapeMessages.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapeMessages.java
deleted file mode 100644
index 1834420..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapeMessages.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class ExampleDiagramGeoshapeMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.l10n.ExampleDiagramGeoshapeMessages";//$NON-NLS-1$
-
-	private ExampleDiagramGeoshapeMessages() {
-		// Do not instantiate
-	}
-
-	public static String GEOVisualizer_DefaultGeoshapeDiagramFileName;
-	public static String CreationWizard_New_Geoshape_Diagram;
-	public static String GeoshapeWizardPage_Title;
-	public static String GeoshapeWizardPage_Description;
-	public static String GeoShapeGeneralDetails_GeoShapeDescriptionLabel_text;
-	public static String GeoShapeGeneralDetails_GeoShapeDescriptionChangeCommand_text;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ExampleDiagramGeoshapeMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapeMessages.properties b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapeMessages.properties
deleted file mode 100644
index 77bf198..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapeMessages.properties
+++ /dev/null

@@ -1,34 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# GEO Visualizer General - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- File creation ---
-GEOVisualizer_DefaultGeoshapeDiagramFileName=geoshapediagram
-
-# ==============================================================================
-# Wizards - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- Geoshape Diagram Wizard ---
-CreationWizard_New_Geoshape_Diagram=New Geoshape Diagram
-GeoshapeWizardPage_Title=Create Geoshape Diagram
-GeoshapeWizardPage_Description=Create a new geoshape diagram.
-
-# ===========================================================================
-#  General Tab related strings - Translation Instruction: needs Translation.
-# ===========================================================================
-
-GeoShapeGeneralDetails_GeoShapeDescriptionLabel_text=Description:
-GeoShapeGeneralDetails_GeoShapeDescriptionChangeCommand_text=Description

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapePluginImages.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapePluginImages.java
deleted file mode 100644
index 9654534..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/ExampleDiagramGeoshapePluginImages.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.l10n;
-
-import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.DiagramPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly.
- *  
- * @author cmahoney
- */
-public class ExampleDiagramGeoshapePluginImages {
-
-	// Prefixes
-	private static final String PREFIX_WIZARD = "icons/wizard/"; //$NON-NLS-1$
-
-	// Image descriptors.
-	public static final ImageDescriptor DESC_GEOSHAPES_WIZARD = create(PREFIX_WIZARD
-		+ "geoshapes_wiz.gif"); //$NON-NLS-1$
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(DiagramPlugin
-			.getPluginId(), imageName);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/package.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/package.html
deleted file mode 100644
index 00b521d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/nonactivating/DiagramEditPartProvider.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/nonactivating/DiagramEditPartProvider.java
deleted file mode 100644
index 464e6a9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/nonactivating/DiagramEditPartProvider.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.nonactivating;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Editpart provider for the geoshape diagram.
- * 
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
- */
-
-public class DiagramEditPartProvider extends AbstractEditPartProvider {	
-	
-	/**
-	 * Gets a diagram's editpart class.
-	 * This method should be overridden by a provider if it wants to provide this service. 
-	 * @param view the view to be <i>controlled</code> by the created editpart
-	 */
-	protected Class getDiagramEditPartClass(View view ) {
-		return(DiagramEditPart.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-		String dgrmType ="Geoshape"; //$NON-NLS-1$
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
-			if (view instanceof Diagram && view.getType().equals(dgrmType)) 
-				return true;
-		}
-		return false;
-	}	
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/package.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/package.html
deleted file mode 100644
index e22980a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/parts/DiagramActionBarContributor.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/parts/DiagramActionBarContributor.java
deleted file mode 100644
index 017e03e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/parts/DiagramActionBarContributor.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.parts;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDiagramEditorWithFlyoutPalette;
-
-/**
- * The geoshapes diagram editor action bar contributor. This allows the
- * geoshapes diagram to inherit the Diagram main menu and the toolbar from the
- * basic diagram editor.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
- */
-public class DiagramActionBarContributor
-	extends
-	org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor {
-
-	/**
-	 * The geoshapes diagram editor ID.
-	 */
-	protected static final String ID = "GeoshapeEditor"; //$NON-NLS-1$
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor#getEditorClass()
-	 */
-	protected Class getEditorClass() {
-		return FileDiagramEditorWithFlyoutPalette.class;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor#getEditorId()
-	 */
-	protected String getEditorId() {
-		return ID;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/parts/package.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/parts/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/parts/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/preferences/GeoshapesPreferenceInitializer.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/preferences/GeoshapesPreferenceInitializer.java
deleted file mode 100644
index c514548..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/preferences/GeoshapesPreferenceInitializer.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.preferences;
-
-import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramPreferenceInitializer;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
-/**
- * Initializes the preference values for the geo shapes Diagram Editor.
- * @author mmostafa
- */
-
-public class GeoshapesPreferenceInitializer
-    extends DiagramPreferenceInitializer {
-
-    public void initializeDefaultPreferences() {
-        super.initializeDefaultPreferences();
-        // Resetting AntiAliase settings in the geo shapes preference store 
-        IPreferenceStore store = getPreferenceStore();  
-        store.setDefault(IPreferenceConstants.PREF_ENABLE_ANTIALIAS, false);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.diagram.ui.internal.preferences.DiagramPreferenceInitializer#getPreferenceStore()
-     */
-    protected IPreferenceStore getPreferenceStore() {
-        return DiagramPlugin.getInstance().getPreferenceStore();
-    }
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramViewProvider.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramViewProvider.java
deleted file mode 100644
index aab2f5f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramViewProvider.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.providers;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.views.factories.GeoshapesDiagramViewFactory;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-
-/**
- * 
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
- * 
- * View provider for the geoshape diagram.
- */
-public class DiagramViewProvider extends AbstractViewProvider { 
-
-	HashMap diagramMap = new HashMap(); 
-	{
-		diagramMap.put("Geoshape", GeoshapesDiagramViewFactory.class);//$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.view.AbstractViewProvider#getDiagramViewClass(IAdaptable, java.lang.String)
-	 */
-	protected Class getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		return (Class) diagramMap.get(diagramKind);
-	}
-}
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/GeoshapesContributionItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/GeoshapesContributionItemProvider.java
deleted file mode 100644
index a5e696f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/GeoshapesContributionItemProvider.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.providers;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.printing.actions.PrintPreviewAction;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.EnhancedPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.RenderedPrintPreviewAction;
-import org.eclipse.jface.action.IAction;
-
-/**
- * A contribution item provider for the Geoshapes Example that adds support for
- * print preview.
- * 
- * @author Wayne Diu, wdiu
- */
-public class GeoshapesContributionItemProvider
-	extends AbstractContributionItemProvider {
-
-	/**
-	 * The constructor
-	 */
-	public GeoshapesContributionItemProvider() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider#createAction(java.lang.String, org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	protected IAction createAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-
-		if (actionId.equals(PrintPreviewAction.ID)) {
-			return new RenderedPrintPreviewAction(new EnhancedPrintActionHelper());
-		}
-
-		return super.createAction(actionId, partDescriptor);
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/package.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/package.html
deleted file mode 100644
index 8a1d867..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the service provider classes for this plugin.
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/util/GeoShapeDiagramFileCreator.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/util/GeoShapeDiagramFileCreator.java
deleted file mode 100644
index 586f495..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/util/GeoShapeDiagramFileCreator.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.util;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorFileCreator;
-
-
-/**
- * @author qili
- *
- * Class that generates diagram files.
- */
-public class GeoShapeDiagramFileCreator extends IDEEditorFileCreator {
-	
-	private static GeoShapeDiagramFileCreator INSTANCE = new GeoShapeDiagramFileCreator();
-
-	/**
-	 * Method getInstance.
-	 * This class is a singleton that can only be accessed through this static method.
-	 * @return VizDiagramFileCreator The singleton instance
-	 */
-	static public GeoShapeDiagramFileCreator getInstance() {
-		return INSTANCE;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator#getExtension()
-	 */
-	public String getExtension() {
-		return ".geo"; //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/util/package.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/util/package.html
deleted file mode 100644
index d13eb8e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/util/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains <i>utility</i> classes used by this plugin.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/GeoshapesDiagramViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/GeoshapesDiagramViewFactory.java
deleted file mode 100644
index b060e33..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/GeoshapesDiagramViewFactory.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.views.factories;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-
-public class GeoshapesDiagramViewFactory
-	extends DiagramViewFactory {
-
-	/**
-	 * Get the measurement unit to be set in pixels implying that that units
-	 * stored in the notation file are identical to device pixels.
-	 */
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/package.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/package.html
deleted file mode 100644
index 35e19f4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/DiagramCreationWizard.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/DiagramCreationWizard.java
deleted file mode 100644
index 0af7162..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/DiagramCreationWizard.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.wizards;
-
-import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.l10n.ExampleDiagramGeoshapeMessages;
-import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.l10n.ExampleDiagramGeoshapePluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorCreationWizard;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
- *
- * Create Diagram Wizard
- */
-public class DiagramCreationWizard extends EditorCreationWizard{
-	
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
-	public void addPages() {
-		super.addPages();
-
-		if (page == null)
-			page = new DiagramWizardPage(getWorkbench(), getSelection());
-
-		addPage(page);
-	}
-	
-	public void init(IWorkbench workbench, IStructuredSelection sel) {
-		super.init(workbench, sel);
-
-		setWindowTitle(ExampleDiagramGeoshapeMessages.
-				CreationWizard_New_Geoshape_Diagram);
-		setDefaultPageImageDescriptor(ExampleDiagramGeoshapePluginImages.DESC_GEOSHAPES_WIZARD);
-		setNeedsProgressMonitor(true);
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/DiagramWizardPage.java b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/DiagramWizardPage.java
deleted file mode 100644
index 6d68a01..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/DiagramWizardPage.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.wizards;
-
-
-import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.l10n.ExampleDiagramGeoshapeMessages;
-import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.util.GeoShapeDiagramFileCreator;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
-
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.geoshapes.*
- *
- * Create Diagram Wizard Page
- */
-public class DiagramWizardPage extends EditorWizardPage{
-
-	/**
-	 * DiagramWizardPage constructor
-	 *
-	 * @param aWorkbench
-	 *            workbench
-	 * @param selection
-	 *            selection
-	 */
-	public DiagramWizardPage(IWorkbench aWorkbench,
-			IStructuredSelection selection) {
-		super("GeoshapeDiagramPage", aWorkbench, selection); //$NON-NLS-1$
-		this.setTitle(ExampleDiagramGeoshapeMessages.
-			GeoshapeWizardPage_Title);
-		this.setDescription(ExampleDiagramGeoshapeMessages.
-			GeoshapeWizardPage_Description);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage#getDefaultFileName()
-	 */
-	protected String getDefaultFileName() {
-		return ExampleDiagramGeoshapeMessages.GEOVisualizer_DefaultGeoshapeDiagramFileName;
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage#getDiagramFileCreator()
-	 */
-	public DiagramFileCreator getDiagramFileCreator() {
-		return GeoShapeDiagramFileCreator.getInstance();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage#getDiagramKind()
-	 */
-	protected String getDiagramKind() {
-		return "Geoshape"; //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/package.html b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/wizards/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/.classpath b/org.eclipse.gmf.examples.runtime.diagram.layout/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.examples.runtime.diagram.layout/.cvsignore b/org.eclipse.gmf.examples.runtime.diagram.layout/.cvsignore
deleted file mode 100644
index 3f55a71..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-servicesLayout.zip

diff --git "a/org.eclipse.gmf.examples.runtime.diagram.layout/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.layout Build Example Zip \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.diagram.layout/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.layout Build Example Zip \133Builder\135.launch"
deleted file mode 100644
index 2b452d5..0000000
--- "a/org.eclipse.gmf.examples.runtime.diagram.layout/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.layout Build Example Zip \133Builder\135.launch"
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.layout&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.layout&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.layout}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.layout/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/.project b/org.eclipse.gmf.examples.runtime.diagram.layout/.project
deleted file mode 100644
index ce521ed..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/.project
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.diagram.layout</name>
-	<comment></comment>
-	<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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.layout Build Example Zip [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.diagram.layout/META-INF/MANIFEST.MF
deleted file mode 100644
index a4dfe3e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.diagram.layout; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.diagram.layout.LayoutPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.diagram.layout,
- org.eclipse.gmf.examples.runtime.diagram.layout.actions,
- org.eclipse.gmf.examples.runtime.diagram.layout.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true; exceptions="org.eclipse.gmf.examples.runtime.diagram.layout.provider"

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/about.html b/org.eclipse.gmf.examples.runtime.diagram.layout/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/build.properties b/org.eclipse.gmf.examples.runtime.diagram.layout/build.properties
deleted file mode 100644
index ed91157..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/build.properties
+++ /dev/null

@@ -1,32 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = *.jar,\
-               .,\
-               META-INF/,\
-               build.properties,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html
-src.includes = *.jar,\
-               META-INF/,\
-               build.properties,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html,\
-               .project,\
-               .classpath
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/buildZip.xml b/org.eclipse.gmf.examples.runtime.diagram.layout/buildZip.xml
deleted file mode 100644
index 58eb56c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-				
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\servicesLayout.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/icons/diagram.gif b/org.eclipse.gmf.examples.runtime.diagram.layout/icons/diagram.gif
deleted file mode 100644
index b385e8c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/icons/diagram.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/icons/diagram2.gif b/org.eclipse.gmf.examples.runtime.diagram.layout/icons/diagram2.gif
deleted file mode 100644
index b385e8c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/icons/diagram2.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/plugin.properties b/org.eclipse.gmf.examples.runtime.diagram.layout/plugin.properties
deleted file mode 100644
index b152f1b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/plugin.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2003, 2004  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-Plugin.name = GMF Diagram Services Layout Example Plug-in
-Plugin.providerName = Eclipse.org
-
-actionSetLabel = Sample Square Layout 
-sampleMenu = &Diagram Services Samples
-layout_menuLabel = &Layout Diagram as Square
-layout_tooltip = Layout the current diagram in a square
-
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/plugin.xml b/org.eclipse.gmf.examples.runtime.diagram.layout/plugin.xml
deleted file mode 100644
index 92f86bc..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/plugin.xml
+++ /dev/null

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%actionSetLabel"
-            visible="true"
-            id="org.eclipse.gmf.examples.runtime.diagram.actionSet">
-         <action
-               label="%layout_menuLabel"
-               icon="icons/diagram.gif"
-               tooltip="%layout_tooltip"
-               class="org.eclipse.gmf.examples.runtime.diagram.layout.actions.SquareLayoutAction"
-               menubarPath="org.eclipse.gmf.examples.runtime.menu/additions"
-               id="org.eclipse.gmf.examples.runtime.diagram.layout.actions.SquareLayoutAction">
-         </action>
-         <menu
-               label="%sampleMenu"
-               id="org.eclipse.gmf.examples.runtime.menu">
-         </menu>
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.layoutProviders">
-      <layoutProvider
-            class="org.eclipse.gmf.examples.runtime.diagram.layout.provider.SquareLayoutProvider">
-         <Priority
-               name="Medium">
-         </Priority>
-      </layoutProvider> 
-   </extension>
-</plugin>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/LayoutPlugin.java b/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/LayoutPlugin.java
deleted file mode 100644
index 7a8362c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/LayoutPlugin.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.layout;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class LayoutPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared plug-in instance
-	 */
-	private static LayoutPlugin plugin;
- 
-	/**
-	 * The plug-in resource bundle
-	 */
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * Constructor
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#AbstractUIPlugin()
-	 */
-	public LayoutPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle
-				.getBundle("org.eclipse.gmf.examples.runtime.diagram.layout.LayoutPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static LayoutPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = LayoutPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/LayoutPluginResources.properties b/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/LayoutPluginResources.properties
deleted file mode 100644
index 5bf8929..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/LayoutPluginResources.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-squareLayoutTitle = Arrange Diagram as Square
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/actions/SquareLayoutAction.java b/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/actions/SquareLayoutAction.java
deleted file mode 100644
index 4b2efdf..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/actions/SquareLayoutAction.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.layout.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gmf.examples.runtime.diagram.layout.provider.SquareLayoutProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * @author sshaw
- *
- * Sample action for demonstrating invokation of a custom layout provider.  In this
- * case the square layout provider is invoked through a separate menu action.
- */
-public class SquareLayoutAction	implements IWorkbenchWindowActionDelegate {
-
-	/**
-	 * Title of diagram creation operation
-	 */
-	private static final String KEY_SQUARE_LAYOUT = "squareLayoutTitle"; //$NON-NLS-1$
-
-	/**
-	 * Constructor
-	 */
-	public SquareLayoutAction() {
-		//No-op
-	}
-
-	/**
-	 * Walk the selected objects and creates a new diagram for each visited
-	 * packages
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-
-		/* Get selection */
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
-		// Get selection from the window
-		final ISelection selection = window.getSelectionService().getSelection();
-        Diagram diagramView = null;
-        
-        // get the editing domain
-        if (selection instanceof IStructuredSelection) {
-
-            IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-
-            // Walk selection
-            for (Iterator i = structuredSelection.iterator(); i.hasNext();) {
-
-                // Try to adapt the selection to a view
-                Object selectedObject = i.next();
-                if (selectedObject instanceof IAdaptable) {
-
-                    // Try to get a View (new notation)
-                    Object object = ((IAdaptable) selectedObject)
-                        .getAdapter(View.class);
-                    
-                    diagramView = ((View)object).getDiagram();
-                }
-            }
-        }
-        
-        if (diagramView != null) {
-            final Diagram diag = diagramView;
-            TransactionalEditingDomain ted = TransactionUtil.getEditingDomain(diagramView);
-            AbstractEMFOperation operation = new AbstractEMFOperation(
-                ted, KEY_SQUARE_LAYOUT, null) {
-
-                protected IStatus doExecute(IProgressMonitor monitor,
-                        IAdaptable info)
-                    throws ExecutionException {
-
-                    LayoutService.getInstance().layout(diag, SquareLayoutProvider.SQUARE_LAYOUT);
-
-                    return Status.OK_STATUS;
-                }
-            };
-            try {
-                operation.execute(new NullProgressMonitor(), null);
-            } 
-            catch (Exception e) {
-                throw new RuntimeException(e.getCause());
-            }
-        }
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		//No-op
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-		//No-op
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow windowIn) {
-		//No-op
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/provider/SquareLayoutProvider.java b/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/provider/SquareLayoutProvider.java
deleted file mode 100644
index bab19af..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/provider/SquareLayoutProvider.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.layout.provider;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutNodeProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeOperation;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author sshaw
- *
- * Example provider for layout.  Calculates a square grid and positions each
- * node inside the grid.
- */
-public class SquareLayoutProvider extends AbstractLayoutNodeProvider {
-
-	public static String SQUARE_LAYOUT = "Square"; //$NON-NLS-1$
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */  
-	public boolean provides(IOperation operation) {
-		// check to make sure all node are contained in a diagram
-		if (operation instanceof ILayoutNodeOperation) {
-			Iterator nodes = ((ILayoutNodeOperation)operation).getLayoutNodes().listIterator();
-			if (nodes.hasNext()) { 
-				Node node = ((ILayoutNode)nodes.next()).getNode();
-				View container = (View)node.eContainer(); 
-				if (!(container instanceof Diagram))
-					return false;
-			} 
-		}
-		else {
-			return false;
-		}
-		
-		// Provide for SQUARE_LAYOUT hint.  
-		// Note: To override the default layout which is invoked from the Arrange menu
-		// then the provider can compare against ILayoutNodeProvider.DEFAULT_LAYOUT.
-		IAdaptable layoutHint = ((ILayoutNodeOperation) operation).getLayoutHint();
-		String layoutType = (String) layoutHint.getAdapter(String.class);
-		//return DEFAULT_LAYOUT.equals(layoutType);
-		return SQUARE_LAYOUT.equals(layoutType);	
-	}
-	
-	public Runnable layoutLayoutNodes(List layoutNodes,
-			boolean offsetFromBoundingBox, IAdaptable layoutHint) {
-		
-		final List lnodes = layoutNodes;
-		
-		return new Runnable() {
-			public void run() {
-				final int rowsize = (int)Math.round(Math.sqrt(lnodes.size()));
-				
-				// calculate the grid size
-				int gridWidth = 0;
-				int gridHeight = 0;
-				ListIterator li = lnodes.listIterator();
-				while (li.hasNext()) {
-					ILayoutNode lnode = (ILayoutNode)li.next();
-					if (lnode.getWidth() > gridWidth)
-						gridWidth = lnode.getWidth();
-					if (lnode.getHeight() > gridHeight)
-						gridHeight = lnode.getHeight();
-				}
-				
-				// add a small buffer in HiMetric units
-				gridWidth += 100;
-				gridHeight += 100;
-				
-				int i = 0;
-				li = lnodes.listIterator();
-				while (li.hasNext()) {
-					ILayoutNode lnode = (ILayoutNode)li.next();
-					
-					Bounds bounds = (Bounds)lnode.getNode().getLayoutConstraint();
-					bounds.setX((i % rowsize) * gridWidth);
-					bounds.setY((i / rowsize) * gridHeight);
-					lnode.getNode().setLayoutConstraint(bounds);
-					
-					i++;
-				}
-			}
-		};
-
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.classpath b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.classpath
deleted file mode 100644
index 467af9e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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="runtime"/>
-</classpath>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.cvsignore b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.cvsignore
deleted file mode 100644
index 12d8cf9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-logicSemanticEdit.zip
-runtime

diff --git "a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit Build Example Zip \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit Build Example Zip \133Builder\135.launch"
deleted file mode 100644
index 4cbfe18..0000000
--- "a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit Build Example Zip \133Builder\135.launch"
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.project b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.project
deleted file mode 100644
index f4ecaa9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.project
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.diagram.logic.model.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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit Build Example Zip [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 8cf643c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.diagram.logic.model.edit;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.diagram.logic.model.provider,
- org.eclipse.gmf.examples.runtime.diagram.logic.semantic.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.examples.runtime.diagram.logic.model;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/about.html b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/build.properties b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/build.properties
deleted file mode 100644
index 47fef44..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/build.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = .,\
-               plugin.properties,\
-               META-INF/,\
-               icons/,\
-               plugin.xml,\
-               about.html
-src.includes = plugin.properties,\
-               META-INF/,\
-               icons/,\
-               plugin.xml,\
-               about.html,\
-               build.properties,\
-               .project,\
-               .classpath
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/buildZip.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/buildZip.xml
deleted file mode 100644
index 1634a44..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-				
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\logicSemanticEdit.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_AndGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_AndGate.gif
deleted file mode 100644
index 542c5f0..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_AndGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Circuit.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Circuit.gif
deleted file mode 100644
index 7e23d6c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Circuit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_FlowContainer.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_FlowContainer.gif
deleted file mode 100644
index ab6e9c9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_FlowContainer.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_LED.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_LED.gif
deleted file mode 100644
index 504fdc4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_LED.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Model.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Model.gif
deleted file mode 100644
index 361b182..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Model.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_OrGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_OrGate.gif
deleted file mode 100644
index 459f5fd..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_OrGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Wire.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Wire.gif
deleted file mode 100644
index 2352be3..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_Wire.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_WireConnectionPoint.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_WireConnectionPoint.gif
deleted file mode 100644
index 173020a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_WireConnectionPoint.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_XORGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_XORGate.gif
deleted file mode 100644
index 2a8a6d1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_Element_XORGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_AndGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_AndGate.gif
deleted file mode 100644
index 542c5f0..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_AndGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Circuit.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Circuit.gif
deleted file mode 100644
index 7e23d6c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Circuit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_FlowContainer.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_FlowContainer.gif
deleted file mode 100644
index ab6e9c9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_FlowContainer.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_InputOutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_InputOutputTerminal.gif
deleted file mode 100644
index f40bfaa..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_InputOutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_InputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_InputTerminal.gif
deleted file mode 100644
index 5d70e42..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_InputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_LED.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_LED.gif
deleted file mode 100644
index 504fdc4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_LED.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Model.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Model.gif
deleted file mode 100644
index 361b182..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Model.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_OrGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_OrGate.gif
deleted file mode 100644
index 459f5fd..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_OrGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_OutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_OutputTerminal.gif
deleted file mode 100644
index e76646c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_OutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Terminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Terminal.gif
deleted file mode 100644
index 40e5eed..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Terminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Wire.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Wire.gif
deleted file mode 100644
index 2352be3..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_Wire.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_WireConnectionPoint.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_WireConnectionPoint.gif
deleted file mode 100644
index 173020a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_WireConnectionPoint.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_XORGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_XORGate.gif
deleted file mode 100644
index 2a8a6d1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateContainerElement_children_XORGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_InputOutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_InputOutputTerminal.gif
deleted file mode 100644
index ab6c90a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_InputOutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_InputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_InputTerminal.gif
deleted file mode 100644
index 2e2932f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_InputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_Terminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_Terminal.gif
deleted file mode 100644
index 0189a7e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_input_Terminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_InputOutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_InputOutputTerminal.gif
deleted file mode 100644
index ab6c90a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_InputOutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_OutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_OutputTerminal.gif
deleted file mode 100644
index 6910560..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_OutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_Terminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_Terminal.gif
deleted file mode 100644
index 0189a7e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_output_Terminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_wireConnectionPoint_WireConnectionPoint.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_wireConnectionPoint_WireConnectionPoint.gif
deleted file mode 100644
index 4bddb0b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateElement_wireConnectionPoint_WireConnectionPoint.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_InputOutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_InputOutputTerminal.gif
deleted file mode 100644
index 68ea265..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_InputOutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_OutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_OutputTerminal.gif
deleted file mode 100644
index 3353cf6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_OutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_Terminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_Terminal.gif
deleted file mode 100644
index 464f093..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_source_Terminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_InputOutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_InputOutputTerminal.gif
deleted file mode 100644
index 68ea265..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_InputOutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_InputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_InputTerminal.gif
deleted file mode 100644
index 1651076..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_InputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_Terminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_Terminal.gif
deleted file mode 100644
index 464f093..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/ctool16/CreateWire_target_Terminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/AndGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/AndGate.gif
deleted file mode 100644
index 8e0282f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/AndGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Circuit.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Circuit.gif
deleted file mode 100644
index cb61f54..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Circuit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/ContainerElement.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/ContainerElement.gif
deleted file mode 100644
index 338fb8d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/ContainerElement.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Element.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Element.gif
deleted file mode 100644
index f8041d2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Element.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/FlowContainer.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/FlowContainer.gif
deleted file mode 100644
index 4a56bb7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/FlowContainer.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Gate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Gate.gif
deleted file mode 100644
index 739ebbf..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Gate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/InputOutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/InputOutputTerminal.gif
deleted file mode 100644
index f8041d2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/InputOutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/InputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/InputTerminal.gif
deleted file mode 100644
index caf2804..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/InputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/LED.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/LED.gif
deleted file mode 100644
index b35c29f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/LED.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Model.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Model.gif
deleted file mode 100644
index 33a997a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Model.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/OrGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/OrGate.gif
deleted file mode 100644
index b7205e0..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/OrGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/OutputTerminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/OutputTerminal.gif
deleted file mode 100644
index 9250fec..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/OutputTerminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Terminal.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Terminal.gif
deleted file mode 100644
index c3370c7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Terminal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Wire.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Wire.gif
deleted file mode 100644
index 186a127..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Wire.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/WireConnectionPoint.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/WireConnectionPoint.gif
deleted file mode 100644
index 8a5c70c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/WireConnectionPoint.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/XORGate.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/XORGate.gif
deleted file mode 100644
index 05f79f0..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/XORGate.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/plugin.properties b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/plugin.properties
deleted file mode 100644
index 2f89821..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/plugin.properties
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/plugin.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/plugin.xml
deleted file mode 100644
index 47ff24e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/plugin.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-    
-  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-    <factory 
-       uri = "http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic" 
-       class = "org.eclipse.gmf.examples.runtime.diagram.logic.semantic.provider.SemanticItemProviderAdapterFactory" 
-       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>
-
-</plugin>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/model/provider/LogicsemanticEditPlugin.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/model/provider/LogicsemanticEditPlugin.java
deleted file mode 100644
index 36c638a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/model/provider/LogicsemanticEditPlugin.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: LogicsemanticEditPlugin.java,v 1.3 2006/03/23 22:12:57 vramaswamy Exp $
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.model.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Logicsemantic edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class LogicsemanticEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final LogicsemanticEditPlugin INSTANCE = new LogicsemanticEditPlugin();
-
-	/**
-	 * 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 LogicsemanticEditPlugin() {
-		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/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/AndGateItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/AndGateItemProvider.java
deleted file mode 100644
index eedf701..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/AndGateItemProvider.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AndGateItemProvider
-	extends GateItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AndGateItemProvider(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 AndGate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AndGate"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_AndGate_type");
-	}
-
-	/**
-	 * 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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/CircuitItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/CircuitItemProvider.java
deleted file mode 100644
index 11ecf64..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/CircuitItemProvider.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CircuitItemProvider
-	extends ContainerElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CircuitItemProvider(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 Circuit.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Circuit"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Circuit_type");
-	}
-
-	/**
-	 * 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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ContainerElementItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ContainerElementItemProvider.java
deleted file mode 100644
index 8f42fd9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ContainerElementItemProvider.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.ViewerNotification;
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContainerElementItemProvider
-	extends ElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContainerElementItemProvider(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);
-
-			addChildrenPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Children feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChildrenPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ContainerElement_children_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ContainerElement_children_feature", "_UI_ContainerElement_type"),
-				 SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 true,
-				 null,
-				 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(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns ContainerElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ContainerElement"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_ContainerElement_type");
-	}
-
-	/**
-	 * 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(ContainerElement.class)) {
-			case SemanticPackage.CONTAINER_ELEMENT__CHILDREN:
-				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
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createLED()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createWire()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createCircuit()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createFlowContainer()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createAndGate()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createOrGate()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createXORGate()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createModel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createOutputTerminal()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createInputTerminal()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.CONTAINER_ELEMENT__CHILDREN,
-				 SemanticFactory.eINSTANCE.createInputOutputTerminal()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ElementItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ElementItemProvider.java
deleted file mode 100644
index 978db82..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ElementItemProvider.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ElementItemProvider
-	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 ElementItemProvider(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);
-
-			addOutputTerminalsPropertyDescriptor(object);
-			addInputTerminalsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Output Terminals feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOutputTerminalsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Element_outputTerminals_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Element_outputTerminals_feature", "_UI_Element_type"),
-				 SemanticPackage.Literals.ELEMENT__OUTPUT_TERMINALS,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Input Terminals feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInputTerminalsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Element_inputTerminals_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Element_inputTerminals_feature", "_UI_Element_type"),
-				 SemanticPackage.Literals.ELEMENT__INPUT_TERMINALS,
-				 false,
-				 null,
-				 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(SemanticPackage.Literals.ELEMENT__TERMINALS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * This returns Element.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Element"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Element_type");
-	}
-
-	/**
-	 * 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(Element.class)) {
-			case SemanticPackage.ELEMENT__OUTPUT_TERMINALS:
-			case SemanticPackage.ELEMENT__INPUT_TERMINALS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case SemanticPackage.ELEMENT__TERMINALS:
-				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);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/FlowContainerItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/FlowContainerItemProvider.java
deleted file mode 100644
index 83b8163..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/FlowContainerItemProvider.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FlowContainerItemProvider
-	extends ContainerElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FlowContainerItemProvider(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 FlowContainer.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowContainer"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_FlowContainer_type");
-	}
-
-	/**
-	 * 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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/GateItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/GateItemProvider.java
deleted file mode 100644
index e695093..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/GateItemProvider.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GateItemProvider
-	extends ElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GateItemProvider(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 Gate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Gate"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Gate_type");
-	}
-
-	/**
-	 * 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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/InputOutputTerminalItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/InputOutputTerminalItemProvider.java
deleted file mode 100644
index 309478a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/InputOutputTerminalItemProvider.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InputOutputTerminalItemProvider
-	extends OutputTerminalItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputOutputTerminalItemProvider(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 InputOutputTerminal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InputOutputTerminal"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((InputOutputTerminal)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InputOutputTerminal_type") :
-			getString("_UI_InputOutputTerminal_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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/InputTerminalItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/InputTerminalItemProvider.java
deleted file mode 100644
index 25dff51..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/InputTerminalItemProvider.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InputTerminalItemProvider
-	extends TerminalItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputTerminalItemProvider(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 InputTerminal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InputTerminal"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((InputTerminal)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InputTerminal_type") :
-			getString("_UI_InputTerminal_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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/LEDItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/LEDItemProvider.java
deleted file mode 100644
index 5968479..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/LEDItemProvider.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LEDItemProvider
-	extends ElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LEDItemProvider(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);
-
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LED_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LED_value_feature", "_UI_LED_type"),
-				 SemanticPackage.Literals.LED__VALUE,
-				 true,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns LED.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LED"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		LED led = (LED)object;
-		return getString("_UI_LED_type") + " " + led.getValue();
-	}
-
-	/**
-	 * 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(LED.class)) {
-			case SemanticPackage.LED__VALUE:
-				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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ModelItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ModelItemProvider.java
deleted file mode 100644
index 804174c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/ModelItemProvider.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelItemProvider
-	extends ContainerElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelItemProvider(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 Model.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Model"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Model_type");
-	}
-
-	/**
-	 * 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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/OrGateItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/OrGateItemProvider.java
deleted file mode 100644
index bc37355..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/OrGateItemProvider.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class OrGateItemProvider
-	extends GateItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OrGateItemProvider(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 OrGate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OrGate"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_OrGate_type");
-	}
-
-	/**
-	 * 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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/OutputTerminalItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/OutputTerminalItemProvider.java
deleted file mode 100644
index f91d036..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/OutputTerminalItemProvider.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class OutputTerminalItemProvider
-	extends TerminalItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutputTerminalItemProvider(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 OutputTerminal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OutputTerminal"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((OutputTerminal)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_OutputTerminal_type") :
-			getString("_UI_OutputTerminal_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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/SemanticItemProviderAdapterFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/SemanticItemProviderAdapterFactory.java
deleted file mode 100644
index 9a6b7ef..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/SemanticItemProviderAdapterFactory.java
+++ /dev/null

@@ -1,406 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.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.examples.runtime.diagram.logic.semantic.util.SemanticAdapterFactory;
-
-/**
- * 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 SemanticItemProviderAdapterFactory extends SemanticAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-	/**
-	 * 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 SemanticItemProviderAdapterFactory() {
-		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.examples.runtime.diagram.logic.semantic.LED} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LEDItemProvider ledItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createLEDAdapter() {
-		if (ledItemProvider == null) {
-			ledItemProvider = new LEDItemProvider(this);
-		}
-
-		return ledItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WireItemProvider wireItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createWireAdapter() {
-		if (wireItemProvider == null) {
-			wireItemProvider = new WireItemProvider(this);
-		}
-
-		return wireItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CircuitItemProvider circuitItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createCircuitAdapter() {
-		if (circuitItemProvider == null) {
-			circuitItemProvider = new CircuitItemProvider(this);
-		}
-
-		return circuitItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FlowContainerItemProvider flowContainerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createFlowContainerAdapter() {
-		if (flowContainerItemProvider == null) {
-			flowContainerItemProvider = new FlowContainerItemProvider(this);
-		}
-
-		return flowContainerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AndGateItemProvider andGateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createAndGateAdapter() {
-		if (andGateItemProvider == null) {
-			andGateItemProvider = new AndGateItemProvider(this);
-		}
-
-		return andGateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OrGateItemProvider orGateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createOrGateAdapter() {
-		if (orGateItemProvider == null) {
-			orGateItemProvider = new OrGateItemProvider(this);
-		}
-
-		return orGateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XORGateItemProvider xorGateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createXORGateAdapter() {
-		if (xorGateItemProvider == null) {
-			xorGateItemProvider = new XORGateItemProvider(this);
-		}
-
-		return xorGateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelItemProvider modelItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createModelAdapter() {
-		if (modelItemProvider == null) {
-			modelItemProvider = new ModelItemProvider(this);
-		}
-
-		return modelItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutputTerminalItemProvider outputTerminalItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createOutputTerminalAdapter() {
-		if (outputTerminalItemProvider == null) {
-			outputTerminalItemProvider = new OutputTerminalItemProvider(this);
-		}
-
-		return outputTerminalItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InputTerminalItemProvider inputTerminalItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createInputTerminalAdapter() {
-		if (inputTerminalItemProvider == null) {
-			inputTerminalItemProvider = new InputTerminalItemProvider(this);
-		}
-
-		return inputTerminalItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InputOutputTerminalItemProvider inputOutputTerminalItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Adapter createInputOutputTerminalAdapter() {
-		if (inputOutputTerminalItemProvider == null) {
-			inputOutputTerminalItemProvider = new InputOutputTerminalItemProvider(this);
-		}
-
-		return inputOutputTerminalItemProvider;
-	}
-
-	/**
-	 * 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);
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/TerminalItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/TerminalItemProvider.java
deleted file mode 100644
index 37cccdc..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/TerminalItemProvider.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TerminalItemProvider
-	extends ElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TerminalItemProvider(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);
-
-			addIdPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Terminal_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_id_feature", "_UI_Terminal_type"),
-				 SemanticPackage.Literals.TERMINAL__ID,
-				 true,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Terminal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Terminal"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((Terminal)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Terminal_type") :
-			getString("_UI_Terminal_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(Terminal.class)) {
-			case SemanticPackage.TERMINAL__ID:
-				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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/WireItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/WireItemProvider.java
deleted file mode 100644
index 6946f52..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/WireItemProvider.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.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.ViewerNotification;
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WireItemProvider
-	extends ElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WireItemProvider(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);
-
-			addSourcePropertyDescriptor(object);
-			addTargetPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Source feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Wire_source_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Wire_source_feature", "_UI_Wire_type"),
-				 SemanticPackage.Literals.WIRE__SOURCE,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Target feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTargetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Wire_target_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Wire_target_feature", "_UI_Wire_type"),
-				 SemanticPackage.Literals.WIRE__TARGET,
-				 true,
-				 null,
-				 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(SemanticPackage.Literals.WIRE__SOURCE);
-			childrenFeatures.add(SemanticPackage.Literals.WIRE__TARGET);
-		}
-		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 Wire.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Wire"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_Wire_type");
-	}
-
-	/**
-	 * 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(Wire.class)) {
-			case SemanticPackage.WIRE__SOURCE:
-			case SemanticPackage.WIRE__TARGET:
-				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
-				(SemanticPackage.Literals.WIRE__SOURCE,
-				 SemanticFactory.eINSTANCE.createOutputTerminal()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.WIRE__SOURCE,
-				 SemanticFactory.eINSTANCE.createInputOutputTerminal()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.WIRE__TARGET,
-				 SemanticFactory.eINSTANCE.createInputTerminal()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SemanticPackage.Literals.WIRE__TARGET,
-				 SemanticFactory.eINSTANCE.createInputOutputTerminal()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == SemanticPackage.Literals.WIRE__SOURCE ||
-			childFeature == SemanticPackage.Literals.WIRE__TARGET;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/XORGateItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/XORGateItemProvider.java
deleted file mode 100644
index b7159ed..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/provider/XORGateItemProvider.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class XORGateItemProvider
-	extends GateItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XORGateItemProvider(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 XORGate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XORGate"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText(Object object) {
-		return getString("_UI_XORGate_type");
-	}
-
-	/**
-	 * 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 LogicsemanticEditPlugin.INSTANCE;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.classpath b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.cvsignore b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.cvsignore
deleted file mode 100644
index d24a7c5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-logicSemanticEditor.zip

diff --git "a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor Build Example Zip \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor Build Example Zip \133Builder\135.launch"
deleted file mode 100644
index 9baca1e..0000000
--- "a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor Build Example Zip \133Builder\135.launch"
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.project b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.project
deleted file mode 100644
index 23ab7fe..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.project
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.diagram.logic.model.editor</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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor Build Example Zip [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index d1fc7dc..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.diagram.logic.model.editor; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation.LogicsemanticEditorPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation,
- org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.examples.runtime.diagram.logic.model.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.workspace.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.transaction.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.workspace;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/about.html b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/build.properties b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/build.properties
deleted file mode 100644
index 3142ff2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/build.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = .,\
-               plugin.properties,\
-               META-INF/,\
-               icons/,\
-               plugin.xml,\
-               about.html
-src.includes = plugin.properties,\
-               META-INF/,\
-               icons/,\
-               plugin.xml,\
-               about.html,\
-               .classpath,\
-               .project,\
-               build.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/buildZip.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/buildZip.xml
deleted file mode 100644
index 2b636c9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-				
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\logicSemanticEditor.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/icons/full/obj16/SemanticModelFile.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/icons/full/obj16/SemanticModelFile.gif
deleted file mode 100644
index 366f9ff..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/icons/full/obj16/SemanticModelFile.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/icons/full/wizban/NewSemantic.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/icons/full/wizban/NewSemantic.gif
deleted file mode 100644
index e85f1da..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/icons/full/wizban/NewSemantic.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/plugin.properties b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/plugin.properties
deleted file mode 100644
index 4b9a218..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/plugin.properties
+++ /dev/null

@@ -1,65 +0,0 @@
-# <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 = GMF Logicsemantic Editor
-providerName = Eclipse.org
-
-_UI_SemanticEditor_menu = &Semantic 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_SemanticModelWizard_label = Semantic Model
-_UI_SemanticModelWizard_description = Create a new Semantic model
-
-_UI_SemanticEditor_label = Semantic Model Editor
-
-_UI_SemanticEditorFilenameDefaultBase = My
-_UI_SemanticEditorFilenameExtension = semantic
-
-_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/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/plugin.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/plugin.xml
deleted file mode 100644
index 9b30055..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/plugin.xml
+++ /dev/null

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-
-  <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.examples.runtime.diagram.logic.semantic.presentation.SemanticModelWizardID"
-      name = "%_UI_SemanticModelWizard_label"
-      class = "org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation.SemanticModelWizard"
-      category = "org.eclipse.emf.ecore.Wizard.category.ID"
-      icon = "icons/full/obj16/SemanticModelFile.gif">
-      <description>%_UI_SemanticModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-  </extension>
-
-  <extension point = "org.eclipse.ui.editors">
-    <editor
-        id = "org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation.SemanticEditorID"
-        name = "%_UI_SemanticEditor_label"
-        icon = "icons/full/obj16/SemanticModelFile.gif"
-        extensions = "logic2semantic"
-        class = "org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation.SemanticEditor" 
-        contributorClass="org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation.SemanticActionBarContributor" >
-    </editor>
-  </extension>
-  <extension
-        point="org.eclipse.emf.transaction.listeners">
-     <listener class="org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation.ResourceLoadedListener">
-        <editingDomain id="org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain"/>
-     </listener>
-  </extension>
-  <extension
-        point="org.eclipse.emf.ecore.extension_parser">
-     <parser
-           class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory"
-           type="logic2semantic"/>
-  </extension>    
-</plugin>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/model/presentation/LogicsemanticEditorPlugin.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/model/presentation/LogicsemanticEditorPlugin.java
deleted file mode 100644
index 217ea3c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/model/presentation/LogicsemanticEditorPlugin.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Logicsemantic editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class LogicsemanticEditorPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final LogicsemanticEditorPlugin INSTANCE = new LogicsemanticEditorPlugin();
-
-	/**
-	 * 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 LogicsemanticEditorPlugin() {
-		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 EclipseUIPlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/ResourceLoadedListener.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/ResourceLoadedListener.java
deleted file mode 100644
index 9095c12..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/ResourceLoadedListener.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *   IBM - Initial API and implementation
- *
- * </copyright>
- *
- * $Id$
- */
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.DemultiplexingListener;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation.LogicsemanticEditorPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * Listens for the loading of resources, and creates editors on them when they
- * load.
- */
-public class ResourceLoadedListener extends DemultiplexingListener {
-	private static ResourceLoadedListener instance;
-	
-	private final Set ignoredResources = new java.util.HashSet();
-	
-	/**
-	 * Initializes me with my filter.
-	 */
-	public ResourceLoadedListener() {
-		super(NotificationFilter.createFeatureFilter(
-				EcorePackage.eINSTANCE.getEResource(), Resource.RESOURCE__IS_LOADED));
-		
-		instance = this;
-	}
-	
-	/**
-	 * Returns the default listener instance.
-	 * 
-	 * @return the instance associated with the editing domain that manages the
-	 *     specified resource set, or <code>null</code> if none is found
-	 */
-	public static ResourceLoadedListener getDefault() {
-		return instance;
-	}
-	
-	/**
-	 * Ignores any future load/unload notifications from the specified resource,
-	 * until the next call to {@link #watch(Resource) watch(res)}.
-	 * 
-	 * @param res the resource to ignore
-	 */
-	public void ignore(Resource res) {
-		ignoredResources.add(res);
-	}
-	
-	/**
-	 * Ceases to {@link #ignore(Resource)} a previously ignored resource.
-	 * 
-	 * @param res the resource
-	 */
-	public void watch(Resource res) {
-		ignoredResources.remove(res);
-	}
-
-	protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
-		if (ignoredResources.contains(notification.getNotifier())) {
-			// skip any resource that we are supposed to ignore
-			return;
-		}
-		
-		if (notification.getNewBooleanValue() && !notification.getOldBooleanValue()) {
-			// a resource has been loaded that was not loaded before.  Open an editor
-			final IFile file = getFile((Resource)notification.getNotifier(), domain);
-			
-			if (file != null) {
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						try {
-							IWorkbenchPage page = getActivePage();
-							
-							if (page != null) {
-								IEditorPart activeEditor = page.getActiveEditor();
-								
-								if (file.getFileExtension().equals("logic2semantic")) { //$NON-NLS-1$
-									page.openEditor(
-											new FileEditorInput(file),
-											"org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation.SemanticEditorID", //$NON-NLS-1$
-											false);
-								}
-								
-								// restore the previously active editor to active
-								//    state
-								if (activeEditor != null) {
-									page.activate(activeEditor);
-								}
-							}
-						} catch (PartInitException e) {
-							LogicsemanticEditorPlugin.getPlugin().log(e.getStatus());
-						}
-					}});
-			}
-		} else if (!notification.getNewBooleanValue() && notification.getOldBooleanValue()) {
-			// a resource has been unloaded that was  loaded before.  Close
-			//    the editor, if any
-			final IFile file = WorkspaceSynchronizer.getFile(
-					(Resource) notification.getNotifier());
-			
-			if (file != null) {
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						IWorkbenchPage page = getActivePage();
-						
-						if (page != null) {
-							IEditorReference[] editors = page.findEditors(
-									new FileEditorInput(file),
-									"org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation.SemanticEditorID", //$NON-NLS-1$
-									IWorkbenchPage.MATCH_ID | IWorkbenchPage.MATCH_INPUT);
-							
-							page.closeEditors(editors, false);
-						}
-					}});
-			}
-		}
-	}
-	
-	private IFile getFile(Resource resource, TransactionalEditingDomain domain) {
-		IFile result = null;
-		
-		URI normalizedURI = domain.getResourceSet().getURIConverter().normalize(resource.getURI());
-		
-		if ("file".equals(normalizedURI.scheme())) { //$NON-NLS-1$
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(URI.decode(normalizedURI.devicePath())));
-			if (files.length > 0) {
-				result = files[0];
-			}
-		} else  {
-			if ("platform".equals(normalizedURI.scheme()) && (normalizedURI.segmentCount() > 2)) { //$NON-NLS-1$
-				if ("resource".equals(normalizedURI.segment(0))) { //$NON-NLS-1$
-					IPath path = new Path(URI.decode(normalizedURI.path())).removeFirstSegments(1);
-					
-					result = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Obtains the currently active workbench page.
-	 * 
-	 * @return the active page, or <code>null</code> if none is active
-	 */
-	private IWorkbenchPage getActivePage() {
-		IWorkbenchPage result = null;
-		
-		IWorkbench bench = PlatformUI.getWorkbench();
-		if (bench != null) {
-			IWorkbenchWindow window = bench.getActiveWorkbenchWindow();
-			
-			if (window != null) {
-				result = window.getActivePage();
-			}
-		}
-		
-		return result;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticActionBarContributor.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticActionBarContributor.java
deleted file mode 100644
index c3c1711..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticActionBarContributor.java
+++ /dev/null

@@ -1,440 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.ControlAction;
-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.emf.workspace.ui.actions.RedoActionWrapper;
-import org.eclipse.emf.workspace.ui.actions.UndoActionWrapper;
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation.LogicsemanticEditorPlugin;
-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.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * This is the action bar contributor for the EXTLibrary model editor.
- * <!-- begin-user-doc -->
- * It is customized from its EMF-generated form to provide alternative implementations
- * of the undo and redo menu actions (delegating to the operation history) and
- * additional example actions such as initiation of long-running background reader
- * jobs.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SemanticActionBarContributor
-	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(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
-		{
-			public void run() {
-				try {
-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
-				}
-				catch (PartInitException exception) {
-					LogicsemanticEditorPlugin.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(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
-		{
-			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 SemanticActionBarContributor() {
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
-
-	public void init(IActionBars actionBars) {
-		super.init(actionBars);
-
-	    ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-	    
-		// override the superclass implementation of these actions
-	    undoAction = new UndoActionWrapper();
-	    undoAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-	    actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undoAction);
-
-	    redoAction = new RedoActionWrapper();
-	    redoAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-	    actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redoAction);
-	}
-	
-	/**
-	 * 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("semantic-settings")); //$NON-NLS-1$
-		toolBarManager.add(new Separator("semantic-additions")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 -->
-	 */
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-
-		IMenuManager submenuManager = new MenuManager(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticEditor_menu"), "org.eclipse.gmf.examples.runtime.diagram.logic.semanticMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
-
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
-
-		// 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(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("additions", submenuManager); //$NON-NLS-1$
-
-		submenuManager = new MenuManager(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("additions", submenuManager); //$NON-NLS-1$
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
-
-		super.addGlobalActions(menuManager);
-	}
-
-	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticEditor.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticEditor.java
deleted file mode 100644
index dd2b681..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticEditor.java
+++ /dev/null

@@ -1,1218 +0,0 @@
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.presentation;
-
-
-import java.io.IOException;
-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.Set;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IOperationHistoryListener;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.ObjectUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryEvent;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-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.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-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.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.transaction.ResourceSetListener;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.ui.provider.TransactionalAdapterFactoryContentProvider;
-import org.eclipse.emf.transaction.ui.provider.TransactionalAdapterFactoryLabelProvider;
-import org.eclipse.emf.transaction.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.emf.workspace.EMFCommandOperation;
-import org.eclipse.emf.workspace.IWorkspaceCommandStack;
-import org.eclipse.emf.workspace.ResourceUndoContext;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation.LogicsemanticEditorPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.provider.SemanticItemProviderAdapterFactory;
-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.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.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-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.EditorPart;
-import org.eclipse.ui.part.FileEditorInput;
-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 Semantic model editor.
- * <!-- begin-user-doc -->
- * This particular implementation is customized from the default editor generated
- * by EMF.  This editor differs from the default EMF implementation in the following
- * ways:
- * <ul>
- *   <li>all instances operate in a single, shared
- *       {@link TransactionalEditingDomain transactional editing domain}</li>
- *   <li>a {@link ResourceSetListener} is statically registered on this editing
- *       domain that automatically creates editors for any resource loaded (e.g.,
- *       by proxy resolution)</li>
- *   <li>the editing domain delegates command-stack functionality to the worbench
- *       {@link IOperationHistory}.  It provides its {@link IUndoContext} to
- *       specialized implementations of the undo/redo actions that operate on the
- *       operation history.  Execution of commands is also delegated to the
- *       operation history</li>
- *   <li>refreshing of the tree content and property sheet is performed within
- *       read-only transactions on the editing domain, using the
- *       {@link TransactionalEditingDomain#runExclusive(Runnable)} API</li>
- *   <li>only the 'selection' tree view is provided (it is not a multi-page editor)</li>
- *   <li>synchronization of the workspace resource with the loaded EMF resource
- *       uses the {@link WorkspaceSynchronizer} utility API</li>
- * </ul>
- * <!-- end-user-doc -->
- * @generated
- */
-public class SemanticEditor
-	extends EditorPart
-	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;
-
-	protected IUndoContext undoContext;
-	protected Resource resource;  // the resource that we are editing
-	
-	/**
-	 * 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 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(SemanticEditor.this);
-
-						setCurrentViewer(contentOutlineViewer);
-					}
-				}
-				else if (p instanceof PropertySheet) {
-					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
-						getActionBarContributor().setActiveEditor(SemanticEditor.this);
-						handleActivate();
-					}
-				}
-				else if (p == SemanticEditor.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 moved since last activation.
-	 * Maps {@link Resource resource} to {@link URI new URI}
-	 */
-	Map movedResources = new HashMap();
-
-	/**
-	 * Resources that have been saved.
-	 * @generated
-	 */
-	Collection savedResources = new ArrayList();
-	
-	private boolean dirty;
-
-	private IOperationHistoryListener historyListener = new IOperationHistoryListener() {
-		public void historyNotification(final OperationHistoryEvent event) {
-			if (event.getEventType() == OperationHistoryEvent.DONE) {
-				Set affectedResources = ResourceUndoContext.getAffectedResources(
-						event.getOperation());
-				
-				if (affectedResources.contains(getResource())) {
-					final IUndoableOperation operation = event.getOperation();
-					
-					// remove the default undo context so that we can have
-					//     independent undo/redo of independent resource changes
-					operation.removeContext(((IWorkspaceCommandStack)
-							getEditingDomain().getCommandStack()).getDefaultUndoContext());
-					
-					// add our undo context to populate our undo menu
-					operation.addContext(getUndoContext());
-					
-					getSite().getShell().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							dirty = true;
-							firePropertyChange(IEditorPart.PROP_DIRTY);
-
-							// Try to select the affected objects.
-							//
-							if (operation instanceof EMFCommandOperation) {
-								Command command = ((EMFCommandOperation) operation).getCommand();
-								
-								if (command != null) {
-									setSelectionToViewer(command
-											.getAffectedObjects());
-								}
-							}
-							
-							if (propertySheetPage != null) {
-								propertySheetPage.refresh();
-							}
-						}
-					});
-				}
-			}
-		}};
-	
-	/**
-	 * Synchronizes workspace changes with the editing domain.
-	 */
-	protected WorkspaceSynchronizer workspaceSynchronizer;
-	
-	/**
-	 * Handles activation of the editor or it's associated views.
-	 */
-	protected void handleActivate() {
-		setCurrentViewer(selectionViewer);
-		
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-		  editingDomain.getResourceToReadOnlyMap().clear();
-
-		  // Refresh any actions that may become enabled or disabled.
-		  //
-		  setSelection(getSelection());
-		}
-
-		try {
-			final Resource res = getResource();
-			
-			if (removedResources.contains(res)) {
-				if (handleDirtyConflict()) {
-					getSite().getPage().closeEditor(SemanticEditor.this, false);
-					SemanticEditor.this.dispose();
-				}
-			} else if (movedResources.containsKey(res)) {
-				if (savedResources.contains(res)) {
-					getOperationHistory().dispose(undoContext, true, true, true);
-					
-					// change saved resource's URI and remove from map
-					res.setURI((URI) movedResources.remove(res));
-						
-					// must change my editor input
-					IEditorInput newInput = new FileEditorInput(
-							WorkspaceSynchronizer.getFile(res));
-					setInputWithNotify(newInput);
-					setPartName(newInput.getName());
-				} else {
-					handleMovedResource();
-				}
-			} else if (changedResources.contains(res)) {
-				changedResources.removeAll(savedResources);
-				handleChangedResource();
-			}
-		} finally {
-			removedResources.clear();
-			changedResources.clear();
-			movedResources.clear();
-			savedResources.clear();
-		}
-	}
-
-	private WorkspaceSynchronizer.Delegate createSynchronizationDelegate() {
-		return new WorkspaceSynchronizer.Delegate() {
-			public boolean handleResourceDeleted(Resource resource) {
-				if ((resource == getResource()) && !isDirty()) {
-					// just close now without prompt
-					getSite().getShell().getDisplay().asyncExec
-						(new Runnable() {
-							 public void run() {
-								 getSite().getPage().closeEditor(SemanticEditor.this, false);
-								 SemanticEditor.this.dispose();
-							 }
-						 });
-				} else {
-					removedResources.add(resource);
-				}
-				
-				return true;
-			}
-			
-			public boolean handleResourceChanged(Resource resource) {
-				changedResources.add(resource);
-				
-				return true;
-			}
-			
-			public boolean handleResourceMoved(Resource resource, URI newURI) {
-				movedResources.put(resource, newURI);
-				
-				return true;
-			}
-			
-			public void dispose() {
-				removedResources.clear();
-				changedResources.clear();
-				movedResources.clear();
-			}};
-	}
-	
-	/**
-	 * Handles what to do with changed resource on activation.
-	 */
-	protected void handleChangedResource() {
-		Resource res = getResource();
-		
-		if (!isDirty() || handleDirtyConflict()) {
-			changedResources.remove(res);
-			
-			getOperationHistory().dispose(undoContext, true, true, true);
-			dirty = false;
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-
-			ResourceLoadedListener listener = ResourceLoadedListener.getDefault();
-			listener.ignore(res);
-			
-			try {
-				if (res.isLoaded()) {
-					res.unload();
-					try {
-						res.load(Collections.EMPTY_MAP);
-					} catch (IOException exception) {
-						LogicsemanticEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-	
-				selectionViewer.setInput(getResource());
-			} finally {
-				listener.watch(res);
-			}
-		}
-	}
-	
-	/**
-	 * Handles what to do with moved resource on activation.
-	 */
-	protected void handleMovedResource() {
-		if (!isDirty() || handleDirtyConflict()) {
-			Resource res = getResource();
-			URI newURI = (URI) movedResources.get(res);
-			
-			if (newURI != null) {
-				if (res.isLoaded()) {
-					// unload
-					res.unload();
-				}
-
-				// load the new URI in another editor
-				res.getResourceSet().getResource(newURI, true);
-			}
-		}
-	}
-
-	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * 
-	 * @generated
-	 */
-	protected boolean handleDirtyConflict() {
-		return
-			MessageDialog.openQuestion
-				(getSite().getShell(),
-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
-				 getString("_WARN_FileConflict")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public SemanticEditor() {
-		super();
-
-		// Create an adapter factory that yields item providers.
-		//
-		List factories = new ArrayList();
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new SemanticItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-
-		adapterFactory = new ComposedAdapterFactory(factories);
-
-		// Get the registered workbench editing domain.
-		//
-		editingDomain = (AdapterFactoryEditingDomain) TransactionalEditingDomain.Registry.INSTANCE.getEditingDomain(
-				"org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain"); //$NON-NLS-1$
-		undoContext = new ObjectUndoContext(
-				this,
-				LogicsemanticEditorPlugin.getPlugin().getString("_UI_SemanticEditor_label")); //$NON-NLS-1$
-		getOperationHistory().addOperationHistoryListener(historyListener);
-	}
-
-	/**
-	 * 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 -->
-	 */
-	public class ReverseAdapterFactoryContentProvider extends TransactionalAdapterFactoryContentProvider {
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super((TransactionalEditingDomain) getEditingDomain(), 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;
-		}
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
-		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.
-			//
-			resource = editingDomain.loadResource(URI.createPlatformResourceURI(modelFile.getFile().getFullPath().toString()).toString());
-		}
-		catch (Exception exception) {
-			LogicsemanticEditorPlugin.INSTANCE.log(exception);
-		}
-	}
-	
-	protected Resource getResource() {
-		return resource;
-	}
-	
-	public IUndoContext getUndoContext() {
-		return undoContext;
-	}
-
-	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPartControl(Composite parent) {
-		// Creates the model from the editor input
-		//
-		createModel();
-
-		Tree tree = new Tree(parent, SWT.MULTI);
-		selectionViewer = new TreeViewer(tree);
-
-		selectionViewer.setContentProvider(new TransactionalAdapterFactoryContentProvider((TransactionalEditingDomain) getEditingDomain(), adapterFactory));
-
-		selectionViewer.setLabelProvider(new TransactionalAdapterFactoryLabelProvider((TransactionalEditingDomain) getEditingDomain(), adapterFactory));
-		
-		// unlike other EMF editors, I edit only a single resource, not a resource set
-		selectionViewer.setInput(getResource());
-
-		new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-		createContextMenuFor(selectionViewer);
-	}
-
-	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	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 if (key.equals(IUndoContext.class)) {
-			// used by undo/redo actions to get their undo context
-			return undoContext;
-		}
-		else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	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 TransactionalAdapterFactoryContentProvider(
-							(TransactionalEditingDomain) getEditingDomain(), adapterFactory));
-					contentOutlineViewer.setLabelProvider(
-						new TransactionalAdapterFactoryLabelProvider(
-							(TransactionalEditingDomain) getEditingDomain(), adapterFactory));
-					
-					// unlike other EMF editors, I edit only a single resource, not a resource set
-					contentOutlineViewer.setInput(getResource());
-
-					// 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(getResource());
-					  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 -->
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage =
-				new ExtendedPropertySheetPage(editingDomain) {
-					public void setSelectionToViewer(List selection) {
-						SemanticEditor.this.setSelectionToViewer(selection);
-						SemanticEditor.this.setFocus();
-					}
-
-					public void setActionBars(IActionBars actionBars) {
-						super.setActionBars(actionBars);
-						getActionBarContributor().shareGlobalActions(this, actionBars);
-					}
-				};
-			propertySheetPage.setPropertySourceProvider(new TransactionalAdapterFactoryContentProvider((TransactionalEditingDomain) getEditingDomain(), adapterFactory));
-		}
-
-		return propertySheetPage;
-	}
-
-	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void handleContentOutlineSelection(ISelection selection) {
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator selectedElements = ((IStructuredSelection)selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-
-				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));
-			}
-		}
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public boolean isDirty() {
-		return dirty;
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void doSave(IProgressMonitor progressMonitor) {
-		// Do the work within an operation because this is a long running activity
-		// that modifies the workbench.  Moreover, we must do this in a read-only
-		// transaction in the editing domain, to ensure exclusive read access
-		//
-		WorkspaceModifyOperation operation =
-			new WorkspaceModifyOperation() {
-				// This is the method that gets invoked when the operation runs.
-				//
-				public void execute(IProgressMonitor monitor) {
-					try {
-						((TransactionalEditingDomain) getEditingDomain()).runExclusive(new Runnable() {
-							public void run() {
-								try {
-									// Save the resource to the file system.
-									//
-									Resource savedResource = getResource();
-									savedResources.add(savedResource);
-									savedResource.save(Collections.EMPTY_MAP);
-								}
-								catch (Exception exception) {
-									LogicsemanticEditorPlugin.INSTANCE.log(exception);
-								}
-							}});
-					}
-					catch (Exception exception) {
-						LogicsemanticEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			};
-
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-			// Refresh the necessary state.
-			//
-			dirty = false;
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		}
-		catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			LogicsemanticEditorPlugin.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 -->
-	 */
-	protected void doSaveAs(final URI uri, final IEditorInput editorInput) {
-		// changing the URI is, conceptually, a write operation.  However, it does
-		//    not affect the abstract state of the model, so we only need exclusive
-		//    (read) access
-		try {
-			((TransactionalEditingDomain) getEditingDomain()).runExclusive(new Runnable() {
-				public void run() {
-					getResource().setURI(uri);
-					setInputWithNotify(editorInput);
-					setPartName(editorInput.getName());
-				}});
-		} catch (InterruptedException e) {
-			// just log it
-			LogicsemanticEditorPlugin.INSTANCE.log(e);
-			
-			// don't follow through with the save because we were interrupted while
-			//    trying to start the transaction, so our URI is not actually changed
-			return;
-		}
-		
-		IProgressMonitor progressMonitor =
-			getActionBars().getStatusLineManager() != null ?
-				getActionBars().getStatusLineManager().getProgressMonitor() :
-				new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void gotoMarker(IMarker marker) {
-		try {
-			if (marker.getType().equals(EValidator.MARKER)) {
-				final String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
-				if (uriAttribute != null) {
-					try {
-						((TransactionalEditingDomain) getEditingDomain()).runExclusive(new Runnable() {
-							public void run() {
-								URI uri = URI.createURI(uriAttribute);
-								EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
-								if (eObject != null) {
-								  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
-								}
-							}});
-					} catch (InterruptedException e) {
-						// just log it
-						LogicsemanticEditorPlugin.INSTANCE.log(e);
-					}
-				}
-			}
-		}
-		catch (CoreException exception) {
-			LogicsemanticEditorPlugin.INSTANCE.log(exception);
-		}
-	}
-
-	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		
-		workspaceSynchronizer = new WorkspaceSynchronizer(
-				(TransactionalEditingDomain) editingDomain,
-				createSynchronizationDelegate());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void setFocus() {
-		selectionViewer.getControl().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")); //$NON-NLS-1$
-						break;
-					}
-					case 1: {
-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
-						break;
-					}
-					default: {
-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
-						break;
-					}
-				}
-			}
-			else {
-				statusLineManager.setMessage(""); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * 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 LogicsemanticEditorPlugin.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 LogicsemanticEditorPlugin.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;
-	}
-
-	private IOperationHistory getOperationHistory() {
-		return ((IWorkspaceCommandStack) editingDomain.getCommandStack()).getOperationHistory();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void dispose() {
-		workspaceSynchronizer.dispose();
-		getOperationHistory().removeOperationHistoryListener(historyListener);
-		getOperationHistory().dispose(getUndoContext(), true, true, true);
-		
-		getResource().unload();
-		editingDomain.getResourceSet().getResources().remove(getResource());
-		
-		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/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticModelWizard.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticModelWizard.java
deleted file mode 100644
index 2d1136b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/presentation/SemanticModelWizard.java
+++ /dev/null

@@ -1,617 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-
-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.EObject;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
-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.jface.dialogs.MessageDialog;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.ModifyEvent;
-
-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.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation.LogicsemanticEditorPlugin;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-
-
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SemanticModelWizard extends Wizard implements INewWizard {
-	/**
-	 * This caches an instance of the model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SemanticPackage semanticPackage = SemanticPackage.eINSTANCE;
-
-	/**
-	 * This caches an instance of the model factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SemanticFactory semanticFactory = semanticPackage.getSemanticFactory();
-
-	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SemanticModelWizardNewFileCreationPage newFileCreationPage;
-
-	/**
-	 * This is the initial object creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SemanticModelWizardInitialObjectCreationPage 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(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(LogicsemanticEditorPlugin.INSTANCE.getImage("full/wizban/NewSemantic"))); //$NON-NLS-1$ 
-	}
-
-	/**
-	 * 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 = semanticPackage.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)semanticPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
-		EObject rootObject = semanticFactory.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) {
-							LogicsemanticEditorPlugin.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(), LogicsemanticEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
-				return false;
-			}
-
-			return true;
-		}
-		catch (Exception exception) {
-			LogicsemanticEditorPlugin.INSTANCE.log(exception);
-			return false;
-		}
-	}
-
-	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public class SemanticModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public SemanticModelWizardNewFileCreationPage(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 ".semantic".
-				//
-				String requiredExt = LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticEditorFilenameExtension"); //$NON-NLS-1$
-				String enteredExt = new Path(getFileName()).getFileExtension();
-				if (enteredExt == null || !enteredExt.equals(requiredExt)) {
-					setErrorMessage(LogicsemanticEditorPlugin.INSTANCE.getString("_WARN_FilenameExtension", new Object [] { requiredExt })); //$NON-NLS-1$
-					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 SemanticModelWizardInitialObjectCreationPage 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 SemanticModelWizardInitialObjectCreationPage(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(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
-
-				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(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
-
-				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 LogicsemanticEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			catch(MissingResourceException mre) {
-				LogicsemanticEditorPlugin.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(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) { //$NON-NLS-1$
-					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 SemanticModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
-		newFileCreationPage.setTitle(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticModelWizard_label")); //$NON-NLS-1$
-		newFileCreationPage.setDescription(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticModelWizard_description")); //$NON-NLS-1$
-		newFileCreationPage.setFileName(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticEditorFilenameDefaultBase") + "." + LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticEditorFilenameExtension")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		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 = LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticEditorFilenameDefaultBase"); //$NON-NLS-1$
-					String defaultModelFilenameExtension = LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticEditorFilenameExtension"); //$NON-NLS-1$
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
-					}
-					newFileCreationPage.setFileName(modelFilename);
-				}
-			}
-		}
-		initialObjectCreationPage = new SemanticModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
-		initialObjectCreationPage.setTitle(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_SemanticModelWizard_label")); //$NON-NLS-1$
-		initialObjectCreationPage.setDescription(LogicsemanticEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
-		addPage(initialObjectCreationPage);
-	}
-
-	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IFile getModelFile() {
-		return newFileCreationPage.getModelFile();
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.classpath b/org.eclipse.gmf.examples.runtime.diagram.logic.model/.classpath
deleted file mode 100644
index 467af9e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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="runtime"/>
-</classpath>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.cvsignore b/org.eclipse.gmf.examples.runtime.diagram.logic.model/.cvsignore
deleted file mode 100644
index 3523d53..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-logicSemantic.zip

diff --git "a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model Build Example Zip \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.diagram.logic.model/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model Build Example Zip \133Builder\135.launch"
deleted file mode 100644
index f5d9932..0000000
--- "a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model Build Example Zip \133Builder\135.launch"
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic.model&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic.model&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic.model}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic.model/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.project b/org.eclipse.gmf.examples.runtime.diagram.logic.model/.project
deleted file mode 100644
index 28b10bd..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.project
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.diagram.logic.model</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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic.model Build Example Zip [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.diagram.logic.model/META-INF/MANIFEST.MF
deleted file mode 100644
index a38267c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.diagram.logic.model; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: model,
- org.eclipse.gmf.examples.runtime.diagram.logic.semantic,
- org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl,
- org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util,
- rosemodel
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/about.html b/org.eclipse.gmf.examples.runtime.diagram.logic.model/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/build.properties b/org.eclipse.gmf.examples.runtime.diagram.logic.model/build.properties
deleted file mode 100644
index 41412a9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/build.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = .,\
-               runtime/model/,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = runtime/model/,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               about.html,\
-               .project,\
-               build.properties,\
-               .classpath

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/buildZip.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model/buildZip.xml
deleted file mode 100644
index 6015005..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF,**/*.ecore,**/*.genmodel,**/*.mdl"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-				
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\logicSemantic.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/icons/Circuit.gif b/org.eclipse.gmf.examples.runtime.diagram.logic.model/icons/Circuit.gif
deleted file mode 100644
index 498364f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/icons/Circuit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/plugin.properties b/org.eclipse.gmf.examples.runtime.diagram.logic.model/plugin.properties
deleted file mode 100644
index 165ffd5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/plugin.properties
+++ /dev/null

@@ -1,34 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: plugin.properties,v 1.3 2005/11/16 03:24:43 rgronback Exp $
- */
-
-# ====================================================================
-# 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 = GMF Logicsemantic Model
-providerName = Eclipse.org
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/plugin.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model/plugin.xml
deleted file mode 100644
index 6b3fd54..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/plugin.xml
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<!--
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: plugin.xml,v 1.4 2006/03/23 22:13:09 vramaswamy Exp $
- */
--->
-
-<plugin>
-
-    <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic" 
-       class = "org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage" />
-  </extension>
-
-</plugin>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/model/logicsemantic.ecore b/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/model/logicsemantic.ecore
deleted file mode 100644
index bbdf5c5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/model/logicsemantic.ecore
+++ /dev/null

@@ -1,42 +0,0 @@
-<?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="semantic"
-    nsURI="http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic" nsPrefix="semantic">
-  <eClassifiers xsi:type="ecore:EClass" name="LED" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="0"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="terminals" upperBound="-1"
-        eType="#//Terminal" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputTerminals" upperBound="-1"
-        eType="#//Terminal" changeable="false" volatile="true" transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputTerminals" upperBound="-1"
-        eType="#//Terminal" changeable="false" volatile="true" transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Wire" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//OutputTerminal"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//InputTerminal"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Circuit" eSuperTypes="#//ContainerElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Gate" abstract="true" eSuperTypes="#//Element"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FlowContainer" eSuperTypes="#//ContainerElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AndGate" eSuperTypes="#//Gate"/>
-  <eClassifiers xsi:type="ecore:EClass" name="OrGate" eSuperTypes="#//Gate"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XORGate" eSuperTypes="#//Gate"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//ContainerElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ContainerElement" abstract="true" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//Element" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Terminal" abstract="true" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutputTerminal" eSuperTypes="#//Terminal"/>
-  <eClassifiers xsi:type="ecore:EClass" name="InputTerminal" eSuperTypes="#//Terminal"/>
-  <eClassifiers xsi:type="ecore:EClass" name="InputOutputTerminal" eSuperTypes="#//OutputTerminal #//InputTerminal"/>
-</ecore:EPackage>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/model/logicsemantic.genmodel b/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/model/logicsemantic.genmodel
deleted file mode 100644
index 23b85db..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/model/logicsemantic.genmodel
+++ /dev/null

@@ -1,42 +0,0 @@
-<?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.examples.runtime.diagram.logic.model/src"
-    editDirectory="/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src"
-    editorDirectory="/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src"
-    modelPluginID="org.eclipse.gmf.examples.runtime.diagram.logic.model" runtimeJar="true"
-    modelName="Logicsemantic" editPluginClass="org.eclipse.gmf.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin"
-    editorPluginClass="org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation.LogicsemanticEditorPlugin">
-  <foreignModel>..\rosemodel\logicsemantic.mdl</foreignModel>
-  <genPackages prefix="Semantic" basePackage="org.eclipse.gmf.examples.runtime.diagram.logic"
-      ecorePackage="logicsemantic.ecore#/">
-    <genClasses ecoreClass="logicsemantic.ecore#//LED">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute logicsemantic.ecore#//LED/value"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Element">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference logicsemantic.ecore#//Element/terminals"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference logicsemantic.ecore#//Element/outputTerminals"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference logicsemantic.ecore#//Element/inputTerminals"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Wire">
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference logicsemantic.ecore#//Wire/source"/>
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference logicsemantic.ecore#//Wire/target"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Circuit"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//Gate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//FlowContainer"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//AndGate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//OrGate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//XORGate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//Model"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//ContainerElement">
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference logicsemantic.ecore#//ContainerElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Terminal">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute logicsemantic.ecore#//Terminal/id"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//OutputTerminal"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//InputTerminal"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//InputOutputTerminal"/>
-  </genPackages>
-</genmodel:GenModel>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/rosemodel/logicsemantic.mdl b/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/rosemodel/logicsemantic.mdl
deleted file mode 100644
index 0732dc4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/runtime/rosemodel/logicsemantic.mdl
+++ /dev/null

@@ -1,8287 +0,0 @@
-
-(object Petal
-    version    	46
-    _written   	"Rose 7.7.0204.3001"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Java"
-	    name       	"IDE"
-	    value      	"Internal Editor")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply3"
-	    value      	""))
-    quid       	"3C7421A4014E"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3C7421A40150"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3C7421A70314"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3C7421A4014F"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3C7421A40151"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "semantic"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	(value Text "org.eclipse.gmf.examples.runtime.diagram.logic"))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	(value Text "semantic"))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	(value Text "http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic"))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	(value Text "semantic")))
-		quid       	"41EEBEB602E8"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "LED"
-			quid       	"41EEBF4900C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EEBF890133"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	TRUE))
-				quid       	"41EEBF5403A4"
-				type       	"int"
-				initv      	"0"
-				exportControl 	"Public")))
-		    (object Class "Element"
-			quid       	"41EFDE890251"
-			abstract   	TRUE)
-		    (object Class "Wire"
-			quid       	"41EFE21F0219"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFE82602DE"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251")))
-		    (object Class "Circuit"
-			quid       	"41EFE73B003D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F00A12037F"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D")))
-		    (object Class "Gate"
-			quid       	"41EFE76A01A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFE81F03D8"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			abstract   	TRUE)
-		    (object Class "FlowContainer"
-			quid       	"41EFE7B5002E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F00A0D012D"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D")))
-		    (object Class "AndGate"
-			quid       	"41EFF146008A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFF190032A"
-				supplier   	"Logical View::semantic::Gate"
-				quidu      	"41EFE76A01A4")))
-		    (object Class "OrGate"
-			quid       	"41EFF14801E2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFF18C0165"
-				supplier   	"Logical View::semantic::Gate"
-				quidu      	"41EFE76A01A4")))
-		    (object Class "XORGate"
-			quid       	"41EFF14A0210"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFF193027E"
-				supplier   	"Logical View::semantic::Gate"
-				quidu      	"41EFE76A01A4")))
-		    (object Class "Model"
-			quid       	"41F0229D02E1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F022AF0098"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D")))
-		    (object Class "ContainerElement"
-			quid       	"41F009CB033D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F00A8A0019"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			abstract   	TRUE)
-		    (object Class "Terminal"
-			quid       	"420B84B502C3"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"420CCBEE031E"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "id"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	TRUE))
-				quid       	"420B8F96005E"
-				type       	"String"
-				initv      	
-|""
-				
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "OutputTerminal"
-			quid       	"425EBA7A0118"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"425EBBB70114"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3")))
-		    (object Class "InputTerminal"
-			quid       	"425EBA8800EA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"425EBBC501A1"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3")))
-		    (object Class "InputOutputTerminal"
-			quid       	"4263C03A001A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"4263C1FA028E"
-				stereotype 	"extend"
-				supplier   	"Logical View::semantic::OutputTerminal"
-				quidu      	"425EBA7A0118")
-			    (object Inheritance_Relationship
-				quid       	"4263C20B01E2"
-				supplier   	"Logical View::semantic::InputTerminal"
-				quidu      	"425EBA8800EA")))
-		    (object Association "$UNNAMED$0"
-			quid       	"41F93FDF00F6"
-			roles      	(list role_list
-			    (object Role "children"
-				quid       	"41F93FE30163"
-				label      	"children"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$1"
-				quid       	"41F93FE30165"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$2"
-			quid       	"420D1AA602AB"
-			roles      	(list role_list
-			    (object Role "source"
-				quid       	"420D1AA70328"
-				label      	"source"
-				supplier   	"Logical View::semantic::OutputTerminal"
-				quidu      	"425EBA7A0118"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$3"
-				quid       	"420D1AA7032A"
-				supplier   	"Logical View::semantic::Wire"
-				quidu      	"41EFE21F0219"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$4"
-			quid       	"420D1AE8003A"
-			roles      	(list role_list
-			    (object Role "target"
-				quid       	"420D1AE90069"
-				label      	"target"
-				supplier   	"Logical View::semantic::InputTerminal"
-				quidu      	"425EBA8800EA"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$5"
-				quid       	"420D1AE9006B"
-				supplier   	"Logical View::semantic::Wire"
-				quidu      	"41EFE21F0219"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$6"
-			quid       	"4263FEEF031C"
-			roles      	(list role_list
-			    (object Role "terminals"
-				attributes 	(list Attribute_Set)
-				quid       	"4263FEF70213"
-				label      	"terminals"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$7"
-				quid       	"4263FEF70222"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$8"
-			quid       	"4264097C01A7"
-			roles      	(list role_list
-			    (object Role "outputTerminals"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"4264097E004F"
-				label      	"outputTerminals"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$9"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	TRUE))
-				quid       	"4264097E0051"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251")))
-		    (object Association "$UNNAMED$10"
-			quid       	"42641CB501AA"
-			roles      	(list role_list
-			    (object Role "inputTerminals"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"42641CB700A1"
-				label      	"inputTerminals"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$11"
-				quid       	"42641CB700B0"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Main"
-			quid       	"41EEBEB602F1"
-			title      	"Main"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	2882
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::semantic::OrGate" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 1808)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(2064, 1756)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"OrGate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFF14801E2"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::XORGate" @2
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2496, 1808)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(2375, 1756)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	242
-				    justify    	0
-				    label      	"XORGate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFF14A0210"
-				width      	260
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::FlowContainer" @3
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(387, 1148)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"FlowContainer")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE7B5002E"
-				width      	364
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::Model" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(832, 1148)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Model")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41F0229D02E1"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::AndGate" @5
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 1808)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@5
-				    location   	(1723, 1756)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	234
-				    justify    	0
-				    label      	"AndGate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFF146008A"
-				width      	252
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::LED" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1292, 1117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	360
-				    justify    	0
-				    label      	"LED")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EEBF4900C6"
-				width      	378
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::Circuit" @7
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@7
-				    location   	(112, 1148)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Circuit")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE73B003D"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::Gate" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 1216)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(2016, 1164)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Gate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE76A01A4"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @9
-				location   	(2112, 1506)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@8
-				vertices   	(list Points
-				    (2112, 1506)
-				    (2112, 1280)))
-			    (object InheritView "" @10
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFF18C0165"
-				client     	@1
-				supplier   	@8
-				line_style 	3
-				origin_attachment 	(2167, 1743)
-				terminal_attachment 	(2167, 1506)
-				drawSupplier 	@9)
-			    (object InheritView "" @11
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFF190032A"
-				client     	@5
-				supplier   	@8
-				line_style 	3
-				origin_attachment 	(1840, 1744)
-				terminal_attachment 	(1840, 1506)
-				drawSupplier 	@9)
-			    (object InheritView "" @12
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFF193027E"
-				client     	@2
-				supplier   	@8
-				line_style 	3
-				origin_attachment 	(2427, 1744)
-				terminal_attachment 	(2427, 1506)
-				drawSupplier 	@9)
-			    (object ClassView "Class" "Logical View::semantic::InputOutputTerminal" @13
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(3280, 1408)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@13
-				    location   	(3043, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"InputOutputTerminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4263C03A001A"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::OutputTerminal" @14
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 1072)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@14
-				    location   	(2522, 1019)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"OutputTerminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"425EBA7A0118"
-				width      	382
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @15
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	FALSE
-				line_color 	3342489
-				quidu      	"4263C1FA028E"
-				client     	@13
-				supplier   	@14
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::semantic::InputTerminal" @16
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(3840, 1072)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@16
-				    location   	(3675, 1019)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"InputTerminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"425EBA8800EA"
-				width      	348
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @17
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4263C20B01E2"
-				client     	@13
-				supplier   	@16
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::semantic::Wire" @18
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2976, 1744)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@18
-				    location   	(2880, 1692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Wire")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE21F0219"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$2" @19
-				location   	(2707, 1520)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"420D1AA602AB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "source" @20
-					Parent_View 	@19
-					location   	(-253, 304)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @21
-					    Parent_View 	@20
-					    location   	(2601, 1210)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+source"
-					    pctDist    	0.813751
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AA70328"
-					client     	@19
-					supplier   	@14
-					line_style 	0
-					label      	(object SegLabel @22
-					    Parent_View 	@20
-					    location   	(2767, 1198)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.841354
-					    height     	63
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$3" @23
-					Parent_View 	@19
-					location   	(-253, 304)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AA7032A"
-					client     	@19
-					supplier   	@18
-					vertices   	(list Points
-					    (2707, 1520)
-					    (2708, 1742)
-					    (2870, 1743))
-					line_style 	0)))
-			    (object AssociationViewNew "$UNNAMED$4" @24
-				location   	(3762, 1727)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"420D1AE8003A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "target" @25
-					Parent_View 	@24
-					location   	(802, 511)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @26
-					    Parent_View 	@25
-					    location   	(3755, 1251)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	135
-					    justify    	0
-					    label      	"+target"
-					    pctDist    	0.836737
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AE90069"
-					client     	@24
-					supplier   	@16
-					vertices   	(list Points
-					    (3762, 1727)
-					    (3855, 1725)
-					    (3840, 1137))
-					line_style 	0
-					label      	(object SegLabel @27
-					    Parent_View 	@25
-					    location   	(3905, 1257)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.821645
-					    height     	62
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$5" @28
-					Parent_View 	@24
-					location   	(802, 511)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AE9006B"
-					client     	@24
-					supplier   	@18
-					line_style 	0)))
-			    (object ClassView "Class" "Logical View::semantic::ContainerElement" @29
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(592, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(382, 364)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"ContainerElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41F009CB033D"
-				width      	438
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @30
-				location   	(592, 972)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@29
-				vertices   	(list Points
-				    (592, 972)
-				    (592, 480)))
-			    (object InheritView "" @31
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F022AF0098"
-				client     	@4
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(917, 1135)
-				terminal_attachment 	(917, 972)
-				drawSupplier 	@30)
-			    (object InheritView "" @32
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F00A0D012D"
-				client     	@3
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(559, 1136)
-				terminal_attachment 	(559, 972)
-				drawSupplier 	@30)
-			    (object InheritView "" @33
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F00A12037F"
-				client     	@7
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(174, 1135)
-				terminal_attachment 	(174, 972)
-				drawSupplier 	@30)
-			    (object ClassView "Class" "Logical View::semantic::Terminal" @34
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(3088, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@34
-				    location   	(2906, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"Terminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"420B84B502C3"
-				width      	382
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @35
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"425EBBB70114"
-				client     	@14
-				supplier   	@34
-				vertices   	(list Points
-				    (2895, 1069)
-				    (3077, 1069)
-				    (3085, 512))
-				line_style 	0)
-			    (object InheritView "" @36
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"425EBBC501A1"
-				client     	@16
-				supplier   	@34
-				vertices   	(list Points
-				    (3665, 1071)
-				    (3077, 1069)
-				    (3085, 512))
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::semantic::Element" @37
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1984, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@37
-				    location   	(1877, 363)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	214
-				    justify    	0
-				    label      	"Element")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFDE890251"
-				width      	232
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @38
-				location   	(1984, 875)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@37
-				vertices   	(list Points
-				    (1984, 875)
-				    (1984, 481)))
-			    (object InheritView "" @39
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFE81F03D8"
-				client     	@8
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(2108, 1152)
-				terminal_attachment 	(2108, 875)
-				drawSupplier 	@38)
-			    (object InheritView "" @40
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EEBF890133"
-				client     	@6
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(1465, 1104)
-				terminal_attachment 	(1465, 875)
-				drawSupplier 	@38)
-			    (object InheritView "" @41
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F00A8A0019"
-				client     	@29
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(757, 479)
-				terminal_attachment 	(757, 875)
-				drawSupplier 	@38)
-			    (object AssociationViewNew "$UNNAMED$0" @42
-				location   	(1339, 416)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F93FDF00F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$1" @43
-					Parent_View 	@42
-					location   	(-645, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @44
-					    Parent_View 	@43
-					    location   	(917, 375)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"41F93FE30165"
-					client     	@42
-					supplier   	@29
-					line_style 	0)
-				    (object RoleView "children" @45
-					Parent_View 	@42
-					location   	(-645, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @46
-					    Parent_View 	@45
-					    location   	(1761, 375)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	177
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"41F93FE30163"
-					client     	@42
-					supplier   	@37
-					line_style 	0
-					label      	(object SegLabel @47
-					    Parent_View 	@45
-					    location   	(1813, 470)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @48
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFE82602DE"
-				client     	@18
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(2949, 1680)
-				terminal_attachment 	(2949, 875)
-				drawSupplier 	@38)
-			    (object InheritView "" @49
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"420CCBEE031E"
-				client     	@34
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(3150, 512)
-				terminal_attachment 	(3150, 875)
-				drawSupplier 	@38)
-			    (object AssociationViewNew "$UNNAMED$6" @50
-				location   	(2498, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4263FEEF031C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "terminals" @51
-					Parent_View 	@50
-					location   	(514, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @52
-					    Parent_View 	@51
-					    location   	(2709, 373)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	205
-					    justify    	0
-					    label      	"+terminals"
-					    pctDist    	0.530151
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4263FEF70213"
-					client     	@50
-					supplier   	@34
-					line_style 	0
-					label      	(object SegLabel @53
-					    Parent_View 	@51
-					    location   	(2705, 459)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.522678
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$7" @54
-					Parent_View 	@50
-					location   	(514, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4263FEF70222"
-					client     	@50
-					supplier   	@37
-					line_style 	0)))
-			    (object AssociationViewNew "$UNNAMED$8" @55
-				location   	(2462, 150)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4264097C01A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "outputTerminals" @56
-					Parent_View 	@55
-					location   	(478, -266)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @57
-					    Parent_View 	@56
-					    location   	(2811, 118)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	337
-					    justify    	0
-					    label      	"+outputTerminals"
-					    pctDist    	0.653130
-					    height     	138
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4264097E004F"
-					client     	@55
-					supplier   	@34
-					vertices   	(list Points
-					    (2462, 150)
-					    (2515, 121)
-					    (2902, 319))
-					line_style 	0
-					label      	(object SegLabel @58
-					    Parent_View 	@56
-					    location   	(2821, 189)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.735082
-					    height     	80
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$9" @59
-					Parent_View 	@55
-					location   	(478, -266)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4264097E0051"
-					client     	@55
-					supplier   	@37
-					line_style 	0)))
-			    (object AssociationViewNew "$UNNAMED$10" @60
-				location   	(2481, 286)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"42641CB501AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "inputTerminals" @61
-					Parent_View 	@60
-					location   	(497, -130)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @62
-					    Parent_View 	@61
-					    location   	(2567, 240)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	313
-					    justify    	0
-					    label      	"+inputTerminals"
-					    pctDist    	0.184227
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"42641CB700A1"
-					client     	@60
-					supplier   	@34
-					vertices   	(list Points
-					    (2481, 286)
-					    (2539, 271)
-					    (2896, 364))
-					line_style 	0
-					label      	(object SegLabel @63
-					    Parent_View 	@61
-					    location   	(2572, 327)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.247818
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$11" @64
-					Parent_View 	@60
-					location   	(497, -130)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"42641CB700B0"
-					client     	@60
-					supplier   	@37
-					line_style 	0))))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3C7421A70315"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::semantic" @65
-			location   	(912, 240)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@65
-			    location   	(768, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"semantic")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41EEBEB602E8"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3C7421A40151"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3C7421A70313"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3C7421A40152"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3C7421A40154"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSI C++ Event Watcher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	"${quote}=${quote}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteType"
-			value      	("IncompleteTypeSet" 1))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotDeclare"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"NoDiscriminantPart"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"UnknownDiscriminantPart"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"KnownDiscriminantPart"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	221)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	231)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	"None")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	".;C:\\Program Files\\Rational\\RUPBuilder;C:\\Program Files\\Rational\\common\\java\\swingall.jar;C:\\Program Files\\Rational\\common\\java\\javahelp\\jh.jar;C:\\jdk1.3.1_05\\src.jar;C:\\jdk1.3.1_05\\jre\\lib\\i18n.jar;C:\\jdk1.3.1_05\\jre\\lib\\jaws.jar;C:\\jdk1.3.1_05\\jre\\lib\\rt.jar;C:\\jdk1.3.1_05\\jre\\lib\\sunrsasign.jar;C:\\jdk1.3.1_05\\lib\\dt.jar;C:\\jdk1.3.1_05\\lib\\htmlconverter.jar;C:\\jdk1.3.1_05\\lib\\tools.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\charsets.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\jce.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\jsse.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\rt.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\sunrsasign.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\dnsns.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\ldapsec.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\localedata.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\sunjce_provider.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\security\\local_policy.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\security\\US_export_policy.jar;C:\\j2sdk1.4.2_03\\lib\\dt.jar;C:\\j2sdk1.4.2_03\\lib\\htmlconverter.jar;C:\\j2sdk1.4.2_03\\lib\\tools.jar")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VC++"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateATL"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SmartPointersOnAssoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"PutImportsIn"
-			value      	"stdafx.h")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"FullPathInImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UseImportAttributes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportAttributes"
-			value      	"no_namespace named_guids")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"TypeLibLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CompileProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlInterfaceAttributes"
-			value      	(value Text 
-|endpoint("")
-|local
-|object
-|pointer_default()
-|uuid("")
-|version("")
-|encode
-|decode
-|auto_handle
-|implicit_handle("")
-|code
-|nocode
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlCoClassAttributes"
-			value      	(value Text 
-|uuid("")
-|helpstring("")
-|helpcontext("")
-|licensed
-|version("")
-|control
-|hidden
-|appobject
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlCoClassInterfaceAttributes"
-			value      	(value Text 
-|default
-|source
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlParameterAttributes"
-			value      	(value Text 
-|in
-|out
-|retval
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlMethodAttributes"
-			value      	(value Text 
-|id(1)
-|helpstring("")
-|call_as("")
-|callback
-|helpcontext("")
-|hidden
-|local
-|restricted
-|source
-|vararg
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlPropertyAttributes"
-			value      	(value Text 
-|id()
-|helpstring("")
-|call_as("")
-|helpcontext("")
-|hidden
-|local
-|restricted
-|source
-|vararg
-|bindable
-|defaultbind
-|defaultcallelem
-|displaybind
-|immediatebind
-|nonbrowseable
-|requestedit
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"RvcPtyVersion"
-			value      	"1.4")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ModelIDStyle"
-			value      	2)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocStyle"
-			value      	1)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateIncludes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ApplyPattern"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateBackupFiles"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SupportCodeName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocRevEngineer"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateOverviewDiagrams"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateModelIDsInCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AttributeTypes"
-			value      	(value Text 
-|attr1=bool
-|attr2=short
-|attr3=int
-|attr4=long
-|attr5=char
-|attr6=float
-|attr7=double
-|attr8=void
-|attr9=clock_t
-|attr10=_complex
-|attr11=_dev_t
-|attr12=div_t
-|attr13=_exception
-|attr14=FILE
-|attr15=_finddata_t
-|attr16=_FPIEEE_RECORD
-|attr17=fpos_t
-|attr18=_HEAPINFO
-|attr19=jmp_buf
-|attr20=lconv
-|attr21=ldiv_t
-|attr22=_off_t
-|attr23=_onexit_t
-|attr24=_PNH
-|attr25=ptrdiff_t
-|attr26=sig_atomic_t
-|attr27=size_t
-|attr28=_stat
-|attr29=time_t
-|attr30=_timeb
-|attr31=tm
-|attr32=_utimbuf
-|attr33=va_list
-|attr34=wchar_t
-|attr35=wctrans_t
-|attr36=wctype_t
-|attr37=_wfinddata_t
-|attr38=_wfinddatai64_t
-|attr39=wint_t
-|attr40=ABORTPROC
-|attr41=ACMDRIVERENUMCB
-|attr42=ACMDRIVERPROC
-|attr43=ACMFILTERCHOOSEHOOKPROC
-|attr44=ACMFILTERENUMCB
-|attr45=ACMFILTERTAGENUMCB
-|attr46=ACMFORMATCHOOSEHOOKPROC
-|attr47=ACMFORMATENUMCB
-|attr48=ACMFORMATTAGENUMCB
-|attr49=APPLET_PROC
-|attr50=ATOM
-|attr51=BOOL
-|attr52=BOOLEAN
-|attr53=BYTE
-|attr54=CALINFO_ENUMPROC
-|attr55=CALLBACK
-|attr56=CHAR
-|attr57=COLORREF
-|attr58=CONST
-|attr59=CRITICAL_SECTION
-|attr60=CTRYID
-|attr61=DATEFMT_ENUMPROC
-|attr62=DESKTOPENUMPROC
-|attr63=DLGPROC
-|attr64=DRAWSTATEPROC
-|attr65=DWORD
-|attr66=EDITWORDBREAKPROC
-|attr67=ENHMFENUMPROC
-|attr68=ENUMRESLANGPROC
-|attr69=ENUMRESNAMEPROC
-|attr70=ENUMRESTYPEPROC
-|attr71=FARPROC
-|attr72=FILE_SEGMENT_ELEMENT
-|attr73=FLOAT
-|attr74=FONTENUMPROC
-|attr75=GOBJENUMPROC
-|attr76=GRAYSTRINGPROC
-|attr77=HACCEL
-|attr78=HANDLE
-|attr79=HBITMAP
-|attr80=HBRUSH
-|attr81=HCOLORSPACE
-|attr82=HCONV
-|attr83=HCONVLIST
-|attr84=HCURSOR
-|attr85=HDC
-|attr86=HDDEDATA
-|attr87=HDESK
-|attr88=HDROP
-|attr89=HDWP
-|attr90=HENHMETAFILE
-|attr91=HFILE
-|attr92=HFONT
-|attr93=HGDIOBJ
-|attr94=HGLOBAL
-|attr95=HHOOK
-|attr96=HICON
-|attr97=HIMAGELIST
-|attr98=HIMC
-|attr99=HINSTANCE
-|attr100=HKEY
-|attr101=HKL
-|attr102=HLOCAL
-|attr103=HMENU
-|attr104=HMETAFILE
-|attr105=HMODULE
-|attr106=HMONITOR
-|attr107=HOOKPROC
-|attr108=HPALETTE
-|attr109=HPEN
-|attr110=HRGN
-|attr111=HRSRC
-|attr112=HSZ
-|attr113=HTREEITEM
-|attr114=HWINSTA
-|attr115=HWND
-|attr116=INT
-|attr117=IPADDR
-|attr118=LANGID
-|attr119=LCID
-|attr120=LCSCSTYPE
-|attr121=LCSGAMUTMATCH
-|attr122=LCTYPE
-|attr123=LINEDDAPROC
-|attr124=LOCALE_ENUMPROC
-|attr125=LONG
-|attr126=LONGLONG
-|attr127=LPARAM
-|attr128=LPBOOL
-|attr129=LPBYTE
-|attr130=LPCCHOOKPROC
-|attr131=LPCFHOOKPROC
-|attr132=LPCOLORREF
-|attr133=LPCRITICAL_SECTION
-|attr134=LPCSTR
-|attr135=LPCTSTR
-|attr136=LPCVOID
-|attr137=LPCWSTR
-|attr138=LPDWORD
-|attr139=LPFIBER_START_ROUTINE
-|attr140=LPFRHOOKPROC
-|attr141=LPHANDLE
-|attr142=LPHANDLER_FUNCTION
-|attr143=LPINT
-|attr144=LPLONG
-|attr145=LPOFNHOOKPROC
-|attr146=LPPAGEPAINTHOOK
-|attr147=LPPAGESETUPHOOK
-|attr148=LPPRINTHOOKPROC
-|attr149=LPPROGRESS_ROUTINE
-|attr150=LPSETUPHOOKPROC
-|attr151=LPSTR
-|attr152=LPSTREAM
-|attr153=LPTHREAD_START_ROUTINE
-|attr154=LPTSTR
-|attr155=LPVOID
-|attr156=LPWORD
-|attr157=LPWSTR
-|attr158=LRESULT
-|attr159=LUID
-|attr160=PBOOL
-|attr161=PBOOLEAN
-|attr162=PBYTE
-|attr163=PCHAR
-|attr164=PCRITICAL_SECTION
-|attr165=PCSTR
-|attr166=PCTSTR
-|attr167=PCWCH
-|attr168=PCWSTR
-|attr169=PDWORD
-|attr170=PFLOAT
-|attr171=PFNCALLBACK
-|attr172=PHANDLE
-|attr173=PHANDLER_ROUTINE
-|attr174=PHKEY
-|attr175=PINT
-|attr176=PLCID
-|attr177=PLONG
-|attr178=PLUID
-|attr179=PROPENUMPROC
-|attr180=PROPENUMPROCEX
-|attr181=PSHORT
-|attr182=PSTR
-|attr183=PTBYTE
-|attr184=PTCHAR
-|attr185=PTIMERAPCROUTINE
-|attr186=PTSTR
-|attr187=PUCHAR
-|attr188=PUINT
-|attr189=PULONG
-|attr190=PUSHORT
-|attr191=PVOID
-|attr192=PWCHAR
-|attr193=PWORD
-|attr194=PWSTR
-|attr195=REGISTERWORDENUMPROC
-|attr196=REGSAM
-|attr197=SC_HANDLE
-|attr198=SC_LOCK
-|attr199=SENDASYNCPROC
-|attr200=SERVICE_STATUS_HANDLE
-|attr201=SHORT
-|attr202=TBYTE
-|attr203=TCHAR
-|attr204=TIMEFMT_ENUMPROC
-|attr205=TIMERPROC
-|attr206=UCHAR
-|attr207=UINT
-|attr208=ULONG
-|attr209=ULONGLONG
-|attr210=UNSIGNED
-|attr211=USHORT
-|attr212=VOID
-|attr213=WCHAR
-|attr214=WINAPI
-|attr215=WINSTAENUMPROC
-|attr216=WNDENUMPROC
-|attr217=WNDPROC
-|attr218=WORD
-|attr219=WPARAM
-|attr220=YIELDPROC
-|attr221=CPoint
-|attr222=CRect
-|attr223=CSize
-|attr224=CString
-|attr225=CTime
-|attr226=CTimeSpan
-|attr227=CCreateContext
-|attr228=CMemoryState
-|attr229=COleSafeArray
-|attr230=CPrintInfo
-|attr231=HRESULT
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Containers"
-			value      	(value Text 
-|cont1=CArray<$TYPE, $TYPE&>
-|cont2=CByteArray
-|cont3=CDWordArray
-|cont4=CObArray
-|cont5=CPtrArray
-|cont6=CStringArray
-|cont7=CUIntArray
-|cont8=CWordArray
-|cont9=CList<$TYPE, $TYPE&>
-|cont10=CPtrList
-|cont11=CObList
-|cont12=CStringList
-|cont13=CMapWordToPtr
-|cont14=CMapPtrToWord
-|cont15=CMapPtrToPtr
-|cont16=CMapWordToOb
-|cont17=CMapStringToPtr
-|cont18=CMapStringToOb
-|cont19=CMapStringToString
-|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
-|cont21=CTypedPtrArray<CObArray, $TYPE*>
-|cont22=CTypedPtrList<CObList, $TYPE*>
-|cont23=CTypedPtrList<CPtrList, $TYPE*>
-|cont24=CComObject<$TYPE>
-|cont25=CComPtr<$TYPE>
-|cont26=CComQIPtr<$TYPE>
-|cont27=CComQIPtr<$TYPE, IID*>
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ClassMethods"
-			value      	(value Text 
-|*_body=// ToDo: Add your specialized code here and/or call the base class
-|cm1=$NAME()
-|cm2=$NAME(orig:const $NAME&)
-|cm3=<<virtual>> ~$NAME()
-|cm4=operator=(rhs:$NAME&):$NAME&
-|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
-|cm5=<<const>> operator==(rhs:const $NAME&):bool
-|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm6=<<const>> operator!=(rhs:$NAME&):bool
-|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm7=<<const>> operator<(rhs:$NAME&):bool
-|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm8=<<const>> operator>(rhs:$NAME&):bool
-|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm9=<<const>> operator<=(rhs:$NAME&):bool
-|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm10=<<const>> operator>=(rhs:$NAME&):bool
-|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
-|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
-|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
-|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Accessors"
-			value      	(value Text 
-|agf=<<const>> get_$BASICNAME():const $TYPE
-|agf_body=return $NAME;
-|asf=set_$BASICNAME(value:$TYPE):void
-|asf_body=$NAME = value;|return;
-|agv=<<const>> get_$BASICNAME():const $TYPE&
-|agv_body=return $NAME;
-|asv=set_$BASICNAME(value:$TYPE&):void
-|asv_body=$NAME = value;|return;
-|agp=<<const>> get_$BASICNAME():const $TYPE
-|agp_body=return $NAME;
-|asp=set_$BASICNAME(value:$TYPE):void
-|asp_body=$NAME = value;|return;
-|agr=<<const>> get_$BASICNAME():const $TYPE
-|agr_body=return $NAME;
-|asr=set_$BASICNAME(value:$TYPE):void
-|asr_body=$NAME = value;|return;
-|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
-|aga_body=return $NAME[index];
-|asa=set_$BASICNAME(index:int, value:$TYPE):void
-|asa_body=$NAME[index] = value;|return;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Conditionals"
-			value      	(value Text 
-|*_decl=#ifdef _DEBUG
-|*_base=CObject
-|cond1=<<virtual, const>> AssertValid():void
-|cond1_body=$SUPERNAME::AssertValid();
-|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
-|cond2_body=$SUPERNAME::Dump(dc);
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Patterns"
-			value      	(value Text 
-|patrn1=cm1,cm3,cond1,cond2
-|Patrn1_name=Default
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AtlClassPrefix"
-			value      	"C")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AtlInterfacePrefix"
-			value      	"I")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AtlTypeDescription"
-			value      	"Class")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultLogicalPackage"
-			value      	"$language Reverse Engineered/$component")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultComponentPackage"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"HeaderFileName"
-			value      	"")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CodeFileName"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InternalMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ExportMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialSourceIncludes"
-			value      	(value Text 
-|"stdafx.h"
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Copyright"
-			value      	(value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"VC++"
-				name       	"(none)"
-				value      	300)
-			    (object Attribute
-				tool       	"VC++"
-				name       	"DLL"
-				value      	301)
-			    (object Attribute
-				tool       	"VC++"
-				name       	"EXE"
-				value      	302)
-			    (object Attribute
-				tool       	"VC++"
-				name       	"MIDL"
-				value      	303)))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Kind"
-			value      	("KindSet" 300))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"BodyExtensions"
-			value      	(value Text 
-|.cpp
-|.cxx
-|.inl
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"HeaderExtensions"
-			value      	(value Text 
-|.h
-|.hpp
-|.hxx
-|inl
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ProjectFolders"
-			value      	(value Text 
-|Source Files
-|Header Files
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UsePathMap"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IsDirectory"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Directory"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Direction"
-			value      	("ParamDirectionTypeSet" 102))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ParamDirectionTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"in"
-				value      	102)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"inout"
-				value      	103)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"out"
-				value      	104)))))
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3C7421A40153"))

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/model/logicsemantic.ecore b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/model/logicsemantic.ecore
deleted file mode 100644
index bbdf5c5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/model/logicsemantic.ecore
+++ /dev/null

@@ -1,42 +0,0 @@
-<?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="semantic"
-    nsURI="http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic" nsPrefix="semantic">
-  <eClassifiers xsi:type="ecore:EClass" name="LED" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="0"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="terminals" upperBound="-1"
-        eType="#//Terminal" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputTerminals" upperBound="-1"
-        eType="#//Terminal" changeable="false" volatile="true" transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputTerminals" upperBound="-1"
-        eType="#//Terminal" changeable="false" volatile="true" transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Wire" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//OutputTerminal"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//InputTerminal"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Circuit" eSuperTypes="#//ContainerElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Gate" abstract="true" eSuperTypes="#//Element"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FlowContainer" eSuperTypes="#//ContainerElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AndGate" eSuperTypes="#//Gate"/>
-  <eClassifiers xsi:type="ecore:EClass" name="OrGate" eSuperTypes="#//Gate"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XORGate" eSuperTypes="#//Gate"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//ContainerElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ContainerElement" abstract="true" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//Element" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Terminal" abstract="true" eSuperTypes="#//Element">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutputTerminal" eSuperTypes="#//Terminal"/>
-  <eClassifiers xsi:type="ecore:EClass" name="InputTerminal" eSuperTypes="#//Terminal"/>
-  <eClassifiers xsi:type="ecore:EClass" name="InputOutputTerminal" eSuperTypes="#//OutputTerminal #//InputTerminal"/>
-</ecore:EPackage>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/model/logicsemantic.genmodel b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/model/logicsemantic.genmodel
deleted file mode 100644
index 23b85db..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/model/logicsemantic.genmodel
+++ /dev/null

@@ -1,42 +0,0 @@
-<?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.examples.runtime.diagram.logic.model/src"
-    editDirectory="/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/src"
-    editorDirectory="/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/src"
-    modelPluginID="org.eclipse.gmf.examples.runtime.diagram.logic.model" runtimeJar="true"
-    modelName="Logicsemantic" editPluginClass="org.eclipse.gmf.examples.runtime.diagram.logic.model.provider.LogicsemanticEditPlugin"
-    editorPluginClass="org.eclipse.gmf.examples.runtime.diagram.logic.model.presentation.LogicsemanticEditorPlugin">
-  <foreignModel>..\rosemodel\logicsemantic.mdl</foreignModel>
-  <genPackages prefix="Semantic" basePackage="org.eclipse.gmf.examples.runtime.diagram.logic"
-      ecorePackage="logicsemantic.ecore#/">
-    <genClasses ecoreClass="logicsemantic.ecore#//LED">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute logicsemantic.ecore#//LED/value"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Element">
-      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference logicsemantic.ecore#//Element/terminals"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference logicsemantic.ecore#//Element/outputTerminals"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference logicsemantic.ecore#//Element/inputTerminals"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Wire">
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference logicsemantic.ecore#//Wire/source"/>
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference logicsemantic.ecore#//Wire/target"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Circuit"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//Gate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//FlowContainer"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//AndGate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//OrGate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//XORGate"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//Model"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//ContainerElement">
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference logicsemantic.ecore#//ContainerElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//Terminal">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute logicsemantic.ecore#//Terminal/id"/>
-    </genClasses>
-    <genClasses ecoreClass="logicsemantic.ecore#//OutputTerminal"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//InputTerminal"/>
-    <genClasses ecoreClass="logicsemantic.ecore#//InputOutputTerminal"/>
-  </genPackages>
-</genmodel:GenModel>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/AndGate.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/AndGate.java
deleted file mode 100644
index f3ac53b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/AndGate.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>And Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getAndGate()
- * @model
- * @generated
- */
-public interface AndGate extends Gate {
-} // AndGate

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Circuit.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Circuit.java
deleted file mode 100644
index 31fbd6b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Circuit.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Circuit</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getCircuit()
- * @model
- * @generated
- */
-public interface Circuit extends ContainerElement {
-} // Circuit

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/ContainerElement.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/ContainerElement.java
deleted file mode 100644
index 9b5b996..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/ContainerElement.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Container Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getContainerElement()
- * @model abstract="true"
- * @generated
- */
-public interface ContainerElement extends Element {
-	/**
-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Children</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>Children</em>' containment reference list.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getContainerElement_Children()
-	 * @model type="org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element" containment="true"
-	 * @generated
-	 */
-	EList getChildren();
-
-} // ContainerElement

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Element.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Element.java
deleted file mode 100644
index d665d18..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Element.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getTerminals <em>Terminals</em>}</li>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getOutputTerminals <em>Output Terminals</em>}</li>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getInputTerminals <em>Input Terminals</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getElement()
- * @model abstract="true"
- * @generated
- */
-public interface Element extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Terminals</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Terminals</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>Terminals</em>' containment reference list.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getElement_Terminals()
-	 * @model type="org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal" containment="true"
-	 * @generated
-	 */
-	EList getTerminals();
-
-	/**
-	 * Returns the value of the '<em><b>Output Terminals</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Output Terminals</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Output Terminals</em>' reference list.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getElement_OutputTerminals()
-	 * @model type="org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal" transient="true" changeable="false" volatile="true"
-	 * @generated
-	 */
-	EList getOutputTerminals();
-
-	/**
-	 * Returns the value of the '<em><b>Input Terminals</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Input Terminals</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Input Terminals</em>' reference list.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getElement_InputTerminals()
-	 * @model type="org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal" transient="true" changeable="false" volatile="true"
-	 * @generated
-	 */
-	EList getInputTerminals();
-
-} // Element

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/FlowContainer.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/FlowContainer.java
deleted file mode 100644
index 2872abf..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/FlowContainer.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Flow Container</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getFlowContainer()
- * @model
- * @generated
- */
-public interface FlowContainer extends ContainerElement {
-} // FlowContainer

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Gate.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Gate.java
deleted file mode 100644
index b90b918..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Gate.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getGate()
- * @model abstract="true"
- * @generated
- */
-public interface Gate extends Element {
-} // Gate

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputOutputTerminal.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputOutputTerminal.java
deleted file mode 100644
index 6dfa8d4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputOutputTerminal.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Input Output Terminal</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getInputOutputTerminal()
- * @model
- * @generated
- */
-public interface InputOutputTerminal extends OutputTerminal, InputTerminal {
-} // InputOutputTerminal

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputTerminal.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputTerminal.java
deleted file mode 100644
index d2023c9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputTerminal.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Input Terminal</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getInputTerminal()
- * @model
- * @generated
- */
-public interface InputTerminal extends Terminal {
-} // InputTerminal

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/LED.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/LED.java
deleted file mode 100644
index 1810279..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/LED.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>LED</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getLED()
- * @model
- * @generated
- */
-public interface LED extends Element {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The default value is <code>"0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(int)
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getLED_Value()
-	 * @model default="0"
-	 * @generated
-	 */
-	int getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(int value);
-
-} // LED

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Model.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Model.java
deleted file mode 100644
index e07c9a1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Model.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getModel()
- * @model
- * @generated
- */
-public interface Model extends ContainerElement {
-} // Model

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OrGate.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OrGate.java
deleted file mode 100644
index e1a73ec..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OrGate.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Or Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getOrGate()
- * @model
- * @generated
- */
-public interface OrGate extends Gate {
-} // OrGate

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OutputTerminal.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OutputTerminal.java
deleted file mode 100644
index 522dc9f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OutputTerminal.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Output Terminal</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getOutputTerminal()
- * @model
- * @generated
- */
-public interface OutputTerminal extends Terminal {
-} // OutputTerminal

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticFactory.java
deleted file mode 100644
index 51ae275..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticFactory.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-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.examples.runtime.diagram.logic.semantic.SemanticPackage
- * @generated
- */
-public interface SemanticFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	SemanticFactory eINSTANCE = org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>LED</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>LED</em>'.
-	 * @generated
-	 */
-	LED createLED();
-
-	/**
-	 * Returns a new object of class '<em>Wire</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Wire</em>'.
-	 * @generated
-	 */
-	Wire createWire();
-
-	/**
-	 * Returns a new object of class '<em>Circuit</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Circuit</em>'.
-	 * @generated
-	 */
-	Circuit createCircuit();
-
-	/**
-	 * Returns a new object of class '<em>Flow Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Flow Container</em>'.
-	 * @generated
-	 */
-	FlowContainer createFlowContainer();
-
-	/**
-	 * Returns a new object of class '<em>And Gate</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>And Gate</em>'.
-	 * @generated
-	 */
-	AndGate createAndGate();
-
-	/**
-	 * Returns a new object of class '<em>Or Gate</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Or Gate</em>'.
-	 * @generated
-	 */
-	OrGate createOrGate();
-
-	/**
-	 * Returns a new object of class '<em>XOR Gate</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>XOR Gate</em>'.
-	 * @generated
-	 */
-	XORGate createXORGate();
-
-	/**
-	 * Returns a new object of class '<em>Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Model</em>'.
-	 * @generated
-	 */
-	Model createModel();
-
-	/**
-	 * Returns a new object of class '<em>Output Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Output Terminal</em>'.
-	 * @generated
-	 */
-	OutputTerminal createOutputTerminal();
-
-	/**
-	 * Returns a new object of class '<em>Input Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Input Terminal</em>'.
-	 * @generated
-	 */
-	InputTerminal createInputTerminal();
-
-	/**
-	 * Returns a new object of class '<em>Input Output Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Input Output Terminal</em>'.
-	 * @generated
-	 */
-	InputOutputTerminal createInputOutputTerminal();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	SemanticPackage getSemanticPackage();
-
-} //SemanticFactory

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticPackage.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticPackage.java
deleted file mode 100644
index 230e55e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticPackage.java
+++ /dev/null

@@ -1,1328 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-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.examples.runtime.diagram.logic.semantic.SemanticFactory
- * @model kind="package"
- * @generated
- */
-public interface SemanticPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "semantic";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "semantic";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	SemanticPackage eINSTANCE = org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ElementImpl <em>Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ElementImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getElement()
-	 * @generated
-	 */
-	int ELEMENT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT__TERMINALS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT__OUTPUT_TERMINALS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT__INPUT_TERMINALS = 2;
-
-	/**
-	 * The number of structural features of the '<em>Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.LEDImpl <em>LED</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.LEDImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getLED()
-	 * @generated
-	 */
-	int LED = 0;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LED__TERMINALS = ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LED__OUTPUT_TERMINALS = ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LED__INPUT_TERMINALS = ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LED__VALUE = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>LED</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LED_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.WireImpl <em>Wire</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.WireImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getWire()
-	 * @generated
-	 */
-	int WIRE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WIRE__TERMINALS = ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WIRE__OUTPUT_TERMINALS = ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WIRE__INPUT_TERMINALS = ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WIRE__SOURCE = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WIRE__TARGET = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Wire</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WIRE_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ContainerElementImpl <em>Container Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ContainerElementImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getContainerElement()
-	 * @generated
-	 */
-	int CONTAINER_ELEMENT = 10;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_ELEMENT__TERMINALS = ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_ELEMENT__OUTPUT_TERMINALS = ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_ELEMENT__INPUT_TERMINALS = ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_ELEMENT__CHILDREN = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Container Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_ELEMENT_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.CircuitImpl <em>Circuit</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.CircuitImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getCircuit()
-	 * @generated
-	 */
-	int CIRCUIT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CIRCUIT__TERMINALS = CONTAINER_ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CIRCUIT__OUTPUT_TERMINALS = CONTAINER_ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CIRCUIT__INPUT_TERMINALS = CONTAINER_ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CIRCUIT__CHILDREN = CONTAINER_ELEMENT__CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Circuit</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CIRCUIT_FEATURE_COUNT = CONTAINER_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.GateImpl <em>Gate</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.GateImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getGate()
-	 * @generated
-	 */
-	int GATE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GATE__TERMINALS = ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GATE__OUTPUT_TERMINALS = ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GATE__INPUT_TERMINALS = ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The number of structural features of the '<em>Gate</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GATE_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.FlowContainerImpl <em>Flow Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.FlowContainerImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getFlowContainer()
-	 * @generated
-	 */
-	int FLOW_CONTAINER = 5;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_CONTAINER__TERMINALS = CONTAINER_ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_CONTAINER__OUTPUT_TERMINALS = CONTAINER_ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_CONTAINER__INPUT_TERMINALS = CONTAINER_ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_CONTAINER__CHILDREN = CONTAINER_ELEMENT__CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Flow Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_CONTAINER_FEATURE_COUNT = CONTAINER_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.AndGateImpl <em>And Gate</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.AndGateImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getAndGate()
-	 * @generated
-	 */
-	int AND_GATE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AND_GATE__TERMINALS = GATE__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AND_GATE__OUTPUT_TERMINALS = GATE__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AND_GATE__INPUT_TERMINALS = GATE__INPUT_TERMINALS;
-
-	/**
-	 * The number of structural features of the '<em>And Gate</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AND_GATE_FEATURE_COUNT = GATE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OrGateImpl <em>Or Gate</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OrGateImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getOrGate()
-	 * @generated
-	 */
-	int OR_GATE = 7;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OR_GATE__TERMINALS = GATE__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OR_GATE__OUTPUT_TERMINALS = GATE__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OR_GATE__INPUT_TERMINALS = GATE__INPUT_TERMINALS;
-
-	/**
-	 * The number of structural features of the '<em>Or Gate</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OR_GATE_FEATURE_COUNT = GATE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.XORGateImpl <em>XOR Gate</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.XORGateImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getXORGate()
-	 * @generated
-	 */
-	int XOR_GATE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XOR_GATE__TERMINALS = GATE__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XOR_GATE__OUTPUT_TERMINALS = GATE__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XOR_GATE__INPUT_TERMINALS = GATE__INPUT_TERMINALS;
-
-	/**
-	 * The number of structural features of the '<em>XOR Gate</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XOR_GATE_FEATURE_COUNT = GATE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ModelImpl <em>Model</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ModelImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getModel()
-	 * @generated
-	 */
-	int MODEL = 9;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL__TERMINALS = CONTAINER_ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL__OUTPUT_TERMINALS = CONTAINER_ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL__INPUT_TERMINALS = CONTAINER_ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL__CHILDREN = CONTAINER_ELEMENT__CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Model</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_FEATURE_COUNT = CONTAINER_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.TerminalImpl <em>Terminal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.TerminalImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getTerminal()
-	 * @generated
-	 */
-	int TERMINAL = 11;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERMINAL__TERMINALS = ELEMENT__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERMINAL__OUTPUT_TERMINALS = ELEMENT__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERMINAL__INPUT_TERMINALS = ELEMENT__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERMINAL__ID = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Terminal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TERMINAL_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OutputTerminalImpl <em>Output Terminal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OutputTerminalImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getOutputTerminal()
-	 * @generated
-	 */
-	int OUTPUT_TERMINAL = 12;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTPUT_TERMINAL__TERMINALS = TERMINAL__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTPUT_TERMINAL__OUTPUT_TERMINALS = TERMINAL__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTPUT_TERMINAL__INPUT_TERMINALS = TERMINAL__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTPUT_TERMINAL__ID = TERMINAL__ID;
-
-	/**
-	 * The number of structural features of the '<em>Output Terminal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTPUT_TERMINAL_FEATURE_COUNT = TERMINAL_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputTerminalImpl <em>Input Terminal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputTerminalImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getInputTerminal()
-	 * @generated
-	 */
-	int INPUT_TERMINAL = 13;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_TERMINAL__TERMINALS = TERMINAL__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_TERMINAL__OUTPUT_TERMINALS = TERMINAL__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_TERMINAL__INPUT_TERMINALS = TERMINAL__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_TERMINAL__ID = TERMINAL__ID;
-
-	/**
-	 * The number of structural features of the '<em>Input Terminal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_TERMINAL_FEATURE_COUNT = TERMINAL_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputOutputTerminalImpl <em>Input Output Terminal</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputOutputTerminalImpl
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getInputOutputTerminal()
-	 * @generated
-	 */
-	int INPUT_OUTPUT_TERMINAL = 14;
-
-	/**
-	 * The feature id for the '<em><b>Terminals</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_OUTPUT_TERMINAL__TERMINALS = OUTPUT_TERMINAL__TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Output Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_OUTPUT_TERMINAL__OUTPUT_TERMINALS = OUTPUT_TERMINAL__OUTPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Input Terminals</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_OUTPUT_TERMINAL__INPUT_TERMINALS = OUTPUT_TERMINAL__INPUT_TERMINALS;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_OUTPUT_TERMINAL__ID = OUTPUT_TERMINAL__ID;
-
-	/**
-	 * The number of structural features of the '<em>Input Output Terminal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INPUT_OUTPUT_TERMINAL_FEATURE_COUNT = OUTPUT_TERMINAL_FEATURE_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED <em>LED</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>LED</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED
-	 * @generated
-	 */
-	EClass getLED();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED#getValue()
-	 * @see #getLED()
-	 * @generated
-	 */
-	EAttribute getLED_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Element</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element
-	 * @generated
-	 */
-	EClass getElement();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getTerminals <em>Terminals</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Terminals</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getTerminals()
-	 * @see #getElement()
-	 * @generated
-	 */
-	EReference getElement_Terminals();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getOutputTerminals <em>Output Terminals</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Output Terminals</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getOutputTerminals()
-	 * @see #getElement()
-	 * @generated
-	 */
-	EReference getElement_OutputTerminals();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getInputTerminals <em>Input Terminals</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Input Terminals</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element#getInputTerminals()
-	 * @see #getElement()
-	 * @generated
-	 */
-	EReference getElement_InputTerminals();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire <em>Wire</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Wire</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire
-	 * @generated
-	 */
-	EClass getWire();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Source</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getSource()
-	 * @see #getWire()
-	 * @generated
-	 */
-	EReference getWire_Source();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getTarget()
-	 * @see #getWire()
-	 * @generated
-	 */
-	EReference getWire_Target();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit <em>Circuit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Circuit</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit
-	 * @generated
-	 */
-	EClass getCircuit();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate <em>Gate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gate</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate
-	 * @generated
-	 */
-	EClass getGate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer <em>Flow Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Flow Container</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer
-	 * @generated
-	 */
-	EClass getFlowContainer();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate <em>And Gate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>And Gate</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate
-	 * @generated
-	 */
-	EClass getAndGate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate <em>Or Gate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Or Gate</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate
-	 * @generated
-	 */
-	EClass getOrGate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate <em>XOR Gate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>XOR Gate</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate
-	 * @generated
-	 */
-	EClass getXORGate();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model <em>Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Model</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model
-	 * @generated
-	 */
-	EClass getModel();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement <em>Container Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Container Element</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement
-	 * @generated
-	 */
-	EClass getContainerElement();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Children</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement#getChildren()
-	 * @see #getContainerElement()
-	 * @generated
-	 */
-	EReference getContainerElement_Children();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal <em>Terminal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Terminal</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal
-	 * @generated
-	 */
-	EClass getTerminal();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal#getId()
-	 * @see #getTerminal()
-	 * @generated
-	 */
-	EAttribute getTerminal_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal <em>Output Terminal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Output Terminal</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal
-	 * @generated
-	 */
-	EClass getOutputTerminal();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal <em>Input Terminal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Input Terminal</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal
-	 * @generated
-	 */
-	EClass getInputTerminal();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal <em>Input Output Terminal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Input Output Terminal</em>'.
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal
-	 * @generated
-	 */
-	EClass getInputOutputTerminal();
-
-	/**
-	 * 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
-	 */
-	SemanticFactory getSemanticFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that 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 -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.LEDImpl <em>LED</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.LEDImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getLED()
-		 * @generated
-		 */
-		EClass LED = eINSTANCE.getLED();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LED__VALUE = eINSTANCE.getLED_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ElementImpl <em>Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ElementImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getElement()
-		 * @generated
-		 */
-		EClass ELEMENT = eINSTANCE.getElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Terminals</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ELEMENT__TERMINALS = eINSTANCE.getElement_Terminals();
-
-		/**
-		 * The meta object literal for the '<em><b>Output Terminals</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ELEMENT__OUTPUT_TERMINALS = eINSTANCE.getElement_OutputTerminals();
-
-		/**
-		 * The meta object literal for the '<em><b>Input Terminals</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ELEMENT__INPUT_TERMINALS = eINSTANCE.getElement_InputTerminals();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.WireImpl <em>Wire</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.WireImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getWire()
-		 * @generated
-		 */
-		EClass WIRE = eINSTANCE.getWire();
-
-		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WIRE__SOURCE = eINSTANCE.getWire_Source();
-
-		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WIRE__TARGET = eINSTANCE.getWire_Target();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.CircuitImpl <em>Circuit</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.CircuitImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getCircuit()
-		 * @generated
-		 */
-		EClass CIRCUIT = eINSTANCE.getCircuit();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.GateImpl <em>Gate</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.GateImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getGate()
-		 * @generated
-		 */
-		EClass GATE = eINSTANCE.getGate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.FlowContainerImpl <em>Flow Container</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.FlowContainerImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getFlowContainer()
-		 * @generated
-		 */
-		EClass FLOW_CONTAINER = eINSTANCE.getFlowContainer();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.AndGateImpl <em>And Gate</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.AndGateImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getAndGate()
-		 * @generated
-		 */
-		EClass AND_GATE = eINSTANCE.getAndGate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OrGateImpl <em>Or Gate</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OrGateImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getOrGate()
-		 * @generated
-		 */
-		EClass OR_GATE = eINSTANCE.getOrGate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.XORGateImpl <em>XOR Gate</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.XORGateImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getXORGate()
-		 * @generated
-		 */
-		EClass XOR_GATE = eINSTANCE.getXORGate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ModelImpl <em>Model</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ModelImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getModel()
-		 * @generated
-		 */
-		EClass MODEL = eINSTANCE.getModel();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ContainerElementImpl <em>Container Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ContainerElementImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getContainerElement()
-		 * @generated
-		 */
-		EClass CONTAINER_ELEMENT = eINSTANCE.getContainerElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTAINER_ELEMENT__CHILDREN = eINSTANCE.getContainerElement_Children();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.TerminalImpl <em>Terminal</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.TerminalImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getTerminal()
-		 * @generated
-		 */
-		EClass TERMINAL = eINSTANCE.getTerminal();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TERMINAL__ID = eINSTANCE.getTerminal_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OutputTerminalImpl <em>Output Terminal</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.OutputTerminalImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getOutputTerminal()
-		 * @generated
-		 */
-		EClass OUTPUT_TERMINAL = eINSTANCE.getOutputTerminal();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputTerminalImpl <em>Input Terminal</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputTerminalImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getInputTerminal()
-		 * @generated
-		 */
-		EClass INPUT_TERMINAL = eINSTANCE.getInputTerminal();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputOutputTerminalImpl <em>Input Output Terminal</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.InputOutputTerminalImpl
-		 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.SemanticPackageImpl#getInputOutputTerminal()
-		 * @generated
-		 */
-		EClass INPUT_OUTPUT_TERMINAL = eINSTANCE.getInputOutputTerminal();
-
-	}
-
-} //SemanticPackage

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Terminal.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Terminal.java
deleted file mode 100644
index 4710933..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Terminal.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Terminal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getTerminal()
- * @model abstract="true"
- * @generated
- */
-public interface Terminal extends Element {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getTerminal_Id()
-	 * @model default=""
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // Terminal

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Wire.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Wire.java
deleted file mode 100644
index 513f42c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Wire.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Wire</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getTarget <em>Target</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getWire()
- * @model
- * @generated
- */
-public interface Wire extends Element {
-	/**
-	 * Returns the value of the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source</em>' reference.
-	 * @see #setSource(OutputTerminal)
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getWire_Source()
-	 * @model required="true"
-	 * @generated
-	 */
-	OutputTerminal getSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getSource <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' reference.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(OutputTerminal value);
-
-	/**
-	 * Returns the value of the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target</em>' reference.
-	 * @see #setTarget(InputTerminal)
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getWire_Target()
-	 * @model required="true"
-	 * @generated
-	 */
-	InputTerminal getTarget();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire#getTarget <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' reference.
-	 * @see #getTarget()
-	 * @generated
-	 */
-	void setTarget(InputTerminal value);
-
-} // Wire

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/XORGate.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/XORGate.java
deleted file mode 100644
index 2c78648..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/XORGate.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XOR Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage#getXORGate()
- * @model
- * @generated
- */
-public interface XORGate extends Gate {
-} // XORGate

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/AndGateImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/AndGateImpl.java
deleted file mode 100644
index 9ea97cd..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/AndGateImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>And Gate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class AndGateImpl extends GateImpl implements AndGate {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AndGateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.AND_GATE;
-	}
-
-} //AndGateImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/CircuitImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/CircuitImpl.java
deleted file mode 100644
index ee3f606..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/CircuitImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Circuit</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class CircuitImpl extends ContainerElementImpl implements Circuit {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CircuitImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.CIRCUIT;
-	}
-
-} //CircuitImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ContainerElementImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ContainerElementImpl.java
deleted file mode 100644
index 31fbc63..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ContainerElementImpl.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Container Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ContainerElementImpl#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ContainerElementImpl extends ElementImpl implements ContainerElement {
-	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildren()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList children = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContainerElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.CONTAINER_ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getChildren() {
-		if (children == null) {
-			children = new EObjectContainmentEList(Element.class, this, SemanticPackage.CONTAINER_ELEMENT__CHILDREN);
-		}
-		return children;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SemanticPackage.CONTAINER_ELEMENT__CHILDREN:
-				return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SemanticPackage.CONTAINER_ELEMENT__CHILDREN:
-				return getChildren();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SemanticPackage.CONTAINER_ELEMENT__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.CONTAINER_ELEMENT__CHILDREN:
-				getChildren().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.CONTAINER_ELEMENT__CHILDREN:
-				return children != null && !children.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ContainerElementImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ElementImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ElementImpl.java
deleted file mode 100644
index dae9742..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ElementImpl.java
+++ /dev/null

@@ -1,198 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ElementImpl#getTerminals <em>Terminals</em>}</li>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ElementImpl#getOutputTerminals <em>Output Terminals</em>}</li>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.ElementImpl#getInputTerminals <em>Input Terminals</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ElementImpl extends EObjectImpl implements Element {
-	/**
-	 * The cached value of the '{@link #getTerminals() <em>Terminals</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTerminals()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList terminals = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.ELEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTerminals() {
-		if (terminals == null) {
-			terminals = new EObjectContainmentEList(Terminal.class, this, SemanticPackage.ELEMENT__TERMINALS);
-		}
-		return terminals;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public EList getOutputTerminals() {
-		ArrayList outputTerminals = new ArrayList();
-		for (Iterator iter = getTerminals().iterator(); iter.hasNext(); ) {
-			Terminal terminal = (Terminal)iter.next();
-			if (terminal instanceof OutputTerminal)
-				outputTerminals.add(terminal);
-		}
-		return new EcoreEList.UnmodifiableEList(this,
-						SemanticPackage.eINSTANCE.getElement_InputTerminals(),
-						outputTerminals.size(), outputTerminals.toArray());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public EList getInputTerminals() {
-		ArrayList inputTerminals = new ArrayList();
-		for (Iterator iter = getTerminals().iterator(); iter.hasNext(); ) {
-			Terminal terminal = (Terminal)iter.next();
-			if (terminal instanceof InputTerminal)
-				inputTerminals.add(terminal);
-		}
-		return new EcoreEList.UnmodifiableEList(this,
-						SemanticPackage.eINSTANCE.getElement_InputTerminals(),
-						inputTerminals.size(), inputTerminals.toArray());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SemanticPackage.ELEMENT__TERMINALS:
-				return ((InternalEList)getTerminals()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SemanticPackage.ELEMENT__TERMINALS:
-				return getTerminals();
-			case SemanticPackage.ELEMENT__OUTPUT_TERMINALS:
-				return getOutputTerminals();
-			case SemanticPackage.ELEMENT__INPUT_TERMINALS:
-				return getInputTerminals();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SemanticPackage.ELEMENT__TERMINALS:
-				getTerminals().clear();
-				getTerminals().addAll((Collection)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.ELEMENT__TERMINALS:
-				getTerminals().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.ELEMENT__TERMINALS:
-				return terminals != null && !terminals.isEmpty();
-			case SemanticPackage.ELEMENT__OUTPUT_TERMINALS:
-				return !getOutputTerminals().isEmpty();
-			case SemanticPackage.ELEMENT__INPUT_TERMINALS:
-				return !getInputTerminals().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ElementImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/FlowContainerImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/FlowContainerImpl.java
deleted file mode 100644
index 69c2572..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/FlowContainerImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Flow Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class FlowContainerImpl extends ContainerElementImpl implements FlowContainer {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FlowContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.FLOW_CONTAINER;
-	}
-
-} //FlowContainerImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/GateImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/GateImpl.java
deleted file mode 100644
index e27581c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/GateImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class GateImpl extends ElementImpl implements Gate {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.GATE;
-	}
-
-} //GateImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/InputOutputTerminalImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/InputOutputTerminalImpl.java
deleted file mode 100644
index 70e9ff4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/InputOutputTerminalImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Input Output Terminal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class InputOutputTerminalImpl extends OutputTerminalImpl implements InputOutputTerminal {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InputOutputTerminalImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.INPUT_OUTPUT_TERMINAL;
-	}
-
-} //InputOutputTerminalImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/InputTerminalImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/InputTerminalImpl.java
deleted file mode 100644
index ebfb1f2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/InputTerminalImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Input Terminal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class InputTerminalImpl extends TerminalImpl implements InputTerminal {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InputTerminalImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.INPUT_TERMINAL;
-	}
-
-} //InputTerminalImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/LEDImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/LEDImpl.java
deleted file mode 100644
index 89fa904..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/LEDImpl.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>LED</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.LEDImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LEDImpl extends ElementImpl implements LED {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int VALUE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected int value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LEDImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.LED;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(int newValue) {
-		int oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SemanticPackage.LED__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SemanticPackage.LED__VALUE:
-				return new Integer(getValue());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SemanticPackage.LED__VALUE:
-				setValue(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.LED__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.LED__VALUE:
-				return value != VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LEDImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ModelImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ModelImpl.java
deleted file mode 100644
index 1d723d1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/ModelImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ModelImpl extends ContainerElementImpl implements Model {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.MODEL;
-	}
-
-} //ModelImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/OrGateImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/OrGateImpl.java
deleted file mode 100644
index 99c99f4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/OrGateImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Or Gate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OrGateImpl extends GateImpl implements OrGate {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OrGateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.OR_GATE;
-	}
-
-} //OrGateImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/OutputTerminalImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/OutputTerminalImpl.java
deleted file mode 100644
index 02cad23..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/OutputTerminalImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Output Terminal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OutputTerminalImpl extends TerminalImpl implements OutputTerminal {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutputTerminalImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.OUTPUT_TERMINAL;
-	}
-
-} //OutputTerminalImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/SemanticFactoryImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/SemanticFactoryImpl.java
deleted file mode 100644
index 3c353d4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/SemanticFactoryImpl.java
+++ /dev/null

@@ -1,207 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SemanticFactoryImpl extends EFactoryImpl implements SemanticFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SemanticFactory init() {
-		try {
-			SemanticFactory theSemanticFactory = (SemanticFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic"); 
-			if (theSemanticFactory != null) {
-				return theSemanticFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new SemanticFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case SemanticPackage.LED: return createLED();
-			case SemanticPackage.WIRE: return createWire();
-			case SemanticPackage.CIRCUIT: return createCircuit();
-			case SemanticPackage.FLOW_CONTAINER: return createFlowContainer();
-			case SemanticPackage.AND_GATE: return createAndGate();
-			case SemanticPackage.OR_GATE: return createOrGate();
-			case SemanticPackage.XOR_GATE: return createXORGate();
-			case SemanticPackage.MODEL: return createModel();
-			case SemanticPackage.OUTPUT_TERMINAL: return createOutputTerminal();
-			case SemanticPackage.INPUT_TERMINAL: return createInputTerminal();
-			case SemanticPackage.INPUT_OUTPUT_TERMINAL: return createInputOutputTerminal();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LED createLED() {
-		LEDImpl led = new LEDImpl();
-		return led;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Wire createWire() {
-		WireImpl wire = new WireImpl();
-		return wire;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Circuit createCircuit() {
-		CircuitImpl circuit = new CircuitImpl();
-		return circuit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FlowContainer createFlowContainer() {
-		FlowContainerImpl flowContainer = new FlowContainerImpl();
-		return flowContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AndGate createAndGate() {
-		AndGateImpl andGate = new AndGateImpl();
-		return andGate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OrGate createOrGate() {
-		OrGateImpl orGate = new OrGateImpl();
-		return orGate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XORGate createXORGate() {
-		XORGateImpl xorGate = new XORGateImpl();
-		return xorGate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Model createModel() {
-		ModelImpl model = new ModelImpl();
-		return model;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutputTerminal createOutputTerminal() {
-		OutputTerminalImpl outputTerminal = new OutputTerminalImpl();
-		return outputTerminal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputTerminal createInputTerminal() {
-		InputTerminalImpl inputTerminal = new InputTerminalImpl();
-		return inputTerminal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputOutputTerminal createInputOutputTerminal() {
-		InputOutputTerminalImpl inputOutputTerminal = new InputOutputTerminalImpl();
-		return inputOutputTerminal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticPackage getSemanticPackage() {
-		return (SemanticPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static SemanticPackage getPackage() {
-		return SemanticPackage.eINSTANCE;
-	}
-
-} //SemanticFactoryImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/SemanticPackageImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/SemanticPackageImpl.java
deleted file mode 100644
index 3a6d80f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/SemanticPackageImpl.java
+++ /dev/null

@@ -1,570 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SemanticPackageImpl extends EPackageImpl implements SemanticPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ledEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass elementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass wireEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass circuitEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass gateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass flowContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass andGateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass orGateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xorGateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass modelEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass containerElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass terminalEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outputTerminalEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass inputTerminalEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass inputOutputTerminalEClass = 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.examples.runtime.diagram.logic.semantic.SemanticPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private SemanticPackageImpl() {
-		super(eNS_URI, SemanticFactory.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 SemanticPackage init() {
-		if (isInited) return (SemanticPackage)EPackage.Registry.INSTANCE.getEPackage(SemanticPackage.eNS_URI);
-
-		// Obtain or create and register package
-		SemanticPackageImpl theSemanticPackage = (SemanticPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SemanticPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SemanticPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theSemanticPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theSemanticPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theSemanticPackage.freeze();
-
-		return theSemanticPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLED() {
-		return ledEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLED_Value() {
-		return (EAttribute)ledEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElement() {
-		return elementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getElement_Terminals() {
-		return (EReference)elementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getElement_OutputTerminals() {
-		return (EReference)elementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getElement_InputTerminals() {
-		return (EReference)elementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWire() {
-		return wireEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWire_Source() {
-		return (EReference)wireEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWire_Target() {
-		return (EReference)wireEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCircuit() {
-		return circuitEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGate() {
-		return gateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFlowContainer() {
-		return flowContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAndGate() {
-		return andGateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOrGate() {
-		return orGateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getXORGate() {
-		return xorGateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getModel() {
-		return modelEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContainerElement() {
-		return containerElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerElement_Children() {
-		return (EReference)containerElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTerminal() {
-		return terminalEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTerminal_Id() {
-		return (EAttribute)terminalEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutputTerminal() {
-		return outputTerminalEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInputTerminal() {
-		return inputTerminalEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInputOutputTerminal() {
-		return inputOutputTerminalEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticFactory getSemanticFactory() {
-		return (SemanticFactory)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
-		ledEClass = createEClass(LED);
-		createEAttribute(ledEClass, LED__VALUE);
-
-		elementEClass = createEClass(ELEMENT);
-		createEReference(elementEClass, ELEMENT__TERMINALS);
-		createEReference(elementEClass, ELEMENT__OUTPUT_TERMINALS);
-		createEReference(elementEClass, ELEMENT__INPUT_TERMINALS);
-
-		wireEClass = createEClass(WIRE);
-		createEReference(wireEClass, WIRE__SOURCE);
-		createEReference(wireEClass, WIRE__TARGET);
-
-		circuitEClass = createEClass(CIRCUIT);
-
-		gateEClass = createEClass(GATE);
-
-		flowContainerEClass = createEClass(FLOW_CONTAINER);
-
-		andGateEClass = createEClass(AND_GATE);
-
-		orGateEClass = createEClass(OR_GATE);
-
-		xorGateEClass = createEClass(XOR_GATE);
-
-		modelEClass = createEClass(MODEL);
-
-		containerElementEClass = createEClass(CONTAINER_ELEMENT);
-		createEReference(containerElementEClass, CONTAINER_ELEMENT__CHILDREN);
-
-		terminalEClass = createEClass(TERMINAL);
-		createEAttribute(terminalEClass, TERMINAL__ID);
-
-		outputTerminalEClass = createEClass(OUTPUT_TERMINAL);
-
-		inputTerminalEClass = createEClass(INPUT_TERMINAL);
-
-		inputOutputTerminalEClass = createEClass(INPUT_OUTPUT_TERMINAL);
-	}
-
-	/**
-	 * <!-- 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
-		ledEClass.getESuperTypes().add(this.getElement());
-		wireEClass.getESuperTypes().add(this.getElement());
-		circuitEClass.getESuperTypes().add(this.getContainerElement());
-		gateEClass.getESuperTypes().add(this.getElement());
-		flowContainerEClass.getESuperTypes().add(this.getContainerElement());
-		andGateEClass.getESuperTypes().add(this.getGate());
-		orGateEClass.getESuperTypes().add(this.getGate());
-		xorGateEClass.getESuperTypes().add(this.getGate());
-		modelEClass.getESuperTypes().add(this.getContainerElement());
-		containerElementEClass.getESuperTypes().add(this.getElement());
-		terminalEClass.getESuperTypes().add(this.getElement());
-		outputTerminalEClass.getESuperTypes().add(this.getTerminal());
-		inputTerminalEClass.getESuperTypes().add(this.getTerminal());
-		inputOutputTerminalEClass.getESuperTypes().add(this.getOutputTerminal());
-		inputOutputTerminalEClass.getESuperTypes().add(this.getInputTerminal());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(ledEClass, org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED.class, "LED", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLED_Value(), ecorePackage.getEInt(), "value", "0", 0, 1, org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(elementEClass, Element.class, "Element", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getElement_Terminals(), this.getTerminal(), null, "terminals", null, 0, -1, Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getElement_OutputTerminals(), this.getTerminal(), null, "outputTerminals", null, 0, -1, Element.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getElement_InputTerminals(), this.getTerminal(), null, "inputTerminals", null, 0, -1, Element.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(wireEClass, Wire.class, "Wire", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWire_Source(), this.getOutputTerminal(), null, "source", null, 1, 1, Wire.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWire_Target(), this.getInputTerminal(), null, "target", null, 1, 1, Wire.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(circuitEClass, Circuit.class, "Circuit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(gateEClass, Gate.class, "Gate", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(flowContainerEClass, FlowContainer.class, "FlowContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(andGateEClass, AndGate.class, "AndGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(orGateEClass, OrGate.class, "OrGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xorGateEClass, XORGate.class, "XORGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(containerElementEClass, ContainerElement.class, "ContainerElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getContainerElement_Children(), this.getElement(), null, "children", null, 0, -1, ContainerElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(terminalEClass, Terminal.class, "Terminal", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTerminal_Id(), ecorePackage.getEString(), "id", "", 0, 1, Terminal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(outputTerminalEClass, OutputTerminal.class, "OutputTerminal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(inputTerminalEClass, InputTerminal.class, "InputTerminal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(inputOutputTerminalEClass, InputOutputTerminal.class, "InputOutputTerminal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //SemanticPackageImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/TerminalImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/TerminalImpl.java
deleted file mode 100644
index ad98175..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/TerminalImpl.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Terminal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.TerminalImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class TerminalImpl extends ElementImpl implements Terminal {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TerminalImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.TERMINAL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SemanticPackage.TERMINAL__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SemanticPackage.TERMINAL__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SemanticPackage.TERMINAL__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.TERMINAL__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.TERMINAL__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TerminalImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/WireImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/WireImpl.java
deleted file mode 100644
index 1dfa37b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/WireImpl.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Wire</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.WireImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl.WireImpl#getTarget <em>Target</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WireImpl extends ElementImpl implements Wire {
-	/**
-	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected OutputTerminal source = null;
-
-	/**
-	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTarget()
-	 * @generated
-	 * @ordered
-	 */
-	protected InputTerminal target = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WireImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.WIRE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutputTerminal getSource() {
-		if (source != null && source.eIsProxy()) {
-			InternalEObject oldSource = (InternalEObject)source;
-			source = (OutputTerminal)eResolveProxy(oldSource);
-			if (source != oldSource) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SemanticPackage.WIRE__SOURCE, oldSource, source));
-			}
-		}
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutputTerminal basicGetSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSource(OutputTerminal newSource) {
-		OutputTerminal oldSource = source;
-		source = newSource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SemanticPackage.WIRE__SOURCE, oldSource, source));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputTerminal getTarget() {
-		if (target != null && target.eIsProxy()) {
-			InternalEObject oldTarget = (InternalEObject)target;
-			target = (InputTerminal)eResolveProxy(oldTarget);
-			if (target != oldTarget) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SemanticPackage.WIRE__TARGET, oldTarget, target));
-			}
-		}
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputTerminal basicGetTarget() {
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTarget(InputTerminal newTarget) {
-		InputTerminal oldTarget = target;
-		target = newTarget;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SemanticPackage.WIRE__TARGET, oldTarget, target));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SemanticPackage.WIRE__SOURCE:
-				if (resolve) return getSource();
-				return basicGetSource();
-			case SemanticPackage.WIRE__TARGET:
-				if (resolve) return getTarget();
-				return basicGetTarget();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SemanticPackage.WIRE__SOURCE:
-				setSource((OutputTerminal)newValue);
-				return;
-			case SemanticPackage.WIRE__TARGET:
-				setTarget((InputTerminal)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.WIRE__SOURCE:
-				setSource((OutputTerminal)null);
-				return;
-			case SemanticPackage.WIRE__TARGET:
-				setTarget((InputTerminal)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SemanticPackage.WIRE__SOURCE:
-				return source != null;
-			case SemanticPackage.WIRE__TARGET:
-				return target != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WireImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/XORGateImpl.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/XORGateImpl.java
deleted file mode 100644
index 085b399..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/impl/XORGateImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XOR Gate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class XORGateImpl extends GateImpl implements XORGate {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XORGateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return SemanticPackage.Literals.XOR_GATE;
-	}
-
-} //XORGateImpl

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/LogicSemanticType.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/LogicSemanticType.java
deleted file mode 100644
index 79ccbe7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/LogicSemanticType.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Element types for the logic elements.
- * 
- * @author qili, ldamus
- */
-public class LogicSemanticType
-	extends AbstractElementTypeEnumerator {
-
-	public static final IElementType MODEL = getElementType("logic.model"); //$NON-NLS-1$
-
-	public static final IElementType LED = getElementType("logic.led"); //$NON-NLS-1$
-
-	public static final IElementType WIRE = getElementType("logic.wire"); //$NON-NLS-1$
-
-	public static final IElementType CIRCUIT = getElementType("logic.circuit"); //$NON-NLS-1$
-
-	public static final IElementType FLOWCONTAINER = getElementType("logic.flowcontainer"); //$NON-NLS-1$
-
-	public static final IElementType ANDGATE = getElementType("logic.andgate"); //$NON-NLS-1$
-
-	public static final IElementType ORGATE = getElementType("logic.orgate"); //$NON-NLS-1$
-
-	public static final IElementType XORGATE = getElementType("logic.xorgate"); //$NON-NLS-1$
-
-	public static final IElementType TERMINAL = getElementType("logic.terminal"); //$NON-NLS-1$
-
-	public static final IElementType INPUT_TERMINAL = getElementType("logic.inputterminal"); //$NON-NLS-1$
-
-	public static final IElementType OUTPUT_TERMINAL = getElementType("logic.outputterminal"); //$NON-NLS-1$
-
-	public static final IElementType INPUT_OUTPUT_TERMINAL = getElementType("logic.inputoutputterminal"); //$NON-NLS-1$
-
-	public static final IElementType HALF_ADDER = getElementType("logic.halfAdder"); //$NON-NLS-1$
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/SemanticAdapterFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/SemanticAdapterFactory.java
deleted file mode 100644
index a503ead..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/SemanticAdapterFactory.java
+++ /dev/null

@@ -1,358 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.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.examples.runtime.diagram.logic.semantic.*;
-
-/**
- * <!-- 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.examples.runtime.diagram.logic.semantic.SemanticPackage
- * @generated
- */
-public class SemanticAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static SemanticPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = SemanticPackage.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 SemanticSwitch modelSwitch =
-		new SemanticSwitch() {
-			public Object caseLED(LED object) {
-				return createLEDAdapter();
-			}
-			public Object caseElement(Element object) {
-				return createElementAdapter();
-			}
-			public Object caseWire(Wire object) {
-				return createWireAdapter();
-			}
-			public Object caseCircuit(Circuit object) {
-				return createCircuitAdapter();
-			}
-			public Object caseGate(Gate object) {
-				return createGateAdapter();
-			}
-			public Object caseFlowContainer(FlowContainer object) {
-				return createFlowContainerAdapter();
-			}
-			public Object caseAndGate(AndGate object) {
-				return createAndGateAdapter();
-			}
-			public Object caseOrGate(OrGate object) {
-				return createOrGateAdapter();
-			}
-			public Object caseXORGate(XORGate object) {
-				return createXORGateAdapter();
-			}
-			public Object caseModel(Model object) {
-				return createModelAdapter();
-			}
-			public Object caseContainerElement(ContainerElement object) {
-				return createContainerElementAdapter();
-			}
-			public Object caseTerminal(Terminal object) {
-				return createTerminalAdapter();
-			}
-			public Object caseOutputTerminal(OutputTerminal object) {
-				return createOutputTerminalAdapter();
-			}
-			public Object caseInputTerminal(InputTerminal object) {
-				return createInputTerminalAdapter();
-			}
-			public Object caseInputOutputTerminal(InputOutputTerminal object) {
-				return createInputOutputTerminalAdapter();
-			}
-			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.examples.runtime.diagram.logic.semantic.LED <em>LED</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.examples.runtime.diagram.logic.semantic.LED
-	 * @generated
-	 */
-	public Adapter createLEDAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element <em>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.examples.runtime.diagram.logic.semantic.Element
-	 * @generated
-	 */
-	public Adapter createElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire <em>Wire</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.examples.runtime.diagram.logic.semantic.Wire
-	 * @generated
-	 */
-	public Adapter createWireAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit <em>Circuit</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.examples.runtime.diagram.logic.semantic.Circuit
-	 * @generated
-	 */
-	public Adapter createCircuitAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate <em>Gate</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.examples.runtime.diagram.logic.semantic.Gate
-	 * @generated
-	 */
-	public Adapter createGateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.FlowContainer <em>Flow Container</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.examples.runtime.diagram.logic.semantic.FlowContainer
-	 * @generated
-	 */
-	public Adapter createFlowContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate <em>And Gate</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.examples.runtime.diagram.logic.semantic.AndGate
-	 * @generated
-	 */
-	public Adapter createAndGateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate <em>Or Gate</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.examples.runtime.diagram.logic.semantic.OrGate
-	 * @generated
-	 */
-	public Adapter createOrGateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate <em>XOR Gate</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.examples.runtime.diagram.logic.semantic.XORGate
-	 * @generated
-	 */
-	public Adapter createXORGateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model <em>Model</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.examples.runtime.diagram.logic.semantic.Model
-	 * @generated
-	 */
-	public Adapter createModelAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement <em>Container 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.examples.runtime.diagram.logic.semantic.ContainerElement
-	 * @generated
-	 */
-	public Adapter createContainerElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal <em>Terminal</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.examples.runtime.diagram.logic.semantic.Terminal
-	 * @generated
-	 */
-	public Adapter createTerminalAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal <em>Output Terminal</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.examples.runtime.diagram.logic.semantic.OutputTerminal
-	 * @generated
-	 */
-	public Adapter createOutputTerminalAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal <em>Input Terminal</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.examples.runtime.diagram.logic.semantic.InputTerminal
-	 * @generated
-	 */
-	public Adapter createInputTerminalAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal <em>Input Output Terminal</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.examples.runtime.diagram.logic.semantic.InputOutputTerminal
-	 * @generated
-	 */
-	public Adapter createInputOutputTerminalAdapter() {
-		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;
-	}
-
-} //SemanticAdapterFactory

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/SemanticSwitch.java b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/SemanticSwitch.java
deleted file mode 100644
index 67f51d3..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/util/SemanticSwitch.java
+++ /dev/null

@@ -1,449 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.*;
-
-/**
- * <!-- 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.examples.runtime.diagram.logic.semantic.SemanticPackage
- * @generated
- */
-public class SemanticSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static SemanticPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemanticSwitch() {
-		if (modelPackage == null) {
-			modelPackage = SemanticPackage.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 SemanticPackage.LED: {
-				LED led = (LED)theEObject;
-				Object result = caseLED(led);
-				if (result == null) result = caseElement(led);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.ELEMENT: {
-				Element element = (Element)theEObject;
-				Object result = caseElement(element);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.WIRE: {
-				Wire wire = (Wire)theEObject;
-				Object result = caseWire(wire);
-				if (result == null) result = caseElement(wire);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.CIRCUIT: {
-				Circuit circuit = (Circuit)theEObject;
-				Object result = caseCircuit(circuit);
-				if (result == null) result = caseContainerElement(circuit);
-				if (result == null) result = caseElement(circuit);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.GATE: {
-				Gate gate = (Gate)theEObject;
-				Object result = caseGate(gate);
-				if (result == null) result = caseElement(gate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.FLOW_CONTAINER: {
-				FlowContainer flowContainer = (FlowContainer)theEObject;
-				Object result = caseFlowContainer(flowContainer);
-				if (result == null) result = caseContainerElement(flowContainer);
-				if (result == null) result = caseElement(flowContainer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.AND_GATE: {
-				AndGate andGate = (AndGate)theEObject;
-				Object result = caseAndGate(andGate);
-				if (result == null) result = caseGate(andGate);
-				if (result == null) result = caseElement(andGate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.OR_GATE: {
-				OrGate orGate = (OrGate)theEObject;
-				Object result = caseOrGate(orGate);
-				if (result == null) result = caseGate(orGate);
-				if (result == null) result = caseElement(orGate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.XOR_GATE: {
-				XORGate xorGate = (XORGate)theEObject;
-				Object result = caseXORGate(xorGate);
-				if (result == null) result = caseGate(xorGate);
-				if (result == null) result = caseElement(xorGate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.MODEL: {
-				Model model = (Model)theEObject;
-				Object result = caseModel(model);
-				if (result == null) result = caseContainerElement(model);
-				if (result == null) result = caseElement(model);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.CONTAINER_ELEMENT: {
-				ContainerElement containerElement = (ContainerElement)theEObject;
-				Object result = caseContainerElement(containerElement);
-				if (result == null) result = caseElement(containerElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.TERMINAL: {
-				Terminal terminal = (Terminal)theEObject;
-				Object result = caseTerminal(terminal);
-				if (result == null) result = caseElement(terminal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.OUTPUT_TERMINAL: {
-				OutputTerminal outputTerminal = (OutputTerminal)theEObject;
-				Object result = caseOutputTerminal(outputTerminal);
-				if (result == null) result = caseTerminal(outputTerminal);
-				if (result == null) result = caseElement(outputTerminal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.INPUT_TERMINAL: {
-				InputTerminal inputTerminal = (InputTerminal)theEObject;
-				Object result = caseInputTerminal(inputTerminal);
-				if (result == null) result = caseTerminal(inputTerminal);
-				if (result == null) result = caseElement(inputTerminal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SemanticPackage.INPUT_OUTPUT_TERMINAL: {
-				InputOutputTerminal inputOutputTerminal = (InputOutputTerminal)theEObject;
-				Object result = caseInputOutputTerminal(inputOutputTerminal);
-				if (result == null) result = caseOutputTerminal(inputOutputTerminal);
-				if (result == null) result = caseInputTerminal(inputOutputTerminal);
-				if (result == null) result = caseTerminal(inputOutputTerminal);
-				if (result == null) result = caseElement(inputOutputTerminal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>LED</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>LED</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLED(LED object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>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>Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseElement(Element object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Wire</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>Wire</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWire(Wire object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Circuit</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>Circuit</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCircuit(Circuit object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Gate</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>Gate</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseGate(Gate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Flow Container</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>Flow Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFlowContainer(FlowContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>And Gate</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>And Gate</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAndGate(AndGate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Or Gate</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>Or Gate</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOrGate(OrGate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>XOR Gate</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>XOR Gate</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseXORGate(XORGate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Model</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>Model</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseModel(Model object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Container 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>Container Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContainerElement(ContainerElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Terminal</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>Terminal</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTerminal(Terminal object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Output Terminal</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>Output Terminal</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutputTerminal(OutputTerminal object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Input Terminal</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>Input Terminal</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInputTerminal(InputTerminal object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Input Output Terminal</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>Input Output Terminal</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInputOutputTerminal(InputOutputTerminal 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;
-	}
-
-} //SemanticSwitch

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/rosemodel/logicsemantic.mdl b/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/rosemodel/logicsemantic.mdl
deleted file mode 100644
index 0732dc4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/rosemodel/logicsemantic.mdl
+++ /dev/null

@@ -1,8287 +0,0 @@
-
-(object Petal
-    version    	46
-    _written   	"Rose 7.7.0204.3001"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Java"
-	    name       	"IDE"
-	    value      	"Internal Editor")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply3"
-	    value      	""))
-    quid       	"3C7421A4014E"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3C7421A40150"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3C7421A70314"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3C7421A4014F"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3C7421A40151"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "semantic"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	(value Text "org.eclipse.gmf.examples.runtime.diagram.logic"))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	(value Text "semantic"))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	(value Text "http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic"))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	(value Text "semantic")))
-		quid       	"41EEBEB602E8"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "LED"
-			quid       	"41EEBF4900C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EEBF890133"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	TRUE))
-				quid       	"41EEBF5403A4"
-				type       	"int"
-				initv      	"0"
-				exportControl 	"Public")))
-		    (object Class "Element"
-			quid       	"41EFDE890251"
-			abstract   	TRUE)
-		    (object Class "Wire"
-			quid       	"41EFE21F0219"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFE82602DE"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251")))
-		    (object Class "Circuit"
-			quid       	"41EFE73B003D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F00A12037F"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D")))
-		    (object Class "Gate"
-			quid       	"41EFE76A01A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFE81F03D8"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			abstract   	TRUE)
-		    (object Class "FlowContainer"
-			quid       	"41EFE7B5002E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F00A0D012D"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D")))
-		    (object Class "AndGate"
-			quid       	"41EFF146008A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFF190032A"
-				supplier   	"Logical View::semantic::Gate"
-				quidu      	"41EFE76A01A4")))
-		    (object Class "OrGate"
-			quid       	"41EFF14801E2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFF18C0165"
-				supplier   	"Logical View::semantic::Gate"
-				quidu      	"41EFE76A01A4")))
-		    (object Class "XORGate"
-			quid       	"41EFF14A0210"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41EFF193027E"
-				supplier   	"Logical View::semantic::Gate"
-				quidu      	"41EFE76A01A4")))
-		    (object Class "Model"
-			quid       	"41F0229D02E1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F022AF0098"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D")))
-		    (object Class "ContainerElement"
-			quid       	"41F009CB033D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"41F00A8A0019"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			abstract   	TRUE)
-		    (object Class "Terminal"
-			quid       	"420B84B502C3"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"420CCBEE031E"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "id"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	TRUE))
-				quid       	"420B8F96005E"
-				type       	"String"
-				initv      	
-|""
-				
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "OutputTerminal"
-			quid       	"425EBA7A0118"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"425EBBB70114"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3")))
-		    (object Class "InputTerminal"
-			quid       	"425EBA8800EA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"425EBBC501A1"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3")))
-		    (object Class "InputOutputTerminal"
-			quid       	"4263C03A001A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"4263C1FA028E"
-				stereotype 	"extend"
-				supplier   	"Logical View::semantic::OutputTerminal"
-				quidu      	"425EBA7A0118")
-			    (object Inheritance_Relationship
-				quid       	"4263C20B01E2"
-				supplier   	"Logical View::semantic::InputTerminal"
-				quidu      	"425EBA8800EA")))
-		    (object Association "$UNNAMED$0"
-			quid       	"41F93FDF00F6"
-			roles      	(list role_list
-			    (object Role "children"
-				quid       	"41F93FE30163"
-				label      	"children"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$1"
-				quid       	"41F93FE30165"
-				supplier   	"Logical View::semantic::ContainerElement"
-				quidu      	"41F009CB033D"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$2"
-			quid       	"420D1AA602AB"
-			roles      	(list role_list
-			    (object Role "source"
-				quid       	"420D1AA70328"
-				label      	"source"
-				supplier   	"Logical View::semantic::OutputTerminal"
-				quidu      	"425EBA7A0118"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$3"
-				quid       	"420D1AA7032A"
-				supplier   	"Logical View::semantic::Wire"
-				quidu      	"41EFE21F0219"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$4"
-			quid       	"420D1AE8003A"
-			roles      	(list role_list
-			    (object Role "target"
-				quid       	"420D1AE90069"
-				label      	"target"
-				supplier   	"Logical View::semantic::InputTerminal"
-				quidu      	"425EBA8800EA"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$5"
-				quid       	"420D1AE9006B"
-				supplier   	"Logical View::semantic::Wire"
-				quidu      	"41EFE21F0219"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$6"
-			quid       	"4263FEEF031C"
-			roles      	(list role_list
-			    (object Role "terminals"
-				attributes 	(list Attribute_Set)
-				quid       	"4263FEF70213"
-				label      	"terminals"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$7"
-				quid       	"4263FEF70222"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$8"
-			quid       	"4264097C01A7"
-			roles      	(list role_list
-			    (object Role "outputTerminals"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"4264097E004F"
-				label      	"outputTerminals"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$9"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	TRUE))
-				quid       	"4264097E0051"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251")))
-		    (object Association "$UNNAMED$10"
-			quid       	"42641CB501AA"
-			roles      	(list role_list
-			    (object Role "inputTerminals"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"42641CB700A1"
-				label      	"inputTerminals"
-				supplier   	"Logical View::semantic::Terminal"
-				quidu      	"420B84B502C3"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$11"
-				quid       	"42641CB700B0"
-				supplier   	"Logical View::semantic::Element"
-				quidu      	"41EFDE890251"))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Main"
-			quid       	"41EEBEB602F1"
-			title      	"Main"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	2882
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::semantic::OrGate" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 1808)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(2064, 1756)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"OrGate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFF14801E2"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::XORGate" @2
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2496, 1808)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(2375, 1756)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	242
-				    justify    	0
-				    label      	"XORGate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFF14A0210"
-				width      	260
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::FlowContainer" @3
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(387, 1148)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"FlowContainer")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE7B5002E"
-				width      	364
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::Model" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(832, 1148)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Model")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41F0229D02E1"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::AndGate" @5
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 1808)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@5
-				    location   	(1723, 1756)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	234
-				    justify    	0
-				    label      	"AndGate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFF146008A"
-				width      	252
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::LED" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1292, 1117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	360
-				    justify    	0
-				    label      	"LED")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EEBF4900C6"
-				width      	378
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::Circuit" @7
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@7
-				    location   	(112, 1148)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Circuit")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE73B003D"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::Gate" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 1216)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(2016, 1164)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Gate")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE76A01A4"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @9
-				location   	(2112, 1506)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@8
-				vertices   	(list Points
-				    (2112, 1506)
-				    (2112, 1280)))
-			    (object InheritView "" @10
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFF18C0165"
-				client     	@1
-				supplier   	@8
-				line_style 	3
-				origin_attachment 	(2167, 1743)
-				terminal_attachment 	(2167, 1506)
-				drawSupplier 	@9)
-			    (object InheritView "" @11
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFF190032A"
-				client     	@5
-				supplier   	@8
-				line_style 	3
-				origin_attachment 	(1840, 1744)
-				terminal_attachment 	(1840, 1506)
-				drawSupplier 	@9)
-			    (object InheritView "" @12
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFF193027E"
-				client     	@2
-				supplier   	@8
-				line_style 	3
-				origin_attachment 	(2427, 1744)
-				terminal_attachment 	(2427, 1506)
-				drawSupplier 	@9)
-			    (object ClassView "Class" "Logical View::semantic::InputOutputTerminal" @13
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(3280, 1408)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@13
-				    location   	(3043, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"InputOutputTerminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4263C03A001A"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::semantic::OutputTerminal" @14
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 1072)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@14
-				    location   	(2522, 1019)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"OutputTerminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"425EBA7A0118"
-				width      	382
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @15
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	FALSE
-				line_color 	3342489
-				quidu      	"4263C1FA028E"
-				client     	@13
-				supplier   	@14
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::semantic::InputTerminal" @16
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(3840, 1072)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@16
-				    location   	(3675, 1019)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"InputTerminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"425EBA8800EA"
-				width      	348
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @17
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4263C20B01E2"
-				client     	@13
-				supplier   	@16
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::semantic::Wire" @18
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2976, 1744)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@18
-				    location   	(2880, 1692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	192
-				    justify    	0
-				    label      	"Wire")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFE21F0219"
-				width      	210
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$2" @19
-				location   	(2707, 1520)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"420D1AA602AB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "source" @20
-					Parent_View 	@19
-					location   	(-253, 304)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @21
-					    Parent_View 	@20
-					    location   	(2601, 1210)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+source"
-					    pctDist    	0.813751
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AA70328"
-					client     	@19
-					supplier   	@14
-					line_style 	0
-					label      	(object SegLabel @22
-					    Parent_View 	@20
-					    location   	(2767, 1198)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.841354
-					    height     	63
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$3" @23
-					Parent_View 	@19
-					location   	(-253, 304)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AA7032A"
-					client     	@19
-					supplier   	@18
-					vertices   	(list Points
-					    (2707, 1520)
-					    (2708, 1742)
-					    (2870, 1743))
-					line_style 	0)))
-			    (object AssociationViewNew "$UNNAMED$4" @24
-				location   	(3762, 1727)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"420D1AE8003A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "target" @25
-					Parent_View 	@24
-					location   	(802, 511)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @26
-					    Parent_View 	@25
-					    location   	(3755, 1251)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	135
-					    justify    	0
-					    label      	"+target"
-					    pctDist    	0.836737
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AE90069"
-					client     	@24
-					supplier   	@16
-					vertices   	(list Points
-					    (3762, 1727)
-					    (3855, 1725)
-					    (3840, 1137))
-					line_style 	0
-					label      	(object SegLabel @27
-					    Parent_View 	@25
-					    location   	(3905, 1257)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.821645
-					    height     	62
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$5" @28
-					Parent_View 	@24
-					location   	(802, 511)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"420D1AE9006B"
-					client     	@24
-					supplier   	@18
-					line_style 	0)))
-			    (object ClassView "Class" "Logical View::semantic::ContainerElement" @29
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(592, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(382, 364)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"ContainerElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41F009CB033D"
-				width      	438
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @30
-				location   	(592, 972)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@29
-				vertices   	(list Points
-				    (592, 972)
-				    (592, 480)))
-			    (object InheritView "" @31
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F022AF0098"
-				client     	@4
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(917, 1135)
-				terminal_attachment 	(917, 972)
-				drawSupplier 	@30)
-			    (object InheritView "" @32
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F00A0D012D"
-				client     	@3
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(559, 1136)
-				terminal_attachment 	(559, 972)
-				drawSupplier 	@30)
-			    (object InheritView "" @33
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F00A12037F"
-				client     	@7
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(174, 1135)
-				terminal_attachment 	(174, 972)
-				drawSupplier 	@30)
-			    (object ClassView "Class" "Logical View::semantic::Terminal" @34
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(3088, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@34
-				    location   	(2906, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"Terminal")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"420B84B502C3"
-				width      	382
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @35
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"425EBBB70114"
-				client     	@14
-				supplier   	@34
-				vertices   	(list Points
-				    (2895, 1069)
-				    (3077, 1069)
-				    (3085, 512))
-				line_style 	0)
-			    (object InheritView "" @36
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"425EBBC501A1"
-				client     	@16
-				supplier   	@34
-				vertices   	(list Points
-				    (3665, 1071)
-				    (3077, 1069)
-				    (3085, 512))
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::semantic::Element" @37
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1984, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	TRUE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@37
-				    location   	(1877, 363)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	214
-				    justify    	0
-				    label      	"Element")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"41EFDE890251"
-				width      	232
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @38
-				location   	(1984, 875)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@37
-				vertices   	(list Points
-				    (1984, 875)
-				    (1984, 481)))
-			    (object InheritView "" @39
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFE81F03D8"
-				client     	@8
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(2108, 1152)
-				terminal_attachment 	(2108, 875)
-				drawSupplier 	@38)
-			    (object InheritView "" @40
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EEBF890133"
-				client     	@6
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(1465, 1104)
-				terminal_attachment 	(1465, 875)
-				drawSupplier 	@38)
-			    (object InheritView "" @41
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F00A8A0019"
-				client     	@29
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(757, 479)
-				terminal_attachment 	(757, 875)
-				drawSupplier 	@38)
-			    (object AssociationViewNew "$UNNAMED$0" @42
-				location   	(1339, 416)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41F93FDF00F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$1" @43
-					Parent_View 	@42
-					location   	(-645, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @44
-					    Parent_View 	@43
-					    location   	(917, 375)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"41F93FE30165"
-					client     	@42
-					supplier   	@29
-					line_style 	0)
-				    (object RoleView "children" @45
-					Parent_View 	@42
-					location   	(-645, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @46
-					    Parent_View 	@45
-					    location   	(1761, 375)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	177
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"41F93FE30163"
-					client     	@42
-					supplier   	@37
-					line_style 	0
-					label      	(object SegLabel @47
-					    Parent_View 	@45
-					    location   	(1813, 470)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @48
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"41EFE82602DE"
-				client     	@18
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(2949, 1680)
-				terminal_attachment 	(2949, 875)
-				drawSupplier 	@38)
-			    (object InheritView "" @49
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"420CCBEE031E"
-				client     	@34
-				supplier   	@37
-				line_style 	3
-				origin_attachment 	(3150, 512)
-				terminal_attachment 	(3150, 875)
-				drawSupplier 	@38)
-			    (object AssociationViewNew "$UNNAMED$6" @50
-				location   	(2498, 416)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4263FEEF031C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "terminals" @51
-					Parent_View 	@50
-					location   	(514, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @52
-					    Parent_View 	@51
-					    location   	(2709, 373)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	205
-					    justify    	0
-					    label      	"+terminals"
-					    pctDist    	0.530151
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4263FEF70213"
-					client     	@50
-					supplier   	@34
-					line_style 	0
-					label      	(object SegLabel @53
-					    Parent_View 	@51
-					    location   	(2705, 459)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.522678
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$7" @54
-					Parent_View 	@50
-					location   	(514, 0)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4263FEF70222"
-					client     	@50
-					supplier   	@37
-					line_style 	0)))
-			    (object AssociationViewNew "$UNNAMED$8" @55
-				location   	(2462, 150)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4264097C01A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "outputTerminals" @56
-					Parent_View 	@55
-					location   	(478, -266)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @57
-					    Parent_View 	@56
-					    location   	(2811, 118)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	337
-					    justify    	0
-					    label      	"+outputTerminals"
-					    pctDist    	0.653130
-					    height     	138
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4264097E004F"
-					client     	@55
-					supplier   	@34
-					vertices   	(list Points
-					    (2462, 150)
-					    (2515, 121)
-					    (2902, 319))
-					line_style 	0
-					label      	(object SegLabel @58
-					    Parent_View 	@56
-					    location   	(2821, 189)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.735082
-					    height     	80
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$9" @59
-					Parent_View 	@55
-					location   	(478, -266)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4264097E0051"
-					client     	@55
-					supplier   	@37
-					line_style 	0)))
-			    (object AssociationViewNew "$UNNAMED$10" @60
-				location   	(2481, 286)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"42641CB501AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "inputTerminals" @61
-					Parent_View 	@60
-					location   	(497, -130)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					label      	(object SegLabel @62
-					    Parent_View 	@61
-					    location   	(2567, 240)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	313
-					    justify    	0
-					    label      	"+inputTerminals"
-					    pctDist    	0.184227
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"42641CB700A1"
-					client     	@60
-					supplier   	@34
-					vertices   	(list Points
-					    (2481, 286)
-					    (2539, 271)
-					    (2896, 364))
-					line_style 	0
-					label      	(object SegLabel @63
-					    Parent_View 	@61
-					    location   	(2572, 327)
-					    font       	(object Font
-						size       	10
-						face       	"Arial"
-						bold       	FALSE
-						italics    	FALSE
-						underline  	FALSE
-						strike     	FALSE
-						color      	0
-						default_color 	TRUE)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..n"
-					    pctDist    	0.247818
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$11" @64
-					Parent_View 	@60
-					location   	(497, -130)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"42641CB700B0"
-					client     	@60
-					supplier   	@37
-					line_style 	0))))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3C7421A70315"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::semantic" @65
-			location   	(912, 240)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@65
-			    location   	(768, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"semantic")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41EEBEB602E8"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3C7421A40151"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3C7421A70313"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3C7421A40152"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3C7421A40154"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSI C++ Event Watcher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	"${quote}=${quote}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteType"
-			value      	("IncompleteTypeSet" 1))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotDeclare"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"NoDiscriminantPart"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"UnknownDiscriminantPart"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"KnownDiscriminantPart"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	221)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	231)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	"None")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	".;C:\\Program Files\\Rational\\RUPBuilder;C:\\Program Files\\Rational\\common\\java\\swingall.jar;C:\\Program Files\\Rational\\common\\java\\javahelp\\jh.jar;C:\\jdk1.3.1_05\\src.jar;C:\\jdk1.3.1_05\\jre\\lib\\i18n.jar;C:\\jdk1.3.1_05\\jre\\lib\\jaws.jar;C:\\jdk1.3.1_05\\jre\\lib\\rt.jar;C:\\jdk1.3.1_05\\jre\\lib\\sunrsasign.jar;C:\\jdk1.3.1_05\\lib\\dt.jar;C:\\jdk1.3.1_05\\lib\\htmlconverter.jar;C:\\jdk1.3.1_05\\lib\\tools.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\charsets.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\jce.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\jsse.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\rt.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\sunrsasign.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\dnsns.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\ldapsec.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\localedata.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\ext\\sunjce_provider.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\security\\local_policy.jar;C:\\j2sdk1.4.2_03\\jre\\lib\\security\\US_export_policy.jar;C:\\j2sdk1.4.2_03\\lib\\dt.jar;C:\\j2sdk1.4.2_03\\lib\\htmlconverter.jar;C:\\j2sdk1.4.2_03\\lib\\tools.jar")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VC++"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateATL"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SmartPointersOnAssoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"PutImportsIn"
-			value      	"stdafx.h")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"FullPathInImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UseImportAttributes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportAttributes"
-			value      	"no_namespace named_guids")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"TypeLibLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CompileProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlInterfaceAttributes"
-			value      	(value Text 
-|endpoint("")
-|local
-|object
-|pointer_default()
-|uuid("")
-|version("")
-|encode
-|decode
-|auto_handle
-|implicit_handle("")
-|code
-|nocode
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlCoClassAttributes"
-			value      	(value Text 
-|uuid("")
-|helpstring("")
-|helpcontext("")
-|licensed
-|version("")
-|control
-|hidden
-|appobject
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlCoClassInterfaceAttributes"
-			value      	(value Text 
-|default
-|source
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlParameterAttributes"
-			value      	(value Text 
-|in
-|out
-|retval
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlMethodAttributes"
-			value      	(value Text 
-|id(1)
-|helpstring("")
-|call_as("")
-|callback
-|helpcontext("")
-|hidden
-|local
-|restricted
-|source
-|vararg
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IdlPropertyAttributes"
-			value      	(value Text 
-|id()
-|helpstring("")
-|call_as("")
-|helpcontext("")
-|hidden
-|local
-|restricted
-|source
-|vararg
-|bindable
-|defaultbind
-|defaultcallelem
-|displaybind
-|immediatebind
-|nonbrowseable
-|requestedit
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"RvcPtyVersion"
-			value      	"1.4")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ModelIDStyle"
-			value      	2)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocStyle"
-			value      	1)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateIncludes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ApplyPattern"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateBackupFiles"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SupportCodeName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocRevEngineer"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateOverviewDiagrams"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateModelIDsInCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AttributeTypes"
-			value      	(value Text 
-|attr1=bool
-|attr2=short
-|attr3=int
-|attr4=long
-|attr5=char
-|attr6=float
-|attr7=double
-|attr8=void
-|attr9=clock_t
-|attr10=_complex
-|attr11=_dev_t
-|attr12=div_t
-|attr13=_exception
-|attr14=FILE
-|attr15=_finddata_t
-|attr16=_FPIEEE_RECORD
-|attr17=fpos_t
-|attr18=_HEAPINFO
-|attr19=jmp_buf
-|attr20=lconv
-|attr21=ldiv_t
-|attr22=_off_t
-|attr23=_onexit_t
-|attr24=_PNH
-|attr25=ptrdiff_t
-|attr26=sig_atomic_t
-|attr27=size_t
-|attr28=_stat
-|attr29=time_t
-|attr30=_timeb
-|attr31=tm
-|attr32=_utimbuf
-|attr33=va_list
-|attr34=wchar_t
-|attr35=wctrans_t
-|attr36=wctype_t
-|attr37=_wfinddata_t
-|attr38=_wfinddatai64_t
-|attr39=wint_t
-|attr40=ABORTPROC
-|attr41=ACMDRIVERENUMCB
-|attr42=ACMDRIVERPROC
-|attr43=ACMFILTERCHOOSEHOOKPROC
-|attr44=ACMFILTERENUMCB
-|attr45=ACMFILTERTAGENUMCB
-|attr46=ACMFORMATCHOOSEHOOKPROC
-|attr47=ACMFORMATENUMCB
-|attr48=ACMFORMATTAGENUMCB
-|attr49=APPLET_PROC
-|attr50=ATOM
-|attr51=BOOL
-|attr52=BOOLEAN
-|attr53=BYTE
-|attr54=CALINFO_ENUMPROC
-|attr55=CALLBACK
-|attr56=CHAR
-|attr57=COLORREF
-|attr58=CONST
-|attr59=CRITICAL_SECTION
-|attr60=CTRYID
-|attr61=DATEFMT_ENUMPROC
-|attr62=DESKTOPENUMPROC
-|attr63=DLGPROC
-|attr64=DRAWSTATEPROC
-|attr65=DWORD
-|attr66=EDITWORDBREAKPROC
-|attr67=ENHMFENUMPROC
-|attr68=ENUMRESLANGPROC
-|attr69=ENUMRESNAMEPROC
-|attr70=ENUMRESTYPEPROC
-|attr71=FARPROC
-|attr72=FILE_SEGMENT_ELEMENT
-|attr73=FLOAT
-|attr74=FONTENUMPROC
-|attr75=GOBJENUMPROC
-|attr76=GRAYSTRINGPROC
-|attr77=HACCEL
-|attr78=HANDLE
-|attr79=HBITMAP
-|attr80=HBRUSH
-|attr81=HCOLORSPACE
-|attr82=HCONV
-|attr83=HCONVLIST
-|attr84=HCURSOR
-|attr85=HDC
-|attr86=HDDEDATA
-|attr87=HDESK
-|attr88=HDROP
-|attr89=HDWP
-|attr90=HENHMETAFILE
-|attr91=HFILE
-|attr92=HFONT
-|attr93=HGDIOBJ
-|attr94=HGLOBAL
-|attr95=HHOOK
-|attr96=HICON
-|attr97=HIMAGELIST
-|attr98=HIMC
-|attr99=HINSTANCE
-|attr100=HKEY
-|attr101=HKL
-|attr102=HLOCAL
-|attr103=HMENU
-|attr104=HMETAFILE
-|attr105=HMODULE
-|attr106=HMONITOR
-|attr107=HOOKPROC
-|attr108=HPALETTE
-|attr109=HPEN
-|attr110=HRGN
-|attr111=HRSRC
-|attr112=HSZ
-|attr113=HTREEITEM
-|attr114=HWINSTA
-|attr115=HWND
-|attr116=INT
-|attr117=IPADDR
-|attr118=LANGID
-|attr119=LCID
-|attr120=LCSCSTYPE
-|attr121=LCSGAMUTMATCH
-|attr122=LCTYPE
-|attr123=LINEDDAPROC
-|attr124=LOCALE_ENUMPROC
-|attr125=LONG
-|attr126=LONGLONG
-|attr127=LPARAM
-|attr128=LPBOOL
-|attr129=LPBYTE
-|attr130=LPCCHOOKPROC
-|attr131=LPCFHOOKPROC
-|attr132=LPCOLORREF
-|attr133=LPCRITICAL_SECTION
-|attr134=LPCSTR
-|attr135=LPCTSTR
-|attr136=LPCVOID
-|attr137=LPCWSTR
-|attr138=LPDWORD
-|attr139=LPFIBER_START_ROUTINE
-|attr140=LPFRHOOKPROC
-|attr141=LPHANDLE
-|attr142=LPHANDLER_FUNCTION
-|attr143=LPINT
-|attr144=LPLONG
-|attr145=LPOFNHOOKPROC
-|attr146=LPPAGEPAINTHOOK
-|attr147=LPPAGESETUPHOOK
-|attr148=LPPRINTHOOKPROC
-|attr149=LPPROGRESS_ROUTINE
-|attr150=LPSETUPHOOKPROC
-|attr151=LPSTR
-|attr152=LPSTREAM
-|attr153=LPTHREAD_START_ROUTINE
-|attr154=LPTSTR
-|attr155=LPVOID
-|attr156=LPWORD
-|attr157=LPWSTR
-|attr158=LRESULT
-|attr159=LUID
-|attr160=PBOOL
-|attr161=PBOOLEAN
-|attr162=PBYTE
-|attr163=PCHAR
-|attr164=PCRITICAL_SECTION
-|attr165=PCSTR
-|attr166=PCTSTR
-|attr167=PCWCH
-|attr168=PCWSTR
-|attr169=PDWORD
-|attr170=PFLOAT
-|attr171=PFNCALLBACK
-|attr172=PHANDLE
-|attr173=PHANDLER_ROUTINE
-|attr174=PHKEY
-|attr175=PINT
-|attr176=PLCID
-|attr177=PLONG
-|attr178=PLUID
-|attr179=PROPENUMPROC
-|attr180=PROPENUMPROCEX
-|attr181=PSHORT
-|attr182=PSTR
-|attr183=PTBYTE
-|attr184=PTCHAR
-|attr185=PTIMERAPCROUTINE
-|attr186=PTSTR
-|attr187=PUCHAR
-|attr188=PUINT
-|attr189=PULONG
-|attr190=PUSHORT
-|attr191=PVOID
-|attr192=PWCHAR
-|attr193=PWORD
-|attr194=PWSTR
-|attr195=REGISTERWORDENUMPROC
-|attr196=REGSAM
-|attr197=SC_HANDLE
-|attr198=SC_LOCK
-|attr199=SENDASYNCPROC
-|attr200=SERVICE_STATUS_HANDLE
-|attr201=SHORT
-|attr202=TBYTE
-|attr203=TCHAR
-|attr204=TIMEFMT_ENUMPROC
-|attr205=TIMERPROC
-|attr206=UCHAR
-|attr207=UINT
-|attr208=ULONG
-|attr209=ULONGLONG
-|attr210=UNSIGNED
-|attr211=USHORT
-|attr212=VOID
-|attr213=WCHAR
-|attr214=WINAPI
-|attr215=WINSTAENUMPROC
-|attr216=WNDENUMPROC
-|attr217=WNDPROC
-|attr218=WORD
-|attr219=WPARAM
-|attr220=YIELDPROC
-|attr221=CPoint
-|attr222=CRect
-|attr223=CSize
-|attr224=CString
-|attr225=CTime
-|attr226=CTimeSpan
-|attr227=CCreateContext
-|attr228=CMemoryState
-|attr229=COleSafeArray
-|attr230=CPrintInfo
-|attr231=HRESULT
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Containers"
-			value      	(value Text 
-|cont1=CArray<$TYPE, $TYPE&>
-|cont2=CByteArray
-|cont3=CDWordArray
-|cont4=CObArray
-|cont5=CPtrArray
-|cont6=CStringArray
-|cont7=CUIntArray
-|cont8=CWordArray
-|cont9=CList<$TYPE, $TYPE&>
-|cont10=CPtrList
-|cont11=CObList
-|cont12=CStringList
-|cont13=CMapWordToPtr
-|cont14=CMapPtrToWord
-|cont15=CMapPtrToPtr
-|cont16=CMapWordToOb
-|cont17=CMapStringToPtr
-|cont18=CMapStringToOb
-|cont19=CMapStringToString
-|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
-|cont21=CTypedPtrArray<CObArray, $TYPE*>
-|cont22=CTypedPtrList<CObList, $TYPE*>
-|cont23=CTypedPtrList<CPtrList, $TYPE*>
-|cont24=CComObject<$TYPE>
-|cont25=CComPtr<$TYPE>
-|cont26=CComQIPtr<$TYPE>
-|cont27=CComQIPtr<$TYPE, IID*>
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ClassMethods"
-			value      	(value Text 
-|*_body=// ToDo: Add your specialized code here and/or call the base class
-|cm1=$NAME()
-|cm2=$NAME(orig:const $NAME&)
-|cm3=<<virtual>> ~$NAME()
-|cm4=operator=(rhs:$NAME&):$NAME&
-|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
-|cm5=<<const>> operator==(rhs:const $NAME&):bool
-|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm6=<<const>> operator!=(rhs:$NAME&):bool
-|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm7=<<const>> operator<(rhs:$NAME&):bool
-|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm8=<<const>> operator>(rhs:$NAME&):bool
-|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm9=<<const>> operator<=(rhs:$NAME&):bool
-|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm10=<<const>> operator>=(rhs:$NAME&):bool
-|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
-|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
-|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
-|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Accessors"
-			value      	(value Text 
-|agf=<<const>> get_$BASICNAME():const $TYPE
-|agf_body=return $NAME;
-|asf=set_$BASICNAME(value:$TYPE):void
-|asf_body=$NAME = value;|return;
-|agv=<<const>> get_$BASICNAME():const $TYPE&
-|agv_body=return $NAME;
-|asv=set_$BASICNAME(value:$TYPE&):void
-|asv_body=$NAME = value;|return;
-|agp=<<const>> get_$BASICNAME():const $TYPE
-|agp_body=return $NAME;
-|asp=set_$BASICNAME(value:$TYPE):void
-|asp_body=$NAME = value;|return;
-|agr=<<const>> get_$BASICNAME():const $TYPE
-|agr_body=return $NAME;
-|asr=set_$BASICNAME(value:$TYPE):void
-|asr_body=$NAME = value;|return;
-|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
-|aga_body=return $NAME[index];
-|asa=set_$BASICNAME(index:int, value:$TYPE):void
-|asa_body=$NAME[index] = value;|return;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Conditionals"
-			value      	(value Text 
-|*_decl=#ifdef _DEBUG
-|*_base=CObject
-|cond1=<<virtual, const>> AssertValid():void
-|cond1_body=$SUPERNAME::AssertValid();
-|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
-|cond2_body=$SUPERNAME::Dump(dc);
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Patterns"
-			value      	(value Text 
-|patrn1=cm1,cm3,cond1,cond2
-|Patrn1_name=Default
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AtlClassPrefix"
-			value      	"C")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AtlInterfacePrefix"
-			value      	"I")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AtlTypeDescription"
-			value      	"Class")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultLogicalPackage"
-			value      	"$language Reverse Engineered/$component")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultComponentPackage"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"HeaderFileName"
-			value      	"")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CodeFileName"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InternalMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ExportMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialSourceIncludes"
-			value      	(value Text 
-|"stdafx.h"
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Copyright"
-			value      	(value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"VC++"
-				name       	"(none)"
-				value      	300)
-			    (object Attribute
-				tool       	"VC++"
-				name       	"DLL"
-				value      	301)
-			    (object Attribute
-				tool       	"VC++"
-				name       	"EXE"
-				value      	302)
-			    (object Attribute
-				tool       	"VC++"
-				name       	"MIDL"
-				value      	303)))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Kind"
-			value      	("KindSet" 300))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"BodyExtensions"
-			value      	(value Text 
-|.cpp
-|.cxx
-|.inl
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"HeaderExtensions"
-			value      	(value Text 
-|.h
-|.hpp
-|.hxx
-|inl
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ProjectFolders"
-			value      	(value Text 
-|Source Files
-|Header Files
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UsePathMap"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"IsDirectory"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Directory"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Direction"
-			value      	("ParamDirectionTypeSet" 102))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ParamDirectionTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"in"
-				value      	102)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"inout"
-				value      	103)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"out"
-				value      	104)))))
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3C7421A40153"))

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/.classpath b/org.eclipse.gmf.examples.runtime.diagram.logic/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.examples.runtime.diagram.logic/.cvsignore b/org.eclipse.gmf.examples.runtime.diagram.logic/.cvsignore
deleted file mode 100644
index 284b98b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-logic.zip

diff --git "a/org.eclipse.gmf.examples.runtime.diagram.logic/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic Build Example Zip \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.diagram.logic/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic Build Example Zip \133Builder\135.launch"
deleted file mode 100644
index 82023c3..0000000
--- "a/org.eclipse.gmf.examples.runtime.diagram.logic/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic Build Example Zip \133Builder\135.launch"
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.diagram.logic&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.logic/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/.project b/org.eclipse.gmf.examples.runtime.diagram.logic/.project
deleted file mode 100644
index d4e60b1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/.project
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.diagram.logic</name>
-	<comment></comment>
-	<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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.diagram.logic Build Example Zip [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.diagram.logic/META-INF/MANIFEST.MF
deleted file mode 100644
index 449a966..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.diagram.logic; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.diagram.logic.internal,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.icons,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.ui.parts,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.util,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories,
- org.eclipse.gmf.examples.runtime.diagram.logic.internal.wizards
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing.render;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.action.ide;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.gef.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.examples.runtime.diagram.logic.model;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.examples.runtime.diagram.logic.model.edit;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.dnd;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true; exceptions="org.eclipse.gmf.examples.runtime.diagram.logic.internal.nonactivating"

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/about.html b/org.eclipse.gmf.examples.runtime.diagram.logic/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/build.properties b/org.eclipse.gmf.examples.runtime.diagram.logic/build.properties
deleted file mode 100644
index 7c007eb..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/build.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               properties/,\
-               about.html
-src.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               properties/,\
-               about.html,\
-               .project,\
-               build.properties,\
-               .classpath
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/buildZip.xml b/org.eclipse.gmf.examples.runtime.diagram.logic/buildZip.xml
deleted file mode 100644
index edd1be6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Enum.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-			
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\logic.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/and16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/and16.gif
deleted file mode 100644
index 8e0282f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/and16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/and24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/and24.gif
deleted file mode 100644
index 6e85b51..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/and24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/circuit16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/circuit16.gif
deleted file mode 100644
index cb61f54..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/circuit16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/circuit24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/circuit24.gif
deleted file mode 100644
index 496eabd..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/circuit24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/comp.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/comp.gif
deleted file mode 100644
index 0a62f18..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/comp.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/connection16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/connection16.gif
deleted file mode 100644
index 186a127..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/connection16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/connection24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/connection24.gif
deleted file mode 100644
index 66a5fe7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/connection24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/fulladder16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/fulladder16.gif
deleted file mode 100644
index 6b47d44..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/fulladder16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/fulladder24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/fulladder24.gif
deleted file mode 100644
index c47b60e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/fulladder24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/geoshape.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/geoshape.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/geoshape.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/halfadder16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/halfadder16.gif
deleted file mode 100644
index 176f369..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/halfadder16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/halfadder24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/halfadder24.gif
deleted file mode 100644
index 06d881f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/halfadder24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledbgprim.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledbgprim.gif
deleted file mode 100644
index 1c29476..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledbgprim.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledbgsel.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledbgsel.gif
deleted file mode 100644
index 6c98cef..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledbgsel.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledicon16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledicon16.gif
deleted file mode 100644
index b35c29f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledicon16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledicon24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledicon24.gif
deleted file mode 100644
index 7c8d52d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/ledicon24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logic.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logic.gif
deleted file mode 100644
index ca05b78..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logic.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logicflow16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logicflow16.gif
deleted file mode 100644
index 4a56bb7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logicflow16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logicflow24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logicflow24.gif
deleted file mode 100644
index 9bcd3c9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/logicflow24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/or16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/or16.gif
deleted file mode 100644
index b7205e0..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/or16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/or24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/or24.gif
deleted file mode 100644
index a8f0657..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/or24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/wizards/logic_wiz.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/wizards/logic_wiz.gif
deleted file mode 100644
index 519895c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/wizards/logic_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/xor16.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/xor16.gif
deleted file mode 100644
index 05f79f0..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/xor16.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/xor24.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/icons/xor24.gif
deleted file mode 100644
index 900c731..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/icons/xor24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/plugin.properties b/org.eclipse.gmf.examples.runtime.diagram.logic/plugin.properties
deleted file mode 100644
index a333340..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/plugin.properties
+++ /dev/null

@@ -1,98 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# =================================================================================
-# Logic Example Internal - Translation Instruction : do not translate this section 
-# =================================================================================
-Plugin.name = GMF Logic Shapes
-Plugin.providerName = Eclipse.org
-ext.globalActionHandlerProviders = Logic Editor Global Action Handler Providers
-ext.contributionItemProvider = Logic Diagram Contribution Item Provider
-ext.iconProvider = Logic Diagram Icon Provider
-ext.LogicDiagramPreferenceStore = Logic Diagram Preference Store
-ext.logicPaletteProvider = Logic Diagram Palette Provider
-ext.actionFilterProviders = Logic Diagram Action Filter Provider
-# ==============================================================================
-# Logic Shapes - Palette -  Translation Instruction:  section to be 
-# translated
-# ==============================================================================
-GMF_example_wizard_category_name: GMF (Graphical Modeling Framework) Diagrams
-
-Logic_example_wizard_description: An example of a wizard that creates sample logic file
-
-Logic_example_graphical_editor_name: Logic editor
-
-CreateLogicPage1.Title: Create logic file
-
-CreateLogicPage1.Description: Create a new logic file resource.
-
-CreateLogicPage1.ModelNames.GroupName: Logic Model Samples
-
-CreateLogicPage1.ModelNames.EmptyModelName: Empty Model
-
-LogicDrawer.Label: Logic Designer
-LogicDrawer.Description: Logic Shapes Drawer.
-
-LogicFlowTool.Label: Logic Flow
-LogicFlowTool.Description: Creates a container that can hold other circuit components.
-
-CircuitTool.Label: Circuit
-CircuitTool.Description: Create a circuit. It can be connected to external circuits/parts, and can have an intricate design as well.
-
-LEDTool.Label: LED
-LEDTool.Description: Creates an LED which is used to read voltage input/output.
-
-ConnectionTool.Label: Connection
-ConnectionTool.Description: Connection tool can be used to connect the various circuit parts. 
-
-GateStack.Label = Gates
-GateStack.Description = Gate Stack
-
-OrGateTool.Label: Or Gate
-OrGateTool.Description: Creates a gate that can perfom the logical OR operation.
-
-XORGateTool.Label: XOR Gate
-XORGateTool.Description: Creates a gate that can perfom the logical XOR operation.
-
-AndGateTool.Label: And Gate
-AndGateTool.Description: Creates a gate that can perfom the logical AND operation.
-
-HalfAdderTool.Label: HalfAdder
-HalfAdderTool.Description: Creates a circuit representing a half-adder.
-
-FullAdderTool.Label: FullAdder
-FullAdderTool.Description: Creates a circuit representing a full-adder (uses two half-adders).
-
-ModelTool.Label: Logic Diagram
-
-# ==============================================================================
-# Provider names  - Translation Instruction: section to be translated
-# ==============================================================================
-
-logic.provider.modelingassistant = Logic Diagram Modeling Assistant Provider
-
-# ==============================================================================
-# Preference Pages  - Translation Instruction: section to be translated
-# ==============================================================================
-
-PreferencePage.Root.Diagrams = Logic Diagrams
-PreferencePage.Appearance = Appearance
-PreferencePage.Connections = Connections
-PreferencePage.Printing = Printing
-PreferencePage.RulerGrid = Rulers and Grid
-PreferencePage.Pathmaps = Path Maps
-
-# ==============================================================================
-# Menu Items  - Translation Instruction: section to be translated
-# ==============================================================================
-CreateCircuit.ActionLabel = Create Circuit
-CreateHalfAdder.ActionLabel = Create Half Adder

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/plugin.xml b/org.eclipse.gmf.examples.runtime.diagram.logic/plugin.xml
deleted file mode 100644
index b526668..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/plugin.xml
+++ /dev/null

@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-   <extension point="org.eclipse.ui.editors">   
-      <editor
-            class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.ui.parts.LogicNotationEditor"
-            contributorClass="org.eclipse.gmf.examples.runtime.diagram.logic.internal.ui.parts.LogicDiagramActionBarContributor"
-            default="true"
-            extensions="logic2"
-            icon="icons/logic.gif"
-            id="LogicEditor"
-            matchingStrategy="org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditorMatchingStrategy"
-            name="%Logic_example_graphical_editor_name">
-      </editor>
-   </extension>
-  
-   <extension point="org.eclipse.ui.newWizards">
-  	  <category name="%GMF_example_wizard_category_name" parentCategory="org.eclipse.ui.Examples" id="org.eclipse.gmf.examples"/> 
-  	  <wizard name="Logic Diagram" icon="icons/logic.gif" category="org.eclipse.ui.Examples/org.eclipse.gmf.examples" class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.wizards.LogicCreationWizard" id="org.eclipse.gmf.examples.runtime.diagram.logic.wizard.new.file">
-  	  	 <description>
-  	  		%Logic_example_wizard_description
-  	  	 </description>  
-  	  </wizard>
-  </extension>
-  
-  <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-      <viewProvider class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicViewProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="">
-         </context>
-         <context
-               semanticHints="FlowContainer, circuit, LED, LogicCompartment, LogicFlowCompartment, OrGate, AndGate, XORGate"
-               viewClass="org.eclipse.gmf.runtime.notation.Node">
-         </context>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="wire">
-         </context>
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="LED">
-            <method name="getProxyClassID()" value="semantic.LED">
-            </method>
-         </object>  
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="AndGate">
-            <method name="getProxyClassID()" value="semantic.AndGate">
-            </method>
-         </object>
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="OrGate">
-            <method name="getProxyClassID()" value="semantic.OrGate">
-            </method>
-         </object>
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="XORGate">
-            <method name="getProxyClassID()" value="semantic.XORGate">
-            </method>
-         </object>
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="Circuit">
-            <method name="getProxyClassID()" value="semantic.Circuit">
-            </method>
-         </object> 
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="FlowContainer">
-            <method name="getProxyClassID()" value="semantic.FlowContainer">
-            </method>
-         </object> 
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="Wire">
-            <method name="getProxyClassID()" value="semantic.Wire">
-            </method>
-         </object> 
-         <object
-               class="org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement"
-               id="ContainerElement"/>
-         <context
-               elements="LED,FlowContainer,Circuit,XORGate,OrGate,AndGate"
-               viewClass="org.eclipse.gmf.runtime.notation.Node"/>
-         <context
-               elements="Wire"
-               viewClass="org.eclipse.gmf.runtime.notation.Edge"/>
-      </viewProvider>
-  </extension>
-  
-  <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicEditPartProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.notation.View" id="LogicElement">
-           	<method name="getType()" value="logic, LED, wire, LogicFlow, circuit, LogicCompartment, LogicFlowCompartment, OrGate, AndGate, XORGate, FlowContainer">
-            </method>
-         </object>
-		 <context views="LogicElement">
-         </context>
-      </editpartProvider>
-  </extension>
-  
-  <!-- Palette Provider -->
-         <extension
-         id="logicPaletteProvider"
-         name="%ext.logicPaletteProvider"
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-       <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority name="Highest">
-         </Priority>
-         <editor id="LogicEditor">
-         </editor>
-         <!--   class=&quot;org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart&quot;-->
-         <contribution factoryClass="org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicPaletteFactory">
-            <entry label="%LogicDrawer.Label" kind="drawer" description="%LogicDrawer.Description" path="/" small_icon="icons/comp.gif" id="logicDrawer">
-               <expand>
-                  <content>
-                  	<!-- expand by default for LogicEditors -->
-                  </content>
-               </expand>
-            </entry>
-            <entry label="%LogicFlowTool.Label" kind="tool" description="%LogicFlowTool.Description" large_icon="icons/logicflow24.gif" path="/logicDrawer/" small_icon="icons/logicflow16.gif" id="FlowContainer">
-            </entry>
-            <entry label="%CircuitTool.Label" kind="tool" description="%CircuitTool.Description" large_icon="icons/circuit24.gif" path="/logicDrawer/" small_icon="icons/circuit16.gif" id="circuit">
-            </entry>
-            <entry label="%LEDTool.Label" kind="tool" description="%LEDTool.Description" large_icon="icons/ledicon24.gif" path="/logicDrawer/" small_icon="icons/ledicon16.gif" id="LED">
-            </entry>
-            <entry label="%GateStack.Label" kind="stack" description="%GateStack.Description" small_icon="icons/or24.gif" path="/logicDrawer/" id="noteStack">
-            </entry>
-            <entry label="%OrGateTool.Label" kind="tool" description="%OrGateTool.Description" large_icon="icons/or24.gif" path="/logicDrawer/noteStack/" small_icon="icons/or16.gif" id="OrGate">
-            </entry>
-            <entry label="%AndGateTool.Label" kind="tool" description="%AndGateTool.Description" large_icon="icons/and24.gif" path="/logicDrawer/noteStack/" small_icon="icons/and16.gif" id="AndGate">
-            </entry>
-            <entry label="%XORGateTool.Label" kind="tool" description="%XORGateTool.Description" large_icon="icons/xor24.gif" path="/logicDrawer/noteStack/" small_icon="icons/xor16.gif" id="XORGate">
-            </entry>
-            <entry label="%ConnectionTool.Label" kind="tool" description="%ConnectionTool.Description" path="/logicDrawer/" small_icon="icons/connection16.gif" large_icon="icons/connection24.gif" id="wire">
-            </entry>
-         </contribution>
-         <contribution>
-            <predefinedEntry
-                  id="geoshapeDrawer"
-                  path="/">
-               <expand force="true"/>
-            </predefinedEntry>
-         </contribution>
-      </paletteProvider>
-   </extension>
-  
-  <extension id="globalActionHandlerProviders" name="%ext.globalActionHandlerProviders" point="org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders">
-      <GlobalActionHandlerProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandlerProvider" id="logicGlobalActionHandlerProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <ViewId id="LogicEditor">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="delete">
-               </GlobalActionId>
-            </ElementType>
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-               <GlobalActionId actionId="save">
-               </GlobalActionId>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-      
-      <!-- Support for copying of images -->
-      <GlobalActionHandlerProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.render.providers.DiagramUIRenderGlobalActionHandlerProvider"
-            id="logicGlobalActionHandlerProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <ViewId
-               id="LogicEditor">
-            <ElementType
-                  class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId
-                     actionId="cut">
-               </GlobalActionId>
-               <GlobalActionId
-                     actionId="copy">
-               </GlobalActionId>             
-               <GlobalActionId 
-               		 actionId="paste">
-               </GlobalActionId>               
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-      
-      <GlobalActionHandlerProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers.DiagramIDEGlobalActionHandlerProvider" id="logicIDEGlobalActionHandlerProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <ViewId id="LogicEditor">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="bookmark">
-               </GlobalActionId>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-      
-      <!--Printing -->
-      <GlobalActionHandlerProvider class="org.eclipse.gmf.runtime.diagram.ui.printing.render.providers.DiagramWithPrintGlobalActionHandlerProvider" id="logicPrintGlobalActionHandlerProvider">
-         <Priority name="Lowest"/>
-         <ViewId id="LogicEditor">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="print"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-      
-  </extension><extension id="LogicContributionItemProvider" name="%ext.contributionItemProvider" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicContributionItemProvider">
-         <Priority name="Low">
-         </Priority>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LEDEditPart">
-            </popupStructuredContributionCriteria>
-            <popupMenuGroup id="valueChangeGroup">
-            </popupMenuGroup>
-            <popupAction path="/valueChangeGroup" id="incrementValueAction">
-            </popupAction>
-            <popupAction path="/valueChangeGroup" id="decrementValueAction">
-            </popupAction>
-            <popupAction
-                  id="deleteSemanticAction"
-                  path="/valueChangeGroup"/>
-         </popupContribution>
-         <partContribution id="LogicEditor">
-            <partAction menubarPath="/file/print" id="printPreviewAction">
-            </partAction>
-         </partContribution>
-       </contributionItemProvider>
-   </extension>
-   
-   <extension id="LogicModelingAssistantProvider" name="%logic.provider.modelingassistant" point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
-      <modelingAssistantProvider class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicModelingAssistantProvider">
-         <Priority name="Low"/>
-         <object class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.ConnectionPointEditPart(org.eclipse.gmf.examples.runtime.diagram.logic)" 
-         	id="CONNECTIONPOINT">                        
-         </object>
-         <object class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicFlowCompartmentEditPart(org.eclipse.gmf.examples.runtime.diagram.logic)" 
-         	id="LOGIC_FLOW_COMPARTMENT">               
-         </object>
-         <object class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicShapeCompartmentEditPart(org.eclipse.gmf.examples.runtime.diagram.logic)" 
-         	id="LOGIC_SHAPE_COMPARTMENT">               
-         </object>
-         <context elements="CONNECTIONPOINT,LOGIC_FLOW_COMPARTMENT,LOGIC_SHAPE_COMPARTMENT"/>
-      </modelingAssistantProvider>
-   </extension>
-  
-  <extension id="LogicUiProperties" name="Logic UI Properties" point="org.eclipse.gmf.runtime.common.core.propertiesConfiguration">
-      <PropertiesConfiguration path="properties/logic.properties"/>
-  </extension>
-  
-  
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-      <parser type="logic2" class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
-      </parser>
-   </extension>
-  
-  <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-        <metamodel
-                nsURI="http://www.eclipse.org/gmf/examples/runtime/1.0.0/logicsemantic">
-           <metamodelType
-                 eclass="Model"
-                 edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.ContainerElementEditHelper"
-                 icon="icons/logic.gif"
-                 id="logic.model"
-                 kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-                 name="%ModelTool.Label">
-              <param
-                    name="semanticHint"
-                    value="model"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.led"     
-                   icon="icons/ledicon16.gif"
-                   name="%LEDTool.Label"
-                   eclass="LED"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.LEDEditHelper"
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <param name="semanticHint" value="LED"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.wire"     
-                   icon="icons/connection16.gif"
-                   name="%ConnectionTool.Label"
-                   eclass="Wire"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.WireEditHelper" 
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <param name="semanticHint" value="wire"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.circuit"     
-                   icon="icons/circuit16.gif"
-                   name="%CircuitTool.Label"
-                   eclass="Circuit"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.CircuitEditHelper" 
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <param name="semanticHint" value="circuit"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.flowcontainer"     
-                   icon="icons/logicflow16.gif"
-                   name="%LogicFlowTool.Label"
-                   eclass="FlowContainer"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.ContainerElementEditHelper" 
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <param name="semanticHint" value="FlowContainer"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.andgate"     
-                   icon="icons/and16.gif"
-                   name="%AndGateTool.Label"
-                   eclass="AndGate"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.GateEditHelper" 
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <param name="semanticHint" value="AndGate"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.orgate"     
-                   icon="icons/or16.gif"
-                   name="%OrGateTool.Label"
-                   eclass="OrGate"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.GateEditHelper" 
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <param name="semanticHint" value="OrGate"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.xorgate"     
-                   icon="icons/xor16.gif"
-                   name="%XORGateTool.Label"
-                   eclass="XORGate"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.GateEditHelper" 
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <param name="semanticHint" value="XORGate"/>
-           </metamodelType>
-           <metamodelType
-                   id="logic.terminal"     
-                   eclass="Terminal"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.TerminalEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="logic.inputterminal"     
-                   eclass="InputTerminal"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.TerminalEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="logic.outputterminal"     
-                   eclass="OutputTerminal"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.TerminalEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="logic.inputoutputterminal"     
-                   eclass="InputOutputTerminal"
-                   edithelper="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.TerminalEditHelper"> 
-           </metamodelType>
-           <specializationType
-                   id="logic.halfAdder"     
-                   icon="icons/halfadder16.gif"
-                   name="%HalfAdderTool.Label"
-                   edithelperadvice="org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers.HalfAdderAdvice"
-                   kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> 
-               <specializes id="logic.circuit"/>
-               <param name="semanticHint" value="circuit"/>
-           </specializationType>
-        </metamodel>
-    </extension>
-    
-    <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-       <clientContext id="org.eclipse.gmf.example.runtime.diagram.logic.context">
-          <enablement>
-             <test
-                property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-                value="org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain"/>
-          </enablement>
-       </clientContext> 
-       <binding context="org.eclipse.gmf.example.runtime.diagram.logic.context">
-          <elementType pattern="logic.*"/>
-          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"/>
-       </binding>
-    </extension>
-   
-   <!-- Diagram Preferences --> 
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PreferencePage.Root.Diagrams"
-            class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicDiagramsPreferencePage"
-            id="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicDiagramsPreferencePage">
-      </page>
-      <page
-            name="%PreferencePage.Appearance"
-            category="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicDiagramsPreferencePage"
-            class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicAppearancePreferencePage"
-            id="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicAppearancePreferencePage">
-      </page>     
-      <page
-            name="%PreferencePage.Connections"
-            category="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicAppearancePreferencePage"
-            class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicConnectionsPreferencePage"
-            id="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicConnectionsPreferencePage">
-      </page>    
-      <page
-            name="%PreferencePage.Printing"
-            category="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicDiagramsPreferencePage"
-            class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicPrintingPreferencePage"
-            id="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicPrintingPreferencePage">
-      </page>
-      <page
-            name="%PreferencePage.RulerGrid"
-            category="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicDiagramsPreferencePage"
-            class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicRulerGridPreferencePage"
-            id="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicRulerGridPreferencePage">
-      </page>
-      <page
-            name="%PreferencePage.Pathmaps"
-            category="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicDiagramsPreferencePage"
-            class="org.eclipse.gmf.runtime.emf.ui.preferences.PathmapsPreferencePage"
-            id="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicPathmapsPreferencePage">
-      </page>
-   </extension>
-   <extension point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences.LogicPreferencesInitializer" />
-   </extension>
-   
-   <!-- Context Menu Items -->
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            id="LogicContainerElementObjectContribution"
-            objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-         <visibility>
-            <and>
-               <!-- For now, we use the ActionFilterService in a 'visibility' element to calculate enablement. -->
-               <objectState name="org.eclipse.gmf.examples.runtime.diagram.logic.isContainerElement" value=""/>
-               <!-- Once Bugzilla 111778 is fixed, the following enablement criteria can be used: -->
-               <!-- <adapt type="org.eclipse.emf.ecore.EObject"> 
-                       <instanceof value="ContainerElement"/>    
-                    </adapt> -->    
-               <or>
-                  <objectClass name="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart"/>
-                  <objectClass name="org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicShapeCompartmentEditPart"/>
-                  <objectClass name="org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicFlowCompartmentEditPart"/>
-               </or>
-            </and>
-         </visibility>
-         <action
-               id="logic.circuit"
-               label="%CreateCircuit.ActionLabel"
-               icon="icons/circuit16.gif"
-               menubarPath="addGroup"
-               class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions.CreateLogicElementActionDelegate"
-               enablesFor="1">
-         </action>
-         <action
-               id="logic.halfAdder"
-               label="%CreateHalfAdder.ActionLabel"
-               icon="icons/halfadder16.gif"
-               menubarPath="addGroup"
-               class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions.CreateLogicElementActionDelegate"
-               enablesFor="1">
-         </action>
-      </objectContribution>
-   </extension>
-   
-   <!-- Action Filter Provider -->
-   <extension 
-        id="logicActionFilterProviders" 
-        name="%ext.actionFilterProviders" 
-        point="org.eclipse.gmf.runtime.common.ui.services.action.actionFilterProviders">
-     <ActionFilterProvider 
-           class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.nonactivating.LogicActionFilterProvider">
-        <Priority name="Lowest"/>
-        <Attribute 
-              name="org.eclipse.gmf.examples.runtime.diagram.logic.isContainerElement" 
-              value=""/>
-     </ActionFilterProvider>
-  </extension>
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.layoutProviders">
-      <layoutProvider class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.nonactivating.LogicLayoutProvider">
-         <Priority name="Medium"/>
-      </layoutProvider>
-   </extension>
-   <extension
-         point="org.eclipse.emf.transaction.editingDomains">
-      <editingDomain
-            factory="org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory"
-            id="org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain"/>
-   </extension>
-</plugin>

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/properties/logic.properties b/org.eclipse.gmf.examples.runtime.diagram.logic/properties/logic.properties
deleted file mode 100644
index 5aa625a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/properties/logic.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# DO NOT TRANSLATE THIS FILE
-LOGIC_EXT=logic2
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramDebugOptions.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramDebugOptions.java
deleted file mode 100644
index e5f6939..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramDebugOptions.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author qili
- * @canBeSeenBy %level1
- *
- */
-public final class LogicDiagramDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private LogicDiagramDebugOptions() {
-		//Limiting the scope of the constructor so that no-one can initialize.
-	}
-
-	public static final String DEBUG = LogicDiagramPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramPlugin.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramPlugin.java
deleted file mode 100644
index 64d05b1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramPlugin.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * Logic Diagram Plug-in
- * 
- * @author qili
- */
-public class LogicDiagramPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The logic diagram editor ID. This matches the id used in this plugin's
-	 * XML for the editor extension point.
-	 */
-	public static final String EDITOR_ID = "LogicEditor"; //$NON-NLS-1$
-
-	/**
-	 * The shared instance.
-	 */
-	private static LogicDiagramPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public LogicDiagramPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the plugin instance
-	 */
-	public static LogicDiagramPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Starts up this wizards plug-in.
-	 */
-	public void start(BundleContext context)
-		throws Exception {
-		super.start(context);
-		
-		PreferencesHint.registerPreferenceStore(
-			new PreferencesHint(EDITOR_ID), getPreferenceStore());
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramStatusCodes.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramStatusCodes.java
deleted file mode 100644
index 2fd4c6b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/LogicDiagramStatusCodes.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author ldamus
- *
- */
-public final class LogicDiagramStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private LogicDiagramStatusCodes() {
-		/* private constructor */
-	}
-
-	/**
-	 * Status code indicating that everything is OK.
-	 */
-	public static final int OK = 0;
-
-	/**
-	 * Status code indicating that an error occurred with a command.
-	 */
-	public static final int COMMAND_FAILURE = 4;
-
-	/**
-	 * Status code warning that an exception was ignored.
-	 * Set to 9 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 9;
-	
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/CreateLogicElementActionDelegate.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/CreateLogicElementActionDelegate.java
deleted file mode 100644
index efa5dec..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/CreateLogicElementActionDelegate.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-
-public class CreateLogicElementActionDelegate extends AbstractActionDelegate
-		implements IObjectActionDelegate {
-
-	protected void doRun(IProgressMonitor progressMonitor) {
-
-		// Action ID corresponds to the ID of the element type to be created
-		String actionId = getAction().getId();
-		IElementType elementType = ElementTypeRegistry.getInstance().getType(
-				actionId);
-
-		if (elementType == null) {
-			// Problem in the Action contribution XML
-			throw new IllegalArgumentException("Action id '" //$NON-NLS-1$
-					+ actionId
-					+ "' does not correspond to an existing element type ID."); //$NON-NLS-1$
-		}
-
-		// Get the selected edit part
-		IStructuredSelection structuredSelection = getStructuredSelection();
-		Object selection = structuredSelection.getFirstElement();
-
-		if (!(selection instanceof IGraphicalEditPart)) {
-			// Action enablement criteria expected to prevent this
-			throw new IllegalArgumentException("Selected element '" //$NON-NLS-1$
-					+ selection + "' is not an IGraphicalEditPart."); //$NON-NLS-1$
-		}
-
-		IGraphicalEditPart container = (IGraphicalEditPart) selection;
-
-		// Get the command to create the new element and its view
-		CreateViewRequest createRequest = CreateViewRequestFactory
-				.getCreateShapeRequest(elementType, container
-						.getDiagramPreferencesHint());
-
-		Command command = container.getCommand(createRequest);
-
-		if (command == null || !(command.canExecute())) {
-			// Action enablement criteria expected to prevent this
-			throw new IllegalArgumentException("Command for '" //$NON-NLS-1$
-					+ actionId + "' is not executable."); //$NON-NLS-1$
-		}
-
-		// Create the new element
-		DiagramCommandStack commandStack = container.getDiagramEditDomain()
-				.getDiagramCommandStack();
-		commandStack.execute(command);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/DeleteSemanticAction.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/DeleteSemanticAction.java
deleted file mode 100644
index 02d52a7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/DeleteSemanticAction.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramDebugOptions;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramStatusCodes;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * This action exists to demonstrate specifically the functionality of notation
- *  semantic procedures when changes happen to the logic semantic elements. More
- *  specifically, we would like for the notation view to be destroyed whenever
- *  a LED semantic element is destroyed.
- *  
- */
-public class DeleteSemanticAction
-	extends DiagramAction
-	implements LogicActionIds {
-
-	public DeleteSemanticAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	public void init() {
-		super.init();
-		setText("Delete Semantic Element"); //$NON-NLS-1$
-	}
-
-	protected Request createTargetRequest() {
-		return new Request("deleteSemanticElement"); //$NON-NLS-1$
-	}
-	
-	protected void doRun(IProgressMonitor progressMonitor) {
-		super.doRun(progressMonitor);
-		
-        AbstractEMFOperation operation = new AbstractEMFOperation(
-			getDiagramEditPart().getEditingDomain(), getLabel()) {
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-
-				for (Iterator i = getStructuredSelection().iterator(); i
-					.hasNext();) {
-					IGraphicalEditPart ep = (IGraphicalEditPart) i.next();
-					DestroyElementCommand.destroy(ep.getPrimaryView().getElement());
-
-				}
-				return new Status(IStatus.OK, LogicDiagramPlugin.getPluginId(),
-						LogicDiagramStatusCodes.OK, StringStatics.BLANK, null);
-			};
-		};
-
-		try {
-			getActionManager().getOperationHistory().execute(operation,
-				new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			Trace.catching(LogicDiagramPlugin.getInstance(),
-				LogicDiagramDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"doRun", e); //$NON-NLS-1$
-			Log.error(LogicDiagramPlugin.getInstance(),
-				LogicDiagramStatusCodes.IGNORED_EXCEPTION_WARNING, e
-					.getLocalizedMessage(), e);
-		}
-		
-	}
-
-	protected boolean isSelectionListener() {
-		return true;
-	}
-	
-	protected boolean calculateEnabled() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/IncrementDecrementAction.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/IncrementDecrementAction.java
deleted file mode 100644
index a8b78db..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/IncrementDecrementAction.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions;
-
-import java.util.HashMap;
-
-import org.eclipse.gef.Request;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-
-/**
- * @author qili
- * 
- * Action to increment/decrement value for LED figures.
- */
-
-public class IncrementDecrementAction
-	extends DiagramAction
-	implements LogicActionIds {
-
-	private static final String INCREMENT_REQUEST = "Increment", //$NON-NLS-1$
-			DECREMENT_REQUEST = "Decrement"; //$NON-NLS-1$
-
-	private String actionId;
-
-	private HashMap actionMap = new HashMap();
-	{
-		actionMap.put(ACTION_INCREMENT_VALUE, INCREMENT_REQUEST);
-		actionMap.put(ACTION_DECREMENT_VALUE, DECREMENT_REQUEST);
-	}
-
-	/**
-	 * Construct a Decompose Action
-	 * 
-	 * @param workbenchPage
-	 */
-	public IncrementDecrementAction(IWorkbenchPage workbenchPage,
-			String actionId) {
-		super(workbenchPage);
-		this.actionId = actionId;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.IDisposableAction#init()
-	 */
-	public void init() {
-		super.init();
-		if (actionId.equals(ACTION_INCREMENT_VALUE)) {
-			setId("Increment"); //$NON-NLS-1$
-			setText("Increment"); //$NON-NLS-1$
-			setToolTipText("Increment LED"); //$NON-NLS-1$
-			setImageDescriptor(ImageDescriptor.createFromFile(
-				LogicDiagramPlugin.class, "icons/plus.gif")); //$NON-NLS-1$
-		} else if (actionId.equals(ACTION_DECREMENT_VALUE)) {
-			setId("Decrement"); //$NON-NLS-1$
-			setText("Decrement"); //$NON-NLS-1$
-			setToolTipText("Decrement LED"); //$NON-NLS-1$
-			setImageDescriptor(ImageDescriptor.createFromFile(
-				LogicDiagramPlugin.class, "icons/minus.gif")); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new Request(actionMap.get(actionId));
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/LogicActionIds.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/LogicActionIds.java
deleted file mode 100644
index db5eaf1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/LogicActionIds.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions;
-
-
-/**
- * @author qili
- *
- * Ids for all action specific to logic diagram
- */
-public interface LogicActionIds {
-	
-	/* Menu contribution ids */
-	public final String MENU_INCREMENT = "incrementMenu"; //$NON-NLS-1$
-	public final String MENU_DECREMENT = "decrementMenu"; //$NON-NLS-1$
-	
-	/* Action contribution ids */
-    public final String ACTION_INCREMENT_VALUE = "incrementValueAction";//$NON-NLS-1$
-	public final String ACTION_DECREMENT_VALUE = "decrementValueAction";//$NON-NLS-1$
-	public final String DELETE_SEMANTIC_VALUE = "deleteSemanticAction"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/package.html
deleted file mode 100644
index 65bcbca..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains a set of classes for defining <i>Actions</i> which are run
-in order to carry out application behaviour that the user has requested
-through the user-interface.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ConfigureLogicElementCommand.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ConfigureLogicElementCommand.java
deleted file mode 100644
index 0d8a95d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ConfigureLogicElementCommand.java
+++ /dev/null

@@ -1,365 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramDebugOptions;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramStatusCodes;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util.LogicSemanticType;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-
-/**
- * Abstract superclass for commands that configure <code>Element</code> s in
- * the logic model with input and output terminals.
- * 
- * @author ldamus
- */
-public abstract class ConfigureLogicElementCommand
-    extends ConfigureElementCommand {
-
-    /**
-     * The input terminal feature.
-     */
-    private static final EReference TERMINALS = SemanticPackage.eINSTANCE
-        .getElement_Terminals();
-
-    /**
-     * Constructs a new configure command for logic elements.
-     * 
-     * @param request
-     *            the configure request
-     * @param configurableType
-     *            the kind of element that can be configured by this command
-     *            instance.
-     */
-    protected ConfigureLogicElementCommand(ConfigureRequest request,
-            EClass configurableType) {
-
-        super(request);
-        setEClass(configurableType);
-    }
-
-    /**
-     * Creates an input terminal in <code>logicElement</code>.
-     * 
-     * @param logicElement
-     *            the logic element
-     * @param id
-     *            the terminal identifier
-     * @param progressMonitor
-     *            the monitor to measure progress through long-running
-     *            operations
-     * @return the new terminal
-     */
-    protected InputTerminal createInputTerminal(Element logicElement,
-            String id, IProgressMonitor progressMonitor) {
-
-        return (InputTerminal) createTerminal(LogicSemanticType.INPUT_TERMINAL,
-            logicElement, id, progressMonitor);
-    }
-
-    /**
-     * Creates an output terminal in <code>logicElement</code>.
-     * 
-     * @param logicElement
-     *            the logic element
-     * @param id
-     *            the terminal identifier
-     * @param progressMonitor
-     *            the monitor to measure progress through long-running
-     *            operations
-     * @return the new terminal
-     */
-    protected OutputTerminal createOutputTerminal(Element logicElement,
-            String id, IProgressMonitor progressMonitor) {
-
-        return (OutputTerminal) createTerminal(
-            LogicSemanticType.OUTPUT_TERMINAL, logicElement, id,
-            progressMonitor);
-    }
-
-    /**
-     * Creates an input/output terminal in <code>logicElement</code>.
-     * 
-     * @param logicElement
-     *            the logic element
-     * @param id
-     *            the terminal identifier
-     * @param progressMonitor
-     *            the monitor to measure progress through long-running
-     *            operations
-     * @return the new terminal
-     */
-    protected InputOutputTerminal createInputOutputTerminal(
-            Element logicElement, String id, IProgressMonitor progressMonitor) {
-
-        return (InputOutputTerminal) createTerminal(
-            LogicSemanticType.INPUT_OUTPUT_TERMINAL, logicElement, id,
-            progressMonitor);
-    }
-
-    /**
-     * Creates a new terminal in the <code>logicElement</code>, and sets its
-     * identifier to <code>id</code>.
-     * 
-     * @param elementType
-     *            the type of terminal to create
-     * @param logicElement
-     *            the logic element
-     * @param id
-     *            the terminal identifier
-     * @param progressMonitor
-     *            the monitor to measure progress through long-running
-     *            operations
-     * @return the new terminal
-     */
-    private Terminal createTerminal(IElementType elementType,
-            Element logicElement, String id, IProgressMonitor progressMonitor) {
-
-        Terminal terminal = createTerminal(elementType, logicElement,
-            progressMonitor);
-
-        if (terminal != null) {
-            setTerminalId(elementType, terminal, id, progressMonitor);
-        }
-        return terminal;
-    }
-
-    /**
-     * Creates a new terminal in the <code>containmentFeature</code> of
-     * <code>logicElement</code>
-     * 
-     * 
-     * @param elementType
-     *            the type of terminal to create
-     * @param logicElement
-     *            the logic element
-     * 
-     * @param progressMonitor
-     *            the monitor to measure progress through long-running
-     *            operations
-     * @return the new terminal element, or <code>null</code> if it wasn't
-     *         created
-     */
-    private Terminal createTerminal(IElementType terminalType,
-            Element logicElement, IProgressMonitor progressMonitor) {
-
-        Element result = createElement(logicElement, terminalType, TERMINALS,
-            progressMonitor);
-
-        if (result instanceof Terminal) {
-            return (Terminal) result;
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates a <code>Wire</code> from <code>source</code> to
-     * <code>target</code>.
-     * 
-     * @param source
-     *            the source terminal
-     * @param target
-     *            the target terminal
-     * @param progressMonitor
-     *            the monitor to measure progress through long-running
-     *            operations
-     * @return the new <code>Wire</code>, or <code>null</code> if none was
-     *         created
-     */
-    protected Wire createWire(OutputTerminal source, InputTerminal target,
-            IProgressMonitor progressMonitor) {
-
-        CreateRelationshipRequest createRequest = new CreateRelationshipRequest(
-            getEditingDomain(), source, target, LogicSemanticType.WIRE);
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(createRequest.getEditHelperContext());
-
-        if (elementType != null) {
-            ICommand createCommand = elementType.getEditCommand(createRequest);
-
-            if (createCommand != null && createCommand.canExecute()) {
-
-                try {
-                    createCommand.execute(progressMonitor, null);
-                    CommandResult commandResult = createCommand
-                        .getCommandResult();
-
-                    if (isOK(commandResult)) {
-                        Object result = commandResult.getReturnValue();
-
-                        if (result instanceof Wire) {
-                            return (Wire) result;
-                        }
-                    }
-
-                } catch (ExecutionException e) {
-                    Trace.catching(
-                    	LogicDiagramPlugin.getInstance(),
-                        LogicDiagramDebugOptions.EXCEPTIONS_CATCHING,
-                        getClass(), "createWire", e); //$NON-NLS-1$
-
-                    Log.error(LogicDiagramPlugin.getInstance(),
-                        LogicDiagramStatusCodes.COMMAND_FAILURE, e
-                            .getLocalizedMessage());
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Creates a <code>Gate</code> in the <code>container</code>.
-     * 
-     * @param container
-     *            the conainer element
-     * @param gateType
-     *            the kind of gate to create
-     * @param progressMonitor
-     *            progressMonitor the monitor to measure progress through
-     *            long-running operations
-     * @return the new <code>Gate</code>, or <code>null</code> if none was
-     *         created
-     */
-    protected Gate createGate(ContainerElement container,
-            IElementType gateType, IProgressMonitor progressMonitor) {
-
-        Element result = createElement(container, gateType, null,
-            progressMonitor);
-
-        if (result instanceof Gate) {
-            return (Gate) result;
-        }
-        return null;
-    }
-
-    /**
-     * Creates a new element.
-     * 
-     * @param container
-     *            the container for the new element
-     * @param type
-     *            the kind of new element to create
-     * @param containmentFeature
-     *            the feature in which to put the new element
-     * @param progressMonitor
-     *            progressMonitor the monitor to measure progress through
-     *            long-running operations
-     * @return the new <code>Element</code>, or <code>null</code> if none
-     *         was created
-     */
-    private Element createElement(Element container, IElementType type,
-            EReference containmentFeature, IProgressMonitor progressMonitor) {
-
-        CreateElementRequest createRequest = new CreateElementRequest(
-            getEditingDomain(), container, type, containmentFeature);
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(createRequest.getEditHelperContext());
-
-        if (elementType != null) {
-            ICommand createCommand = elementType.getEditCommand(createRequest);
-
-            if (createCommand != null && createCommand.canExecute()) {
-
-                try {
-                    createCommand.execute(progressMonitor, null);
-                    CommandResult commandResult = createCommand
-                        .getCommandResult();
-
-                    if (isOK(commandResult)) {
-                        Object result = commandResult.getReturnValue();
-
-                        if (result instanceof Element) {
-                            return (Element) result;
-                        }
-                    }
-
-                } catch (ExecutionException e) {
-                    Trace.catching(
-                    	LogicDiagramPlugin.getInstance(),
-                        LogicDiagramDebugOptions.EXCEPTIONS_CATCHING,
-                        getClass(), "createElement", e); //$NON-NLS-1$
-
-                    Log.error(LogicDiagramPlugin.getInstance(),
-                        LogicDiagramStatusCodes.COMMAND_FAILURE, e
-                            .getLocalizedMessage());
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets the <code>terminal</code> identifier to <code>id</code>.
-     * 
-     * @param elementType
-     *            the type of terminal
-     * @param terminal
-     *            the terminal element
-     * @param id
-     *            the terminal identifier
-     * @param progressMonitor
-     *            the monitor to measure progress through long-running
-     *            operations
-     */
-    private void setTerminalId(IElementType elementType, Terminal terminal,
-            String id, IProgressMonitor progressMonitor) {
-
-        SetRequest setRequest = new SetRequest(getEditingDomain(), terminal,
-            SemanticPackage.eINSTANCE.getTerminal_Id(), id);
-
-        ICommand setCommand = elementType.getEditCommand(setRequest);
-
-        if (setCommand != null && setCommand.canExecute()) {
-            try {
-                setCommand.execute(progressMonitor, null);
-
-            } catch (ExecutionException e) {
-                Trace.catching(
-                	LogicDiagramPlugin.getInstance(),
-                	LogicDiagramDebugOptions.EXCEPTIONS_CATCHING,
-                    getClass(), "setTerminalId", e); //$NON-NLS-1$
-
-                Log.error(LogicDiagramPlugin.getInstance(),
-                    LogicDiagramStatusCodes.COMMAND_FAILURE, e
-                        .getLocalizedMessage());
-            }
-        }
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/CreateWireCommand.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/CreateWireCommand.java
deleted file mode 100644
index 49596b5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/CreateWireCommand.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-
-/**
- * Command to create a new wire element.
- * 
- * @author ldamus
- */
-public class CreateWireCommand
-	extends CreateRelationshipCommand {
-
-	/**
-	 * Constructs a new command to create a wire element.
-	 * 
-	 * @param request
-	 *            the create request
-	 */
-	public CreateWireCommand(CreateRelationshipRequest request) {
-		super(request);
-		setEClass(SemanticPackage.eINSTANCE.getContainerElement());
-	}
-
-	/**
-	 * Creates a wire and sets its source and target.
-	 */
-	protected EObject doDefaultElementCreation() {
-		Wire oWire = (Wire) EMFCoreUtil.create(getElementToEdit(),
-			getContainmentFeature(), getElementType().getEClass());
-
-		oWire.setSource((OutputTerminal) getSource());
-		oWire.setTarget((InputTerminal) getTarget());
-
-		return oWire;
-	}
-
-	/**
-	 * A wire can only be created when the source is an output terminal and the
-	 * target is an input terminal.
-	 */
-	public boolean canExecute() {
-
-		if ((getSource() instanceof OutputTerminal &&
-			getTarget() instanceof InputTerminal)) {
-			return super.canExecute();
-		}
-		
-		return false;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ReorientWireCommand.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ReorientWireCommand.java
deleted file mode 100644
index 5a00b42..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ReorientWireCommand.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-
-/**
- * Command to change the source or target of a wire.
- * 
- * @author ldamus
- */
-public class ReorientWireCommand
-	extends EditElementCommand {
-
-	/**
-	 * The reorient direction.
-	 */
-	private final int reorientDirection;
-
-	/**
-	 * The relationship's new source or target.
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * Constructs a new command.
-	 * 
-	 * @param request
-	 *            the reorient relationship request
-	 */
-	public ReorientWireCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		this.reorientDirection = request.getDirection();
-		this.newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * Reorients the wire.
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-		Wire wire = (Wire) getElementToEdit();
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			wire.setSource((OutputTerminal) newEnd);
-
-		} else if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			wire.setTarget((InputTerminal) newEnd);
-		}
-		return CommandResult.newOKCommandResult(wire);
-	}
-
-	/**
-	 * The source can be changed to a new output terminal. The target can be
-	 * changed to a new target terminal.
-	 */
-	public boolean canExecute() {
-
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE
-			&& !(newEnd instanceof OutputTerminal)) {
-			return false;
-		}
-
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET
-			&& !(newEnd instanceof InputTerminal)) {
-			return false;
-		}
-		return super.canExecute();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/package.html
deleted file mode 100644
index d477353..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/CircuitEditHelper.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/CircuitEditHelper.java
deleted file mode 100644
index 7d81b4c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/CircuitEditHelper.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands.ConfigureLogicElementCommand;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-
-/**
- * Edit helper for logic circuit elements.
- * 
- * @author ldamus
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class CircuitEditHelper
-	extends ContainerElementEditHelper {
-
-	/**
-	 * Gets a command to configure a circuit.
-	 */
-	protected ICommand getConfigureCommand(final ConfigureRequest req) {
-
-		return new ConfigureLogicElementCommand(req, SemanticPackage.eINSTANCE
-			.getCircuit()) {
-
-			protected CommandResult doExecuteWithResult(
-                    IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-
-				Circuit oCircuit = (Circuit) req.getElementToConfigure();
-
-				createInputOutputTerminal(oCircuit, "A", monitor); //$NON-NLS-1$
-				createInputOutputTerminal(oCircuit, "B", monitor); //$NON-NLS-1$
-				createInputOutputTerminal(oCircuit, "C", monitor); //$NON-NLS-1$
-				createInputOutputTerminal(oCircuit, "D", monitor); //$NON-NLS-1$
-
-				createInputOutputTerminal(oCircuit, "1", monitor); //$NON-NLS-1$
-				createInputOutputTerminal(oCircuit, "2", monitor); //$NON-NLS-1$
-				createInputOutputTerminal(oCircuit, "3", monitor); //$NON-NLS-1$
-				createInputOutputTerminal(oCircuit, "4", monitor); //$NON-NLS-1$
-
-				return CommandResult.newOKCommandResult(oCircuit);
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/ContainerElementEditHelper.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/ContainerElementEditHelper.java
deleted file mode 100644
index 93418fb..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/ContainerElementEditHelper.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands.CreateWireCommand;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util.LogicSemanticType;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-
-/**
- * Edit helper for logic container elements.
- * 
- * @author ldamus
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class ContainerElementEditHelper
-	extends LogicElementEditHelper {
-    
-    // Default containment features.
-    {
-        getDefaultContainmentFeatures().put(
-            SemanticPackage.eINSTANCE.getElement(),
-            SemanticPackage.eINSTANCE.getContainerElement_Children());
-    }
-
-	/**
-     * Gets a command to create a child in the container element.
-     */
-	protected ICommand getCreateCommand(CreateElementRequest req) {
-
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * Creates a wire relationship.
-	 */
-	protected ICommand getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-
-		if (req.getElementType() == LogicSemanticType.WIRE
-            && req.getSource() instanceof OutputTerminal
-            && req.getTarget() instanceof InputTerminal) {
-            
-            return new CreateWireCommand(req);
-        }
-
-		return super.getCreateRelationshipCommand(req);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/GateEditHelper.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/GateEditHelper.java
deleted file mode 100644
index 3878841..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/GateEditHelper.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands.ConfigureLogicElementCommand;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-
-/**
- * Edit helper for logic gate elements.
- * 
- * @author ldamus
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class GateEditHelper
-	extends LogicElementEditHelper {
-
-	/**
-	 * Gets a command to configure a gate.
-	 */
-	protected ICommand getConfigureCommand(final ConfigureRequest req) {
-
-		return new ConfigureLogicElementCommand(req, SemanticPackage.eINSTANCE
-			.getGate()) {
-
-			protected CommandResult doExecuteWithResult(
-                    IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-
-				Gate oGate = (Gate) req.getElementToConfigure();
-
-				createInputTerminal(oGate, "A", monitor); //$NON-NLS-1$
-				createInputTerminal(oGate, "B", monitor); //$NON-NLS-1$
-				createOutputTerminal(oGate, "1", monitor); //$NON-NLS-1$
-
-				return CommandResult.newOKCommandResult(oGate);
-			}
-		};
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/HalfAdderAdvice.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/HalfAdderAdvice.java
deleted file mode 100644
index b0d0e89..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/HalfAdderAdvice.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands.ConfigureLogicElementCommand;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Gate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputOutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util.LogicSemanticType;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Edit helper advice for the half adder circuit specialization.
- * 
- * @author ldamus
- */
-public class HalfAdderAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * Returns a command that will configure a Circuit to become a Half Adder.
-	 * This command will replace the default Circuit configuration command.
-	 * 
-	 * @return the half adder configuration command
-	 */
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		// The Half Adder advice completely replaces the default circuit
-		// configuration.
-		request.setParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND,
-				Boolean.TRUE);
-
-		return new ConfigureLogicElementCommand(request,
-				SemanticPackage.eINSTANCE.getCircuit()) {
-
-			protected CommandResult doExecuteWithResult(
-                    IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-
-				Circuit circuit = (Circuit) request.getElementToConfigure();
-
-				// Input two 1-bit binary numbers
-				InputOutputTerminal a = createInputOutputTerminal(circuit,
-						"A", monitor); //$NON-NLS-1$
-				InputOutputTerminal b = createInputOutputTerminal(circuit,
-						"B", monitor); //$NON-NLS-1$
-
-				// Sum of the the two bits
-				InputOutputTerminal s = createInputOutputTerminal(circuit,
-						"1", monitor); //$NON-NLS-1$
-
-				// Carry
-				InputOutputTerminal c = createInputOutputTerminal(circuit,
-						"2", monitor); //$NON-NLS-1$
-
-				// The half adder contains an XOR gate and an AND gate
-				Gate xorGate = createGate(circuit, LogicSemanticType.XORGATE,
-                    monitor);
-				Gate andGate = createGate(circuit, LogicSemanticType.ANDGATE,
-                    monitor);
-
-				// Inputs A and B are directed into the XOR gate
-				List xorInputs = xorGate.getInputTerminals();
-				createWire(a, (InputTerminal) xorInputs.get(0), monitor);
-				createWire(b, (InputTerminal) xorInputs.get(1), monitor);
-
-				// The same inputs A and B are also directed into the AND gate
-				List andInputs = andGate.getInputTerminals();
-				createWire(a, (InputTerminal) andInputs.get(0), monitor);
-				createWire(b, (InputTerminal) andInputs.get(1), monitor);
-
-				// The XOR gate produces the sum bit
-				List xorOutputs = xorGate.getOutputTerminals();
-				createWire((OutputTerminal) xorOutputs.get(0), s,
-                    monitor);
-
-				// The AND gate produces the carry bit
-				List andOutputs = andGate.getOutputTerminals();
-				createWire((OutputTerminal) andOutputs.get(0), c,
-                    monitor);
-
-				return CommandResult.newOKCommandResult(circuit);
-			}
-		};
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/LEDEditHelper.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/LEDEditHelper.java
deleted file mode 100644
index efccea4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/LEDEditHelper.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands.ConfigureLogicElementCommand;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-
-/**
- * Edit helper for logic LED elements.
- * 
- * @author ldamus
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class LEDEditHelper
-	extends LogicElementEditHelper {
-
-	/**
-	 * Gets a command to configure an LED.
-	 */
-	protected ICommand getConfigureCommand(final ConfigureRequest req) {
-
-		return new ConfigureLogicElementCommand(req, SemanticPackage.eINSTANCE
-			.getLED()) {
-
-			protected CommandResult doExecuteWithResult(
-                    IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                
-				LED oLED = (LED) req.getElementToConfigure();
-
-				createInputTerminal(oLED, "A", monitor); //$NON-NLS-1$
-				createInputTerminal(oLED, "B", monitor); //$NON-NLS-1$
-				createInputTerminal(oLED, "C", monitor); //$NON-NLS-1$
-				createInputTerminal(oLED, "D", monitor); //$NON-NLS-1$
-
-				createOutputTerminal(oLED, "1", monitor); //$NON-NLS-1$
-				createOutputTerminal(oLED, "2", monitor); //$NON-NLS-1$
-				createOutputTerminal(oLED, "3", monitor); //$NON-NLS-1$
-				createOutputTerminal(oLED, "4", monitor); //$NON-NLS-1$
-
-				return CommandResult.newOKCommandResult(oLED);
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/LogicElementEditHelper.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/LogicElementEditHelper.java
deleted file mode 100644
index c407233..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/LogicElementEditHelper.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * Superclass for all of the logic element edit helpers.
- * 
- * @author ldamus
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class LogicElementEditHelper
-	extends AbstractEditHelper {
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getContainerCommand(org.eclipse.gmf.runtime.emf.type.core.requests.GetContainerRequest)
-	 */
-	protected ICommand getEditContextCommand(GetEditContextRequest req) {
-
-		GetEditContextCommand result = null;
-		
-		IEditCommandRequest editRequest = req.getEditCommandRequest();
-		
-		if (editRequest instanceof CreateElementRequest) {
-			result = new GetEditContextCommand(req);
-			EObject container = ((CreateElementRequest) editRequest).getContainer();
-
-			if (container instanceof Diagram) {
-				EObject element = ((Diagram) container).getElement();
-	
-				if (element == null) {
-					// Element is null if the diagram was created using the wizard
-					EObject annotation = ((Diagram) container).eContainer();
-	
-					if (annotation != null) {
-						element = annotation.eContainer();
-					}
-				}
-				container = element;
-			}
-			result.setEditContext(container);
-		}
-		return result;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/TerminalEditHelper.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/TerminalEditHelper.java
deleted file mode 100644
index 03b024e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/TerminalEditHelper.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-
-/**
- * Edit helper for logic terminal elements.
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class TerminalEditHelper
-	extends LogicElementEditHelper {
-	
-	/**
-	 * References from wires to terminals.
-	 */
-	private static final EReference[] WIRE_TERMINAL_REFERENCES = new EReference[] {
-		SemanticPackage.eINSTANCE.getWire_Source(),
-		SemanticPackage.eINSTANCE.getWire_Target(),
-	};
-
-	/**
-	 * Gets a command to destroy the dependents of the terminal that is being
-	 * destroyed.  These will be wires.
-	 */
-	protected ICommand getDestroyDependentsCommand(DestroyDependentsRequest request) {
-		Collection wires = EMFCoreUtil.getReferencers(
-				request.getElementToDestroy(),
-				WIRE_TERMINAL_REFERENCES);
-
-		return request.getDestroyDependentsCommand(wires);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/WireEditHelper.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/WireEditHelper.java
deleted file mode 100644
index f6e23a8..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/WireEditHelper.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.edithelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands.ReorientWireCommand;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OutputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-
-/**
- * Edit helper for logic wire elements.
- * 
- * @author ldamus
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class WireEditHelper
-	extends LogicElementEditHelper {
-
-	/**
-	 * Gets a command to determine the container for a new wire element.
-	 */
-	protected ICommand getEditContextCommand(final GetEditContextRequest req) {
-
-		IEditCommandRequest editRequest = req.getEditCommandRequest();
-
-		if (editRequest instanceof CreateRelationshipRequest) {
-			final CreateRelationshipRequest createRelationshipRequest = (CreateRelationshipRequest) editRequest;
-
-			if (hasValidSourceAndTarget(createRelationshipRequest)) {
-
-				// Get the nearest common container element to own the new wire.
-				List terminals = new ArrayList();
-				
-				EObject source = createRelationshipRequest.getSource();
-				if (source != null) {
-					terminals.add(source);
-				}
-				EObject target = createRelationshipRequest.getTarget();
-				if (target != null) {
-					terminals.add(target);
-				}
-				
-				EObject container = EMFCoreUtil.getLeastCommonContainer(
-						terminals, SemanticPackage.eINSTANCE
-								.getContainerElement());
-
-				GetEditContextCommand result = new GetEditContextCommand(req);
-				result.setEditContext(container);
-				return result;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Checks the source and target elements in
-	 * <code>createRelationshipRequest</code>. Wires can only be created from
-	 * an <code>OutputTerminal</code> to and <code>InputTerminal</code>.
-	 * 
-	 * @param createRelationshipRequest
-	 *            the request
-	 * @return <code>true</code> if the source and target are valid,
-	 *         <code>false</code> otherwise.
-	 */
-	private boolean hasValidSourceAndTarget(
-			CreateRelationshipRequest createRelationshipRequest) {
-
-		// If source is specified, it must be an output terminal.
-		EObject source = createRelationshipRequest.getSource();
-		if (source != null && !(source instanceof OutputTerminal)) {
-			return false;
-		}
-
-		// If target is specified, it must be an input terminal.
-		EObject target = createRelationshipRequest.getTarget();
-		if (target != null && !(target instanceof InputTerminal)) {
-			return false;
-		}
-		
-		return true;
-	}
-
-	/**
-	 * Gets a command to change the source or target of a wire.
-	 */
-	protected ICommand getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-
-		return new ReorientWireCommand(req);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/edithelpers/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/CircuitEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/CircuitEditPart.java
deleted file mode 100644
index 977f2e4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/CircuitEditPart.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.ContainerHighlightEditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.BottomTerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.CircuitFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.TerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.TopTerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-/**
- * Holds a circuit, which is a container capable of 
- * holding other LogicEditParts.
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class CircuitEditPart extends TerminalOwnerShapeEditPart
-{
-	/**
-	 * @param view
-	 */
-	public CircuitEditPart(View view) {
-		super(view);
-	}
-	
-	//install ContainerHighlightEditPolicy to highlight circuit figure
-	protected void createDefaultEditPolicies(){
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ContainerHighlightEditPolicy());
-	}
-	
-	/**
-	 * Creates a new Circuit Figure and returns it.
-	 *
-	 * @return  Figure representing the circuit.
-	 */
-	protected NodeFigure createMainFigure() {
-		NodeFigure nf = new CircuitFigure(new Dimension(getMapMode().DPtoLP(100), getMapMode().DPtoLP(100)));
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-		nf.setLayoutManager(layout);
-		return nf;
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.ITerminalOwnerEditPart#createBoundsMap()
-	 */
-	public Map createBoundsMap() {
-		Map posMap = new HashMap();
-		
-		IMapMode mm = getMapMode();
-		posMap.put( "A", new Point(mm.DPtoLP(11), mm.DPtoLP(-1))); //$NON-NLS-1$
-		posMap.put( "B", new Point(mm.DPtoLP(36), mm.DPtoLP(-1))); //$NON-NLS-1$
-		posMap.put( "C", new Point(mm.DPtoLP(61), mm.DPtoLP(-1))); //$NON-NLS-1$
-		posMap.put( "D", new Point(mm.DPtoLP(86), mm.DPtoLP(-1))); //$NON-NLS-1$
-		
-		posMap.put( "1", new Point(mm.DPtoLP(11), mm.DPtoLP(100))); //$NON-NLS-1$
-		posMap.put( "2", new Point(mm.DPtoLP(36), mm.DPtoLP(100))); //$NON-NLS-1$
-		posMap.put( "3", new Point(mm.DPtoLP(61), mm.DPtoLP(100))); //$NON-NLS-1$
-		posMap.put( "4", new Point(mm.DPtoLP(86), mm.DPtoLP(100))); //$NON-NLS-1$
-		
-		return posMap;
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.ITerminalOwnerEditPart#createOwnedTerminalFigure(TerminalEditPart)
-	 */
-	public NodeFigure createOwnedTerminalFigure(TerminalEditPart terminalEP) {
-		Terminal terminal = (Terminal) ViewUtil
-			.resolveSemanticElement((View) terminalEP.getModel());
-		if (terminal == null) {
-			return null;
-		}
-
-		NodeFigure theFigure = null;
-		int side = PositionConstants.NORTH;
-		if (terminal instanceof InputTerminal) {
-			theFigure = new TopTerminalFigure(terminal.getId(), 
-				new Dimension(getMapMode().DPtoLP(6), getMapMode().DPtoLP(7)));
-		} else {
-			theFigure = new BottomTerminalFigure(terminal.getId(),
-				new Dimension(getMapMode().DPtoLP(6), getMapMode().DPtoLP(7)));
-			side = PositionConstants.SOUTH;
-		}
-		
-		terminalEP.setLocator(new TerminalFigure.TerminalLocator(
-			getFigure(), new Dimension(getMapMode().DPtoLP(100), getMapMode()
-				.DPtoLP(100)), side));		
-		return theFigure;
-	}
-    
-    public Object getPreferredValue(EStructuralFeature feature) {
-        if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.logicGreen);
-        } else if (feature == NotationPackage.eINSTANCE
-            .getLineStyle_LineColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.connectorGreen);
-        }
-        return super.getPreferredValue(feature);
-    }
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/ITerminalOwnerEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/ITerminalOwnerEditPart.java
deleted file mode 100644
index 2d641fc..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/ITerminalOwnerEditPart.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-
-/**
- * @author qili / sshaw
- *
- * The interface for logic shapes that own connection points.
- */
-public interface ITerminalOwnerEditPart {
-	
-	/**
-	 * Create connection points position map on the given editpart.
-	 * @return connection points position map
-	 */
-	public Map createBoundsMap();
-	
-	/**
-	 * Method for returning the owned terminal figure based on an ID value.
-	 * 
-	 * @param terminalEP <code>Terminal</code> to create a figure of
-	 * @return <code>NodeFigure</code> that is the figure for the terminal.
-	 */
-	public NodeFigure createOwnedTerminalFigure(TerminalEditPart terminalEP);
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LEDEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LEDEditPart.java
deleted file mode 100644
index a73751b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LEDEditPart.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.LEDEditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.BottomTerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LEDFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.TerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.TopTerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * qili
- * 
- * Holds the EditPart signifying an LED.
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class LEDEditPart extends TerminalOwnerShapeEditPart
-{	
-	/**
-	 * @param view
-	 */
-	public LEDEditPart(View view) {
-		super(view);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new LEDEditPolicy());
-	}
-	
-	/**
-	 * Apart from the usual visual update, it also
-	 * updates the numeric contents of the LED.
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshValue();
-		refreshFontColor();
-	}
-
-	/**
-	 * Refreshes the LED value property
-	 */
-	protected void refreshValue(){		
-		LED LEDStyle = (LED) ViewUtil.resolveSemanticElement((View)getModel());
-		if(LEDStyle != null)
-			((LEDFigure)getMainFigure()).setValue(LEDStyle.getValue());
-	}
-	
-	/**
-	 * Override to prevent change of bounds
-	 */
-	protected void refreshBounds() {
-		Dimension size = getFigure().getSize();
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-			this,
-			getFigure(),
-			new Rectangle(loc, size));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setFontColor(org.eclipse.swt.graphics.Color)
-	 */
-	protected void setFontColor(Color color) {
-		((LEDFigure)getMainFigure()).setFontColor(color);
-	}
-	
-	protected void handleNotificationEvent(Notification evt) {
-		if (SemanticPackage.eINSTANCE.getLED_Value().equals(evt.getFeature()))
-			refreshValue();
-		else if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(evt.getFeature())) {
-			refreshFontColor();
-		}
-		else
-			super.handleNotificationEvent(evt);
-	}
-	
-	public EditPolicy getPrimaryDragEditPolicy() {
-		return new NonResizableEditPolicyEx();
-	}
-	
-	final private Dimension ledSizeDP = new Dimension(61, 44);
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart#createMainFigure()
-	 */
-	protected NodeFigure createMainFigure() {
-		Dimension ledSizeLP = new Dimension(ledSizeDP);
-		getMapMode().DPtoLP(ledSizeLP);
-		return new LEDFigure(ledSizeLP);
-	}
-	
-	public Map createBoundsMap() {
-		Map boundMap = new HashMap();
-		
-		IMapMode mm = getMapMode();
-		boundMap.put( "A", new Point(mm.DPtoLP(51), mm.DPtoLP(1))); //$NON-NLS-1$
-		boundMap.put( "B", new Point(mm.DPtoLP(36), mm.DPtoLP(1))); //$NON-NLS-1$
-		boundMap.put( "C", new Point(mm.DPtoLP(21), mm.DPtoLP(1))); //$NON-NLS-1$
-		boundMap.put( "D", new Point(mm.DPtoLP(6), mm.DPtoLP(1))); //$NON-NLS-1$
-		boundMap.put( "1", new Point(mm.DPtoLP(51), mm.DPtoLP(44))); //$NON-NLS-1$
-		boundMap.put( "2", new Point(mm.DPtoLP(36), mm.DPtoLP(44))); //$NON-NLS-1$
-		boundMap.put( "3", new Point(mm.DPtoLP(21), mm.DPtoLP(44))); //$NON-NLS-1$
-		boundMap.put( "4", new Point(mm.DPtoLP(6), mm.DPtoLP(44))); //$NON-NLS-1$
-		
-		return boundMap;
-	}
-	
-	public NodeFigure createOwnedTerminalFigure(TerminalEditPart terminalEP) {
-		Terminal terminal = (Terminal) ViewUtil
-			.resolveSemanticElement((View) terminalEP.getModel());
-		if (terminal == null) {
-			return null;
-		}
-
-		NodeFigure theFigure = null;
-		int side = PositionConstants.NORTH;
-		if (terminal instanceof InputTerminal) {
-			theFigure = new TopTerminalFigure(terminal.getId(), 
-								new Dimension(getMapMode().DPtoLP(6), getMapMode().DPtoLP(7)));
-		} else {
-			theFigure = new BottomTerminalFigure(terminal.getId(), 
-								new Dimension(getMapMode().DPtoLP(6), getMapMode().DPtoLP(7)));
-			side = PositionConstants.SOUTH;
-		}
-		
-		Dimension ledSizeLP = new Dimension(ledSizeDP);
-		getMapMode().DPtoLP(ledSizeLP);
-		
-		terminalEP.setLocator(new TerminalFigure.TerminalLocator(getFigure(), ledSizeLP, side));
-
-		return theFigure;
-	}
-    
-    public Object getPreferredValue(EStructuralFeature feature) {
-        if (feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.displayText);
-        }
-        return super.getPreferredValue(feature);
-    }
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicFlowCompartmentEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicFlowCompartmentEditPart.java
deleted file mode 100644
index f998a57..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicFlowCompartmentEditPart.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import java.beans.PropertyChangeEvent;
-
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPolicy;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.LogicFlowEditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.PopupBarEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author qili
- *
- * Holds the EditPart signifying a ResizableCompartmentFigure
- */
-public class LogicFlowCompartmentEditPart extends ListCompartmentEditPart{
-	
-	/**
-	 * Constructor for LogicFlowCompartmentEditPart.
-	 * @param view the view <code>controlled</code> by this editpart.
-	 */
-	public LogicFlowCompartmentEditPart(View view) {
-		super(view);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
-	 */
-	public IFigure createFigure() {
-		
-		ResizableCompartmentFigure rcf = (ResizableCompartmentFigure) super.createFigure();
-		FlowLayout layout = new FlowLayout();
-		layout.setMajorSpacing(getMapMode().DPtoLP(5));
-		layout.setMinorSpacing(getMapMode().DPtoLP(5));
-		rcf.getContentPane().setLayoutManager(layout);
-		return rcf;
-	}
-	
-	/**
-	 * In LogicCreationEditPolicy overwrite "getReparentCommand(ChangeBoundsRequest)" 
-	 * function and remove the assumption on SemanticElement
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.NODE_ROLE, null);
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, null);
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new LogicFlowEditPolicy());	
-		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new PopupBarEditPolicy());
-	}
-	
-	/**
-	 * Subclasses should override to return the compartment title
-	 * 
-	 * @return The compartment title
-	 */
-	public String getCompartmentName() {
-		return ExampleDiagramLogicMessages.LogicFlowCompartmentEditPart_Title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart#hasModelChildrenChanged(java.beans.PropertyChangeEvent)
-	 */
-	protected boolean hasModelChildrenChanged(PropertyChangeEvent evt) {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart#hasModelChildrenChanged(java.beans.PropertyChangeEvent)
-	 */
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-}
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicFlowContainerEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicFlowContainerEditPart.java
deleted file mode 100644
index 5f08c74..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicFlowContainerEditPart.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicFlowFigure;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author qili
- *
- * Holds the EditPart signifying a LogicFlowFigure
- */
-public class LogicFlowContainerEditPart 
-	extends ShapeNodeEditPart 
-{
-	/**
-	 * @param view
-	 */
-	public LogicFlowContainerEditPart(View view) {
-		super(view);
-	}
-	
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.NODE_ROLE, null);
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, null);
-	}
-
-	/**
-	 * Overwrite createNodeFigure() in super class
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure newFigure = new LogicFlowFigure(new Dimension(getMapMode().DPtoLP(100), getMapMode().DPtoLP(100)));
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-		layout.setStretchMinorAxis(true);
-		newFigure.setLayoutManager(layout);
-		return newFigure;
-	} 
-    
-    public Object getPreferredValue(EStructuralFeature feature) {
-        if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.logicGreen);
-        } else if (feature == NotationPackage.eINSTANCE
-            .getLineStyle_LineColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.logicBlack);
-        }
-        return super.getPreferredValue(feature);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicGateEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicGateEditPart.java
deleted file mode 100644
index 1d1336f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicGateEditPart.java
+++ /dev/null

@@ -1,251 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.AndGateFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.AndGateTerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.OrGateFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.OrGateTerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.OutputTerminalFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.XOrGateFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.AndGate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.InputTerminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * EditPart for holding gates in the Logic Example.
- */
-public class LogicGateEditPart extends TerminalOwnerShapeEditPart
-{	
-	/** 
-	 * Create an instance.
-	 * @param view the editpart's model.
-	 */
-	public LogicGateEditPart(View view) {
-		super(view);
-	}
-	
-	public EditPolicy getPrimaryDragEditPolicy() {
-		return new NonResizableEditPolicyEx();
-	}
-	
-	/**
-	 * Returns a newly created Figure of this.
-	 *
-	 * @return A new Figure of this.
-	 */
-	protected NodeFigure createMainFigure() {
-		NodeFigure newFigure;
-		if (getModel() == null)
-			return null;
-		View view = (View)getModel();
-		EObject semanticElement = view.getElement();
-		EClass eClazz = semanticElement.eClass();
-		Dimension gateSize = new Dimension(getMapMode().DPtoLP(15), getMapMode().DPtoLP(17));
-		if (eClazz == SemanticPackage.eINSTANCE.getOrGate())	
-			newFigure = new OrGateFigure(gateSize);
-		else if (eClazz == SemanticPackage.eINSTANCE.getAndGate())
-			newFigure = new AndGateFigure(gateSize);
-		else if (eClazz == SemanticPackage.eINSTANCE.getXORGate())
-			newFigure = new XOrGateFigure(gateSize);
-		else
-			newFigure = null;
-		return newFigure;
-	}
-	
-	/**
-	 * Override to prevent change of bounds
-	 */
-	protected void refreshBounds() {
-		Dimension size = getFigure().getSize();
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-			this,
-			getFigure(),
-			new Rectangle(loc, size));
-	}
-	
-	public Map createBoundsMap() {
-		Map boundMap = new HashMap();
-		if(getModel()==null || !(getModel() instanceof View))
-			return boundMap;
-		View view = (View)getModel();
-		EObject semanticElement = view.getElement();
-		EClass eClazz = semanticElement.eClass();
-		
-		IMapMode mm = getMapMode();
-		
-		if (eClazz == SemanticPackage.eINSTANCE.getOrGate()) {
-			boundMap.put( "A", new Point(mm.DPtoLP(4), mm.DPtoLP(3))); //$NON-NLS-1$
-			boundMap.put( "B", new Point(mm.DPtoLP(5), mm.DPtoLP(3))); //$NON-NLS-1$
-			boundMap.put( "1", new Point(mm.DPtoLP(5), mm.DPtoLP(9))); //$NON-NLS-1$
-		} else if (eClazz == SemanticPackage.eINSTANCE.getAndGate()) {
-			boundMap.put( "A", new Point(mm.DPtoLP(4), mm.DPtoLP(3))); //$NON-NLS-1$
-			boundMap.put( "B", new Point(mm.DPtoLP(9), mm.DPtoLP(3))); //$NON-NLS-1$
-			boundMap.put( "1", new Point(mm.DPtoLP(6), mm.DPtoLP(9))); //$NON-NLS-1$
-		} else {
-			boundMap.put( "A", new Point(mm.DPtoLP(4), mm.DPtoLP(3))); //$NON-NLS-1$
-			boundMap.put( "B", new Point(mm.DPtoLP(5), mm.DPtoLP(3))); //$NON-NLS-1$
-			boundMap.put( "1", new Point(mm.DPtoLP(5), mm.DPtoLP(9))); //$NON-NLS-1$
-		}
-		
-		return boundMap;
-	}
-	
-	public NodeFigure createOwnedTerminalFigure(TerminalEditPart terminalEP) {
-		Terminal terminal = (Terminal) ViewUtil
-			.resolveSemanticElement((View) terminalEP.getModel());
-		if (terminal == null) {
-			return null;
-		}
-		
-		NodeFigure theFigure = null;
-
-        if (terminal instanceof InputTerminal) {
-            if (terminal.eContainer() instanceof AndGate) {
-                theFigure = new AndGateTerminalFigure(terminal.getId(),
-                    new Dimension(getMapMode().DPtoLP(4), getMapMode()
-                        .DPtoLP(2)));
-            } else {
-                theFigure = new OrGateTerminalFigure(terminal.getId(),
-                    new Dimension(getMapMode().DPtoLP(4), getMapMode()
-                        .DPtoLP(4)));
-            }
-            terminalEP.setLocator(new GateTerminalLocator(getFigure(), true));
-        } else {
-            theFigure = new OutputTerminalFigure(terminal.getId(),
-                new Dimension(getMapMode().DPtoLP(4), getMapMode().DPtoLP(5)));
-            terminalEP.setLocator(new GateTerminalLocator(getFigure(), false));
-        }
-
-        return theFigure;
-    }
-    
-    private class GateTerminalLocator extends BorderItemLocator {
-        /**
-         * @param parentFigure
-         * @param isInputTerminal
-         */
-        public GateTerminalLocator (IFigure parentFigure, boolean isInputTerminal) {
-            super(parentFigure);
-            if (isInputTerminal)
-                setPreferredSideOfParent(PositionConstants.NORTH);
-            else
-                setPreferredSideOfParent(PositionConstants.SOUTH);
-        }
-        
-        /* (non-Javadoc)
-         * @see org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator#relocate(org.eclipse.draw2d.IFigure)
-         */
-        public void relocate(IFigure borderItem) {
-            Rectangle bounds = getParentFigure().getBounds();
-            Point pos = new Point();
-            
-            if (getPreferredSideOfParent() == PositionConstants.NORTH) {
-                int gap = (bounds.width - (2 * borderItem.getBounds().width)) / 3;
-                
-                pos.x = bounds.x + gap;
-                pos.y = bounds.y;
-                
-                if (conflicts(pos,borderItem))
-                    pos.x += borderItem.getBounds().width + gap - 25; //25 is offset.
-            }
-            else if (getPreferredSideOfParent() == PositionConstants.SOUTH) {
-                pos.x = bounds.x + ((bounds.width - borderItem.getBounds().width) / 2);
-                pos.y = bounds.y + bounds.height;
-            }
-            
-            borderItem.setBounds(new Rectangle(pos, borderItem.getSize()));
-        }
-
-        /**
-         * Determine if the the given point conflicts with the position of an
-         * existing borderItemFigure.
-         * 
-         * @param recommendedLocation
-         * @return <code>ture</code> or <code>false</code>
-         */
-        private boolean conflicts(Point recommendedLocation,
-                IFigure targetBorderItem) {
-            Rectangle recommendedRect = new Rectangle(recommendedLocation,
-                targetBorderItem.getSize());
-            List borderItems = targetBorderItem.getParent().getChildren();
-            ListIterator iterator = borderItems.listIterator();
-            while (iterator.hasNext()) {
-                IFigure borderItem = (IFigure) iterator.next();
-                if (borderItem.isVisible()) {
-                    Rectangle rect = borderItem.getBounds().getCopy();
-                    if (borderItem != targetBorderItem
-                        && rect.intersects(recommendedRect)
-                        && !rect.getLocation().equals(targetBorderItem.getParent().getBounds().getLocation())) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-    }
-
-     public Object getPreferredValue(EStructuralFeature feature) {
-        if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-
-            View view = (View) getModel();
-            EObject semanticElement = view.getElement();
-            EClass eClazz = semanticElement.eClass();
-
-            if (eClazz == SemanticPackage.eINSTANCE.getOrGate()) {
-                return FigureUtilities
-                    .colorToInteger(LogicColorConstants.andGate);
-            } else if (eClazz == SemanticPackage.eINSTANCE.getAndGate()) {
-                return FigureUtilities
-                    .colorToInteger(LogicColorConstants.orGate);
-            } else if (eClazz == SemanticPackage.eINSTANCE.getXORGate()) {
-                return FigureUtilities
-                    .colorToInteger(LogicColorConstants.xorGate);
-            }
-        } else if (feature == NotationPackage.eINSTANCE
-            .getLineStyle_LineColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.logicBlack);
-        }
-        return super.getPreferredValue(feature);
-    }
-    
-    
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicShapeCompartmentEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicShapeCompartmentEditPart.java
deleted file mode 100644
index 9b665a6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicShapeCompartmentEditPart.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.CircuitCompartmentCanonicalEditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.action.Action;
-
-/**
- * @author qili
- *
- * Holds the EditPart signifying a ShapeCompartmentFigure
- */
-public class LogicShapeCompartmentEditPart extends ShapeCompartmentEditPart{
-	
-	/**
-	 * Constructor for LogicShapeCompartmentEditPart.
-	 * @param view the view <code>controlled</code> by this editpart.
-	 */
-	public LogicShapeCompartmentEditPart(View view) {
-		super(view);
-	}
-	
-	/* 
-	 * Overridden to turn off support for drag selection of children.
-	 */
-	protected boolean supportsDragSelection() {
-		return false;
-	}
-	
-	public String getCompartmentName() {
-		return Action.removeMnemonics(ExampleDiagramLogicMessages.logic_CircuitTool_Label);
-	}
-	
-	//install ContainerHighlightEditPolicy to highlight circuit figure
-	protected void createDefaultEditPolicies(){
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new CircuitCompartmentCanonicalEditPolicy ());
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/TerminalEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/TerminalEditPart.java
deleted file mode 100644
index 638721a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/TerminalEditPart.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A Connection Point can sit on a border of a logic shape or on the
- * interior.
- * 
- * @author qili
- */
-public class TerminalEditPart extends AbstractBorderItemEditPart {
-
-	private BorderItemLocator locator;
-
-	/**
-	 * @param view
-	 */
-	public TerminalEditPart(View view) {
-		super(view);
-	}
-
-	protected NodeFigure createNodeFigure() {
-		EditPart host = getParent();
-		if (host instanceof ITerminalOwnerEditPart) {
-			return ((ITerminalOwnerEditPart) host)
-				.createOwnedTerminalFigure(this);
-		}
-		return null;
-	}
-	
-	/* 
-	 * Don't allow terminal editparts to be selectable
-	 */
-	public boolean isSelectable() {
-		return false;
-	}
-	
-	public void activate() {
-		super.activate();
-		Insets parentInset = new Insets(0);
-		IFigure fig = ((BorderItemLocator)getLocator()).getParentFigure();
-		if (fig != null) {
-			parentInset = fig.getInsets();
-		}
-		Rectangle rBounds = ((NodeFigure) getFigure()).getHandleBounds();
-		((BorderItemLocator)getLocator()).setBorderItemOffset(new Dimension(
-			rBounds.width / 2 + parentInset.getWidth() / 2, rBounds.height / 2
-				+ parentInset.getHeight() / 2));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart#getLocator()
-	 */
-	public IBorderItemLocator getLocator() {
-		return locator;
-	}
-
-	
-	/**
-	 * Sets the locator.
-	 * @param locator The locator to set.
-	 */
-	public void setLocator(BorderItemLocator locator) {
-		this.locator = locator;
-	}
-    
-    public Object getPreferredValue(EStructuralFeature feature) {
-        if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.connectorGreen);
-        } else if (feature == NotationPackage.eINSTANCE
-            .getLineStyle_LineColor()) {
-            return FigureUtilities
-                .colorToInteger(LogicColorConstants.logicBlack);
-        }
-        return super.getPreferredValue(feature);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/TerminalOwnerShapeEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/TerminalOwnerShapeEditPart.java
deleted file mode 100644
index b50947d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/TerminalOwnerShapeEditPart.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.TerminalCanonicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author qili
- *
- * Abstract editpart class for logic shapes
- */
-public abstract class TerminalOwnerShapeEditPart 
-	extends AbstractBorderedShapeEditPart 
-	implements ITerminalOwnerEditPart
-{
-		
-	/**
-	 * @param view
-	 */
-	public TerminalOwnerShapeEditPart(View view) {
-		super(view);
-	}
-	
-	protected void createDefaultEditPolicies(){
-		super.createDefaultEditPolicies();
-	
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, 
-			new TerminalCanonicalEditPolicy());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart#addBorderItem(org.eclipse.draw2d.IFigure, org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart)
-	 */
-	protected void addBorderItem(IFigure borderItemContainer,
-			IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof TerminalEditPart) {
-			borderItemContainer.add(borderItemEditPart.getFigure(),
-				((TerminalEditPart) borderItemEditPart).getLocator());
-		} else {
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/WireEditPart.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/WireEditPart.java
deleted file mode 100644
index 05783d5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/WireEditPart.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts;
-
-
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Implements a Connection Editpart to represnt a Wire like
- * connection.
- *
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class WireEditPart
-	extends ConnectionNodeEditPart
-	implements PropertyChangeListener
-{
-
-public WireEditPart(View view) {
-	super(view);
-}
-	
-public static final Color dead  = new Color(Display.getDefault(),0,0,0);
-
-public void activateFigure(){
-	super.activateFigure();
-	/*Once the figure has been added to the ConnectionLayer, start listening for its
-	 * router to change.
-	 */
-	getFigure().addPropertyChangeListener(Connection.PROPERTY_CONNECTION_ROUTER, this);
-}
-
-/**
- * Method createConnectionFigure.
- * @return Connection
- */
-protected Connection createConnectionFigure(){
-	if (getModel() == null)
-		return null;
-	
-	Connection connx = new PolylineConnectionEx();
-	return connx;
-}
-
-/**
- * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#handlePropertyChangeEvent(java.beans.PropertyChangeEvent)
- */
-protected void handleNotificationEvent(Notification event) {
-	super.handleNotificationEvent(event);
-	if (NotationPackage.eINSTANCE.getIdentityAnchor_Id().equals(event.getFeature())) {
-    	anchorChange();
-    }
-}
-
-/**
- * Refreshes the visual aspects of this, based upon the
- * model (Wire). It changes the wire color depending on
- * the state of Wire.
- * 
- */
-protected void refreshVisuals() {
-	super.refreshVisuals();
-
-	getFigure().setForegroundColor(dead);
-
-}
-
-public Object getPreferredValue(EStructuralFeature feature) {
-    if (feature == NotationPackage.eINSTANCE
-        .getLineStyle_LineColor()) {
-        return FigureUtilities.colorToInteger(dead);
-    }
-    return super.getPreferredValue(feature);
-}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/package.html
deleted file mode 100644
index 588d0ea..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the <i>edit part</i> classes.
-An edit part is a controller that specifies how model elements are mapped to visual figures and coordinates the editing behavior of the model.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index d1901ca..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalConnectionEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * CanonicalConnectionEditPolic implementation that synchronizes with the semantic 
- * contents of the Circuit element.
- * 
- * @author sshaw
- *
- */
-public class CircuitCompartmentCanonicalEditPolicy extends CanonicalConnectionEditPolicy {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#getSemanticChildrenList()
-	 */
-	protected List getSemanticChildrenList() {
-		EObject modelRef = resolveSemanticElement();
-		
-		Circuit circuitElement = (Circuit) modelRef;
-		if (circuitElement==null)
-			return Collections.EMPTY_LIST;
-		List allChildren = circuitElement.getChildren();
-		List ledElements = new ArrayList();
-		
-		ListIterator li = allChildren.listIterator();
-		while (li.hasNext()) {
-			Object obj = li.next();
-			if (obj instanceof Element && !(obj instanceof Wire))
-				ledElements.add(obj);
-		}
-		
-		return ledElements;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalConnectionEditPolicy#getSemanticConnectionsList()
-	 */
-	protected List getSemanticConnectionsList() {
-		EObject modelRef = resolveSemanticElement();
-		
-		Circuit circuitElement = (Circuit) modelRef;
-		if (circuitElement==null)
-			return Collections.EMPTY_LIST;
-		List allChildren = circuitElement.getChildren();
-		ListIterator li = allChildren.listIterator();
-		UniqueEList wires = new UniqueEList();
-		while (li.hasNext()) {
-			Object obj = li.next();
-			if (obj instanceof Wire) {
-				Wire wire = (Wire)obj;
-                if (isWirePartOfContainer(circuitElement, wire))
-                    wires.add(wire);
-			}
-		}
-		
-		return wires;
-	}
-    
-    private boolean isWirePartOfContainer(Circuit circuitElement, Wire wire) {
-        if (EcoreUtil.isAncestor(circuitElement, wire.getSource()) &&
-                EcoreUtil.isAncestor(circuitElement, wire.getTarget())) {
-                return true;
-            }
-            else {
-                if ((!wire.getSource().eContainer().equals(circuitElement) && 
-                    EcoreUtil.isAncestor(circuitElement, wire.getSource().eContainer())) ||
-                    (!wire.getTarget().eContainer().equals(circuitElement) &&
-                    EcoreUtil.isAncestor(circuitElement, wire.getTarget().eContainer()))) {
-                    return true;
-                }
-            }
-        
-        return false;
-    }
-
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#shouldDeleteView(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected boolean shouldDeleteView(View view) {
-	    EObject modelRef = resolveSemanticElement(); 
-        Circuit circuitElement = (Circuit) modelRef;
-        
-        EObject semEl = ViewUtil.resolveSemanticElement(view);
-        if (semEl != null) {
-            if (semEl instanceof Wire) {
-                Wire wire = (Wire)semEl;
-                if (wire.eContainer().equals(circuitElement) &&
-                    isWirePartOfContainer(circuitElement, wire))
-                    return true;
-            }
-            else if (semEl instanceof Element) {
-                return true;
-            }
-        }
-        
-		return false;
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalConnectionEditPolicy#getSourceElement(org.eclipse.emf.ecore.EObject)
-	 */
-	protected EObject getSourceElement(EObject relationship) {
-		Wire wire = (Wire)relationship;
-		return wire.getSource();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalConnectionEditPolicy#getTargetElement(org.eclipse.emf.ecore.EObject)
-	 */
-	protected EObject getTargetElement(EObject relationship) {
-		Wire wire = (Wire)relationship;
-		return wire.getTarget();
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/ContainerHighlightEditPolicy.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/ContainerHighlightEditPolicy.java
deleted file mode 100644
index a4f9f36..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/ContainerHighlightEditPolicy.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
-import org.eclipse.swt.graphics.Color;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-
-
-/**
- * @author qili
- *
- * To highlight the container when it is selected
- */
-public class ContainerHighlightEditPolicy extends GraphicalEditPolicy{
-	private Color revertColor;
-
-	public void eraseTargetFeedback(Request request){
-		if (revertColor != null){
-			setContainerBackground(revertColor);
-			revertColor = null;
-		}
-	}
-
-	private Color getContainerBackground(){
-		return getContainerFigure().getBackgroundColor();
-	}
-
-	private IFigure getContainerFigure(){
-		return ((GraphicalEditPart)getHost()).getFigure();
-	}
-	
-	public EditPart getTargetEditPart(Request request){
-		return request.getType().equals(RequestConstants.REQ_SELECTION_HOVER) ?
-			getHost() : null;
-	}
-
-	private void setContainerBackground(Color c){
-		getContainerFigure().setBackgroundColor(c);
-	}
-	
-	protected void showHighlight(){
-		if (revertColor == null){
-			revertColor = getContainerBackground();
-			setContainerBackground(LogicColorConstants.logicBackgroundBlue);
-		}
-	}
-	
-	//Highlight the background when the following requests are created
-	public void showTargetFeedback(Request request){
-		if(request.getType().equals(RequestConstants.REQ_MOVE) ||
-			request.getType().equals(RequestConstants.REQ_ADD) ||
-			request.getType().equals(RequestConstants.REQ_CLONE) ||
-			request.getType().equals(RequestConstants.REQ_CONNECTION_START) ||
-			request.getType().equals(RequestConstants.REQ_CONNECTION_END) ||
-			request.getType().equals(RequestConstants.REQ_CREATE)
-		)
-			showHighlight();
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/LEDEditPolicy.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/LEDEditPolicy.java
deleted file mode 100644
index 813e04f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/LEDEditPolicy.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author qili
- *
- * 
- */
-public class LEDEditPolicy extends ComponentEditPolicy{
-	
-	private static final String
-	INCREMENT_REQUEST = "Increment", //$NON-NLS-1$
-	DECREMENT_REQUEST = "Decrement"; //$NON-NLS-1$
-
-public Command getCommand(Request request) {
-	if (INCREMENT_REQUEST.equals(request.getType()))
-		return getIncrementDecrementCommand(true);
-	if (DECREMENT_REQUEST.equals(request.getType()))
-		return getIncrementDecrementCommand(false);
-	return super.getCommand(request);
-}
-
-protected Command getIncrementDecrementCommand(boolean type){
-	IncrementDecrementCommand command = new IncrementDecrementCommand(((IGraphicalEditPart)getHost()).getEditingDomain(), type);
-	command.setChild(((View)(getHost().getModel())).getElement());
-	return new ICommandProxy(command);
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.gef.EditPolicy#getTargetEditPart(org.eclipse.gef.Request)
- */
-public EditPart getTargetEditPart(Request request) {
-	if (INCREMENT_REQUEST.equals(request.getType())
-			|| DECREMENT_REQUEST.equals(request.getType()))
-		return getHost();
-	return null;
-}
-	
-static class IncrementDecrementCommand 
-	extends AbstractTransactionalCommand {
-	
-	boolean isIncrement = true;
-	LED child = null;
-	
-	public IncrementDecrementCommand(TransactionalEditingDomain editingDomain, boolean increment){
-		super(editingDomain, "Logic Value Change", null); //$NON-NLS-1$
-		isIncrement=increment;
-	}
-	
-	public void setChild(EObject child){
-		this.child=(LED)child;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		throws ExecutionException {
-		
-		int value = child.getValue();
-		if(isIncrement){
-			if(value==15)value=-1;
-			child.setValue(value+1);
-		}else{
-			if(value==0)value=16;
-			child.setValue(value-1);
-		}
-		
-		return CommandResult.newOKCommandResult();
-	}
-
-}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/LogicFlowEditPolicy.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/LogicFlowEditPolicy.java
deleted file mode 100644
index 02f37e4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/LogicFlowEditPolicy.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateRequest;
-
-import org.eclipse.gmf.runtime.diagram.core.commands.AddCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableEditPolicyEx;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author qili
- *
- * An EditPolicy for use with {@link org.eclipse.draw2d.FlowLayout}.
- */
-public class LogicFlowEditPolicy
-	extends org.eclipse.gef.editpolicies.FlowLayoutEditPolicy
-{
-
-protected Command createAddCommand(EditPart child, EditPart after) {
-	int index = getHost().getChildren().indexOf(after);
-    TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-	AddCommand command = new AddCommand(editingDomain, new EObjectAdapter((View)getHost().getModel()),
-										new EObjectAdapter((View)child.getModel()), index);
-	return new ICommandProxy(command);
-}
-
-/**
- * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#createChildEditPolicy(org.eclipse.gef.EditPart)
- */
-protected EditPolicy createChildEditPolicy(EditPart child) {
-	ResizableEditPolicyEx policy = new ResizableEditPolicyEx();
-	policy.setResizeDirections(0);
-	return policy;
-}
-
-protected Command createMoveChildCommand(EditPart child, EditPart after) {
-	return null;
-}
-
-protected Command getCreateCommand(CreateRequest request) {
-	return null;
-}
-
-protected Command getDeleteDependantCommand(Request request) {
-	return null;
-}
-
-protected Command getOrphanChildrenCommand(Request request) {
-	return null;
-}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/TerminalCanonicalEditPolicy.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/TerminalCanonicalEditPolicy.java
deleted file mode 100644
index 51ad3f8..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/TerminalCanonicalEditPolicy.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.ITerminalOwnerEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Element;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author qili
- *
- * Sync notation views with semantic children
- */
-public class TerminalCanonicalEditPolicy extends CanonicalEditPolicy {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#getSemanticChildrenList()
-	 */
-	protected List getSemanticChildrenList() {
-		Element logicElement = getLogicElement();
-		
-//		making sure that semantic element is not null before proceeding.
-		if (logicElement == null)
-			return Collections.EMPTY_LIST;
-		
-		List theElements = new ArrayList();
-		
-		if (logicElement instanceof Circuit) {
-			theElements = logicElement.getInputTerminals();
-		} else {
-			List theInput = logicElement.getInputTerminals();
-			List theOutput = logicElement.getOutputTerminals();
-		
-			theElements.addAll(theInput);
-			theElements.addAll(theOutput);
-		}
-		return theElements;
-	}
-	
-	/** 
-	 * Returns <tt>false</tt> not to delete LogicShapeCompartmentview.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#shouldDeleteView(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return view.getType().equals(LogicConstants.LOGIC_SHAPE_COMPARTMENT) == false; 
-	}
-	
-	
-	/**
-	 * @return semantic element for the logic shape
-	 */
-	private final Element getLogicElement() {
-		return (Element)ViewUtil.resolveSemanticElement((View)(this.host().getModel()));
-	}
-	
-		/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#getCreateViewCommand(org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor)
-	 */
-	protected ICommand getCreateViewCommand(ViewDescriptor descriptor) {
-		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);
-		
-		ICommand viewCommand = super.getCreateViewCommand(descriptor);
-		
-		IAdaptable adapter = descriptor.getElementAdapter();
-		if( adapter == null ) {
-			return null;
-		}
-		Terminal element = (Terminal)adapter.getAdapter(Terminal.class);
-	
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-        
-		ICommand boundsCommand = 
-			new SetBoundsCommand(editingDomain, 
-				ExampleDiagramLogicMessages.SetLocationCommand_Label_Resize,
-				descriptor,
-				(Point)((ITerminalOwnerEditPart)getHost()).createBoundsMap().get(element.getId()));
-		
-		cc.compose(viewCommand);
-		cc.compose(boundsCommand);
-		
-		return cc;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/package.html
deleted file mode 100644
index eb2525c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/package.html
+++ /dev/null

@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the <i>edit policy</i> classes. 
-</p><p>
-Edit policy information:
-<ul>
-<li> Brings an editing functionality into an editpart (when installed on it)
-<li> Responsible for satisfying requests and feedback management
-<li> Categorized into different roles (component, connection, container, selectionetc).
-<li> Every role is responsible for satisfying one or more requests by returning commands
-</ul>
-
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/AndGateFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/AndGateFigure.java
deleted file mode 100644
index a9ed641..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/AndGateFigure.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class AndGateFigure extends NodeFigure {
-	
-	private Dimension prefSize;
-	
-	/**
-	 * Constructor for AndGateFigure.
-	 */
-	public AndGateFigure(Dimension prefSize) {
-		getBounds().width = prefSize.width;
-		getBounds().height = prefSize.height; 
-		this.prefSize = new Dimension(prefSize);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return new Dimension(prefSize);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		Rectangle r = getBounds().getCopy();
-		
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		r.translate(mm.DPtoLP(2), mm.DPtoLP(2));
-		r.setSize(mm.DPtoLP(11), mm.DPtoLP(9));
-
-		//draw main area
-		g.fillRectangle(r);
-	
-		//outline main area
-		g.drawLine(r.x, r.y, r.right(), r.y);
-		g.drawLine(r.right(), r.y, r.right(), r.bottom() - mm.DPtoLP(1));
-		g.drawLine(r.x, r.y, r.x, r.bottom() - mm.DPtoLP(1));
-
-		//draw and outline the arc
-		r.height = mm.DPtoLP(9);
-		r.y += mm.DPtoLP(4);
-		g.fillArc(r, 180, 180);
-		r.width--;
-		r.height--;
-		g.drawArc(r, 180, 190);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/AndGateTerminalFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/AndGateTerminalFigure.java
deleted file mode 100644
index 8862d02..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/AndGateTerminalFigure.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * @author qili
- *
- * Node figure for Connection Points. Connection Points are small square items that can sit on the
- * border.
- */
-public class AndGateTerminalFigure extends TerminalFigure {
-	
-	protected static PointList points = new PointList();
-	
-	static {
-		points.addPoint(2, 0);
-		points.addPoint(2, 2);
-	}
-	
-	/**
-	 * Constructor
-	 * @param edge
-	 */
-	public AndGateTerminalFigure(String ID, Dimension prefSize) {
-		super(prefSize);
-		
-		setSize(prefSize);
-		
-		fixedAnchor = new FixedConnectionAnchor(this);
-		fixedAnchor.offsetH = prefSize.height;
-		fixedAnchor.offsetV = 0;
-		
-		getConnectionAnchors().put(ID, fixedAnchor);
-	}
-		
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 * 
-	 * @param graphics
-	 */
-	protected void paintFigure(Graphics graphics) {	
-		Rectangle r = getBounds().getCopy();
-		
-		graphics.translate(r.getLocation());
-		PointList copy = points.getCopy();
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		mm.DPtoLP(copy);
-		
-		graphics.drawPolygon(copy);	
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/BottomTerminalFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/BottomTerminalFigure.java
deleted file mode 100644
index 8e558c8..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/BottomTerminalFigure.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * Node figure for Connection Points. Connection Points are small square items that can sit on the
- * border.
- * 
- * @author qili
- *  
- */
-public class BottomTerminalFigure extends TerminalFigure {
-	
-	private static PointList points = new PointList();
-	
-	static {
-		points.addPoint(-3, 0);
-		points.addPoint(2, 0);
-		points.addPoint(3, -2);
-		points.addPoint(3, -7);
-		points.addPoint(-2, -7);
-		points.addPoint(-2, -2);
-	}
-	
-	/**
-	 * Constructor
-	 * @param edge
-	 */
-	public BottomTerminalFigure(String ID, Dimension prefSize) {
-		super(prefSize);
-		setOpaque(true);
-		setSize(prefSize);
-		
-		fixedAnchor = new FixedConnectionAnchor(this);
-		fixedAnchor.topDown = false;
-		getConnectionAnchors().put(ID, fixedAnchor);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 * 
-	 * @param graphics
-	 */
-	protected void paintFigure(Graphics graphics) {			
-		Rectangle r = getBounds().getCopy();
-		
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		r.translate(0, mm.DPtoLP(4));
-		
-		graphics.translate(r.getLocation());
-//		 Draw the gaps for the connectors
-		graphics.setForegroundColor(ColorConstants.white);
-		
-		PointList copy = points.getCopy();
-		mm.DPtoLP(copy);
-		copy.translate(copy.getBounds().width / 2, copy.getBounds().height / 2);
-		graphics.fillPolygon(copy);
-		graphics.drawPolygon(copy);	
-	}
-
-}
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/CircuitBorder.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/CircuitBorder.java
deleted file mode 100644
index c67c4c1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/CircuitBorder.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.AbstractBorder;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class CircuitBorder  
-	extends AbstractBorder
-{
-	protected Insets insets = new Insets(6, 6, 6, 6);
-
-	public Insets getInsets(IFigure figure) {
-		return insets;
-	}
-
-	public void paint(IFigure figure, Graphics g, Insets in) {
-		Rectangle r = figure.getBounds().getCropped(in);
-		IMapMode mm = MapModeUtil.getMapMode(figure);
-		
-		//Draw the sides of the border
-		g.fillRectangle(r.x, r.y, r.width, mm.DPtoLP(6));
-		g.fillRectangle(r.x, r.bottom() - mm.DPtoLP(6), r.width, mm.DPtoLP(6));
-		g.fillRectangle(r.x, r.y + mm.DPtoLP(2), mm.DPtoLP(6), r.height - mm.DPtoLP(4));
-		g.fillRectangle(r.right() - mm.DPtoLP(6), r.y + mm.DPtoLP(2), mm.DPtoLP(6), r.height - mm.DPtoLP(4));
-
-		//Outline the border
-		g.drawLine(r.x, r.y + 8, r.right() - 1, r.y + 8);
-		g.drawLine(r.x, r.bottom() - 8, r.right() - 1, r.bottom() - 8);
-		g.drawLine(r.x, r.y + 2, r.x, r.bottom() - 3);
-		g.drawLine(r.right() - 1, r.bottom() - 3, r.right() - 1, r.y + 2);
-		
-		r.crop(new Insets(1, 1, 0, 0));
-		r.expand(1, 1);
-		r.crop(getInsets(figure));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/CircuitFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/CircuitFigure.java
deleted file mode 100644
index a99f629..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/CircuitFigure.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.handles.HandleBounds;
-import org.eclipse.swt.graphics.Color;
-
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class CircuitFigure
-	extends NodeFigure
-	implements HandleBounds
-{
-	private Dimension prefSize;
-	
-	public CircuitFigure(Dimension prefSize) {
-		setBorder(new CircuitBorder());
-		setOpaque(true);
-		this.prefSize = prefSize;
-	}
-
-	public Dimension getPreferredSize(int w, int h) {
-		Dimension newPrefSize = super.getPreferredSize(w, h);
-		Dimension defaultSize = prefSize;
-		newPrefSize.union(defaultSize);
-		return newPrefSize;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		Rectangle rect = getBounds().getCopy();
-		graphics.setBackgroundColor(new Color(null, 255, 255, 255));
-		graphics.fillRectangle(rect);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/FixedConnectionAnchor.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/FixedConnectionAnchor.java
deleted file mode 100644
index 96ebda1..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/FixedConnectionAnchor.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2004  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScalableFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class FixedConnectionAnchor 
-	extends AbstractConnectionAnchor
-{
-
-public boolean leftToRight = true;
-public int offsetH;
-public int offsetV;
-public boolean topDown = true;
-
-public FixedConnectionAnchor(IFigure owner) {
-	super(owner);
-}
-
-/**
- * @see org.eclipse.draw2d.AbstractConnectionAnchor#ancestorMoved(IFigure)
- */
-public void ancestorMoved(IFigure figure) {
-	if (figure instanceof ScalableFigure)
-		return;
-	super.ancestorMoved(figure);
-}
-
-public Point getLocation(Point reference) {
-	Rectangle r = getOwner().getBounds();
-	int x,y;
-	if (topDown)
-		y = r.y + offsetV;
-	else
-		y = r.bottom() - 1 - offsetV;
-
-	if (leftToRight)
-		x = r.x + offsetH;
-	else
-		x = r.right() - 1 - offsetH;
-	
-	Point p = new PrecisionPoint(x,y);
-	getOwner().translateToAbsolute(p);
-	return p;
-}
-
-public Point getReferencePoint(){
-	return getLocation(null);
-}
-	
-/**
- * @param offsetH The offsetH to set.
- */
-public void setOffsetH(int offsetH) {
-	this.offsetH = offsetH;
-	fireAnchorMoved();
-}
-
-/**
- * @param offsetV The offsetV to set.
- */
-public void setOffsetV(int offsetV) {
-	this.offsetV = offsetV;
-	fireAnchorMoved();
-}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LEDFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LEDFigure.java
deleted file mode 100644
index 64cfe81..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LEDFigure.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.handles.HandleBounds;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class LEDFigure
-	extends NodeFigure
-	implements HandleBounds
-{
-	private Color fontColor;
-	
-	/**
-	 * Color of the shadow around the LEDFigure's display
-	 */
-	public static final Color DISPLAY_SHADOW = new Color(null, 57, 117, 90); 
-
-	/**
-	 * Color of the LEDFigure's displayed value
-	 */
-	public static final Color DISPLAY_TEXT = new Color(null, 255, 199, 16);
-
-	protected String value;
-	
-	private Dimension prefSize;
-	/**
-	 * Creates a new LEDFigure
-	 */
-	public LEDFigure(Dimension prefSize) {
-		getBounds().width = prefSize.width;
-		getBounds().height = prefSize.height;
-		this.prefSize = new Dimension(prefSize);
-	}
-	
-	/**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return new Dimension(prefSize);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		Rectangle displayRectangle = new Rectangle(mm.DPtoLP(15), mm.DPtoLP(11), mm.DPtoLP(31), mm.DPtoLP(25));
-		Rectangle displayShadow = new Rectangle(mm.DPtoLP(14), mm.DPtoLP(10), mm.DPtoLP(32), mm.DPtoLP(26));
-		Rectangle displayHighlight = new Rectangle(mm.DPtoLP(15), mm.DPtoLP(11), mm.DPtoLP(32), mm.DPtoLP(26));
-		Point valuePoint = new Point(mm.DPtoLP(16), mm.DPtoLP(10));
-
-		int Y1 = mm.DPtoLP(0);
-		int Y2 = mm.DPtoLP(44);
-		
-		Rectangle r = getBounds().getCopy();
-		
-		g.translate(r.getLocation());
-		g.fillRectangle(mm.DPtoLP(0), mm.DPtoLP(0), r.width, r.height /*- MapMode.DPtoLP(4)*/);	
-		int right = r.width - 1;
-		g.drawLine(mm.DPtoLP(0), Y1, right, Y1);
-		g.drawLine(mm.DPtoLP(0), Y1, mm.DPtoLP(0), Y2);
-	
-		g.drawLine(mm.DPtoLP(0), Y2, right, Y2);
-		g.drawLine(right, Y1, right, Y2);
-
-		// Draw the display
-		RGB whiteColor = ColorConstants.white.getRGB();
-		RGB backgroundColor = getBackgroundColor().getRGB();
-		RGB newHightlightRGB = new RGB((whiteColor.red + backgroundColor.red)/2 , (whiteColor.green + backgroundColor.green)/2 , (whiteColor.blue + backgroundColor.blue)/2 );
-		g.setBackgroundColor( DiagramColorRegistry.getInstance()
-			.getColor(newHightlightRGB));
-		g.fillRectangle(displayHighlight);
-		RGB blackColor = ColorConstants.black.getRGB();
-		RGB newShadowRGB = new RGB((blackColor.red + backgroundColor.red)/2 , (blackColor.green + backgroundColor.green)/2 , (blackColor.blue + backgroundColor.blue)/2 );
-		g.setBackgroundColor( DiagramColorRegistry.getInstance()
-			.getColor(newShadowRGB));
-		g.fillRectangle(displayShadow);
-		
-		g.setBackgroundColor(ColorConstants.black);
-		g.fillRectangle(displayRectangle);
-	
-		// Draw the value
-		g.setForegroundColor(getFontColor());
-		g.drawText(value, valuePoint);
-	}
-	
-	/**
-	 * @return font color 
-	 */
-	public Color getFontColor() {
-		return fontColor;
-	}
-	
-	/**
-	 * @param c set the font color
-	 */
-	public void setFontColor(Color c) {
-		fontColor = c;
-		revalidate();
-	}
-
-	/**
-	 * Sets the value of the LEDFigure to val.
-	 * 
-	 * @param val The value to set on this LEDFigure
-	 */
-	public void setValue(int val) {
-		value = String.valueOf(val);
-		if (val < 10)
-			value = "0" + value;	//$NON-NLS-1$
-		repaint();
-	}
-
-	/**
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return "LEDFigure"; //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicColorConstants.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicColorConstants.java
deleted file mode 100644
index 509a246..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicColorConstants.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.swt.graphics.Color;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public interface LogicColorConstants
-{
-
-public final static Color andGate = new Color(null, 220,70,80);
-public final static Color orGate = new Color (null, 0, 134, 255);
-public final static Color xorGate = new Color (null, 240,240,40);
-public final static Color logicGreen = new Color(null, 123,174,148);
-public final static Color logicHighlight = new Color(null,66,166,115);
-public final static Color connectorGreen = new Color(null,0,69,40);
-public final static Color logicBackgroundBlue = new Color(null, 200, 200, 240);
-public final static Color ghostFillColor = new Color(null, 31, 31, 31);
-public final static Color logicBlack = new Color(null, 0, 0, 0);
-public final static Color displayText = new Color(null, 255, 199, 16);
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowBorder.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowBorder.java
deleted file mode 100644
index f9c8a2d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowBorder.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class LogicFlowBorder 
-	extends org.eclipse.draw2d.LineBorder 
-{
-	
-	private int grabBarWidth;
-	private Dimension grabBarSize;
-
-	public LogicFlowBorder() { 
-		// do nothing 
-	}
-
-	public LogicFlowBorder(Dimension size) {
-		setGrabBarWidth(size.width);
-		this.grabBarSize = new Dimension(size);
-	}
-
-	public Insets getInsets(IFigure figure){
-		return new Insets(getWidth()+2, grabBarWidth+2, getWidth()+2, getWidth()+2);
-	}
-
-	public Dimension getPreferredSize() {
-		return grabBarSize;
-	}
-
-	public void paint(IFigure figure, Graphics graphics, Insets insets) {
-		Rectangle bounds = figure.getBounds();
-		tempRect.setBounds(new Rectangle(bounds.x, bounds.y, grabBarWidth, bounds.height));
-		graphics.fillRectangle(tempRect);
-		super.paint(figure, graphics, insets);
-	}
-
-	public void setGrabBarWidth(int width) {
-		grabBarWidth = width;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowFigure.java
deleted file mode 100644
index b4b56a7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowFigure.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.handles.HandleBounds;
-
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class LogicFlowFigure
-	extends NodeFigure
-	implements HandleBounds
-{
-	private Dimension prefSize;
-	
-	public LogicFlowFigure(Dimension size) {
-		setBorder(new LogicFlowBorder());
-		setOpaque(true);
-		prefSize = size;
-	}
- 
-	/**
-	 * @see org.eclipse.gef.handles.HandleBounds#getHandleBounds()
-	 */
-	public Rectangle getHandleBounds() {
-		return getBounds().getCropped(new Insets(2,0,2,0));
-	}
-
-	public Dimension getPreferredSize(int w, int h) {
-		Dimension newPrefSize = super.getPreferredSize(w, h);
-		newPrefSize.union(prefSize);
-		return newPrefSize;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		Rectangle rect = getBounds().getCopy();
-		rect.crop(new Insets(2,0,2,0));
-	}
-
-	public String toString() {
-		return "LogicFlowBoardFigure"; //$NON-NLS-1$
-	}
-
-	public void validate() {
-		if(isValid()) return;
-		super.validate();
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OrGateFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OrGateFigure.java
deleted file mode 100644
index c349afd..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OrGateFigure.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class OrGateFigure extends NodeFigure {
-	private static final PointList points = new PointList();
-
-	static {
-		points.addPoint(2, 10);
-		points.addPoint(2, 2);
-		points.addPoint(4, 4);
-		points.addPoint(6, 5);
-		points.addPoint(7, 5);
-		points.addPoint(8, 5);
-		points.addPoint(10, 4);
-		points.addPoint(12, 2);
-		points.addPoint(12, 10);
-	}	
-
-	private Dimension prefSize;
-	
-	/**
-	 * Creates a new OrGateFigure
-	 */
-	public OrGateFigure(Dimension prefSize) {
-		getBounds().width = prefSize.width; 
-		getBounds().height = prefSize.height;
-		this.prefSize = new Dimension(prefSize);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return new Dimension(prefSize);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		Rectangle r = getBounds().getCopy();
-		
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		r.translate(mm.DPtoLP(2), mm.DPtoLP(2));
-		r.setSize(mm.DPtoLP(11), mm.DPtoLP(9));
-	
-		//Draw the bottom arc of the gate
-		r.y += mm.DPtoLP(4);
-		r.width = r.width - mm.DPtoLP(1);
-		g.fillOval(r);
-		r.height--;
-		g.drawOval(r);
-	
-		//draw gate
-		g.translate(getLocation());
-		PointList outline = points.getCopy();
-		mm.DPtoLP(outline);
-		g.fillPolygon(outline);
-		g.drawPolyline(outline);
-		g.translate(getLocation().getNegated());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OrGateTerminalFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OrGateTerminalFigure.java
deleted file mode 100644
index a8e167e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OrGateTerminalFigure.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * @author qili
- *
- * Node figure for Connection Points. Connection Points are small square items that can sit on the
- * border.
- */
-public class OrGateTerminalFigure extends TerminalFigure {
-	
-	private static PointList points = new PointList();
-	
-	static {
-		points.addPoint(2, 0);
-		points.addPoint(2, 4);
-	}
-	
-	/**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return new Dimension(prefSize);
-	}
-	
-	/**
-	 * Constructor
-	 * @param edge
-	 */
-	public OrGateTerminalFigure(String ID, Dimension prefSize) {
-		super(prefSize);
-		setSize(prefSize);
-		this.prefSize = new Dimension(prefSize);
-		
-		fixedAnchor = new FixedConnectionAnchor(this);
-		fixedAnchor.offsetH = prefSize.width / 2;
-		getConnectionAnchors().put(ID, fixedAnchor);
-	}
-		
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 * 
-	 * @param graphics
-	 */
-	protected void paintFigure(Graphics graphics) {	
-		Rectangle r = getBounds().getCopy();
-		
-		graphics.translate(r.getLocation());
-		PointList copy = points.getCopy();
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		mm.DPtoLP(copy);
-		graphics.drawPolygon(copy);	
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OutputTerminalFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OutputTerminalFigure.java
deleted file mode 100644
index 7b38780..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/OutputTerminalFigure.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * @author qili
- *
- * Node figure for Connection Points. Connection Points are small square items that can sit on the
- * border.
- */
-public class OutputTerminalFigure extends TerminalFigure {
-	
-	private static PointList points = new PointList();
-	
-    static {
-		points.addPoint(2, 0);
-		points.addPoint(2, 3);
-	}
-	
-    /**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return new Dimension(prefSize);
-	}
-	
-	/**
-	 * Constructor
-	 * @param edge
-	 */
-	public OutputTerminalFigure(String ID, Dimension prefSize) {
-		super(prefSize);
-		setSize(prefSize);
-		
-		fixedAnchor = new FixedConnectionAnchor(this);
-		fixedAnchor.offsetH = prefSize.height / 2;
-		fixedAnchor.topDown = false;
-		getConnectionAnchors().put(ID, fixedAnchor);
-	}
-		
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 * 
-	 * @param graphics
-	 */
-	protected void paintFigure(Graphics graphics) {	
-		Rectangle r = getBounds().getCopy();
-		
-		graphics.translate(r.getLocation());
-		
-		PointList copy = points.getCopy();
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		mm.DPtoLP(copy);
-		graphics.drawPolygon(copy);	
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/TerminalFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/TerminalFigure.java
deleted file mode 100644
index affdfeb..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/TerminalFigure.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * @author qili
- *
- * To manage fixed connection anchors
- */
-public class TerminalFigure extends NodeFigure{
-	
-	protected FixedConnectionAnchor fixedAnchor;
-	protected Dimension prefSize;
-	
-	/**
-	 * @author sshaw
-	 *
-	 * Override for BorderItemLocator that will fix the location for the connection point based on 
-	 * an initial position.  This locator will also scale the location of the connection if the
-	 * parent figure changes.
-	 */
-	static public class TerminalLocator extends BorderItemLocator {
-		 
-		private Dimension initDim; 
-		public void relocate(IFigure target) {
-			Rectangle parentRect = getParentBorder();
-			float xRatio = parentRect.width / (float)initDim.width;
-			float yRatio = parentRect.height / (float)initDim.height;
-			
-			Rectangle targetRect = target.getBounds();
-			Point ptLoc = this.getAbsoluteToBorder(getConstraint().getLocation());
-			ptLoc = ptLoc.getTranslated(-parentRect.x, -parentRect.y);
-			ptLoc.scale(xRatio, yRatio);
-			ptLoc = ptLoc.getTranslated(parentRect.x, parentRect.y);
-			
-			target.setBounds(new Rectangle(ptLoc.x - targetRect.width / 2, ptLoc.y - targetRect.height / 2, targetRect.width, targetRect.height));
-		}
-		
-		/**
-		 * @param gate
-		 * @param parentFigure
-		 */
-		public TerminalLocator(IFigure parentFigure, Dimension initDim, int side) {
-			super(parentFigure, side);
-			this.initDim = initDim;
-		}
-	}
-	
-	/**
-	 * @param preferredSide
-	 */
-	public TerminalFigure(Dimension prefSize) {
-		super();
-		this.prefSize = new Dimension(prefSize);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getSourceConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
-		if (p == null) {
-			return getConnectionAnchor(szAnchor);
-		}
-		return fixedAnchor;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getTargetConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
-		if (p == null) {
-			return getConnectionAnchor(szAnchor);
-		}
-		return fixedAnchor;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return new Dimension(prefSize);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/TopTerminalFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/TopTerminalFigure.java
deleted file mode 100644
index 311eaf2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/TopTerminalFigure.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * Node figure for Connection Points. Connection Points are small square items that can sit on the
- * border.
- * 
- * @author qili
- *  
- */
-public class TopTerminalFigure extends TerminalFigure {
-	
-	protected static PointList points = new PointList();
-	
-	static {
-		points.addPoint(-3, 0);
-		points.addPoint(2, 0);
-		points.addPoint(3, 2);
-		points.addPoint(3, 7);
-		points.addPoint(-2, 7);
-		points.addPoint(-2, 2);
-	}
-	
-    /**
-	 * Constructor
-	 * @param edge
-	 */
-	public TopTerminalFigure(String ID, Dimension prefSize) {
-		super(prefSize);
-		setOpaque(true);
-		setSize(prefSize);
-		fixedAnchor = new FixedConnectionAnchor(this);
-		getConnectionAnchors().put(ID, fixedAnchor);
-	}
-		
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 * 
-	 * @param graphics
-	 */
-	protected void paintFigure(Graphics graphics) {	
-		Rectangle r = getBounds().getCopy();
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		r.translate(0, mm.DPtoLP(-4));
-		
-		graphics.translate(r.getLocation());
-//		 Draw the gaps for the connectors
-		graphics.setForegroundColor(ColorConstants.white);
-		
-		PointList copy = points.getCopy();
-		mm.DPtoLP(copy);
-		copy.translate(copy.getBounds().width / 2, copy.getBounds().height / 2);
-		graphics.fillPolygon(copy);
-		graphics.drawPolygon(copy);	
-	}
-}
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/XOrGateFigure.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/XOrGateFigure.java
deleted file mode 100644
index 8aa0879..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/XOrGateFigure.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * code copied from real logic example in gef
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class XOrGateFigure extends NodeFigure {
-
-	private static final PointList outlinePoints = new PointList();
-	private static final PointList topPoints = new PointList();
-
-	static {
-		//setup gate outline
-		outlinePoints.addPoint(2, 10);
-		outlinePoints.addPoint(2, 4);
-		outlinePoints.addPoint(4, 6);
-		outlinePoints.addPoint(6, 7);
-		outlinePoints.addPoint(7, 7);
-		outlinePoints.addPoint(8, 7);
-		outlinePoints.addPoint(10, 6);
-		outlinePoints.addPoint(12, 4);
-		outlinePoints.addPoint(12, 10);
-
-		//setup top curve of gate
-		topPoints.addPoint(2, 2);
-		topPoints.addPoint(4, 4);
-		topPoints.addPoint(6, 5);
-		topPoints.addPoint(7, 5);
-		topPoints.addPoint(8, 5);
-		topPoints.addPoint(10, 4);
-		topPoints.addPoint(12, 2);
-	}	
-
-	 private Dimension prefSize;
-	    
-	/**
-	 * Constructor for XOrGateFigure.
-	 */
-	public XOrGateFigure(Dimension prefSize) {
-		getBounds().width = prefSize.width;
-		getBounds().height = prefSize.height;
-		this.prefSize = new Dimension(prefSize);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return new Dimension(prefSize);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		Rectangle r = getBounds().getCopy();
-		
-		IMapMode mm = MapModeUtil.getMapMode(this);
-		r.translate(mm.DPtoLP(2), mm.DPtoLP(2));
-		r.setSize(mm.DPtoLP(11), mm.DPtoLP(9)); 
-
-		//Draw an oval that represents the bottom arc
-		r.y += mm.DPtoLP(4);
-	
-		/* 
-		 * Draw the bottom gate arc.
-		 * This is done with an oval. The oval overlaps the top
-		 * arc of the gate, so this region is clipped.
-		 */
-		g.pushState();
-		r.y++;
-		g.clipRect(r);
-		r.y--;
-		
-		r.width = r.width - mm.DPtoLP(1);
-		g.fillOval(r);
-		r.height--;
-		g.drawOval(r);
-		g.popState();
-
-		//Draw the gate outline and top curve
-		g.translate(getLocation());
-		
-		PointList topLP = topPoints.getCopy();
-		mm.DPtoLP(topLP);
-		g.drawPolyline(topLP);
-		
-		PointList outlineLP = outlinePoints.getCopy();
-		mm.DPtoLP(outlineLP);
-		g.fillPolygon(outlineLP);
-		g.drawPolyline(outlineLP);
-		g.translate(getLocation().negate());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/package.html
deleted file mode 100644
index d477353..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/icons/minus.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/icons/minus.gif
deleted file mode 100644
index 2d44f41..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/icons/minus.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/icons/plus.gif b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/icons/plus.gif
deleted file mode 100644
index 6e00852..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/icons/plus.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.java
deleted file mode 100644
index dff2356..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class ExampleDiagramLogicMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages";//$NON-NLS-1$
-
-	private ExampleDiagramLogicMessages() {
-		// Do not instantiate
-	}
-
-	public static String LogicVisualizer_DefaultLogicDiagramFileName;
-	public static String LogicVisualizer_DefaultSavedBrowseDiagramDiagramProject;
-	public static String CreationWizard_New_Logic_Diagram;
-	public static String LogicWizardPage_Title;
-	public static String LogicWizardPage_Description;
-	public static String LogicTopicDiagramEditor_Unable_To_Save_Viz_Diagram_Title;
-	public static String LogicTopicDiagramEditor_Unable_To_Save_Viz_Diagram_Text;
-	public static String LogicVisualizerTopicDiagramEditor_Viz_Diagram_Exists;
-	public static String LogicVisualizerTopicDiagramEditor_Viz_Diagram_Exists_Text;
-	public static String LogicFlowCompartmentEditPart_Title;
-	public static String LogicVisualizerEditor_EDITOR_OPEN_EXC_;
-	public static String logic_ConnectionTool_Label;
-	public static String logic_ConnectionTool_Description;
-	public static String logic_LEDTool_Label;
-	public static String logic_LEDTool_Description;
-	public static String logic_LogicFlowTool_Label;
-	public static String logic_LogicFlowTool_Description;
-	public static String logic_CircuitTool_Label;
-	public static String logic_CircuitTool_Description;
-	public static String logic_OrGateTool_Label;
-	public static String logic_OrGateTool_Description;
-	public static String logic_AndGateTool_Label;
-	public static String logic_AndGateTool_Description;
-	public static String logic_XORGateTool_Label;
-	public static String logic_XORGateTool_Description;
-	public static String logic_HalfAdderTool_Label;
-	public static String logic_HalfAdderTool_Description;
-	public static String logic_FullAdderTool_Label;
-	public static String logic_FullAdderTool_Description;
-	public static String logic_Shape_Label;
-	public static String SetLocationCommand_Label_Resize;
-	public static String LogicWizardPage_StoreSemanticsSeparately;
-	public static String LogicWizardPage_BrowseSemanticResource;
-	public static String LogicWizardPage_BrowseSemanticDialogTitle;
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ExampleDiagramLogicMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.properties b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.properties
deleted file mode 100644
index af51a5f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.properties
+++ /dev/null

@@ -1,85 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Logic General - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- File creation ---
-LogicVisualizer_DefaultLogicDiagramFileName=logicdiagram
-LogicVisualizer_DefaultSavedBrowseDiagramDiagramProject=Saved Browse Diagrams
-
-# ==============================================================================
-# Wizards - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- Logic Diagram Wizard ---
-CreationWizard_New_Logic_Diagram=New Logic Diagram
-LogicWizardPage_Title=Create Logic Diagram
-LogicWizardPage_Description=Create a new logic diagram.
-LogicWizardPage_StoreSemanticsSeparately=Store semantics in a separate semantic resource
-LogicWizardPage_BrowseSemanticResource=Browse...
-LogicWizardPage_BrowseSemanticDialogTitle=Semantic Resource Selection
-
-# --- Topic Diagram ---
-LogicTopicDiagramEditor_Unable_To_Save_Viz_Diagram_Title=Unable to Save Diagram.
-LogicTopicDiagramEditor_Unable_To_Save_Viz_Diagram_Text=Unable to save visualizer diagram from the current topic diagram.
-LogicVisualizerTopicDiagramEditor_Viz_Diagram_Exists=File Exists
-LogicVisualizerTopicDiagramEditor_Viz_Diagram_Exists_Text=Cannot overwrite the existing diagram. Please specify a different diagram file name.
-
-#
-# This Resource Bundle contains localizable strings for the Logic plug-in
-#
-# ==============================================================================
-LogicFlowCompartmentEditPart_Title=Logic Flow Compartment
-
-# ==============================================================================
-# Exceptions and Errors - Translation Instruction : needs Translation.
-# ==============================================================================
-
-#--- Parameter passed here is the serialized form of the VizRef for which visualization failed ---
-LogicVisualizerEditor_EDITOR_OPEN_EXC_=Unable to open the editor
-
-
-#
-# Menu Contribution properties
-#
-logic_ConnectionTool_Label: Connection
-logic_ConnectionTool_Description: Create a connection
-
-logic_LEDTool_Label: &LED
-logic_LEDTool_Description: Create a LED shape
-
-logic_LogicFlowTool_Label: &Logic Flow
-logic_LogicFlowTool_Description: Create a flow container shape
-
-logic_CircuitTool_Label: &Circuit
-logic_CircuitTool_Description: Create a circuit shape
-
-logic_OrGateTool_Label: &Or Gate
-logic_OrGateTool_Description: Create a OR gate shape
-
-logic_AndGateTool_Label: &And Gate
-logic_AndGateTool_Description: Create a AND gate shape
-
-logic_XORGateTool_Label: &XOR Gate
-logic_XORGateTool_Description: Create a XOR gate shape
-
-logic_HalfAdderTool_Label: &HalfAdder
-logic_HalfAdderTool_Description: Create a half-adder shape
-
-logic_FullAdderTool_Label: &FullAdder
-logic_FullAdderTool_Description: Create a full-adder shape
-
-logic_Shape_Label: &Logic Shape
-
-SetLocationCommand_Label_Resize: Set Location or Size

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicPluginImages.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicPluginImages.java
deleted file mode 100644
index b2f3ec5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicPluginImages.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly.
- * 
- * @author cmahoney
- */
-public class ExampleDiagramLogicPluginImages {
-
-	// Prefixes
-	private static final String PREFIX_WIZARD = "icons/wizards/"; //$NON-NLS-1$
-
-	// Image descriptors.
-	public static final ImageDescriptor DESC_LOGIC_WIZARD = create(PREFIX_WIZARD
-		+ "logic_wiz.gif"); //$NON-NLS-1$
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(LogicDiagramPlugin
-			.getPluginId(), imageName);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/package.html
deleted file mode 100644
index a06998f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/nonactivating/LogicActionFilterProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/nonactivating/LogicActionFilterProvider.java
deleted file mode 100644
index 765b64d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/nonactivating/LogicActionFilterProvider.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.nonactivating;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.ContainerElement;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.AbstractActionFilterProvider;
-
-/**
- * Action filter provider for the logic example context menu action enablement.
- * Required temporarily until Bugzilla 111778 is fixed.
- * 
- * @author ldamus
- */
-public class LogicActionFilterProvider extends AbstractActionFilterProvider {
-
-	private final static String IS_CONTAINER_ELEMENT = "org.eclipse.gmf.examples.runtime.diagram.logic.isContainerElement"; //$NON-NLS-1$
-
-	public boolean testAttribute(Object target, String name, String value) {
-
-		if (name.equals(IS_CONTAINER_ELEMENT)) {
-			if (target instanceof ContainerElement) {
-				return true;
-			}
-
-			if (target instanceof IAdaptable) {
-				IAdaptable adaptable = (IAdaptable) target;
-				return (adaptable.getAdapter(ContainerElement.class) != null);
-			}
-		}
-		return false;
-	}
-
-	public boolean provides(IOperation operation) {
-		// Not used
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/nonactivating/LogicLayoutProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/nonactivating/LogicLayoutProvider.java
deleted file mode 100644
index f7610eb..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/nonactivating/LogicLayoutProvider.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.nonactivating;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.providers.CompositeTopDownProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author mmostafa
- * Custom provider that lays out the logic Diagram in a top to down fashion.
- */
-
-public class LogicLayoutProvider
-    extends CompositeTopDownProvider {
-
-    public boolean provides(IOperation operation) {
-        // enable this provider only on logic diagrams
-        if (operation instanceof ILayoutNodeOperation) {
-            Iterator nodes = ((ILayoutNodeOperation) operation)
-                .getLayoutNodes().listIterator();
-            if (nodes.hasNext()) {
-                View node = ((ILayoutNode) nodes.next()).getNode();
-                Diagram container = node.getDiagram();
-                if (container == null
-                    || !(container.getType().equals("logic"))) //$NON-NLS-1$
-                    return false;
-            }
-        } else {
-            return false;
-        }
-        IAdaptable layoutHint = ((ILayoutNodeOperation) operation)
-            .getLayoutHint();
-        String layoutType = (String) layoutHint.getAdapter(String.class);
-        return LayoutType.DEFAULT.equals(layoutType);
-    }
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/package.html
deleted file mode 100644
index 798cb7b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicAppearancePreferencePage.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicAppearancePreferencePage.java
deleted file mode 100644
index ad8f68c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicAppearancePreferencePage.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * The Appearance preference page used for the Logic Diagram preferences.
- *
- * @author cmahoney
- */
-public class LogicAppearancePreferencePage
-	extends AppearancePreferencePage {
-
-	/**
-	 * Creates a new instance and initializes the preference store.
-	 */
-	public LogicAppearancePreferencePage() {
-		super();
-		setPreferenceStore(LogicDiagramPlugin.getInstance().getPreferenceStore());
-	}
-
-	/**
-     * Initializes the default preference values 
-     * for this preference store.
-     * 
-     * @param store
-     */
-    public static void initDefaults(IPreferenceStore store) {
-
-    	setDefaultFontPreference(store);
-
-        Color fontColor = ColorConstants.black;
-    	PreferenceConverter.setDefault(
-            store,
-            IPreferenceConstants.PREF_FONT_COLOR,
-            fontColor.getRGB());
-
-        Color fillColor = LogicColorConstants.logicGreen;
-        PreferenceConverter.setDefault(
-            store,
-            IPreferenceConstants.PREF_FILL_COLOR,
-            fillColor.getRGB());
-
-        Color lineColor = LogicColorConstants.connectorGreen;
-        PreferenceConverter.setDefault(
-            store,
-            IPreferenceConstants.PREF_LINE_COLOR,
-            lineColor.getRGB());
-
-        Color noteFillColor = DiagramColorConstants.diagramLightYellow;
-        PreferenceConverter.setDefault(
-            store,
-            IPreferenceConstants.PREF_NOTE_FILL_COLOR,
-			noteFillColor.getRGB());
-
-        Color noteLineColor = DiagramColorConstants.diagramDarkYellow;
-        PreferenceConverter.setDefault(
-            store,
-            IPreferenceConstants.PREF_NOTE_LINE_COLOR,
-			noteLineColor.getRGB());
-    }	
-	
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicConnectionsPreferencePage.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicConnectionsPreferencePage.java
deleted file mode 100644
index d29d213..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicConnectionsPreferencePage.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;
-
-/**
- * The connections preference page used for the Logic Diagram preferences.
- * 
- * @author cmahoney
- */
-public class LogicConnectionsPreferencePage
-	extends ConnectionsPreferencePage {
-
-	/**
-	 * Creates a new instance.
-	 */
-	public LogicConnectionsPreferencePage() {
-		super();
-		setPreferenceStore(LogicDiagramPlugin.getInstance()
-			.getPreferenceStore());
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicDiagramsPreferencePage.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicDiagramsPreferencePage.java
deleted file mode 100644
index 43e804c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicDiagramsPreferencePage.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;
-
-/**
- * The Appearance preference page used for the Logic Diagram preferences.
- *
- * @author cmahoney
- */
-public class LogicDiagramsPreferencePage
-	extends DiagramsPreferencePage {
-	
-	/**
-	 * Creates a new instance and initializes the preference store.
-	 */
-	public LogicDiagramsPreferencePage() {
-		super();
-		setPreferenceStore(LogicDiagramPlugin.getInstance().getPreferenceStore());
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicPreferencesInitializer.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicPreferencesInitializer.java
deleted file mode 100644
index 31b9367..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicPreferencesInitializer.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Initializes the preferences pages for the Logic Diagram Editor.
- * 
- * @author cmahoney
- */
-public class LogicPreferencesInitializer
-	extends DiagramPreferenceInitializer {
-
-	public void initializeDefaultPreferences() {
-		super.initializeDefaultPreferences();
-		
-		// Resetting appearance settings in the logic preference store 
-		IPreferenceStore store = getPreferenceStore();	
-		LogicAppearancePreferencePage.initDefaults(store);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.preferences.DiagramPreferenceInitializer#getPreferenceStore()
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return LogicDiagramPlugin.getInstance().getPreferenceStore();
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicPrintingPreferencePage.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicPrintingPreferencePage.java
deleted file mode 100644
index 04ad8f7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicPrintingPreferencePage.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
-
-
-/**
- * The printing preference page used for the Logic Diagram preferences.
- *
- * @author Wayne Diu, wdiu
- */
-public class LogicPrintingPreferencePage
-	extends PrintingPreferencePage {
-
-	/**
-	 * Creates a new instance and initializes the preference store.
-	 */
-	public LogicPrintingPreferencePage() {
-		super();
-		setPreferenceStore(LogicDiagramPlugin.getInstance().getPreferenceStore());
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicRulerGridPreferencePage.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicRulerGridPreferencePage.java
deleted file mode 100644
index 0befbda..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/preferences/LogicRulerGridPreferencePage.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.preferences;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;
-
-
-/**
- * The Ruler and Grid preference page used for the Logic Diagram preferences.
- *
- * @author cmahoney
- */
-public class LogicRulerGridPreferencePage
-	extends RulerGridPreferencePage {
-
-	/**
-	 * Creates a new instance and initializes the preference store.
-	 */
-	public LogicRulerGridPreferencePage() {
-		super();
-		setPreferenceStore(LogicDiagramPlugin.getInstance().getPreferenceStore());
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicConstants.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicConstants.java
deleted file mode 100644
index 8cb6e6a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicConstants.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- *
- */
-public class LogicConstants {
-
-	// Supported Shapes
-	public static final String TOOL_LED            = "LED"; //$NON-NLS-1$
-	public static final String TOOL_FLOWCONTAINER  = "FlowContainer"; //$NON-NLS-1$
-	public static final String TOOL_CIRCUIT 	   = "circuit";	//$NON-NLS-1$
-	public static final String TOOL_ORGATE		   = "OrGate"; //$NON-NLS-1$
-	public static final String TOOL_ANDGATE		   = "AndGate"; //$NON-NLS-1$
-	public static final String TOOL_XORGATE		   = "XORGate"; //$NON-NLS-1$
-	public static final String TOOL_HALFADDER	   = "HalfAdder"; //$NON-NLS-1$
-	public static final String TOOL_FULLADDER	   = "FullAdder"; //$NON-NLS-1$
-	public static final String LOGIC_SHAPE_COMPARTMENT   = "LogicCompartment"; //$NON-NLS-1$
-	public static final String LOGIC_FLOW_COMPARTMENT   = "LogicFlowCompartment"; //$NON-NLS-1$
-	
-	// Logic Shape Icons
-	public static final String ICON_LED            = "ledicon16.gif";  //$NON-NLS-1$
-	public static final String ICON_LOGICFLOW	   = "logicflow16.gif"; //$NON-NLS-1$
-	public static final String ICON_CIRCUIT		   = "circuit16.gif"; //$NON-NLS-1$
-	public static final String ICON_ORGATE		   = "or16.gif"; //$NON-NLS-1$
-	public static final String ICON_ANDGATE		   = "and16.gif"; //$NON-NLS-1$
-	public static final String ICON_XORGATE		   = "xor16.gif"; //$NON-NLS-1$
-	public static final String ICON_HALFADDER	   = "halfadder16.gif"; //$NON-NLS-1$
-	public static final String ICON_FULLADDER	   = "fulladder16.gif"; //$NON-NLS-1$
-	
-	// Supported Connections
-	public static final String TOOL_CONNECTION     = "wire"; //$NON-NLS-1$
-	// Connection Icons
-	public static final String ICON_CONNECTION     = "connection16.gif";  //$NON-NLS-1$
-	
-	public static List getSupportedShapes() {
-		
-		List toReturn = new ArrayList();
-		
-		toReturn.add( TOOL_LED );
-		toReturn.add( TOOL_FLOWCONTAINER );
-		toReturn.add( TOOL_CIRCUIT );
-		toReturn.add( TOOL_ORGATE );
-		toReturn.add( TOOL_ANDGATE );
-		toReturn.add( TOOL_XORGATE );
-		toReturn.add( TOOL_HALFADDER );
-		toReturn.add( TOOL_FULLADDER );
-		
-		return toReturn;
-	}
-	
-	public static List getSupportedConnections() {
-		
-		List toReturn = new ArrayList();
-		
-		toReturn.add( TOOL_CONNECTION );
-			
-		return toReturn;
-	}
-	
-	public static String getShapeLocalizedType(String typeName) {
-		return getShapeLabel(typeName).replaceFirst("&", "");//$NON-NLS-2$//$NON-NLS-1$
-	}
-	
-	public static String getDisplayName(String label) {
-		return label.replaceFirst("&", "");//$NON-NLS-2$//$NON-NLS-1$
-	}
-	
-	public static String getShapeLabel( String toGet ) {
-		
-		if( toGet.equals( TOOL_LED ) )
-			return ExampleDiagramLogicMessages.logic_LEDTool_Label;
-		if( toGet.equals( TOOL_FLOWCONTAINER ) )
-			return ExampleDiagramLogicMessages.logic_LogicFlowTool_Label;
-		if( toGet.equals( TOOL_CIRCUIT ) )
-			return ExampleDiagramLogicMessages.logic_CircuitTool_Label; 
-		if( toGet.equals( TOOL_ORGATE ) )
-			return ExampleDiagramLogicMessages.logic_OrGateTool_Label; 
-		if( toGet.equals( TOOL_ANDGATE ) )
-			return ExampleDiagramLogicMessages.logic_AndGateTool_Label; 
-		if( toGet.equals( TOOL_XORGATE ) )
-			return ExampleDiagramLogicMessages.logic_XORGateTool_Label; 
-		if( toGet.equals( TOOL_HALFADDER ) )
-			return ExampleDiagramLogicMessages.logic_HalfAdderTool_Label; 
-		if( toGet.equals( TOOL_FULLADDER ) )
-			return ExampleDiagramLogicMessages.logic_FullAdderTool_Label; 
-		
-		return ExampleDiagramLogicMessages.logic_Shape_Label;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicContributionItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicContributionItemProvider.java
deleted file mode 100644
index 5cb8d3d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicContributionItemProvider.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions.DeleteSemanticAction;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions.IncrementDecrementAction;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions.LogicActionIds;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.printing.actions.PrintPreviewAction;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.EnhancedPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.RenderedPrintPreviewAction;
-import org.eclipse.jface.action.IAction;
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- *
- * Collects all the actions that are provided by the logic diagram plug-in.
- */
-public class LogicContributionItemProvider 
-	extends AbstractContributionItemProvider
-	implements LogicActionIds {
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider#createAction(java.lang.String, org.eclipse.gmf.runtime.common.ui.internal.util.IWorkbenchPartDescriptor)
-	 */
-	protected IAction createAction(
-			String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-		
-		if (actionId.equals(ACTION_INCREMENT_VALUE) || actionId.equals(ACTION_DECREMENT_VALUE)) {
-			return new IncrementDecrementAction(partDescriptor.getPartPage(), actionId);
-		} else if (actionId.equals(DELETE_SEMANTIC_VALUE)) {
-			return new DeleteSemanticAction(partDescriptor.getPartPage());
-		} else if (actionId.equals(PrintPreviewAction.ID)) {
-			return new RenderedPrintPreviewAction(new EnhancedPrintActionHelper());
-		}
-
-		return super.createAction(actionId, partDescriptor);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicEditPartProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicEditPartProvider.java
deleted file mode 100644
index 1007812..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicEditPartProvider.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.CircuitEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LEDEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicFlowCompartmentEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicFlowContainerEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicGateEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicShapeCompartmentEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.TerminalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.WireEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Editpart provider for the logic diagram.
- * 
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-
-public class LogicEditPartProvider extends AbstractEditPartProvider {	
-	
-	/** list of supported shape editparts. */
-	private Map shapeMap = new HashMap();
-	{
-		shapeMap.put( SemanticPackage.eINSTANCE.getLED(), LEDEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getFlowContainer(), LogicFlowContainerEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getCircuit(), CircuitEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getOrGate(), LogicGateEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getAndGate(), LogicGateEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getXORGate(), LogicGateEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getInputTerminal(), TerminalEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getOutputTerminal(), TerminalEditPart.class );
-		shapeMap.put( SemanticPackage.eINSTANCE.getInputOutputTerminal(), TerminalEditPart.class );
-	}
-	
-	/** list of supported connector editparts. */
-	private Map connectorMap = new HashMap();
-	{
-		connectorMap.put(SemanticPackage.eINSTANCE.getWire(), WireEditPart.class );
-	}
-	
-	/** list of supported shape compartment editparts */
-	private Map shapeCompartmentMap = new HashMap();
-	{
-		shapeCompartmentMap.put(LogicConstants.LOGIC_SHAPE_COMPARTMENT, LogicShapeCompartmentEditPart.class); 
-	}
-	
-	/** list of supported list compartment editparts */
-	private Map listCompartmentMap = new HashMap();
-	{
-		listCompartmentMap.put(LogicConstants.LOGIC_FLOW_COMPARTMENT, LogicFlowCompartmentEditPart.class); 
-	}
-
-	/**
-	 * Gets a diagram's editpart class.
-	 * This method should be overridden by a provider if it wants to provide this service. 
-	 * @param view the view to be <i>controlled</code> by the created editpart
-	 */
-	protected Class getDiagramEditPartClass(View view ) {
-		if (view.getType().equals("logic")) { //$NON-NLS-1$
-            return(DiagramEditPart.class);
-        }
-		return null;
-	}
-	
-	/**
-	 * Set the editpart class to the editpart mapped to the supplied view's semantic hint.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider#setConnectorEditPartClass(org.eclipse.gmf.runtime.diagram.ui.internal.view.IConnectorView)
-	 */
-	protected Class getEdgeEditPartClass(View view) {
-		return(Class) connectorMap.get(getReferencedElementEClass(view));
-	}
-
-	/**
-	 * Gets a Node's editpart class.
-	 * This method should be overridden by a provider if it wants to provide this service. 
-	 * @param view the view to be <i>controlled</code> by the created editpart
-	 */
-	protected Class getNodeEditPartClass(View view ) {
-		Class clazz = null;
-		String semanticHint = view.getType();
-		EClass eClass = getReferencedElementEClass(view);
-		clazz = (Class) listCompartmentMap.get(semanticHint);
-		if(clazz!=null)
-			return clazz;
-		clazz = (Class) shapeCompartmentMap.get(semanticHint);
-		if(clazz!=null)
-			return clazz;
-		clazz =  ((Class)shapeMap.get(eClass));
-		return clazz;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicModelingAssistantProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicModelingAssistantProvider.java
deleted file mode 100644
index f0d7be2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicModelingAssistantProvider.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.ITerminalOwnerEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicFlowCompartmentEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicShapeCompartmentEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util.LogicSemanticType;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantProvider;
-
-/**
- * Provides modeling assistant services for logic diagrams.
- * 
- * @author qili, cmahoney
- */
-public class LogicModelingAssistantProvider
-	extends ModelingAssistantProvider {
-
-	/** List containing the one relationship type -- transition */
-	private static final List wireType = Collections
-		.singletonList(LogicSemanticType.WIRE);
-
-	/** List containing valid types for the target */
-	private static final List targetTypes = new ArrayList(1);
-	static {
-		targetTypes.add(LogicSemanticType.TERMINAL);
-	}
-	
-	/** List containing valid logic shape types for the action bars */
-	private static final List logicShapeTypes = new ArrayList(5);
-	static {
-		logicShapeTypes.add(LogicSemanticType.FLOWCONTAINER);
-		logicShapeTypes.add(LogicSemanticType.CIRCUIT);
-		logicShapeTypes.add(LogicSemanticType.LED);
-		logicShapeTypes.add(LogicSemanticType.ORGATE);
-		logicShapeTypes.add(LogicSemanticType.ANDGATE);
-		logicShapeTypes.add(LogicSemanticType.XORGATE);
-	}
-
-	public List getRelTypesOnSource(IAdaptable source) {
-		if (source.getAdapter(ITerminalOwnerEditPart.class) != null) {
-			return wireType;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	public List getRelTypesOnSourceAndTarget(IAdaptable source,
-			IAdaptable target) {
-		if (source.getAdapter(ITerminalOwnerEditPart.class) != null
-			&& target.getAdapter(ITerminalOwnerEditPart.class) != null) {
-			return wireType;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	public List getRelTypesOnTarget(IAdaptable target) {
-		if (target.getAdapter(ITerminalOwnerEditPart.class) != null) {
-			return wireType;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	public List getTypesForTarget(IAdaptable source,
-			IElementType relationshipType) {
-		if (source.getAdapter(ITerminalOwnerEditPart.class) != null
-			&& wireType.contains(relationshipType)) {
-			return targetTypes;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	public List getTypesForPopupBar(IAdaptable host) {
-		Object ep = host.getAdapter(IGraphicalEditPart.class);
-		if (ep instanceof LogicShapeCompartmentEditPart
-			|| ep instanceof LogicFlowCompartmentEditPart) {
-			return logicShapeTypes;
-		}
-		return Collections.EMPTY_LIST;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicPaletteFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicPaletteFactory.java
deleted file mode 100644
index 7f1d854..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicPaletteFactory.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util.LogicSemanticType;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.diagram.ui.tools.ConnectionCreationTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool;
-
-/**
- * A palette factory for Logic Entries
- * 
- * @author qili, mmostafa
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- */
-public class LogicPaletteFactory
-	extends PaletteFactory.Adapter {
-	
-	/*
-	 *  Create the tool according to type  	 
-	 */
-	public Tool createTool(String toolId) {
-        if (toolId.equals(LogicConstants.TOOL_LED)){
-            return new CreationTool(LogicSemanticType.LED);
-        }else if (toolId.equals(LogicConstants.TOOL_CIRCUIT)) {
-            return new CreationTool(LogicSemanticType.CIRCUIT);
-        }else if (toolId.equals(LogicConstants.TOOL_ORGATE)) {
-            return new CreationTool(LogicSemanticType.ORGATE);
-        }else if (toolId.equals(LogicConstants.TOOL_ANDGATE)) {
-            return new CreationTool(LogicSemanticType.ANDGATE);
-        }else if (toolId.equals(LogicConstants.TOOL_XORGATE)) {
-            return new CreationTool(LogicSemanticType.XORGATE);
-        }else if (toolId.equals(LogicConstants.TOOL_FLOWCONTAINER)) {
-            return new CreationTool(LogicSemanticType.FLOWCONTAINER);
-        
-        }else if (toolId.equals(LogicConstants.TOOL_CONNECTION)) {
-            return new ConnectionCreationTool(LogicSemanticType.WIRE);
-        }
-        return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicViewProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicViewProvider.java
deleted file mode 100644
index c3dd291..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicViewProvider.java
+++ /dev/null

@@ -1,128 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.AndGateViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.CircuitViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.ConnectionPointViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.LEDViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.LogicFlowContainerViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.LogicShapeCompartmentViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.OrGateViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories.XORGateViewFactory;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ListCompartmentViewFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- *
- * View provider for the logic diagram.
- */
-public class LogicViewProvider extends AbstractViewProvider { 
-
-	HashMap diagramMap = new HashMap(); 
-	{
-		diagramMap.put("logic", DiagramViewFactory.class);//$NON-NLS-1$
-	}
-	
-//	 Map to hold the Node Views
-	private Map nodeMap = new HashMap();
-	{
-		nodeMap.put( SemanticPackage.eINSTANCE.getLED(), LEDViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getFlowContainer(), LogicFlowContainerViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getCircuit(), CircuitViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getAndGate(), AndGateViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getOrGate(), OrGateViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getXORGate(), XORGateViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getInputTerminal(), ConnectionPointViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getOutputTerminal(), ConnectionPointViewFactory.class );
-		nodeMap.put( SemanticPackage.eINSTANCE.getInputOutputTerminal(), ConnectionPointViewFactory.class );
-		
-		// Shape Compartments
-		nodeMap.put(LogicConstants.LOGIC_SHAPE_COMPARTMENT, LogicShapeCompartmentViewFactory.class); 
-		// List Compartments
-		nodeMap.put(LogicConstants.LOGIC_FLOW_COMPARTMENT, ListCompartmentViewFactory.class); 
-	}
-	
-	// Map to hold the Line/Connector Views
-	private Map connectorMap = new HashMap();
-	{
-		connectorMap.put(SemanticPackage.eINSTANCE.getWire(), ConnectionViewFactory.class);
-	}
-	
-	/**
-	 * Returns the shape view class to instantiate based on the passed params
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getNodeViewClass(
-		IAdaptable semanticAdapter,
-		View containerView,
-		String semanticHint) {
-		
-		Class clazz = null;
-		
-		if (semanticHint != null &&
-			semanticHint.length() > 0)
-			clazz = (Class)nodeMap.get(semanticHint);
-		
-		if (clazz == null)
-			clazz = (Class)nodeMap.get(getSemanticEClass(semanticAdapter));
-		
-		return clazz;
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider#getDiagramViewClass(IAdaptable, java.lang.String)
-	 */
-	protected Class getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		return (Class) diagramMap.get(diagramKind);
-	}
-	
-	/**
-	 * Returns the connector view class to instantiate based on the passed
-	 * params
-	 * 
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getEdgeViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-		return (Class) connectorMap.get(getSemanticEClass(semanticAdapter));
-	}
-	
-	public static boolean isGateView(View view){
-		EObject element = view.getElement();
-		EClass eClass = element.eClass();
-		if (eClass == SemanticPackage.eINSTANCE.getAndGate() ||
-			eClass == SemanticPackage.eINSTANCE.getOrGate() ||
-			eClass == SemanticPackage.eINSTANCE.getXORGate())
-			return true;
-		return false;
-	}
-}
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/package.html
deleted file mode 100644
index 382094c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the service provider classes for this plugin.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/LogicDiagramActionBarContributor.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/LogicDiagramActionBarContributor.java
deleted file mode 100644
index 45e2e15..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/LogicDiagramActionBarContributor.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.ui.parts;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDiagramEditorWithFlyoutPalette;
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- * 
- * Contribiute logic diagram action bar
- */
-public class LogicDiagramActionBarContributor
-	extends DiagramActionBarContributor {
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor#getEditorClass()
-	 */
-	protected Class getEditorClass() {
-		return FileDiagramEditorWithFlyoutPalette.class;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor#getEditorId()
-	 */
-	protected String getEditorId() {
-		return LogicDiagramPlugin.EDITOR_ID;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/LogicNotationEditor.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/LogicNotationEditor.java
deleted file mode 100644
index e87b3b6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/LogicNotationEditor.java
+++ /dev/null

@@ -1,80 +0,0 @@
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.ui.parts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramDropTargetListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDiagramEditorWithFlyoutPalette;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.TransferData;
-
-
-public class LogicNotationEditor
-	extends FileDiagramEditorWithFlyoutPalette {
-
-	private static final String EDITING_DOMAIN_ID = "org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain"; //$NON-NLS-1$
-	private static final List SUPPORTED_DRAG_DROP_ECLASSES = new ArrayList();
-	static {
-		SUPPORTED_DRAG_DROP_ECLASSES.add(SemanticPackage.eINSTANCE.getLED());
-		SUPPORTED_DRAG_DROP_ECLASSES.add(SemanticPackage.eINSTANCE.getAndGate());
-		SUPPORTED_DRAG_DROP_ECLASSES.add(SemanticPackage.eINSTANCE.getOrGate());
-		SUPPORTED_DRAG_DROP_ECLASSES.add(SemanticPackage.eINSTANCE.getXORGate());
-		SUPPORTED_DRAG_DROP_ECLASSES.add(SemanticPackage.eINSTANCE.getCircuit());
-	}
-	
-	protected String getEditingDomainID() {
-		return EDITING_DOMAIN_ID;
-	}
-	
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-		
-		getDiagramGraphicalViewer().addDropTargetListener(
-			(TransferDropTargetListener) new DiagramDropTargetListener(getDiagramGraphicalViewer(), LocalTransfer.getInstance()) {
-			protected List getObjectsBeingDropped() {
-				TransferData[] data = getCurrentEvent().dataTypes;
-				List eObjects = new ArrayList();
-				
-				for (int i=0; i<data.length; i++) {
-					if (LocalTransfer.getInstance().isSupportedType(data[i])) {
-						IStructuredSelection selection = (IStructuredSelection)LocalTransfer.getInstance().nativeToJava(data[i]);
-						eObjects.addAll(selection.toList());
-					}
-				}
-				return eObjects;
-			}
-			
-			public boolean isEnabled(DropTargetEvent event) {
-				if (super.isEnabled(event)) {
-					Object modelObj = getViewer().getContents().getModel();
-					if (modelObj instanceof EObject) {
-						List eObjects = getDropObjectsRequest().getObjects();
-						
-						if (eObjects == null)
-							return false;
-						
-						for (Iterator i = eObjects.iterator(); i.hasNext();) {
-							Object o = i.next();
-							
-							if (!(o instanceof EObject))
-								return false;
-							
-							if (!SUPPORTED_DRAG_DROP_ECLASSES.contains(((EObject)o).eClass()))
-								return false;
-						}
-						
-						return true;
-					}
-				}
-
-				return false;
-			}
-		});
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/ui/parts/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/LogicDiagramFileCreator.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/LogicDiagramFileCreator.java
deleted file mode 100644
index 530bfe2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/LogicDiagramFileCreator.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.util;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorFileCreator;
-
-
-/**
- * @author qili
- *
- * Class that generates diagram files.
- */
-public class LogicDiagramFileCreator extends IDEEditorFileCreator {
-	
-	private static LogicDiagramFileCreator INSTANCE = new LogicDiagramFileCreator();
-
-	/**
-	 * Method getInstance.
-	 * This class is a singleton that can only be accessed through this static method.
-	 * @return VizDiagramFileCreator The singleton instance
-	 */
-	static public LogicDiagramFileCreator getInstance() {
-		return INSTANCE;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator#getExtension()
-	 */
-	public String getExtension() {
-		return ".logic2"; //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/LogicEditorUtil.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/LogicEditorUtil.java
deleted file mode 100644
index 01f9dff..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/LogicEditorUtil.java
+++ /dev/null

@@ -1,236 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramDebugOptions;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramStatusCodes;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Model;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticFactory;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorUtil;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-/**
- * @author qili
- *
- * Diagram Utility Class for Logic Editor.
- */
-public class LogicEditorUtil extends IDEEditorUtil {
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorUtil#createAndOpenDiagram(org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator, org.eclipse.core.runtime.IPath, java.lang.String, java.io.InputStream, java.lang.String, org.eclipse.ui.IWorkbenchWindow, org.eclipse.core.runtime.IProgressMonitor, boolean, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
-	 */
-	public static final IFile createAndOpenDiagram(
-			DiagramFileCreator diagramFileCreator, IPath containerPath,
-			String fileName, InputStream initialContents, String kind,
-			IWorkbenchWindow dWindow, IProgressMonitor progressMonitor,
-			boolean openEditor, boolean saveDiagram, String semanticResourcePath) {
-
-		IFile newFile = createNewDiagramFile(
-            diagramFileCreator, containerPath, fileName, initialContents, kind,
-            dWindow.getShell(), progressMonitor, semanticResourcePath);
-
-		if (newFile != null && openEditor) {
-			// Since the file resource was created fine, open it for editing
-			// iff requested by the user
-			IDEEditorUtil.openDiagram(newFile, dWindow, saveDiagram,
-                progressMonitor);
-		}
-
-		return newFile;
-	}
-	
-	/**
-	 * Creates a new diagram file resource in the selected container and with
-	 * the selected name. Creates any missing resource containers along the
-	 * path; does nothing if the container resources already exist.
-	 * <p>
-	 * In normal usage, this method is invoked after the user has pressed Finish
-	 * on the wizard; the enablement of the Finish button implies that all
-	 * controls on on this page currently contain valid values.
-	 * </p>
-	 * <p>
-	 * Note that this page caches the new file once it has been successfully
-	 * created; subsequent invocations of this method will answer the same file
-	 * resource without attempting to create it again.
-	 * </p>
-	 * <p>
-	 * This method should be called within a workspace modify operation since it
-	 * creates resources.
-	 * </p>
-	 *
-	 * @return the created file resource, or <code>null</code> if the file was
-	 *         not created
-	 */
-	public static final IFile createNewDiagramFile(
-			DiagramFileCreator diagramFileCreator, IPath containerFullPath,
-			String fileName, InputStream initialContents, final String kind,
-			Shell shell, final IProgressMonitor progressMonitor, final String semanticResourcePath) {
-		
-		/** cache of newly-created file */
-		final IFile newDiagramFile = diagramFileCreator.createNewFile(
-			containerFullPath, fileName, initialContents, shell,
-			new IRunnableContext() {
-
-				public void run(boolean fork, boolean cancelable,
-						IRunnableWithProgress runnable)
-					throws InvocationTargetException, InterruptedException {
-					runnable.run(progressMonitor);
-				}
-			});
-		
-		TransactionalEditingDomain domain = GMFEditingDomainFactory.getInstance().createEditingDomain();
-		final ResourceSet resourceSet =  domain.getResourceSet();
-		
-		AbstractEMFOperation op = new AbstractEMFOperation(domain,
-				ExampleDiagramLogicMessages.LogicWizardPage_Title) {
-			
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-				
-				IFile semanticFile = null;
-				boolean semanticFileIsNew = false;
-				if (semanticResourcePath != null && semanticResourcePath.length() > 0) {
-					semanticFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(semanticResourcePath));
-					if (!semanticFile.exists()) {
-						semanticFileIsNew = true;
-						try {
-							semanticFile.create(new ByteArrayInputStream(new byte[0]), false, progressMonitor);
-						} catch (CoreException e) {
-							Log.error(LogicDiagramPlugin.getInstance(), IStatus.ERROR, e.getMessage(), e);
-							return null;
-						}
-					}
-				}
-				
-				// Fill the contents of the file dynamically
-				Resource notationModel = null;
-				Model semanticModel = null;
-
-				try {
-					newDiagramFile.refreshLocal(IResource.DEPTH_ZERO, null); //RATLC00514368
-					if (semanticFile != null) {
-						semanticFile.refreshLocal(IResource.DEPTH_ZERO, null);
-					}
-					
-					InputStream stream = newDiagramFile.getContents();
-					final String completeFileName = newDiagramFile.getLocation().toOSString();
-
-					try {
-						//Empty file....
-		                notationModel = resourceSet.createResource(URI
-		                    .createFileURI(completeFileName));
-		                
-		                if (semanticFileIsNew) {
-		                	semanticModel = SemanticFactory.eINSTANCE.createModel();
-		                	Resource semanticResource = resourceSet.createResource(URI.createPlatformResourceURI(semanticResourcePath,true));
-		                	
-							semanticResource.getContents().add(semanticModel);
-		                } else if (semanticFile != null){
-		                	semanticModel = (Model) resourceSet.getResource(URI.createPlatformResourceURI(semanticResourcePath,true),true).getContents().get(0);
-		                }
-
-					} finally {
-						stream.close();
-					}
-
-				} catch (Exception e) {
-					Trace.catching(LogicDiagramPlugin.getInstance(),
-						LogicDiagramDebugOptions.EXCEPTIONS_CATCHING,
-						LogicEditorUtil.class, "createNewDiagramFile", //$NON-NLS-1$
-						e);
-				}
-
-
-				if (notationModel != null) {
-					if (semanticModel == null) {
-						semanticModel = SemanticFactory.eINSTANCE.createModel();
-						notationModel.getContents().add(semanticModel);
-					}
-
-		            Diagram view = ViewService.createDiagram(semanticModel, kind,
-		                new PreferencesHint(LogicDiagramPlugin.EDITOR_ID));
-		            
-		            if (view != null) {
-		                notationModel.getContents().add(0,view);
-		                view.getDiagram().setName(newDiagramFile.getName());
-		            }
-
-		            try {
-		                notationModel.save(Collections.EMPTY_MAP);
-		                semanticModel.eResource().save(Collections.EMPTY_MAP);
-		            } catch (IOException e) {
-		                Trace.catching(LogicDiagramPlugin.getInstance(),
-		                    LogicDiagramDebugOptions.EXCEPTIONS_CATCHING,
-		                    LogicEditorUtil.class, "createNewDiagramFile", e); //$NON-NLS-1$
-		                Log.error(LogicDiagramPlugin.getInstance(),
-		                    LogicDiagramStatusCodes.IGNORED_EXCEPTION_WARNING, e
-		                        .getLocalizedMessage());
-		            }
-				}
-				
-				return Status.OK_STATUS;
-			}
-		};
-
-		
-		try {
-			op.execute(new NullProgressMonitor(), null);
-			
-		} catch (ExecutionException e) {
-			Trace.catching(LogicDiagramPlugin.getInstance(),
-                    LogicDiagramDebugOptions.EXCEPTIONS_CATCHING,
-                    LogicEditorUtil.class, "createNewDiagramFile", e); //$NON-NLS-1$
-                Log.error(LogicDiagramPlugin.getInstance(),
-                    LogicDiagramStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                        .getLocalizedMessage());
-		}
-		
-		return newDiagramFile;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/package.html
deleted file mode 100644
index f68690a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains <i>utility</i> classes used by this plugin.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/AndGateViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/AndGateViewFactory.java
deleted file mode 100644
index 66d7562..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/AndGateViewFactory.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The AndGateView Factory class
- * 
- * @author mmostafa
- */
-public class AndGateViewFactory
-	extends LogicGateViewFactory {
-
-    protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) {
-        super.decorateView(containerView, view, semanticAdapter, semanticHint, index,
-            persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setFillColor((FigureUtilities.colorToInteger(LogicColorConstants.andGate)).intValue());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/CircuitViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/CircuitViewFactory.java
deleted file mode 100644
index cb16dd9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/CircuitViewFactory.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The CircuitView Factory class 
- * @author mmostafa
- */
-public class CircuitViewFactory
-	extends AbstractShapeViewFactory {
-
-	/* 
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractNodeViewFactory#decorateView(org.eclipse.gmf.runtime.notation.View, org.eclipse.gmf.runtime.notation.View, org.eclipse.core.runtime.IAdaptable, java.lang.String, int, boolean)
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-			index, persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setFillColor((FigureUtilities.colorToInteger(LogicColorConstants.logicGreen)).intValue());
-        style.setLineColor((FigureUtilities.colorToInteger(LogicColorConstants.connectorGreen)).intValue());
-		getViewService().createNode(semanticAdapter, view,
-			LogicConstants.LOGIC_SHAPE_COMPARTMENT, ViewUtil.APPEND, persisted, getPreferencesHint()); 
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/ConnectionPointViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/ConnectionPointViewFactory.java
deleted file mode 100644
index 2ef2680..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/ConnectionPointViewFactory.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author mmostafa
- */
-public class ConnectionPointViewFactory extends AbstractShapeViewFactory {
-    protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) {
-        super.decorateView(containerView, view, semanticAdapter, semanticHint, index,
-            persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setFillColor((FigureUtilities.colorToInteger(LogicColorConstants.connectorGreen)).intValue());
-        style.setLineColor((FigureUtilities.colorToInteger(LogicColorConstants.logicBlack)).intValue());
-    }	
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LEDViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LEDViewFactory.java
deleted file mode 100644
index 46a6c4a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LEDViewFactory.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The LEDView Factory class 
- * @author mmostafa
- */
-public class LEDViewFactory
-	extends AbstractShapeViewFactory {
-
-    protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) {
-        super.decorateView(containerView, view, semanticAdapter, semanticHint, index,
-            persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setFontColor((FigureUtilities.colorToInteger(LogicColorConstants.displayText)).intValue());
-        style.setFontHeight(19);
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicFlowContainerViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicFlowContainerViewFactory.java
deleted file mode 100644
index 17f32d7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicFlowContainerViewFactory.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The LogicFlowContainerView Factory class 
- * @author mmostafa
- */
-public class LogicFlowContainerViewFactory
-	extends AbstractShapeViewFactory {
-
-	/**
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param persisted
-	 */
-	public View createView(IAdaptable semanticAdapter, View containerView,
-			String semanticHint, int index, boolean persisted, final PreferencesHint preferencesHint) {
-		View view =  super.createView(semanticAdapter, containerView, semanticHint,
-			index, persisted, preferencesHint);
-		return view;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.view.AbstractNodeView#decorateView(org.eclipse.gmf.runtime.diagram.ui.internal.view.IContainerView,
-	 *      org.eclipse.core.runtime.IAdaptable, java.lang.String, int, boolean)
-	 */
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		super.decorateView(containerView, view, semanticAdapter, semanticHint,
-			index, persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setFillColor((FigureUtilities.colorToInteger(LogicColorConstants.logicGreen)).intValue());
-        style.setLineColor((FigureUtilities.colorToInteger(LogicColorConstants.logicBlack)).intValue());
-		getViewService().createNode(semanticAdapter, view,
-			LogicConstants.LOGIC_FLOW_COMPARTMENT, ViewUtil.APPEND, getPreferencesHint());	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicGateViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicGateViewFactory.java
deleted file mode 100644
index 18f417b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicGateViewFactory.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The LogicGateView Factory class 
- * @author mmostafa
- */
-public class LogicGateViewFactory
-	extends AbstractShapeViewFactory {
-
-    protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) {
-        super.decorateView(containerView, view, semanticAdapter, semanticHint, index,
-            persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setLineColor((FigureUtilities.colorToInteger(LogicColorConstants.logicBlack)).intValue());
-
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicShapeCompartmentViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicShapeCompartmentViewFactory.java
deleted file mode 100644
index f987e1e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/LogicShapeCompartmentViewFactory.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ResizableCompartmentViewFactory;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The LogicShapeCompartmentView Factory class 
- * @author mmostafa
- */
-public class LogicShapeCompartmentViewFactory
-	extends ResizableCompartmentViewFactory {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractViewFactory#createStyles(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		styles.add(NotationFactory.eINSTANCE
-			.createCanonicalStyle());
-		return styles;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/OrGateViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/OrGateViewFactory.java
deleted file mode 100644
index b813cd6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/OrGateViewFactory.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The OrGateView Factory class
- * 
- * @author mmostafa
- */
-public class OrGateViewFactory
-	extends LogicGateViewFactory {
-
-    protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) {
-        super.decorateView(containerView, view, semanticAdapter, semanticHint, index,
-            persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setFillColor((FigureUtilities.colorToInteger(LogicColorConstants.orGate)).intValue());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/XORGateViewFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/XORGateViewFactory.java
deleted file mode 100644
index a0f325c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/XORGateViewFactory.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.views.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The XORGateView Factory class
- * 
- * @author mmostafa
- */
-public class XORGateViewFactory
-	extends LogicGateViewFactory {
-    
-    protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) {
-        super.decorateView(containerView, view, semanticAdapter, semanticHint, index,
-            persisted);
-        ShapeStyle style = (ShapeStyle)view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-        style.setFillColor((FigureUtilities.colorToInteger(LogicColorConstants.xorGate)).intValue());
-
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/package.html
deleted file mode 100644
index d477353..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/views/factories/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicCreationWizard.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicCreationWizard.java
deleted file mode 100644
index 990bbad..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicCreationWizard.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.wizards;
-
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorCreationWizard;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- *
- * Create Logic Diagram Wizard
- */
-public class LogicCreationWizard extends EditorCreationWizard{
-	
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
-	public void addPages() {
-		super.addPages();
-
-		if (page == null)
-			page = new LogicWizardPage(getWorkbench(), getSelection());
-
-		addPage(page);
-	}
-	
-	public void init(IWorkbench workbench, IStructuredSelection sel) {
-		super.init(workbench, sel);
-
-		setWindowTitle(ExampleDiagramLogicMessages.CreationWizard_New_Logic_Diagram);
-		setDefaultPageImageDescriptor(ExampleDiagramLogicPluginImages.DESC_LOGIC_WIZARD);
-		setNeedsProgressMonitor(true);
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicWizardPage.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicWizardPage.java
deleted file mode 100644
index 0aac140..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicWizardPage.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.diagram.logic.internal.wizards;
-
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.LogicDiagramFileCreator;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.LogicEditorUtil;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.examples.runtime.diagram.logic.*
- *
- * Create Logic Diagram Wizard Page
- */
-public class LogicWizardPage extends EditorWizardPage{
-
-	private Button separateSemantics;
-	private Text semanticResource;
-
-	/**
-	 * LogicDiagramWizardPage constructor
-	 *
-	 * @param aWorkbench
-	 *            workbench
-	 * @param selection
-	 *            selection
-	 */
-	public LogicWizardPage(IWorkbench aWorkbench,
-			IStructuredSelection selection) {
-		super("LogicDiagramPage", aWorkbench, selection); //$NON-NLS-1$
-		this.setTitle(ExampleDiagramLogicMessages.LogicWizardPage_Title);
-		this.setDescription(ExampleDiagramLogicMessages.LogicWizardPage_Description);
-	}
-	
-	public IFile createAndOpenDiagram(
-			IPath containerPath,
-			String fileName,
-			InputStream initialContents,
-			String kind,
-			IWorkbenchWindow dWindow,
-			IProgressMonitor progressMonitor,
-			boolean saveDiagram) {
-		
-		String semanticResourcePath = null;
-		
-		if (separateSemantics.getSelection()
-				&& semanticResource.getText().length() > 0) {
-			
-			semanticResourcePath = semanticResource.getText();
-		}
-		
-		return LogicEditorUtil.createAndOpenDiagram(
-				getDiagramFileCreator(),
-				containerPath,
-				fileName,
-				initialContents,
-				kind,
-				dWindow,
-				progressMonitor,
-				isOpenNewlyCreatedDiagramEditor(),
-				saveDiagram,
-				semanticResourcePath);
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage#getDefaultFileName()
-	 */
-	protected String getDefaultFileName() {
-		return ExampleDiagramLogicMessages.LogicVisualizer_DefaultLogicDiagramFileName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage#getDiagramFileCreator()
-	 */
-	public DiagramFileCreator getDiagramFileCreator() {
-		return LogicDiagramFileCreator.getInstance();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorWizardPage#getDiagramKind()
-	 */
-	protected String getDiagramKind() {
-		return "logic"; //$NON-NLS-1$
-	}
-	
-	protected void createAdvancedControls(Composite parent) {
-		super.createAdvancedControls(parent);
-		
-		separateSemantics = new Button(parent,SWT.CHECK);
-		separateSemantics.setText(ExampleDiagramLogicMessages.LogicWizardPage_StoreSemanticsSeparately);
-		separateSemantics.setSelection(false);
-		
-        Composite separateSemanticsGroup = new Composite(parent, SWT.NONE);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 4;
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        separateSemanticsGroup.setLayout(layout);
-        GridData data = new GridData(GridData.FILL_HORIZONTAL);
-        separateSemanticsGroup.setLayoutData(data);
-		
-        semanticResource = new Text(separateSemanticsGroup, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-        data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-        data.horizontalSpan = 2;
-        semanticResource.setLayoutData(data);
-        semanticResource.setEnabled(false);
-        
-        // browse button
-        final Button browseButton = new Button(separateSemanticsGroup, SWT.PUSH);      
-        browseButton.setText(ExampleDiagramLogicMessages.LogicWizardPage_BrowseSemanticResource);
-        browseButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                handleBrowseButtonPressed();
-            }
-        });
-        browseButton.setEnabled(false);
-        setButtonLayoutData(browseButton);
-        
-		separateSemantics.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				semanticResource.setEnabled(!semanticResource.getEnabled());
-				browseButton.setEnabled(!browseButton.getEnabled());
-				semanticResource.setText(getContainerFullPath().append(getFileName()).removeFileExtension().addFileExtension("logic2semantic").toString()); //$NON-NLS-1$
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// Do nothing
-			}
-		});
-	}
-
-	protected void handleBrowseButtonPressed() {
-		ResourceSelectionDialog dialog = new ResourceSelectionDialog(getShell(),ResourcesPlugin.getWorkspace().getRoot(), ExampleDiagramLogicMessages.LogicWizardPage_BrowseSemanticDialogTitle);
-		
-		if (dialog.open() == ResourceSelectionDialog.OK) {
-			if (dialog.getResult().length == 0)
-				return;
-			
-			IResource r = (IResource)dialog.getResult()[0];
-			semanticResource.setText(r.getFullPath().toString());
-		}
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/package.html b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/.classpath b/org.eclipse.gmf.examples.runtime.emf.clipboard/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.examples.runtime.emf.clipboard/.cvsignore b/org.eclipse.gmf.examples.runtime.emf.clipboard/.cvsignore
deleted file mode 100644
index ef5815d..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-*.zip

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/.externalToolBuilders/Zip EMF Clipboard Copypaste Example.launch b/org.eclipse.gmf.examples.runtime.emf.clipboard/.externalToolBuilders/Zip EMF Clipboard Copypaste Example.launch
deleted file mode 100644
index cf221d3..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/.externalToolBuilders/Zip EMF Clipboard Copypaste Example.launch
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.gmf.examples.runtime.emf.clipboard&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project:/buildZip.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/.project b/org.eclipse.gmf.examples.runtime.emf.clipboard/.project
deleted file mode 100644
index 1107bbc..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/.project
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.emf.clipboard</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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Zip EMF Clipboard Copypaste Example.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.emf.clipboard/META-INF/MANIFEST.MF
deleted file mode 100644
index 1be5a02..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.emf.clipboard; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.emf.clipboard.ClipboardExamplePlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.emf.clipboard,
- org.eclipse.gmf.examples.runtime.emf.clipboard.actions,
- org.eclipse.gmf.examples.runtime.emf.clipboard.internal.l10n,
- org.eclipse.gmf.examples.runtime.emf.clipboard.library,
- org.eclipse.gmf.examples.runtime.emf.clipboard.transfer
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.change;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.clipboard.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.examples.library.editor;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/about.html b/org.eclipse.gmf.examples.runtime.emf.clipboard/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/build.properties b/org.eclipse.gmf.examples.runtime.emf.clipboard/build.properties
deleted file mode 100644
index 8791d1b..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/build.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-src.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               .project,\
-               build.properties,\
-               .classpath
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/buildZip.xml b/org.eclipse.gmf.examples.runtime.emf.clipboard/buildZip.xml
deleted file mode 100644
index 0a06dc7..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/buildZip.xml
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="zip.source" basedir=".">
-
-	<target name="init">
-		<property name="project.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-	</target>
-
-	<target name="zip.source" depends="init" description="Zip all source code.">
-
-		<!-- Copy & map Query.java -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.java,**/*.properties,.classpath,plugin.xml,**/MANIFEST.MF"/>
-						
-			<!-- Suppress tokens -->
-			<filterset
-	      		begintoken="/*"
-	      		endtoken="*/">
-		    		<filter
-		      			token="@BEGIN@"
-			      		value=""/>
-		    		<filter
-		      			token="@END@"
-			      		value=""/>
-			</filterset>
-		</copy>
-
-		<!-- Copy binaries -->
-		<copy toDir="${temp.folder}">
-			<fileset dir="${project.folder}"
-				includes="**/*.gif"/>
-		</copy>
-				
-		<!-- Zip file in temporary folder -->		
-		<zip
-			destfile="${project.folder}\emf-clipboard-copypaste.zip"
-			basedir="${temp.folder}"
-			filesonly="false"
-			whenempty="skip"
-		/>
-
-		<!-- Delete temporary folder -->		
-		<delete dir="${temp.folder}"/>
-		
-	</target>
-	
-</project>

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/copy.gif b/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/copy.gif
deleted file mode 100644
index 71d7c95..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/copy.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/cut.gif b/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/cut.gif
deleted file mode 100644
index d044e59..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/cut.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/paste.gif b/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/paste.gif
deleted file mode 100644
index 39dd4d9..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/icons/paste.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/plugin.properties b/org.eclipse.gmf.examples.runtime.emf.clipboard/plugin.properties
deleted file mode 100644
index e00c50d..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/plugin.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-Plugin.name = GMF Clipboard Support Example Plug-in
-Plugin.providerName = Eclipse.org
-
-_UI_ClipMenu_label = Clip&board
-_UI_Copy_label = &Copy
-_UI_Paste_label = &Paste

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/plugin.xml b/org.eclipse.gmf.examples.runtime.emf.clipboard/plugin.xml
deleted file mode 100644
index 3f6fb3c..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/plugin.xml
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <!-- Register the clipboard support for the Library metamodel -->
-   <extension point="org.eclipse.gmf.runtime.emf.clipboard.core.clipboardSupport">
-      <factory
-            class="org.eclipse.gmf.examples.runtime.emf.clipboard.library.LibraryClipboardSupportFactory"
-            nsURI="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0"
-            priority="medium"/>
-   </extension>
-   
-   <!-- Register an extension parser for the library metamodel, to ensure that
-        we use resources that assign UUIDs to elements. -->
-   <!-- For the time-being, we will assume that the org.eclipse.gmf.example.runtime.emf plugin is installed and
-         will provide us with a viable MResource that supports UUIDs. -->
-   <!-- <extension point="org.eclipse.emf.ecore.extension_parser">
-      <parser
-            type="extlibrary"
-            class="org.eclipse.gmf.examples.runtime.emf.clipboard.library.LibraryResourceFactory"/>
-   </extension> -->
-   
-   <extension point="org.eclipse.ui.editorActions"> 
-      <editorContribution 
-         id="org.eclipse.emf.query.examples.ocl.editorContribution" 
-         targetID="org.eclipse.emf.examples.extlibrary.presentation.EXTLibraryEditorID"> 
-         <menu
-               label="%_UI_ClipMenu_label"
-               path="org.eclipse.emf.examples.extlibraryMenuID/additions"
-               id="org.eclipse.gmf.runtime.emf.clipboard.coreMenuID">
-            <separator name="additions"/>
-         </menu>
-         <action
-               label="%_UI_Paste_label"
-               class="org.eclipse.gmf.examples.runtime.emf.clipboard.actions.PasteDelegate"
-               menubarPath="org.eclipse.emf.examples.extlibraryMenuID/org.eclipse.gmf.runtime.emf.clipboard.coreMenuID/additions"
-               icon="icons/paste.gif"
-               id="org.eclipse.gmf.examples.runtime.emf.clipboard.PasteAction">
-            <!--<enablement>
-               <objectClass
-                     name="org.eclipse.emf.ecore.EObject">
-               </objectClass>
-            </enablement>-->
-         </action>
-         <action
-               label="%_UI_Copy_label"
-               class="org.eclipse.gmf.examples.runtime.emf.clipboard.actions.CopyDelegate"
-               menubarPath="org.eclipse.emf.examples.extlibraryMenuID/org.eclipse.gmf.runtime.emf.clipboard.coreMenuID/additions"
-               icon="icons/copy.gif"
-               id="org.eclipse.gmf.examples.runtime.emf.clipboard.CopyAction">
-            <enablement>
-               <objectClass
-                     name="org.eclipse.emf.ecore.EObject">
-               </objectClass>
-            </enablement>
-         </action>
-      </editorContribution> 
-   </extension> 
-   
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            targetID="org.eclipse.emf.examples.extlibrary.presentation.EXTLibraryEditorID"
-            id="org.eclipse.gmf.examples.runtime.emf.clipboard.viewerContribution">
-         <menu
-               label="%_UI_ClipMenu_label"
-               path="additions"
-               id="org.eclipse.gmf.runtime.emf.clipboard.coreMenuID">
-            <separator name="additions"/>
-         </menu>
-         <action
-               label="%_UI_Paste_label"
-               class="org.eclipse.gmf.examples.runtime.emf.clipboard.actions.PasteDelegate"
-               menubarPath="org.eclipse.gmf.runtime.emf.clipboard.coreMenuID/additions"
-               icon="icons/paste.gif"
-               id="org.eclipse.gmf.examples.runtime.emf.clipboard.PasteAction">
-            <!--<enablement>
-               <objectClass
-                     name="org.eclipse.emf.ecore.EObject">
-               </objectClass>
-            </enablement>-->
-         </action>
-         <action
-               label="%_UI_Copy_label"
-               class="org.eclipse.gmf.examples.runtime.emf.clipboard.actions.CopyDelegate"
-               menubarPath="org.eclipse.gmf.runtime.emf.clipboard.coreMenuID/additions"
-               icon="icons/copy.gif"
-               id="org.eclipse.gmf.examples.runtime.emf.clipboard.CopyAction">
-            <enablement>
-               <objectClass
-                     name="org.eclipse.emf.ecore.EObject">
-               </objectClass>
-            </enablement>
-         </action>
-      </viewerContribution>
-   </extension>
-</plugin>

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/ClipboardExamplePlugin.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/ClipboardExamplePlugin.java
deleted file mode 100644
index d719d48..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/ClipboardExamplePlugin.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.examples.runtime.emf.clipboard;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ClipboardExamplePlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static ClipboardExamplePlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public ClipboardExamplePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ClipboardExamplePlugin getDefault() {
-		return plugin;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/AbstractClipboardDelegate.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/AbstractClipboardDelegate.java
deleted file mode 100644
index 85c34ab..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/AbstractClipboardDelegate.java
+++ /dev/null

@@ -1,173 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.actions;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.examples.extlibrary.presentation.EXTLibraryEditor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionDelegate;
-
-
-/**
- * Abstract action delegate for copy/paste actions; provides common behaviours
- * for managing the selection, etc.
- */
-abstract class AbstractClipboardDelegate
-	extends ActionDelegate
-	implements IEditorActionDelegate {
-
-	/**
-	 * The shell this action is hosted in.
-	 */
-	private Shell shell = null;
-
-	/**
-	 * The active editor
-	 */
-	private EXTLibraryEditor editor = null;
-
-	/**
-	 * Selected {@link EObject}s.
-	 */
-	private Collection selectedEObjects = Collections.EMPTY_SET;
-
-	/**
-	 * Selected {@link Resource}s
-	 */
-	private Collection selectedResources = Collections.EMPTY_SET;
-	
-	/**
-	 * Initializes me.
-	 */
-	protected AbstractClipboardDelegate() {
-		super();
-	}
-	
-	/**
-	 * Retrieves the user's selection.
-	 * 
-	 * @return a collection of selected {@link EObject}s
-	 */
-	protected Collection getSelectedObjects() {
-		return selectedEObjects;
-	}
-	
-	/**
-	 * Retrieves the user's selected resources.
-	 * 
-	 * @return a collection of selected {@link Resouce}s
-	 */
-	protected Collection getSelectedResources() {
-		return selectedResources;
-	}
-
-	/**
-	 * Obtains the shell to use for opening dialogs.
-	 * 
-	 * @return my shell
-	 */
-	protected Shell getShell() {
-		return shell;
-	}
-	
-	/**
-	 * Selects the specified <code>objects</code> in the current editor.
-	 * 
-	 * @param objects the objects to select (may be empty)
-	 */
-	protected void selectInEditor(Collection objects) {
-		editor.setSelectionToViewer(objects);
-	}
-	
-	/**
-	 * Accesses the current editor.
-	 * 
-	 * @return the current editor
-	 */
-	protected EXTLibraryEditor getEditor() {
-		return editor;
-	}
-	
-	/**
-	 * Template method that delegates to subclasses to run with a clipboard.
-	 */
-	public final void run(IAction action) {
-		Clipboard clipboard = null;
-
-		try {
-			clipboard = new Clipboard(getShell().getDisplay());
-			
-			doRun(clipboard);
-		} finally {
-			if (clipboard != null) {
-				// must clean up the clipboard that we created
-				clipboard.dispose();
-			}
-		}
-	}
-
-	/**
-	 * Implemented by sublasses to do their copy or paste to or from the
-	 * specified clipboard.
-	 * 
-	 * @param clipboard the clipboard.  Must not be disposed by the receiver
-	 */
-	protected abstract void doRun(Clipboard clipboard);
-
-	/**
-	 * Gets all of the {@link EObject}s in the current selection, if any.
-	 */
-	public void selectionChanged(IAction action, final ISelection selection) {
-		selectedEObjects = Collections.EMPTY_SET;
-		selectedResources = Collections.EMPTY_SET;
-		
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			selectedEObjects = new java.util.ArrayList();
-			selectedResources = new java.util.ArrayList();
-			
-			for (Iterator iter = structuredSelection.iterator(); iter.hasNext();) {
-				Object next = iter.next();
-				
-				if (next instanceof EObject) {
-					selectedEObjects.add(next);
-				} else if (next instanceof Resource) {
-					selectedResources.add(next);
-				}
-			}
-		}
-		
-		action.setEnabled(!selectedEObjects.isEmpty());
-	}
-
-	/**
-	 * Get the active library editor and its host shell.
-	 */
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		editor = (EXTLibraryEditor) targetEditor;
-		
-		if (targetEditor != null) {
-			this.shell = targetEditor.getSite().getShell();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/CopyDelegate.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/CopyDelegate.java
deleted file mode 100644
index 81f8a58..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/CopyDelegate.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.actions;
-
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.Transfer;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
-import org.eclipse.gmf.examples.runtime.emf.clipboard.transfer.EmfTransfer;
-import org.eclipse.gmf.examples.runtime.emf.clipboard.transfer.EmfTransferType;
-
-
-
-/**
- * Action delegate for the Library-metamodel-aware Copy action.
- */
-public class CopyDelegate
-	extends AbstractClipboardDelegate {
-
-	/**
-	 * Initializes me.
-	 */
-	public CopyDelegate() {
-		super();
-	}
-
-	/**
-	 * Copies the selected elements to the clipboard, in string form.  No hints
-	 * are required for the copy operation.
-	 */
-	protected void doRun(Clipboard clipboard) {
-		String clipString = ClipboardUtil.copyElementsToString(
-			getSelectedObjects(),
-			null,
-			null);
-		
-		if (clipString == null) {
-			return;
-		}
-		
-		// use the customer EMF data transfer type provided by this plug-in
-		clipboard.setContents(
-			new EmfTransferType[] {new EmfTransferType(clipString)},
-			new Transfer[] {EmfTransfer.getInstance()});
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/PasteDelegate.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/PasteDelegate.java
deleted file mode 100644
index 22dcb40..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/PasteDelegate.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.actions;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.gmf.examples.runtime.emf.clipboard.internal.l10n.EMFClipboardMessages;
-import org.eclipse.gmf.examples.runtime.emf.clipboard.transfer.EmfTransfer;
-import org.eclipse.gmf.examples.runtime.emf.clipboard.transfer.EmfTransferType;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.Clipboard;
-
-
-/**
- * Action delegate for the Library-metamodel-aware Paste action.  The paste
- * action is undoable.
- */
-public class PasteDelegate
-	extends AbstractClipboardDelegate {
-
-	private static final String PROBLEMS_TITLE = EMFClipboardMessages.pasteProblems_title;
-	private static final String PROBLEMS_MESSAGE = EMFClipboardMessages.pasteProblems_msg;
-	
-	/**
-	 * Initializes me.
-	 */
-	public PasteDelegate() {
-		super();
-	}
-
-	/**
-	 * Pastes elements from the clipboard.  No hints are required for this paste
-	 * operation.
-	 */
-	protected void doRun(final Clipboard clipboard) {
-		final Collection objectsPasted = new java.util.HashSet();
-		
-		EditingDomain domain = getEditor().getEditingDomain();
-		
-		CompoundCommand command = new CompoundCommand(EMFClipboardMessages.paste_label);
-		
-		// add a command that does the paste to the composite
-		command.append(new RecordingCommand(
-			domain,
-			"", //$NON-NLS-1$
-			new Runnable() {
-				public void run() {
-					doRun(clipboard, objectsPasted);
-				}}));
-		
-		// another command to select the pasted elements.
-		//    It does nothing on undo
-		command.append(new SelectionCommand(objectsPasted));
-		
-		// execute the composite
-		domain.getCommandStack().execute(command);
-	}
-	
-	/**
-	 * Implementation of the <code>Runnable</code>'s run method in the change
-	 * command.
-	 * 
-	 * @param clipboard the clipboard to paste from
-	 * @param objectsPasted accumulates the objects pasted
-	 */
-	void doRun(Clipboard clipboard, Collection objectsPasted) {
-		boolean problems = false;
-		
-		// use the customer EMF data transfer type provided by this plug-in
-		EmfTransferType data = (EmfTransferType) clipboard.getContents(
-			EmfTransfer.getInstance());
-		
-		if (data != null) {
-			String clipString = data.getString();
-			
-			// paste into each selected element
-			for (Iterator iter = getSelectedObjects().iterator(); iter.hasNext();) {
-				EObject target = (EObject) iter.next();
-				
-				Collection pasted = ClipboardUtil.pasteElementsFromString(
-					clipString, target, null, null);
-				
-				if (pasted == null || pasted.isEmpty()) {
-					problems = true;
-				} else {
-					objectsPasted.addAll(pasted);
-				}
-			}
-
-			// paste into each selected resource
-			for (Iterator iter = getSelectedResources().iterator(); iter.hasNext();) {
-				Resource target = (Resource) iter.next();
-				
-				Collection pasted = ClipboardUtil.pasteElementsFromString(
-					clipString, target, null, null);
-				
-				if (pasted == null || pasted.isEmpty()) {
-					problems = true;
-				} else {
-					objectsPasted.addAll(pasted);
-				}
-			}
-		}
-		
-		if (problems) {
-			MessageDialog.openInformation(
-				getShell(), PROBLEMS_TITLE, PROBLEMS_MESSAGE);
-		}
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, final ISelection selection) {
-		super.selectionChanged(action, selection);
-		if (!action.isEnabled()) {
-			action.setEnabled(!getSelectedResources().isEmpty());
-		}
-	}
-
-	/**
-	 * A command that selects a collection of elements in the editor whenever
-	 * it is executed or redone.
-	 */
-	private class SelectionCommand extends AbstractCommand {
-		private Collection elementsToSelect;
-		
-		/**
-		 * Initializes me with the <code>elements</code> to select.
-		 * 
-		 * @param elements the elements to select
-		 */
-		SelectionCommand(Collection elements) {
-			this.elementsToSelect = elements;
-		}
-		
-		public void execute() {
-			selectInEditor(elementsToSelect);
-		}
-
-		public void redo() {
-			execute();
-		}
-		
-		public void undo() {
-			// undo is a no-op (deleting the pasted objects
-			//     unselects them, anyway)
-		}
-		
-		protected boolean prepare() {
-			return true;  // nothing to prepare
-		}
-		
-		public void dispose() {
-			elementsToSelect = null;
-		}
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/RecordingCommand.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/RecordingCommand.java
deleted file mode 100644
index dfbbe85..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/actions/RecordingCommand.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.actions;
-
-import java.util.Collections;
-import java.util.Set;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.util.ChangeRecorder;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-
-/**
- * A command that records the changes made by an arbitrary {@link Runnable},
- * to be able to undo them, later.
- */
-public class RecordingCommand
-	extends AbstractCommand {
-
-	private Runnable runnable;
-	private Set notifiers;
-	private ChangeRecorder recorder;
-	private ChangeDescription change;
-	
-	/**
-	 * Initializes me with my label and my runnable to execute.
-	 * 
-	 * @param domain my editing domain
-	 * @param label my label
-	 * @param runnable the change that I need to make
-	 */
-	public RecordingCommand(EditingDomain domain, String label, Runnable runnable) {
-		super(label);
-		this.runnable = runnable;
-		recorder = new ChangeRecorder();
-		notifiers = Collections.singleton(domain.getResourceSet());
-	}
-
-	/**
-	 * I run the runnable when I execute the first time.
-	 */
-	public void execute() {
-		try {
-			recorder.beginRecording(notifiers);
-			runnable.run();
-		} finally {
-			change = recorder.endRecording();
-			runnable = null;
-		}
-	}
-	
-	/**
-	 * I am ready to execute if I haven't recorded any changes, yet.
-	 */
-	protected boolean prepare() {
-		return change == null;
-	}
-	
-	/**
-	 * Applies (undoes) changes recorded previously, recording the new changes
-	 * meanwhile.
-	 */
-	private void applyChanges() {
-		try {
-			recorder.beginRecording(notifiers);
-			change.apply();
-		} finally {
-			change = recorder.endRecording();
-		}
-	}
-	
-	/**
-	 * I can undo if I have recorded any changes previously.
-	 */
-	public boolean canUndo() {
-		return change != null;
-	}
-	
-	/**
-	 * Undoes by applying recorded changes.
-	 */
-	public void undo() {
-		applyChanges();
-	}
-
-	/**
-	 * Redoes by applying changes recorded in the last undo.
-	 */
-	public void redo() {
-		applyChanges();
-	}
-	
-	public void dispose() {
-		change = null;
-		recorder = null;
-		notifiers = null;
-		runnable = null;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/internal/l10n/EMFClipboardMessages.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/internal/l10n/EMFClipboardMessages.java
deleted file mode 100644
index 3dc0fe4..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/internal/l10n/EMFClipboardMessages.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- * 
- * @author Christian Vogt (cvogt)
- */
-public class EMFClipboardMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.examples.runtime.emf.clipboard.internal.l10n.EMFClipboardMessages"; //$NON-NLS-1$
-
-	public static String pasteProblems_title;
-	public static String pasteProblems_msg;
-	public static String paste_label;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFClipboardMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/internal/l10n/EMFClipboardMessages.properties b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/internal/l10n/EMFClipboardMessages.properties
deleted file mode 100644
index bc0d8bf..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/internal/l10n/EMFClipboardMessages.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-pasteProblems_title = Paste Problems
-pasteProblems_msg = Not all elements were successfully pasted.
-paste_label = Paste elements

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryClipboardSupport.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryClipboardSupport.java
deleted file mode 100644
index 7691a14..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryClipboardSupport.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.library;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.AbstractClipboardSupport;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteAction;
-
-
-/**
- * Implementation of copy/paste semantics peculiar to the <code>Library</code>
- * metamodel.  The special semantics that we implement are:
- * <ul>
- *   <li>whenever an Author is copied, all of his/her books are copied, also,
- *       though they are not contained by the author</li>
- *   <li>whenever an Author that is pasted would have the same name as another
- *       already in the destination library, then we don't create a duplicate
- *       but merge the new author with the existing one.  This effectively
- *       adds all of the new author's books that we have copied from another
- *       library to the existing author who, having the same name, is assumed
- *       to be the same person</li>
- *   <li>hints to determine the names of objects, which names are not always
- *       implemented by attributes named "name"</li>
- * </ul>
- *
- * @author Christian W. Damus (cdamus)
- */
-class LibraryClipboardSupport
-	extends AbstractClipboardSupport {
-
-	/**
-	 * Initializes me.
-	 */
-	public LibraryClipboardSupport() {
-		super();
-	}
-
-	/**
-	 * Provide a mapping of name attributes for the <code>EClass</code>es of
-	 * the Library metamodel.
-	 */
-	protected EAttribute getNameAttribute(EClass eClass) {
-		EAttribute result;
-		
-		switch (eClass.getClassifierID()) {
-		case EXTLibraryPackage.BOOK:
-			result = EXTLibraryPackage.eINSTANCE.getBook_Title();
-			break;
-		case EXTLibraryPackage.LIBRARY:
-			result = EXTLibraryPackage.eINSTANCE.getLibrary_Name();
-			break;
-		case EXTLibraryPackage.WRITER:
-			result = EXTLibraryPackage.eINSTANCE.getWriter_Name();
-			break;
-		default:
-			result = null;
-			break;
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Merge an author into an existing author of the same name when pasting.
-	 */
-	public PasteAction getPasteCollisionAction(EClass eClass) {
-		if (eClass == EXTLibraryPackage.eINSTANCE.getWriter()) {
-			return PasteAction.MERGE;
-		} else {
-			return super.getPasteCollisionAction(eClass);
-		}
-	}
-	
-	/**
-	 * We always copy an author's books.
-	 */
-	public boolean isCopyAlways(EObject context, EReference eReference,
-			Object value) {
-		
-		if (eReference == EXTLibraryPackage.eINSTANCE.getWriter_Books()) {
-			return true;
-		} else {
-			return super.isCopyAlways(context, eReference, value);
-		}
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryClipboardSupportFactory.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryClipboardSupportFactory.java
deleted file mode 100644
index 19aef2c..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryClipboardSupportFactory.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.library;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportFactory;
-
-
-/**
- * Factory to create {@link LibraryClipboardSupport}s.
- */
-public class LibraryClipboardSupportFactory
-	implements IClipboardSupportFactory {
-
-	private final IClipboardSupport support = new LibraryClipboardSupport();
-	
-	/**
-	 * Initializes me.
-	 */
-	public LibraryClipboardSupportFactory() {
-		super();
-	}
-
-	public IClipboardSupport newClipboardSupport(EPackage ePackage) {
-		// I only register support for the one Library EPackage
-		return support;
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryResource.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryResource.java
deleted file mode 100644
index c13fad7..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryResource.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.library;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-
-
-/**
- * Custom library resource that uses UUIDs for URI fragments.
- */
-public class LibraryResource
-	extends XMIResourceImpl {
-
-	/**
-	 * Initializes me.
-	 */
-	public LibraryResource() {
-		super();
-	}
-
-	/**
-	 * Initializes me with my URI.
-	 * 
-	 * @param uri my URI
-	 */
-	public LibraryResource(URI uri) {
-		super(uri);
-	}
-
-	/**
-	 * We want to use UUIDs.
-	 * 
-	 * @return <code>true</code>, always
-	 */
-	protected boolean useUUIDs() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryResourceFactory.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryResourceFactory.java
deleted file mode 100644
index f88f804..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/library/LibraryResourceFactory.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.library;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-
-/**
- * Custom factory to create our custom resources.
- * 
- * @see LibraryResource
- */
-public class LibraryResourceFactory
-	extends XMIResourceFactoryImpl {
-
-	/**
-	 * Initializes me.
-	 */
-	public LibraryResourceFactory() {
-		super();
-	}
-
-	/**
-	 * Creates a {@link LibraryResource}.
-	 * 
-	 * @return a new {@link LibraryResource}
-	 */
-	public Resource createResource(URI uri) {
-		return new LibraryResource(uri);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/transfer/EmfTransfer.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/transfer/EmfTransfer.java
deleted file mode 100644
index 35854dd..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/transfer/EmfTransfer.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.transfer;
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-
-
-/**
- * Custom data transfer implementation for the clipboard example.
- */
-public class EmfTransfer
-	extends ByteArrayTransfer {
-
-	private static final String[] TYPE_NAMES = new String[] {"emfClipboardExample"}; //$NON-NLS-1$
-	private static final int[] TYPE_IDS = new int[] {Transfer.registerType(TYPE_NAMES[0])};
-	
-	private static final EmfTransfer INSTANCE = new EmfTransfer();
-	
-	/**
-	 * Initializes me.
-	 */
-	private EmfTransfer() {
-		super();
-	}
-	
-	/**
-	 * Obtains the singleton instance.
-	 * 
-	 * @return the instance
-	 */
-	public static EmfTransfer getInstance() {
-		return INSTANCE;
-	}
-
-	protected int[] getTypeIds() {
-		return TYPE_IDS;
-	}
-
-	protected String[] getTypeNames() {
-		return TYPE_NAMES;
-	}
-
-	/**
-	 * Implements the serialization to the clipboard.
-	 */
-	protected void javaToNative(Object object, TransferData transferData) {
-		if (object == null || !(object instanceof EmfTransferType)) {
-			return;
-		}
-		
-		if (isSupportedType(transferData)) {
-			EmfTransferType data = (EmfTransferType) object;
-			
-			super.javaToNative(data.toBytes(), transferData);
-		}
-	}
-	
-	/**
-	 * Implements deserialization from the clipboard.
-	 */
-	protected Object nativeToJava(TransferData transferData) {
-		EmfTransferType result = null;
-		
-		if (isSupportedType(transferData)) {
-			byte[] bytes = (byte[]) super.nativeToJava(transferData);
-			
-			if (bytes != null) {
-				result = EmfTransferType.fromBytes(bytes);
-			}
-		}
-		
-		return result;
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/transfer/EmfTransferType.java b/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/transfer/EmfTransferType.java
deleted file mode 100644
index bddd245..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/src/org/eclipse/gmf/examples/runtime/emf/clipboard/transfer/EmfTransferType.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.emf.clipboard.transfer;
-
-import java.io.UnsupportedEncodingException;
-
-
-/**
- * Clipboard transfer data type for the clipboard example.
- */
-public final class EmfTransferType {
-	private String string;
-	
-	/**
-	 * Initializes me.
-	 * 
-	 * @param string the string form of a user selection of
-	 *     {@link org.eclipse.emf.ecore.EObject}s.  Must not be <code>null</code>
-	 */
-	public EmfTransferType(String string) {
-		assert string != null;
-		
-		this.string = string;
-	}
-	
-	/**
-	 * Gets the string representation of the
-	 * {@link org.eclipse.emf.ecore.EObject}s retrieved from the clipboard.
-	 * 
-	 * @return the string (will not be <code>null</code>)
-	 */
-	public String getString() {
-		return string;
-	}
-
-	/**
-	 * Converts my data to bytes for the clipboard.
-	 * 
-	 * @return the bytes
-	 */
-	byte[] toBytes() {
-		try {
-			return string.getBytes("UTF-8"); //$NON-NLS-1$
-		} catch (UnsupportedEncodingException e) {
-			// UTF-8 is always supported by the Java platform
-			throw new Error("UTF-8 encoding not supported by String class", e); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Converts bytes from the clipboard to my data.
-	 * 
-	 * @param bytes the bytes
-	 * @return the transfer type
-	 */
-	static EmfTransferType fromBytes(byte[] bytes) {
-		try {
-			return new EmfTransferType(new String(bytes, "UTF-8")); //$NON-NLS-1$
-		} catch (UnsupportedEncodingException e) {
-			// UTF-8 is always supported by the Java platform
-			throw new Error("UTF-8 encoding not supported by String class", e); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/.classpath b/org.eclipse.gmf.examples.runtime.ui.pde/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.examples.runtime.ui.pde/.cvsignore b/org.eclipse.gmf.examples.runtime.ui.pde/.cvsignore
deleted file mode 100644
index 6938697..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc

diff --git "a/org.eclipse.gmf.examples.runtime.ui.pde/.externalToolBuilders/org.eclipse.gmf.examples.runtime.ui.pde Gather Examples \133Builder\135.launch" "b/org.eclipse.gmf.examples.runtime.ui.pde/.externalToolBuilders/org.eclipse.gmf.examples.runtime.ui.pde Gather Examples \133Builder\135.launch"
deleted file mode 100644
index 3261d55..0000000
--- "a/org.eclipse.gmf.examples.runtime.ui.pde/.externalToolBuilders/org.eclipse.gmf.examples.runtime.ui.pde Gather Examples \133Builder\135.launch"
+++ /dev/null

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.ui.pde/gatherExamples.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/.project b/org.eclipse.gmf.examples.runtime.ui.pde/.project
deleted file mode 100644
index 0289616..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/.project
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.ui.pde</name>
-	<comment></comment>
-	<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>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.gmf.examples.runtime.ui.pde Gather Examples [Builder].launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime.ui.pde/META-INF/MANIFEST.MF
deleted file mode 100644
index 87e5f6a..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.examples.runtime.ui.pde; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.examples.runtime.ui.pde.internal,
- org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n,
- org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards,
- org.eclipse.gmf.examples.runtime.ui.pde.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/about.html b/org.eclipse.gmf.examples.runtime.ui.pde/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/build.properties b/org.eclipse.gmf.examples.runtime.ui.pde/build.properties
deleted file mode 100644
index a609e5b..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               .,\
-               examples/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/.cvsignore b/org.eclipse.gmf.examples.runtime.ui.pde/examples/.cvsignore
deleted file mode 100644
index c4c4ffc..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-*.zip

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/gatherExamples.xml b/org.eclipse.gmf.examples.runtime.ui.pde/gatherExamples.xml
deleted file mode 100644
index 5af9c70..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/gatherExamples.xml
+++ /dev/null

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<project default="gather_examples" basedir=".">
-
-	<target name="init">
-		
-		<property name="workspace.folder" value=".."/>
-		<property name="examples.destination" value="${basedir}/examples"/>
-		<property name="examples.icons.destination" value="${basedir}/icons"/>
-		
-		<!-- IMPORTANT: Include new examples here.  Example that is added here must be added as a dependency in plugin.xml of this plugin -->		
-		<patternset id="examples">
-			<include name="org.eclipse.gmf.examples.runtime.diagram.geoshapes/geoshapes.zip"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic/logic.zip"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic.model/logicSemantic.zip"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/logicSemanticEdit.zip"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/logicSemanticEditor.zip"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.decorator/servicesDecorator.zip"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.layout/servicesLayout.zip"/>			
-			<include name="org.eclipse.gmf.examples.runtime.common.service/serviceExample.zip"/>			
-		</patternset>
-
-		<!-- IMPORTANT: Include new example icons here -->	
-		<patternset id="icons">
-			<include name="org.eclipse.gmf.examples.runtime.diagram.geoshapes/icons/geoshape.gif"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic/icons/logic.gif"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic.model/icons/Circuit.gif"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/icons/full/obj16/Element.gif"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/icons/full/obj16/SemanticModelFile.gif"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.decorator/icons/diagram.gif"/>
-			<include name="org.eclipse.gmf.examples.runtime.diagram.layout/icons/diagram2.gif"/>
-		</patternset>
-						
-	</target>
-
-	<target name="gather_examples" depends="init">
-		
-		<copy todir="${examples.destination}" flatten="true">
-			<fileset dir="${workspace.folder}">
-				<patternset refid="examples"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${examples.icons.destination}" flatten="true">
-			<fileset dir="${workspace.folder}">
-				<patternset refid="icons"/>
-			</fileset>
-		</copy>
-		
-	</target>
-	
-</project>
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/icons/.cvsignore b/org.eclipse.gmf.examples.runtime.ui.pde/icons/.cvsignore
deleted file mode 100644
index 2d0c929..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/icons/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-*.gif

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/plugin.properties b/org.eclipse.gmf.examples.runtime.ui.pde/plugin.properties
deleted file mode 100644
index dd15912..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/plugin.properties
+++ /dev/null

@@ -1,40 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-#
-# START TRANSLATABLE
-#
-
-Plugin.name = GMF Examples Plug-in
-Plugin.providerName = Eclipse.org
-
-newWizardCategories.examples.runtimePDEPlugin = GMF (Graphical Modeling Framework) Plug-ins
-
-newWizards.examples.logic.name = Logic
-newWizards.examples.logic.desc = Create plug-ins that collectively contribute an editor to edit a logic diagram using the Modeling Platform Diagram Layer
-
-newWizards.examples.geoshapes.name = Geoshape
-newWizards.examples.geoshapes.desc = Create a plug-in that contributes an editor to edit a diagram containing geometric shapes using the Modeling Platform Diagram Layer
-
-newWizards.examples.layoutservice.name = Square Layout Provider
-newWizards.examples.layoutservice.desc = Create a plug-in that contributes a layout provider that positions the shapes of a diagram in a square geometry to demonstrate how to construct a custom layout.
-
-newWizards.examples.decorationservice.name = Review Decorator Provider
-newWizards.examples.decorationservice.desc = Create a plug-in that contributes a decorator provider that demonstrates how to adorn a note with an icon depending on the contents of the text (Passed vs. Failed)
-
-newWizards.examples.serviceexample.name = Service
-newWizards.examples.serviceexample.description = Creates the Service Example Plugin which demonstrates the use of the Service.
-
-
-#
-# END TRANSLATABLE
-#
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/plugin.xml b/org.eclipse.gmf.examples.runtime.ui.pde/plugin.xml
deleted file mode 100644
index 13b3c40..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/plugin.xml
+++ /dev/null

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%newWizardCategories.examples.runtimePDEPlugin"
-            parentCategory="org.eclipse.ui.Examples"
-            id="org.eclipse.gmf.examples.runtime">
-      </category>
-      
-      <wizard
-            name="%newWizards.examples.logic.name"
-            icon="icons/logic.gif"
-            category="org.eclipse.ui.Examples/org.eclipse.gmf.examples.runtime"
-            class="org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards.LogicNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.runtime.ui.pde.wizards.logic">
-         <description>
-            %newWizards.examples.logic.desc
-         </description>
-      </wizard>  
-      
-      <wizard
-            name="%newWizards.examples.geoshapes.name"
-            icon="icons/geoshape.gif"
-            category="org.eclipse.ui.Examples/org.eclipse.gmf.examples.runtime"
-            class="org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards.GeoshapeNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.runtime.ui.pde.wizards.geoshapes">
-         <description>
-            %newWizards.examples.geoshapes.desc
-         </description>
-      </wizard>  
-      
-      <wizard
-            name="%newWizards.examples.layoutservice.name"
-            icon="icons/diagram2.gif"
-            category="org.eclipse.ui.Examples/org.eclipse.gmf.examples.runtime"
-            class="org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards.LayoutNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.runtime.ui.pde.wizards.layoutService">
-         <description>
-            %newWizards.examples.layoutservice.desc
-         </description>
-      </wizard>  
-      
-      <wizard
-            name="%newWizards.examples.decorationservice.name"
-            icon="icons/diagram.gif"
-            category="org.eclipse.ui.Examples/org.eclipse.gmf.examples.runtime"
-            class="org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards.DecoratorNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.runtime.ui.pde.wizards.decoratorService">
-         <description>
-            %newWizards.examples.decorationservice.desc
-         </description>
-      </wizard>  
-      
-      <wizard
-            category="org.eclipse.ui.Examples/org.eclipse.gmf.examples.runtime"
-            class="org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards.ServiceExampleNewWizard"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            icon="icons/diagram.gif"
-            id="org.eclipse.gmf.examples.runtime.common.service.wizards"
-            name="%newWizards.examples.serviceexample.name"
-            project="true">
-         <description>
-            %newWizards.examples.serviceexample.description
-         </description>
-      </wizard>      
-      
-   </extension>
-</plugin>

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesDebugOptions.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesDebugOptions.java
deleted file mode 100644
index 00a4c8a..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesDebugOptions.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class GmfExamplesDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private GmfExamplesDebugOptions() {
-		/* private constructor */
-	}
-
-	/** Debug option. */
-	public static final String DEBUG = GmfExamplesPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	/** Debug option for tracing exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	
-	/** Debug option for tracing exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	/** Debug option for tracing method entering. */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	
-	/** Debug option for tracing method exiting. */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-	/** Debug option for tracing command admin. */
-	public static final String COMMANDS_ADMIN = DEBUG + "/commands/admin"; //$NON-NLS-1$
-	
-	/** Debug option for trasing command execution. */
-	public static final String COMMANDS_EXECUTE = DEBUG + "/commands/execute"; //$NON-NLS-1$
-	
-	/** Debug option for tracing command undo. */
-	public static final String COMMANDS_UNDO = DEBUG + "/commands/undo"; //$NON-NLS-1$
-	
-	/** Debug option for tracing command redo. */
-	public static final String COMMANDS_REDO = DEBUG + "/commands/redo"; //$NON-NLS-1$
-
-	/** Debug option for tracing service configuration. */
-	public static final String SERVICES_CONFIG = DEBUG + "/services/config"; //$NON-NLS-1$
-	
-	/** Debug option for tracing service activation. */
-	public static final String SERVICES_ACTIVATE = DEBUG + "/services/activate"; //$NON-NLS-1$
-	
-	/** Debug option for tracing service execution. */
-	public static final String SERVICES_EXECUTE = DEBUG + "/services/execute"; //$NON-NLS-1$
-	
-	/** Debug option for tracing on demand loading. */
-    public static final String ONDEMANEDLOADING = DEBUG + "/plugin/ondemand/loading";//$NON-NLS-1$
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesPlugin.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesPlugin.java
deleted file mode 100644
index 027bedf..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesPlugin.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class GmfExamplesPlugin
-	extends AbstractUIPlugin {
-
-	/** The shared instance. */
-	private static GmfExamplesPlugin fPlugin;
-
-	/**
-	 * Constructor.
-	 */
-	public GmfExamplesPlugin() {
-		super();
-		fPlugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return The plugin instance of <code>GmfExamplesPlugin</code>
-	 */
-	public static GmfExamplesPlugin getDefault() {
-		return fPlugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesStatusCodes.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesStatusCodes.java
deleted file mode 100644
index 4a84dfa..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/GmfExamplesStatusCodes.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *  
- */
-public final class GmfExamplesStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private GmfExamplesStatusCodes() {
-		//No-op
-	}
-
-	/**
-	 * Status code indicating that an error occurred with internationalization.
-	 */
-	public static final int L10N_FAILURE = 3;
-	
-	/**
-	 * Status code indicating that an error occurred with a service.
-	 */
-	public static final int SERVICE_FAILURE = 5;
-
-	/**
-	 * Error caused by an exception
-	 */
-	public static final int EXCEPTION_OCCURED = 10;
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/AbstractResourceManager.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/AbstractResourceManager.java
deleted file mode 100644
index ad3ebba..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/AbstractResourceManager.java
+++ /dev/null

@@ -1,457 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n;
-
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesDebugOptions;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesStatusCodes;
-import org.eclipse.gmf.examples.runtime.ui.pde.util.Log;
-import org.eclipse.gmf.examples.runtime.ui.pde.util.StringStatics;
-import org.eclipse.gmf.examples.runtime.ui.pde.util.Trace;
-
-/**
- * <p>
- * AbstractResourceManager is an abstract class which is designed to encapsulate a behaviour 
- * of an object that provides a single point of access to the I18N and resource management
- * per logical cluster of Java packages. 
- * </p>
- * <p>
- * The logical cluster, though can be equivalent, but not limited to one per plug-in. 
- * For instance, a logical cluster in the plug-in devoted to UML diagrams can be
- * split into as many logical clusters, as there are types of diagrams in the plug-in.
- * That is - a plugin that is dedicated to collaboration and sequence diagrams, can be
- * split into two logical clusters, each requiring separate resource management -
- * one for collaboration diagram, and another for sequence diagram.
- * </p>
- * <p>
- * Each cluster should allocate a dedicated package for I18N and resource management. The
- * preferred convention is use i18n package suffix to designate such package. For example, 
- * com.ibm.diagrams.collaboration.l10n and com.ibm.diagrams.sequence.l10n are
- * designated packages for resource and I18N management.
- * </p>
- * <p>
- * Each cluster-oriented resource management package will have a single 
- * <code>org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n.AbstractResourceManager</code> subclass. The subclass should
- * have a singleton instance and override, if necessary, the resource initialization method
- * <code>
- * 	initializeMessageResources()
- * </code>
- * to add the assignments of values to any value holding static variables declared in the 
- * subclass. The subclass can be designated to hold 
- * any resource and I18N related static variables if necessary, e.g. message resource bundle 
- * keys. 
- * 
- * The <code>initilaizeResources()</code> method should be overridden by subclasses in order to 
- * add/remove initialization of any additional/redundant resource types
- * </p>
- * <p>
- * The subclass should override if necessary the default names of the message resource bundle 
- * file (default MessageBundle) using the method:
- * <code>
- * 		getMessageBundleName()
- * </code>
- * </p>
- * <p>
- * On the file system side the convention is to store all resources associated with the given
- * cluster in the designated i18n package. That includes messages.properties.
- * For example, com.ibm.diagram.collaboration cluster will store
- * its resources here:
- * com/
- * 	rational/
- * 		diagram/
- * 			collaboration/
- * 				l10n/
- * 					 messages.properties
- * </p>
- * <p>
- * Synchronization aspects
- * 
- * The instances of this class are immutable, once created and initialized.
- * 
- * @see java.util.ResourceBundle
- * @author Natalia Balaba
- * @canBeSeenBy %partners
- */
-
-public abstract class AbstractResourceManager {
-	// --------------------------------------------------------------------//
-	// ------------  STATIC VARIABLES BEGIN -------------------------------//
-	// --------------------------------------------------------------------//
-
-	// strings that used to compose default resource names
-
-	private static final String MESSAGES = ".messages"; //$NON-NLS-1$
-
-	private static final String MISSING_RESOURCE_MESSAGE = "Attempt to access missing resource ({0})."; //$NON-NLS-1$
-
-	//
-	// Resource bundle keys for localizable components of a list of items.
-	//   Note that these strings are localized in the Common Core plug-in's
-	//   message resource bundle, not in my subclass's plug-in's bundle!
-	//
-	/** Key for list separator. */
-	static final String KEY_LIST_SEPARATOR = "list.separator"; //$NON-NLS-1$
-	
-	/** Ksy for list separator only. */
-	static final String KEY_LIST_SEPARATOR_ONLY = "list.separator.only"; //$NON-NLS-1$
-	
-	/** Key for first list separator. */
-	static final String KEY_LIST_SEPARATOR_FIRST = "list.separator.first"; //$NON-NLS-1$
-	
-	/** Key for last list separator. */
-	static final String KEY_LIST_SEPARATOR_LAST = "list.separator.last"; //$NON-NLS-1$
-	
-	/** Key for list prefix. */
-	static final String KEY_LIST_PREFIX = "list.prefix"; //$NON-NLS-1$
-	
-	/** Key for list suffix. */
-	static final String KEY_LIST_SUFFIX = "list.suffix"; //$NON-NLS-1$
-	
-	/** Key for default list separator. */
-	static final String DEFAULT_LIST_SEPARATOR = ", "; //$NON-NLS-1$
-	
-	/** Key for default list prefix. */
-	static final String DEFAULT_LIST_PREFIX = ""; //$NON-NLS-1$
-	
-	/** Key for default list suffix. */
-	static final String DEFAULT_LIST_SUFFIX = ""; //$NON-NLS-1$
-
-	// --------------------------------------------------------------------//
-	// ------------  STATIC VARIABLES END ---------------------------------//
-	// --------------------------------------------------------------------//
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE VARIABLES BEGIN -----------------------------//
-	// --------------------------------------------------------------------//
-
-	/**
-	 *  a resource bundle that stores I18N message resources
-	 */
-	private ResourceBundle messagesBundle = null;
-
-	/*
-	 * the strings that point to the names and locations of the resources.
-	 * subclasses must override if name of the messages bundle is different
-	 * from the default
-	 */
-
-	/**
-	 * The name of the messages bundle. The default is "messages"
-	 */
-	private String messagesBundleName = null;
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE VARIABLES END  ------------------------------//
-	// --------------------------------------------------------------------//
-
-	// --------------------------------------------------------------------//
-	// ------------  CONSTRUCTORS BEGIN   ---------------------------------//
-	// --------------------------------------------------------------------//
-
-	/**
-	 * Create a resource manager instance and initialize resources it will manage.
-	 * Subclasses should be declared final and have a singleton instance. If the
-	 * name of the messages bundle is different from the default the subclasses
-	 * should override getMessagesBundleDefaultName()
-	 */
-	protected AbstractResourceManager() {
-		super();
-		messagesBundleName = getMessagesBundleDefaultName();
-
-		initializeResources();
-	}
-
-	// --------------------------------------------------------------------//
-	// ------------  CONSTRUCTORS BEGIN   ---------------------------------//
-	// --------------------------------------------------------------------//
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE METHODS BEGIN  ------------------------------//
-	// --------------------------------------------------------------------//
-
-	/**
-	 * Returns the messageBundle.
-	 * Resource bundles contain locale-specific objects - text, numbers, etc.
-	 * @return the message bundle
-	 */
-	protected ResourceBundle getMessagesBundle() {
-		return messagesBundle;
-	}
-
-	/**
-	 * Returns a package name of the class of this object
-	 * @return - the full name if the client resource package
-	 */
-	protected String getPackageName() {
-		return getClass().getPackage().getName();
-	}
-
-	/**
-	 * Returns the name of the messages bundle, including the package path.
-	 * E.g. for MessageBundle.properties file located at 
-	 * com.ibm.diagrams.collaboration.l10n
-	 * the name returned will be com.ibm.diagrams.collaboration.l10n.MessageBundle
-	 * @return - messages bundle name
-	 */
-	protected String getMessagesBundleName() {
-		return messagesBundleName;
-	}
-
-	/**
-	 * Returns the plugin that hosts the resource manager
-	 * @return Plugin the plugin that hosts the resource manager
-	 */
-	protected abstract Plugin getPlugin();
-
-	/**
-	 * Load various resources. Do nothing by default.
-	 * Subclasses should override this method to include initialization of the 
-	 * particular resource types. 
-	 */
-	protected abstract void initializeResources();
-
-	/**
-	 * Populate messageBundle with text related resources from the MessageBundle 
-	 * properties file. 
-	 * This method provides  single assignment point to the private variable messagesBundle.
-	 * To override default initialization subclasses should override createMessagesBundle()
-	 * @see #createMessagesBundle()
-	 */
-	protected void initializeMessageResources() {
-		messagesBundle = createMessagesBundle();
-	}
-
-	/**
-	* Load messages resource bundle.
-	* 
-	* If resource bundle is missing creates an instance of EmptyResourceBundle and
-	* returns that as a default value
-	* @return - messages resource bundle
-	*/
-
-	protected ResourceBundle createMessagesBundle() {
-		try {
-			return ResourceBundle.getBundle(
-				getMessagesBundleName(),
-				Locale.getDefault(),
-				getClass().getClassLoader());
-		} catch (MissingResourceException mre) {
-			Trace.catching(GmfExamplesPlugin.getDefault(), GmfExamplesDebugOptions.EXCEPTIONS_CATCHING, getClass(), "createMessagesBundle", mre); //$NON-NLS-1$
-			Log.error(GmfExamplesPlugin.getDefault(), GmfExamplesStatusCodes.L10N_FAILURE, "createMessagesBundle", mre); //$NON-NLS-1$
-			return new EmptyResourceBundle(getMessagesBundleName());
-		}
-
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 * @return - value for the given key or the key if value
-	 * @param key java.lang.String the key to retrieve the value
-	 */
-	public String getString(String key) {
-		return getString(key, key);
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or  defaultValue if not found.
-	 * @return - value for the given key or the suuplied 
-	 * 							   default if value was not found
-	 * @param key java.lang.String the key to retrieve the value
-	 * @param defaultValue java.lang.String the default value to return
-	 * 											if no value by the given key was
-	 * 											found
-	 */
-	public String getString(String key, String defaultValue) {
-		try {
-			return getMessagesBundle().getString(key);
-		} catch (MissingResourceException mre) {
-			Trace.catching(GmfExamplesPlugin.getDefault(), GmfExamplesDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getString", mre); //$NON-NLS-1$
-			Log.warning(
-				GmfExamplesPlugin.getDefault(),
-				GmfExamplesStatusCodes.L10N_FAILURE,
-				MessageFormat.format(
-					MISSING_RESOURCE_MESSAGE,
-					new Object[] { key }),
-				mre);
-
-			return defaultValue;
-		}
-	}
-
-	/**
-	 * Creates a localized, parameterized message from the specified pattern
-	 * in the resource bundle.
-	 * 
-	 * @param patternKey resource bundle key of the message pattern
-	 * @param args objects to substitute into the <tt>{0}</tt>, <tt>{1}</tt>,
-	 *     etc. parameters in the message pattern
-	 * @return the formatted message
-	 * 
-	 * @see MessageFormat
-	 */
-	public String formatMessage(String patternKey, Object[] args) {
-		final String pattern = getString(patternKey);
-		
-		try {
-			return MessageFormat.format(pattern, args);
-		} catch (Exception e) {
-			// formats may throw IllegalArgumentExceptions and others
-			Trace.catching(
-					getPlugin(),
-					GmfExamplesDebugOptions.EXCEPTIONS_CATCHING,
-					ResourceManager.class,
-					"messageFormat", //$NON-NLS-1$
-					e);
-			
-			return pattern;  // better than nothing?
-		}
-	}
-
-	/**
-	 * Formats an array of strings according to the conventions of the locale.
-	 * For example, in English locales, the result is a comma-separated list
-	 * with "and" preceding the last item (no commas if there are only two
-	 * items).  The entry in a singleton array is returned as is.
-	 * 
-	 * @param strings an array of strings to format into a list
-	 * @return the list, <code>strings[0]</code> if there is only one element,
-	 *    or <code>""</code> if the array has no elements
-	 */
-	public String formatList(String[] strings) {
-		return formatList(java.util.Arrays.asList(strings));
-	}
-
-	/**
-	 * <p>
-	 * Formats a collection of objects according to the conventions of the
-	 * locale.
-	 * For example, in English locales, the result is a comma-separated list
-	 * with "and" preceding the last item (no commas if there are only two
-	 * items).
-	 * </p>
-	 * <p>
-	 * The individual elements of the collection are converted to strings using
-	 * the {@link String#valueOf(java.lang.Object)} method.
-	 * </p>
-	 * 
-	 * @param items an array of objects to format into a list
-	 * @return the list, <code>strings[0]</code> if there is only one element,
-	 *    or <code>""</code> if the array has no elements
-	 */
-	public String formatList(Collection items) {
-		switch (items.size()) {
-			case 0 :
-				return StringStatics.BLANK;
-			case 1 :
-				return String.valueOf(items.iterator().next());
-			case 2 :
-				return formatPair(ResourceManager.getInstance(), items);
-			default :
-				return formatList(ResourceManager.getInstance(), items);
-		}
-	}
-
-	/**
-	 * Helper method to format a two-item list (which in some locales looks
-	 * different from a list of more than two items).
-	 * 
-	 * @param mgr the common core plug-in's resource manager, which is used to
-	 *     retrieve the localized components of a list
-	 * @param items the pair of items (must be exactly two)
-	 * @return the pair as a string
-	 * 
-	 * @see #formatList(Collection)
-	 */
-	private String formatPair(AbstractResourceManager mgr, Collection items) {
-		Iterator iter = items.iterator();
-
-		StringBuffer result = new StringBuffer(32);
-
-		result.append(iter.next());
-
-		result.append(mgr.getString(
-						KEY_LIST_SEPARATOR_ONLY,
-						mgr.getString(
-								KEY_LIST_SEPARATOR,
-								DEFAULT_LIST_SEPARATOR)));
-
-		result.append(iter.next());
-
-		return result.toString();
-	}
-
-	/**
-	 * Helper method to format a list of more than two items.
-	 * 
-	 * @param mgr the common core plug-in's resource manager, which is used to
-	 *     retrieve the localized components of a list
-	 * @param items the list of items (must be more than two)
-	 * @return the list as a string
-	 * 
-	 * @see #formatList(Collection)
-	 */
-	private String formatList(AbstractResourceManager mgr, Collection items) {
-		Iterator iter = items.iterator();
-		int max = items.size() - 1;
-
-		final String sep = mgr.getString(
-				KEY_LIST_SEPARATOR,
-				DEFAULT_LIST_SEPARATOR);
-
-		StringBuffer result = new StringBuffer(32);
-
-		result.append(mgr.getString(KEY_LIST_PREFIX, DEFAULT_LIST_PREFIX));
-
-		for (int i = 0; i <= max; i++) {
-			if (i == 1) {
-				result.append(mgr.getString(KEY_LIST_SEPARATOR_FIRST, sep));
-			} else if (i == max) {
-				result.append(mgr.getString(KEY_LIST_SEPARATOR_LAST, sep));
-			} else if (i > 1) {
-				result.append(sep);
-			}
-
-			result.append(iter.next());
-		}
-
-		result.append(mgr.getString(KEY_LIST_SUFFIX, DEFAULT_LIST_SUFFIX));
-
-		return result.toString();
-	}
-
-	/**
-	 * Returns default name for the messages bundle. Subclasses should override 
-	 * if the messages bundle name differs from the default
-	 * @return - default name for the messages bundle
-	 */
-	protected String getMessagesBundleDefaultName() {
-		return getPackageName() + MESSAGES;
-	}
-
-
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE METHODS END  --------------------------------//
-	// --------------------------------------------------------------------//
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/EmptyResourceBundle.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/EmptyResourceBundle.java
deleted file mode 100644
index d9167fe..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/EmptyResourceBundle.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n;
-
-import java.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesStatusCodes;
-import org.eclipse.gmf.examples.runtime.ui.pde.util.Log;
-
-/**
- * The EmptyResourceBundle represents a resource bundle object that is always empty.
- * This object is used as a deafult return value whenever the loading of a resource bundle
- * has failed. The object keeps error logging every attempt to access to.
- * 
- * @author Natalia Balaba
- * @canBeSeenBy %partners
- */
-public final class EmptyResourceBundle extends ResourceBundle {
-
-	// --------------------------------------------------------------------//
-	// ------------  STATIC VARIABLES BEGIN -------------------------------//
-	// --------------------------------------------------------------------//
-
-	/**
-	 * error message
-	 */
-	private static String MISSING_BUNDLE_MESSAGE = "Resource bundle ({0}) is missing."; //$NON-NLS-1$
-
-	/**
-	 * error message
-	 */
-	private static String INVALID_ACCESS_MESSAGE = "Attempt to access resource in missing bundle ({0})."; //$NON-NLS-1$
-
-	// --------------------------------------------------------------------//
-	// ------------  STATIC VARIABLES END ---------------------------------//
-	// --------------------------------------------------------------------//
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE VARIABLES BEGIN -----------------------------//
-	// --------------------------------------------------------------------//
-
-	/**
-	 * name of the bundle that failed to load - will be used for exception 
-	 * messages
-	 */
-	private String bundleName = null;
-
-	/**
-	 * collection of  bundle keys - always empty
-	 */
-	private Vector keys = new Vector();
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE VARIABLES END -------------------------------//
-	// --------------------------------------------------------------------//
-
-	// --------------------------------------------------------------------//
-	// ------------  CONSTRUCTORS BEGIN -----------------------------------//
-	// --------------------------------------------------------------------//
-
-	/**
-	 * Create an instance of EmptyResourceBundle and log the error to the log 
-	 * file.
-	 * 
-	 * @param bundleName name of the bundle
-	 */
-	public EmptyResourceBundle(String bundleName) {
-		super();
-		this.bundleName = bundleName;
-		Log.warning(
-			GmfExamplesPlugin.getDefault(),
-			GmfExamplesStatusCodes.L10N_FAILURE,
-			MessageFormat.format(
-				MISSING_BUNDLE_MESSAGE,
-				new Object[] { getBundleName()}));
-	}
-
-	// --------------------------------------------------------------------//
-	// ------------  CONSTRUCTORS END -------------------------------------//
-	// --------------------------------------------------------------------//
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE METHODS BEGIN -------------------------------//
-	// --------------------------------------------------------------------//
-
-	/* This method always returns null  - since there is not associated value
-	 * @see java.util.ResourceBundle#handleGetObject(String)
-	 */
-	protected Object handleGetObject(String key) {
-		return null;
-	}
-
-	/* 
-	 * Return empty keys enumeration
-	 * @see java.util.ResourceBundle#getKeys()
-	 */
-	public Enumeration getKeys() {
-		Log.warning(
-			GmfExamplesPlugin.getDefault(),
-			GmfExamplesStatusCodes.L10N_FAILURE,
-			MessageFormat.format(
-				INVALID_ACCESS_MESSAGE,
-				new Object[] { getBundleName()}));
-
-		return keys.elements();
-	}
-
-	/**
-	 * Returns the bundleName.
-	 * @return java.lang.String - name of the missing resource bundle
-	 */
-	private String getBundleName() {
-		return bundleName;
-	}
-
-	// --------------------------------------------------------------------//
-	// ------------  INSTANCE METHODS END ---------------------------------//
-	// --------------------------------------------------------------------//
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/ResourceManager.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/ResourceManager.java
deleted file mode 100644
index 6dc3ce8..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/ResourceManager.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n;
-
-import org.eclipse.core.runtime.Plugin;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-
-
-/**
- * A singleton resource manager object that manages string, image, font and
- * cursor types of resources for this plug-in.
- */
-public final class ResourceManager
-	extends AbstractResourceManager {
-
-	/**
-	 * Singleton instance for the resource manager.
-	 */
-	private static AbstractResourceManager resourceManager = new ResourceManager();
-
-	/**
-	 * Constructs a new resource manager.
-	 */
-	private ResourceManager() {
-		super();
-	}
-
-	/**
-	 * Retrieves the singleton instance of this resource manager.
-	 * 
-	 * @return The singleton resource manager.
-	 */
-	public static AbstractResourceManager getInstance() {
-		return resourceManager;
-	}
-
-	/**
-	 * Retrieves a localized string for the specified key.
-	 * 
-	 * @return A localized string value, or a key if the bundle does not contain
-	 *         this entry.
-	 * @param key
-	 *            The resource bundle key.
-	 */
-	public static String getI18NString(String key) {
-		return getInstance().getString(key);
-	}
-
-	/**
-	 * Initializes this resource manager's resources.
-	 * 
-	 */
-	protected void initializeResources() {
-		initializeMessageResources();
-	}
-
-	protected Plugin getPlugin() {
-		return GmfExamplesPlugin.getDefault();
-	}
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/messages.properties b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/messages.properties
deleted file mode 100644
index 9032f05..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/messages.properties
+++ /dev/null

@@ -1,61 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-#
-# START TRANSLATABLE
-#
-
-Logic.wizard.createProjectPage.title = Modeling Logic Diagram Plug-in Project Creation
-Logic.wizard.createProjectPage.desc = Create the three plug-in projects of the logic example
-
-Geoshapes.wizard.createProjectPage.title = Modeling Geoshapes Diagram Plug-in Project Creation
-Geoshapes.wizard.createProjectPage.desc = Create the plug-in project of the Geoshapes example
-
-LayoutService.wizard.createProjectPage.title = Square Layout Provider Diagram Plug-in
-LayoutService.wizard.createProjectPage.desc = Create a plug-in that contributes a layout provider that positions the shapes of a diagram in a square geometry to demonstrate how to construct a custom layout
-
-DecoratorService.wizard.createProjectPage.title = Review Decorator Provider Diagram Plug-in
-DecoratorService.wizard.createProjectPage.desc = Create a plug-in that contributes a decorator provider that demonstrates how to adorn a note with an icon depending on the contents of the text (Passed vs. Failed)
-
-emf.msl.title = EMF Model Services Layer Plug-in Project Creation
-emf.msl.desc = Create the plug-in project for the EMF Model Services Layer support example
-
-emf.clipboard.copypaste.title = EMF Clipboard Support Plug-in Project Creation
-emf.clipboard.copypaste.desc = Create the plug-in project for the EMF clipboard support example
-
-emf.ocl.interpreter.title = EMF OCL Interpreter Plug-in Project Creation
-emf.ocl.interpreter.desc = Create the plug-in project for the EMF OCL interpreter example
-
-emf.ocl.query.title = EMF OCL Query Plug-in Project Creation
-emf.ocl.query.desc = Create the plug-in project for the EMF OCL query example
-
-emf.ocl.validation.title = EMF OCL Validation Plug-in Project Creation
-emf.ocl.validation.desc = Create the plug-in project for the EMF OCL validation constraints example
-
-emf.query.statements.title = EMF Query Statements Plug-in Project Creation
-emf.query.statements.desc = Create the plug-in project for the EMF query statements example
-
-emf.validation.adapter.title = EMF Validation Adapter Plug-in Project Creation
-emf.validation.adapter.desc = Create the plug-in project for the EMF Validation Framework EValidator adapter
-
-emf.validation.general.title = EMF Validation Example Plug-in Project Creation
-emf.validation.general.desc = Create the plug-in project for the EMF validation API example
-
-ServiceExample.wizard.createProjectPage.title = Service Example Plug-in Project Creation
-ServiceExample.wizard.createProjectPage.desc = Creates the Service Example plug-in project
-
-monitor.creatingProject = Creating Project
-monitor.unzippingProject = - Copying archive into the new project
-
-#
-# END TRANSLATABLE
-#
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/DecoratorNewWizard.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/DecoratorNewWizard.java
deleted file mode 100644
index 2ce619f..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/DecoratorNewWizard.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n.ResourceManager;
-
-/**
- * This wizard generates the Review Decorator plug-in sample.
- */
-public class DecoratorNewWizard
-	extends ProjectUnzipperNewWizard {
-
-	/** Wizard page title. */
-	private static final String DECORATORSERVICE_WIZARD_CREATEPROJECTPAGE_TITLE = ResourceManager
-		.getI18NString("DecoratorService.wizard.createProjectPage.title"); //$NON-NLS-1$
-
-	/** Wizard page description. */
-	private static final String DECORATORSERVICE_WIZARD_CREATEPROJECTPAGE_DESC = ResourceManager
-		.getI18NString("DecoratorService.wizard.createProjectPage.desc"); //$NON-NLS-1$
-
-	/**
-	 * Constructor
-	 */
-	public DecoratorNewWizard() {
-		super("exampleProjectLocation", //$NON-NLS-1$
-				DECORATORSERVICE_WIZARD_CREATEPROJECTPAGE_TITLE,
-				DECORATORSERVICE_WIZARD_CREATEPROJECTPAGE_DESC,
-                "org.eclipse.gmf.examples.runtime.diagram.decorator", //$NON-NLS-1$
-                GmfExamplesPlugin
-				.getDefault().find(new Path("examples/servicesDecorator.zip"))); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/GeoshapeNewWizard.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/GeoshapeNewWizard.java
deleted file mode 100644
index 5cd6a17..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/GeoshapeNewWizard.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n.ResourceManager;
-
-/**
- * This wizard generates the Geoshapes plug-in sample.
- */
-public class GeoshapeNewWizard
-	extends ProjectUnzipperNewWizard {
-
-	/** Wizard page title. */
-	private static final String GEOSHAPES_WIZARD_CREATEPROJECTPAGE_TITLE = ResourceManager
-		.getI18NString("Geoshapes.wizard.createProjectPage.title"); //$NON-NLS-1$
-
-	/** Wizard page description. */
-	private static final String GEOSHAPES_WIZARD_CREATEPROJECTPAGE_DESC = ResourceManager
-		.getI18NString("Geoshapes.wizard.createProjectPage.desc"); //$NON-NLS-1$
-
-	/**
-	 * Constructor
-	 */
-	public GeoshapeNewWizard() {
-		super("exampleProjectLocation", //$NON-NLS-1$
-			GEOSHAPES_WIZARD_CREATEPROJECTPAGE_TITLE,
-			GEOSHAPES_WIZARD_CREATEPROJECTPAGE_DESC,
-            "org.eclipse.gmf.examples.runtime.diagram.geoshapes", //$NON-NLS-1$ 
-            GmfExamplesPlugin
-				.getDefault().find(new Path("examples/geoshapes.zip"))); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/LayoutNewWizard.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/LayoutNewWizard.java
deleted file mode 100644
index bb0bd6f..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/LayoutNewWizard.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n.ResourceManager;
-
-/**
- * This wizard generates the Layout provider plug-in sample.
- */
-public class LayoutNewWizard
-	extends ProjectUnzipperNewWizard {
-
-	/** Wizard page title. */
-	private static final String LAYOUTSERVICE_WIZARD_CREATEPROJECTPAGE_TITLE = ResourceManager
-		.getI18NString("LayoutService.wizard.createProjectPage.title"); //$NON-NLS-1$
-
-	/** Wizard page description. */
-	private static final String LAYOUTSERVICE_WIZARD_CREATEPROJECTPAGE_DESC = ResourceManager
-		.getI18NString("LayoutService.wizard.createProjectPage.desc"); //$NON-NLS-1$
-
-	/**
-	 * Constructor
-	 */
-	public LayoutNewWizard() {
-		super("exampleProjectLocation", //$NON-NLS-1$
-			LAYOUTSERVICE_WIZARD_CREATEPROJECTPAGE_TITLE,
-			LAYOUTSERVICE_WIZARD_CREATEPROJECTPAGE_DESC, 
-            "org.eclipse.gmf.examples.runtime.diagram.layout", //$NON-NLS-1$  
-            GmfExamplesPlugin
-				.getDefault().find(new Path("examples/servicesLayout.zip"))); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/LogicNewWizard.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/LogicNewWizard.java
deleted file mode 100644
index 97b97a6..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/LogicNewWizard.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n.ResourceManager;
-
-/**
- * This wizard generates the geoshapes example plug-in.
- */
-public class LogicNewWizard
-	extends ProjectUnzipperNewWizard {
-
-	/**
-	 * Wizard page title
-	 */
-	private static final String LOGIC_WIZARD_CREATEPROJECTPAGE_TITLE = ResourceManager
-		.getI18NString("Logic.wizard.createProjectPage.title"); //$NON-NLS-1$
-
-	/**
-	 * Wizard page description
-	 */
-	private static final String LOGIC_WIZARD_CREATEPROJECTPAGE_DESC = ResourceManager
-		.getI18NString("Logic.wizard.createProjectPage.desc"); //$NON-NLS-1$
-
-	/**
-	 * Constructor.
-	 */
-	public LogicNewWizard() {
-		super("exampleProjectLocation", //$NON-NLS-1$
-			LOGIC_WIZARD_CREATEPROJECTPAGE_TITLE,
-			LOGIC_WIZARD_CREATEPROJECTPAGE_DESC,
-            "org.eclipse.gmf.examples.runtime.diagram.logic", //$NON-NLS-1$
-            new URL[] {
-				GmfExamplesPlugin.getDefault().find(
-					new Path("examples/logic.zip")), //$NON-NLS-1$
-				GmfExamplesPlugin.getDefault().find(
-					new Path("examples/logicSemantic.zip")), //$NON-NLS-1$
-                    GmfExamplesPlugin.getDefault().find(
-                        new Path("examples/logicSemanticEdit.zip")), //$NON-NLS-1$
-				GmfExamplesPlugin.getDefault().find(
-					new Path("examples/logicSemanticEditor.zip")) //$NON-NLS-1$
-			}, new String[] {"{0}", "{0}.semantic", "{0}.semantic.edit", "{0}.semantic.editor"} //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		);
-	}
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/ProjectUnzipperNewWizard.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/ProjectUnzipperNewWizard.java
deleted file mode 100644
index ed288e8..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/ProjectUnzipperNewWizard.java
+++ /dev/null

@@ -1,546 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesStatusCodes;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n.ResourceManager;
-import org.eclipse.gmf.examples.runtime.ui.pde.util.Log;
-
-/**
- * This abstract wizard serves as the base for our zipped project wizards. At
- * minimum, the wizard uses its constructor parameter to create a 1 page wizard.
- * The page lets users define the name and location of the project where to
- * unzip the project archive. The wizard performs: project creation, the unzip
- * operation, the classpath update, the progress monitoring
- * 
- * @see Wizard
- */
-abstract public class ProjectUnzipperNewWizard
-	extends Wizard
-	implements INewWizard, IExecutableExtension {
-
-	/**
-	 * Java Nature
-	 */
-	private static final String ORG_ECLIPSE_JDT_CORE_JAVANATURE = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$
-
-	/**
-	 * PDE Nature
-	 */
-	private static final String ORG_ECLIPSE_PDE_PLUGIN_NATURE = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
-	/**
-	 * Monitor string shown when creating project
-	 */
-	private static String KEY_CREATING_PROJECT = "monitor.creatingProject"; //$NON-NLS-1$
-
-	/**
-	 * Monitor string shown when unzipping the project
-	 */
-	private static String KEY_UNZIPPING_PROJECT = "monitor.unzippingProject"; //$NON-NLS-1$
-
-	/**
-	 * The single page provided by this base implementation. It provides all the
-	 * functionality required to capture the name and location of the target
-	 * project
-	 */
-	private WizardNewProjectCreationPage wizardNewProjectCreationPage;
-
-	/**
-	 * The name of the project creation page
-	 */
-	private String pageName;
-
-	/**
-	 * The title of the project creation page
-	 */
-	private String pageTitle;
-
-	/**
-	 * The description of the project creation page
-	 */
-	private String pageDescription;
-
-    /**
-     * The name of the project in the project creation page
-     */
-    private String pageProjectName;
-
-	/**
-	 * The list of paths pointing to the location of the project archives
-	 */
-	private URL[] projectZipURL;
-
-	/**
-	 * The list of formats to be applied to the user supplied name
-	 */
-	private String[] nameFormats;
-
-	/**
-	 * The configuration element associated with this new project wizard
-	 */
-	private IConfigurationElement config;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param pageNameIn
-	 *            The name of the project creation page
-	 * @param pageTitleIn
-	 *            The title of the project creation page
-	 * @param pageDescriptionIn
-	 *            The description of the project creation page
-     * @param pageProjectNameIn
-     *            The project name in the project creation page
-	 * @param projectZipURLIn
-	 *            The URL pointing to the location of the project archive
-	 */
-	public ProjectUnzipperNewWizard(String pageNameIn, String pageTitleIn,
-			String pageDescriptionIn, String pageProjectNameIn, URL projectZipURLIn) {
-		this(pageNameIn, pageTitleIn, pageDescriptionIn, pageProjectNameIn,
-			new URL[] {projectZipURLIn}, new String[] {"{0}"}); //$NON-NLS-1$
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param pageNameIn
-	 *            The name of the project creation page
-	 * @param pageTitleIn
-	 *            The title of the project creation page
-	 * @param pageDescriptionIn
-	 *            The description of the project creation page
-     * @param pageProjectNameIn
-     *            The project name in the project creation page
-	 * @param projectZipURLListIn
-	 *            The list of URL pointing to the location of the project
-	 *            archives
-	 * @param formatsIn
-	 *            The list of formats to be applied to the user supplied name.
-	 *            The {@link java.text.MessageFormat} class should be consulted
-	 *            to understand substitutions. The &quot;{0}&quot; substitution
-	 *            will be overridden with the user supplied name. Otherwise, the
-	 *            absolute strings may be passed in, which will completely
-	 *            ignore the user supplied name.
-	 */
-	public ProjectUnzipperNewWizard(String pageNameIn, String pageTitleIn,
-			String pageDescriptionIn, String pageProjectNameIn, 
-            URL[] projectZipURLListIn,
-			String[] nameFormatsIn) {
-		super();
-
-		assert projectZipURLListIn.length > 0;
-		assert nameFormatsIn.length > 0;
-		assert projectZipURLListIn.length == nameFormatsIn.length;
-
-		pageName = pageNameIn;
-		pageTitle = pageTitleIn;
-		pageDescription = pageDescriptionIn;
-        pageProjectName = pageProjectNameIn;
-		projectZipURL = projectZipURLListIn;
-		nameFormats = nameFormatsIn;
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * Performs the bulk of the wizard functionality: project creation, the
-	 * unzip operation and classpath update
-	 * 
-	 * @see Wizard#performFinish
-	 */
-	public boolean performFinish() {
-
-		try {
-			IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-
-				public void execute(IProgressMonitor monitor)
-					throws InterruptedException {
-					try {
-						monitor.beginTask(ResourceManager
-							.getI18NString(KEY_CREATING_PROJECT), 120);
-
-						/*
-						 * Create the project folder
-						 */
-						IPath projectPath = wizardNewProjectCreationPage
-							.getLocationPath();
-
-						for (int i = 0; i < nameFormats.length; i++) {
-							String projectName = MessageFormat.format(
-								nameFormats[i],
-								new Object[] {wizardNewProjectCreationPage
-									.getProjectName()});
-							String projectFolder = projectPath.toOSString()
-								+ File.separator + projectName;
-							File projectFolderFile = new File(projectFolder);
-
-							IWorkspace workspace = ResourcesPlugin
-								.getWorkspace();
-							IProject project = workspace.getRoot().getProject(
-								projectName);
-
-							// If the project does not exist, we will create it
-							// and populate it.
-							if (!project.exists()) {
-								projectFolderFile.mkdirs();
-								monitor.worked(10);
-
-								/*
-								 * Copy plug-in project code
-								 */
-								extractProject(projectFolderFile,
-									getProjectZipURL()[i],
-									new SubProgressMonitor(monitor, 100));
-
-								if (monitor.isCanceled()) {
-									throw new InterruptedException();
-								}
-
-								if (projectPath.equals(workspace.getRoot()
-									.getLocation())) {
-									project.create(monitor);
-								} else {
-									IProjectDescription desc = workspace
-										.newProjectDescription(project
-											.getName());
-									desc.setLocation(new Path(projectFolder));
-
-									project.create(desc, monitor);
-								}
-							}
-
-							// Now, we ensure that the project is open.
-							project.open(monitor);
-
-							renameProject(project, projectName);
-
-							// Add Java and PDE natures
-							IProjectDescription desc = workspace
-								.newProjectDescription(project.getName());
-							desc.setNatureIds(new String[] {
-								ORG_ECLIPSE_PDE_PLUGIN_NATURE,
-								ORG_ECLIPSE_JDT_CORE_JAVANATURE});
-							project.setDescription(desc, monitor);
-
-							monitor.worked(10);
-							if (monitor.isCanceled()) {
-								throw new InterruptedException();
-							}
-						} // end for
-
-					} catch (IOException e) {
-						throw new RuntimeException(e);
-					} catch (CoreException e) {
-						throw new RuntimeException(e);
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-
-			getContainer().run(false, true, operation);
-
-			/* Set perspective */
-			BasicNewProjectResourceWizard
-				.updatePerspective(getConfigurationElement());
-
-		} catch (InterruptedException e) {
-			return false;
-
-		} catch (Exception e) {
-
-			Log.error(GmfExamplesPlugin.getDefault(),
-				GmfExamplesStatusCodes.EXCEPTION_OCCURED, e.getMessage(), e);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Unzip the project archive to the specified folder
-	 * 
-	 * @param projectFolderFile
-	 *            The folder where to unzip the project archive
-	 * @param monitor
-	 *            Monitor to display progress and/or cancel operation
-	 * @throws IOException
-	 * @throws IOException
-	 * @throws InterruptedException
-	 * @throws FileNotFoundException
-	 * 
-	 * @throws FileNotFoundException
-	 * @throws InterruptedException
-	 */
-	private void extractProject(File projectFolderFile, URL url,
-			IProgressMonitor monitor)
-		throws FileNotFoundException, IOException, InterruptedException {
-
-		/*
-		 * Get project archive
-		 */
-		// URL urlZip = PdeUiPlugin.getDefault().find();
-		// URL urlZipLocal = Platform.asLocalURL(urlZip);
-		URL urlZipLocal = Platform.asLocalURL(url);
-
-		/*
-		 * Walk each element and unzip
-		 */
-		ZipFile zipFile = new ZipFile(urlZipLocal.getPath());
-
-		try {
-			/*
-			 * Allow for a hundred work units
-			 */
-			monitor.beginTask(ResourceManager
-				.getI18NString(KEY_UNZIPPING_PROJECT), zipFile.size());
-
-			unzip(zipFile, projectFolderFile, monitor);
-		} finally {
-			zipFile.close();
-			monitor.done();
-		}
-	}
-
-	/**
-	 * Unzips the platform formatted zip file to specified folder
-	 * 
-	 * @param zipFile
-	 *            The platform formatted zip file
-	 * @param projectFolderFile
-	 *            The folder where to unzip the project archive
-	 * @param monitor
-	 *            Monitor to display progress and/or cancel operation
-	 * @throws IOException
-	 * @throws FileNotFoundException
-	 * @throws InterruptedException
-	 */
-	private void unzip(ZipFile zipFile, File projectFolderFile,
-			IProgressMonitor monitor)
-		throws IOException, FileNotFoundException, InterruptedException {
-
-		Enumeration e = zipFile.entries();
-
-		while (e.hasMoreElements()) {
-			ZipEntry zipEntry = (ZipEntry) e.nextElement();
-			File file = new File(projectFolderFile, zipEntry.getName());
-
-			if (false == zipEntry.isDirectory()) {
-
-				/*
-				 * Copy files (and make sure parent directory exist)
-				 */
-				File parentFile = file.getParentFile();
-				if (null != parentFile && false == parentFile.exists()) {
-					parentFile.mkdirs();
-				}
-
-				Path path = new Path(file.getPath());
-				if (path.getFileExtension().equals("java")) { //$NON-NLS-1$
-					InputStreamReader is = null;
-					OutputStreamWriter os = null;
-
-					try {
-						is = new InputStreamReader(zipFile
-							.getInputStream(zipEntry), "ISO-8859-1"); //$NON-NLS-1$
-						os = new OutputStreamWriter(new FileOutputStream(file),
-							ResourcesPlugin.getEncoding());
-						char[] buffer = new char[102400];
-						while (true) {
-							int len = is.read(buffer);
-							if (len < 0)
-								break;
-							os.write(buffer, 0, len);
-						}
-					} finally {
-						if (null != is) {
-							is.close();
-						}
-						if (null != os) {
-							os.close();
-						}
-					}
-				} else {
-					InputStream is = null;
-					OutputStream os = null;
-
-					try {
-						is = zipFile.getInputStream(zipEntry);
-						os = new FileOutputStream(file);
-
-						byte[] buffer = new byte[102400];
-						while (true) {
-							int len = is.read(buffer);
-							if (len < 0)
-								break;
-							os.write(buffer, 0, len);
-						}
-					} finally {
-						if (null != is) {
-							is.close();
-						}
-						if (null != os) {
-							os.close();
-						}
-					}
-				}
-			}
-
-			monitor.worked(1);
-
-			if (monitor.isCanceled()) {
-				throw new InterruptedException();
-			}
-		}
-	}
-
-	/**
-	 * Renames the specified project to the specified name
-	 * 
-	 * @param project
-	 *            Project to rename
-	 * @param projectName
-	 *            New name for the project
-	 * @throws CoreException
-	 */
-	private void renameProject(IProject project, String projectName)
-		throws CoreException {
-		IProjectDescription description = project.getDescription();
-		description.setName(projectName);
-		project.move(description, IResource.FORCE | IResource.SHALLOW, null);
-	}
-
-	/**
-	 * Creates the sole wizard page contributed by this base implementation; the
-	 * standard Eclipse WizardNewProjectCreationPage.
-	 * 
-	 * @see WizardNewProjectCreationPage#WizardNewProjectCreationPage(String)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-
-		wizardNewProjectCreationPage = new WizardNewProjectCreationPage(
-			getPageName());
-
-		wizardNewProjectCreationPage.setTitle(getPageTitle());
-
-		wizardNewProjectCreationPage.setDescription(getPageDescription());
-        
-        wizardNewProjectCreationPage.setInitialProjectName(getPageProjectName());
-
-		this.addPage(wizardNewProjectCreationPage);
-	}
-
-	/**
-	 * Accessor to the pageName field
-	 * 
-	 * @return The pageName field value
-	 */
-	private String getPageName() {
-		return pageName;
-	}
-
-	/**
-	 * Accessor to the pageTitle field
-	 * 
-	 * @return The pageTitle field value
-	 */
-	private String getPageTitle() {
-		return pageTitle;
-	}
-
-	/**
-	 * Accessor to the pageDescription field
-	 * 
-	 * @return The pageDescription field value
-	 */
-	private String getPageDescription() {
-		return pageDescription;
-	}
-
-    /**
-     * Accessor to the PageProjectName field
-     * 
-     * @return The PageProjectName field value
-     */
-    private String getPageProjectName() {
-        return pageProjectName;
-    }
-
-	/**
-	 * Accessor to the ProjectZipURL field
-	 * 
-	 * @return The projectZipURL field value
-	 */
-	private URL[] getProjectZipURL() {
-		return projectZipURL;
-	}
-
-	/**
-	 * Accessor to the config field
-	 * 
-	 * @return The config field value
-	 */
-	private IConfigurationElement getConfigurationElement() {
-		return config;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement configIn,
-			String propertyName, Object data)
-		throws CoreException {
-		config = configIn;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/ServiceExampleNewWizard.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/ServiceExampleNewWizard.java
deleted file mode 100644
index af62a78..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/ServiceExampleNewWizard.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.l10n.ResourceManager;
-
-
-/**
- * Service Example wizard page.
- * 
- * @author jcorchis
- *
- */
-public class ServiceExampleNewWizard extends ProjectUnzipperNewWizard {
-	
-	
-	/**
-	 * Wizard page title
-	 */
-	private static final String WIZARD_CREATEPROJECTPAGE_TITLE = ResourceManager
-		.getI18NString("ServiceExample.wizard.createProjectPage.title"); //$NON-NLS-1$
-
-	/**
-	 * Wizard page description
-	 */
-	private static final String WIZARD_CREATEPROJECTPAGE_DESC = ResourceManager
-		.getI18NString("ServiceExample.wizard.createProjectPage.desc"); //$NON-NLS-1$
-
-	/**
-	 * Constructor
-	 */
-	public ServiceExampleNewWizard() {
-		super("exampleProjectLocation", //$NON-NLS-1$
-			WIZARD_CREATEPROJECTPAGE_TITLE,
-			WIZARD_CREATEPROJECTPAGE_DESC,
-            "org.eclipse.gmf.examples.runtime.common.service", //$NON-NLS-1$ 
-            GmfExamplesPlugin
-				.getDefault().find(new Path("examples/serviceExample.zip"))); //$NON-NLS-1$
-	}	
-
-}

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Log.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Log.java
deleted file mode 100644
index 43d233f..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Log.java
+++ /dev/null

@@ -1,251 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.util;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesDebugOptions;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesPlugin;
-import org.eclipse.gmf.examples.runtime.ui.pde.internal.GmfExamplesStatusCodes;
-
-
-/**
- * A utility for logging errors, warnings, and information. Provides a simple
- * interface for generating logs based on status objects.
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public class Log {
-
-	/**
-	 * private constructor for the static class.
-	 */
-	protected Log() {
-		super();
-	}
-	
-	/**
-	 * The default log listener for this log utility.
-	 */
-	private static final ILog fLog = GmfExamplesPlugin.getDefault().getLog();
-
-	/**
-	 * Retrieves the default log listener for this log utility.
-	 * 
-	 * @return The default log listener for this log utility.
-	 */
-	protected static ILog getDefault() {
-		return fLog;
-	}
-	
-	/**
-	 * Responds to a log request for the specified plug-in based on the
-	 * specified status object. Statuses with severity of error or warning
-	 * result in the generation of a platform log for the specified plug-in; all
-	 * log requests are forward to the default log listener.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param status
-	 *            The status object on which to base the log.
-	 *  
-	 */
-	public static void log(Plugin plugin, IStatus status) {
-		switch (status.getSeverity()) {
-			case IStatus.ERROR:
-			case IStatus.WARNING:
-				getDefault().log(status);
-				break;
-			default:
-				/*
-				 * The Eclipse logging facility does not have the concept of
-				 * logging levels. Anything logged to the plugins logger will
-				 * automatically be logged to the .log file. The Common Logging
-				 * implementation provides the common log file
-				 * (CommonBaseEvents.log) with the associated extension point
-				 * and preference page but is not related to the .log file.
-				 * Since we do not want to Eclipse log poluted with "plug-in
-				 * started" messages, we do not log these.
-				 * 
-				 * getDefault().log(status);
-				 */
-				break;
-		}
-	}
-
-	/**
-	 * Generates a log for the specified plug-in, with the specified severity,
-	 * status code, and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param severity
-	 *            The severity of the log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void log(Plugin plugin, int severity, int code, String message) {
-
-		log(plugin, severity, code, message, null);
-	}
-
-	/**
-	 * Generates a log for the specified plug-in, with the specified severity,
-	 * status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param severity
-	 *            The severity of the log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void log(Plugin plugin, int severity, int code,
-			String message, Throwable throwable) {
-
-		//
-		// Status ctor requires a non-null message
-		String msg = message == null ? "" //$NON-NLS-1$
-			: message;
-
-		try {
-			log(plugin, new Status(severity, plugin.getBundle()
-				.getSymbolicName(), code, msg, throwable));
-		} catch (IllegalArgumentException iae) {
-			Trace.catching(GmfExamplesPlugin.getDefault(),
-				GmfExamplesDebugOptions.EXCEPTIONS_CATCHING, Log.getDefault()
-					.getClass(), "log", iae); //$NON-NLS-1$
-			Log.error(GmfExamplesPlugin.getDefault(),
-				GmfExamplesStatusCodes.SERVICE_FAILURE, "log", iae); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Generates an error log for the specified plug-in, with the specified
-	 * status code and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void error(Plugin plugin, int code, String message) {
-		error(plugin, code, message, null);
-	}
-	
-	/**
-	 * Generates an error log for the specified plug-in, with the specified
-	 * status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void error(Plugin plugin, int code, String message,
-			Throwable throwable) {
-
-		log(plugin, IStatus.ERROR, code, message, throwable);
-	}
-
-	/**
-	 * Generates a warning log for the specified plug-in, with the specified
-	 * status code and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void warning(Plugin plugin, int code, String message) {
-		warning(plugin, code, message, null);
-	}
-
-	/**
-	 * Generates a warning log for the specified plug-in, with the specified
-	 * status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void warning(Plugin plugin, int code, String message,
-			Throwable throwable) {
-
-		log(plugin, IStatus.WARNING, code, message, throwable);
-	}
-
-	/**
-	 * Generates an information log for the specified plug-in, with the
-	 * specified status code and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void info(Plugin plugin, int code, String message) {
-		info(plugin, code, message, null);
-	}
-
-	/**
-	 * Generates an information log for the specified plug-in, with the
-	 * specified status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void info(Plugin plugin, int code, String message,
-			Throwable throwable) {
-
-		log(plugin, IStatus.INFO, code, message, throwable);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/StringStatics.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/StringStatics.java
deleted file mode 100644
index 2c3f77a..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/StringStatics.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.util;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * This class contains string statics that are not to be translated.
- * 
- * @author wdiu, Wayne Diu
- * @canBeSeenBy %partners
- */
-public class StringStatics {
-
-	/** Prevent instantiation with a private constructor */
-	private StringStatics() {
-		/* private constructor */
-	}
-
-	/** The empty string */
-	public static final String BLANK = ""; //$NON-NLS-1$
-
-	/** The period . */
-	public static final String PERIOD = "."; //$NON-NLS-1$
-
-	/** The forward slash / */
-	public static final String FORWARD_SLASH = "/"; //URLs //$NON-NLS-1$
-
-	/** The backward slash / */
-	public static final String BACKWARD_SLASH = "\\"; //$NON-NLS-1$
-
-	/** The ellipsis ... */
-	public static final String ELLIPSIS = "..."; //$NON-NLS-1$
-
-	/** The space */
-	public static final String SPACE = " "; //$NON-NLS-1$
-
-	/** The colon : */
-	public static final String COLON = ":"; //$NON-NLS-1$
-
-	/** The double colon :: */
-	public static final String DOUBLE_COLON = "::"; //$NON-NLS-1$
-
-	/** The newline for a particular platform */
-	public static final String PLATFORM_NEWLINE = System
-		.getProperty("line.separator"); //$NON-NLS-1$
-
-	/** The newline for the Windows platform */
-	public static final String WINDOWS_NEWLINE = "\r\n"; //$NON-NLS-1$
-
-	/** The newline for the Unix platform */
-	public static final String UNIX_NEWLINE = "\n"; //$NON-NLS-1$
-
-	/** The separator defined by File.separator */
-	public static final String FILE_SEPARATOR = File.separator;
-
-	/** The separator defined by IPath.SEPARATOR */
-	public static final String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR);
-
-	/** The apostrophe ' */
-	public static final String APOSTROPHE = "'"; //$NON-NLS-1$
-
-	/** The apostrophe ' */
-	public static final String AMPERSAND = "&"; //$NON-NLS-1$
-
-	/** The greater than symbol > */
-	public static final String GREATER_THAN = ">"; //$NON-NLS-1$
-
-	/** The equals = */
-	public static final String EQUALS = "="; //$NON-NLS-1$
-
-	/** The version separator in a plugin name for release _ */
-	public static final String PLUGIN_VERSION_SEPARATOR = "_"; //$NON-NLS-1$
-
-	/** The Underscore * */
-	public static final String UNDER_SCORE = "_"; //$NON-NLS-1$
-
-	/** The hyphen * */
-	public static final String HYPHEN = "-"; //$NON-NLS-1$
-
-	/** The comma * */
-	public static final String COMMA = ",";//$NON-NLS-1$
-	
-	/** Open Parenthesis */
-	public static final String OPEN_PARENTHESIS = "("; //$NON-NLS-1$
-	
-	/** Close Parenthesis */
-	public static final String CLOSE_PARENTHESIS = ")"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Trace.java b/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Trace.java
deleted file mode 100644
index 98cc137..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Trace.java
+++ /dev/null

@@ -1,514 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.examples.runtime.ui.pde.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * A utility for tracing debug information. Provides a simple interface for
- * filtering and generating trace output.
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public class Trace {
-
-	/**
-	 * private constructor for the static class.
-	 */
-	private Trace() {
-		super();
-	}
-	
-	/**
-	 * String containing an open parenthesis.
-	 * 
-	 */
-	protected static final String PARENTHESIS_OPEN = "("; //$NON-NLS-1$
-
-	/**
-	 * String containing a close parenthesis.
-	 * 
-	 */
-	protected static final String PARENTHESIS_CLOSE = ")"; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the changing of values.
-	 * 
-	 */
-	protected static final String PREFIX_CHANGING = "CHANGING "; //$NON-NLS-1$
-	
-	/**
-	 * Prefix for tracing the catching of throwables.
-	 * 
-	 */
-	protected static final String PREFIX_CATCHING = "CAUGHT "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the throwing of throwables.
-	 * 
-	 */
-	protected static final String PREFIX_THROWING = "THROWN "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the entering of methods.
-	 * 
-	 */
-	protected static final String PREFIX_ENTERING = "ENTERING "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the exiting of methods.
-	 * 
-	 */
-	protected static final String PREFIX_EXITING = "EXITING "; //$NON-NLS-1$
-
-	/**
-	 * Separator for methods.
-	 * 
-	 */
-	protected static final String SEPARATOR_METHOD = "#"; //$NON-NLS-1$
-
-	/**
-	 * Separator for parameters.
-	 * 
-	 */
-	protected static final String SEPARATOR_PARAMETER = ", "; //$NON-NLS-1$
-
-	/**
-	 * Separator for return values.
-	 * 
-	 */
-	protected static final String SEPARATOR_RETURN = ":"; //$NON-NLS-1$
-
-	/**
-	 * Separator containing a space.
-	 * 
-	 */
-	protected static final String SEPARATOR_SPACE = " "; //$NON-NLS-1$
-	
-	/**
-	 * Label indicating old value.
-	 * 
-	 */
-	protected static final String LABEL_OLD_VALUE = "old="; //$NON-NLS-1$
-
-	/**
-	 * Label indicating new value.
-	 * 
-	 */
-	protected static final String LABEL_NEW_VALUE = "new="; //$NON-NLS-1$
-	
-
-	/**
-	 * The cached debug options (for optimization).
-	 */
-	private static final Map cachedOptions = new HashMap();
-
-	/**
-	 * Retrieves a Boolean value indicating whether tracing is enabled for the
-	 * specified plug-in.
-	 * 
-	 * @return Whether tracing is enabled for the plug-in.
-	 * @param plugin The plug-in for which to determine trace enablement.
-	 * 
-	 */
-	protected static boolean shouldTrace(Plugin plugin) {
-		return plugin.isDebugging();
-	}
-
-	/**
-	 * Retrieves a Boolean value indicating whether tracing is enabled for the
-	 * specified debug option of the specified plug-in.
-	 * 
-	 * @return Whether tracing is enabled for the debug option of the plug-in.
-	 * @param plugin The plug-in for which to determine trace enablement.
-	 * @param option The debug option for which to determine trace enablement.
-	 * 
-	 */
-	public static boolean shouldTrace(Plugin plugin, String option) {
-		if (shouldTrace(plugin)) {
-			Boolean value = null;
-			
-			synchronized (cachedOptions) {
-				value = (Boolean) cachedOptions.get(option);
-	
-				if (null == value) {
-					value = Boolean.valueOf(Platform.getDebugOption(option));
-	
-					cachedOptions.put(option, value);
-				}
-			}
-			
-			return value.booleanValue();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Retrieves a textual representation of the specified argument.
-	 * 
-	 * @return A textual representation of the specified argument.
-	 * @param argument The argument for which to retrieve a textual
-	 *                  representation.
-	 * 
-	 */
-	protected static String getArgumentString(Object argument) {
-		return String.valueOf(argument);
-	}
-
-	/**
-	 * Retrieves a textual representation of the specified arguments.
-	 * 
-	 * @return A textual representation of the specified arguments.
-	 * @param arguments The arguments for which to retrieve a textual
-	 *                   representation.
-	 * 
-	 */
-	protected static String getArgumentsString(Object[] arguments) {
-		StringBuffer buffer = new StringBuffer();
-
-		for (int i = 0; i < arguments.length; i++) {
-			buffer.append(getArgumentString(arguments[i]));
-
-			if (i < arguments.length - 1) {
-				buffer.append(SEPARATOR_PARAMETER);
-			}
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 * Traces the specified message.
-	 * 
-	 * @param message The message to be traced.
-	 * 
-	 */
-	protected static void trace(String message) {
-		System.out.println(message);
-	}
-
-	/**
-	 * Traces the specified message from the specified plug-in.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param message The message to be traced.
-	 * 
-	 */
-	public static void trace(Plugin plugin, String message) {
-		if (shouldTrace(plugin)) {
-			trace(message);
-		}
-	}
-
-	/**
-	 * Traces the specified message from the specified plug-in for the specified
-	 * debug option.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param message The message to be traced.
-	 * 
-	 */
-	public static void trace(Plugin plugin, String option, String message) {
-		if (shouldTrace(plugin, option)) {
-			trace(message);
-		}
-	}
-	
-	/**
-	 * Traces the changing of a value.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param valueDescription The description of the value which is changing.
-	 * @param oldValue The old value.
-	 * @param newValue The new value.
-	 */
-	public static void changing(
-	        Plugin plugin,
-	        String option,
-	        String valueDescription,
-	        Object oldValue,
-	        Object newValue) {
-		    
-	        if (shouldTrace(plugin, option)) {
-	            trace(
-	                PREFIX_CHANGING
-	                	+ valueDescription
-	                	+ SEPARATOR_SPACE
-	                	+ LABEL_OLD_VALUE
-	                	+ getArgumentString(oldValue)
-	                	+ SEPARATOR_PARAMETER
-	                   	+ LABEL_NEW_VALUE
-	                	+ getArgumentString(newValue)
-						);
-	        }
-	    }
-	
-	/**
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class in which the value is changing.
-	 * @param methodName The name of the method in which the value is changing.
-	 * @param valueDescription The description of the value which is changing.
-	 * @param oldValue The old value.
-	 * @param newValue The new value.
-	 */
-	public static void changing(
-        Plugin plugin,
-        String option,
-        Class clazz,
-        String methodName,
-        String valueDescription,
-        Object oldValue,
-        Object newValue) {
-	    
-        if (shouldTrace(plugin, option)) {
-            trace(
-                PREFIX_CHANGING
-                	+ valueDescription
-                	+ SEPARATOR_SPACE
-                	+ LABEL_OLD_VALUE
-                	+ getArgumentString(oldValue)
-                	+ SEPARATOR_PARAMETER
-                   	+ LABEL_NEW_VALUE
-                	+ getArgumentString(newValue)
-                	+ SEPARATOR_SPACE
-                	+ PARENTHESIS_OPEN
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_CLOSE
-					);
-        }
-    }
-
-	/**
-	 * Traces the catching of the specified throwable in the specified method of
-	 * the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class in which the throwable is being caught.
-	 * @param methodName The name of the method in which the throwable is being
-	 *                    caught.
-	 * @param throwable The throwable that is being caught.
-	 * 
-	 */
-	public static void catching(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Throwable throwable) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_CATCHING
-					+ throwable.getMessage()
-					+ SEPARATOR_SPACE
-					+ PARENTHESIS_OPEN
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_CLOSE);
-
-			throwable.printStackTrace(System.err);
-		}
-	}
-
-	/**
-	 * Traces the throwing of the specified throwable from the specified method
-	 * of the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class from which the throwable is being thrown.
-	 * @param methodName The name of the method from which the throwable is
-	 *                    being thrown.
-	 * @param throwable The throwable that is being thrown.
-	 * 
-	 */
-	public static void throwing(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Throwable throwable) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_THROWING
-					+ throwable.getMessage()
-					+ SEPARATOR_SPACE
-					+ PARENTHESIS_OPEN
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_CLOSE);
-
-			throwable.printStackTrace(System.err);
-		}
-	}
-
-	/**
-	 * Traces the entering into the specified method of the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being entered.
-	 * @param methodName The name of method that is being entered.
-	 * 
-	 */
-	public static void entering(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_ENTERING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName);
-		}
-	}
-
-	/**
-	 * Traces the entering into the specified method of the specified class,
-	 * with the specified parameter.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being entered.
-	 * @param methodName The name of method that is being entered.
-	 * @param parameter The parameter to the method being entered.
-	 * 
-	 */
-	public static void entering(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Object parameter) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_ENTERING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_OPEN
-					+ getArgumentString(parameter)
-					+ PARENTHESIS_CLOSE);
-		}
-	}
-
-	/**
-	 * Traces the entering into the specified method of the specified class,
-	 * with the specified parameters.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being entered.
-	 * @param methodName The name of method that is being entered.
-	 * @param parameters The parameters to the method being entered.
-	 * 
-	 */
-	public static void entering(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Object[] parameters) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_ENTERING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_OPEN
-					+ getArgumentsString(parameters)
-					+ PARENTHESIS_CLOSE);
-		}
-	}
-
-	/**
-	 * Traces the exiting from the specified method of the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being exited.
-	 * @param methodName The name of method that is being exited.
-	 * 
-	 */
-	public static void exiting(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_EXITING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName);
-		}
-	}
-
-	/**
-	 * Traces the exiting from the specified method of the specified class,
-	 * with the specified return value.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being exited.
-	 * @param methodName The name of method that is being exited.
-	 * @param returnValue The return value of the method being exited.
-	 * 
-	 */
-	public static void exiting(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Object returnValue) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_EXITING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ SEPARATOR_RETURN
-					+ getArgumentString(returnValue));
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/.classpath b/org.eclipse.gmf.runtime.common.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.core/.cvsignore b/org.eclipse.gmf.runtime.common.core/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.common.core/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.common.core/.options b/org.eclipse.gmf.runtime.common.core/.options
deleted file mode 100644
index 2989e9f..0000000
--- a/org.eclipse.gmf.runtime.common.core/.options
+++ /dev/null

@@ -1,34 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.common.core plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.common.core plug-in
-org.eclipse.gmf.runtime.common.core/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.common.core/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.common.core/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.common.core/debug/methods/exiting=false
-
-# Trace information related to command administration
-org.eclipse.gmf.runtime.common.core/debug/commands/admin=false
-# Trace when commands are executed
-org.eclipse.gmf.runtime.common.core/debug/commands/execute=false
-# Trace when commands are undone
-org.eclipse.gmf.runtime.common.core/debug/commands/undo=false
-# Trace when commands are redone
-org.eclipse.gmf.runtime.common.core/debug/commands/redo=false
-
-# Trace information related to service configuration
-org.eclipse.gmf.runtime.common.core/debug/services/config=false
-# Trace when providers/policies are activated
-org.eclipse.gmf.runtime.common.core/debug/services/activate=false
-# Trace when operations are executed
-org.eclipse.gmf.runtime.common.core/debug/services/execute=false
-
-
-#On demand plugin loading
-org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading=false
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/.project b/org.eclipse.gmf.runtime.common.core/.project
deleted file mode 100644
index 681e070..0000000
--- a/org.eclipse.gmf.runtime.common.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.core</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/org.eclipse.gmf.runtime.common.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 312673a..0000000
--- a/org.eclipse.gmf.runtime.common.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.core; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.core.command,
- org.eclipse.gmf.runtime.common.core.internal;x-friends:="org.eclipse.gmf.tests.runtime.common.core",
- org.eclipse.gmf.runtime.common.core.internal.command;x-friends:="org.eclipse.gmf.tests.runtime.common.core,org.eclipse.gmf.tests.runtime.emf.ui,org.eclipse.gmf.runtime.emf.commands.core",
- org.eclipse.gmf.runtime.common.core.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.common.core",
- org.eclipse.gmf.runtime.common.core.resources,
- org.eclipse.gmf.runtime.common.core.service,
- org.eclipse.gmf.runtime.common.core.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.common.core/about.html b/org.eclipse.gmf.runtime.common.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/build.properties b/org.eclipse.gmf.runtime.common.core/build.properties
deleted file mode 100644
index 260070f..0000000
--- a/org.eclipse.gmf.runtime.common.core/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               .options,\
-               META-INF/,\
-               .,\
-               schema/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.common.core/plugin.properties b/org.eclipse.gmf.runtime.common.core/plugin.properties
deleted file mode 100644
index d917bc1..0000000
--- a/org.eclipse.gmf.runtime.common.core/plugin.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Common Core
-Plugin.providerName = Eclipse.org
-
-extPoint.propertiesConfiguration = Properties Configurations Extension Point
-extPoint.logListeners = Log Listeners Extension Point

diff --git a/org.eclipse.gmf.runtime.common.core/plugin.xml b/org.eclipse.gmf.runtime.common.core/plugin.xml
deleted file mode 100644
index 64d5834..0000000
--- a/org.eclipse.gmf.runtime.common.core/plugin.xml
+++ /dev/null

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<plugin>
-   
-   <extension-point 	
-   		id="propertiesConfiguration" 
-   		name="%extPoint.propertiesConfiguration" 
-   		schema="schema/propertiesConfiguration.exsd"/>
-
-   <extension-point 
-   		id="logListeners" 
-   		name="logListeners" 
-   		schema="schema/logListeners.exsd"/>
-</plugin>

diff --git a/org.eclipse.gmf.runtime.common.core/schema/logListeners.exsd b/org.eclipse.gmf.runtime.common.core/schema/logListeners.exsd
deleted file mode 100644
index 66b948d..0000000
--- a/org.eclipse.gmf.runtime.common.core/schema/logListeners.exsd
+++ /dev/null

@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.core" id="logListeners" name="Log Listeners Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define listeners for Eclipse Log.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="LogListener"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point, i.e. &lt;tt&gt;org.eclipse.gmf.runtime.common.core.logListeners&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. &lt;tt&gt;logListeners&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. &lt;tt&gt;%ext.logListeners&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="LogListener">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The listener class.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.core.runtime.ILogListener"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-         
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of a log listener extension:
-      &lt;br&gt;&lt;tt&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;extension&lt;/tt&gt;
-      &lt;br&gt;&lt;tt&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;point=&quot;org.eclipse.gmf.runtime.common.core.logListeners&quot;&amp;gt;&lt;/tt&gt;
-      &lt;br&gt;&lt;tt&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;LogListener&lt;/tt&gt;
-      &lt;br&gt;&lt;tt&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;class=&quot;org.eclipse.test.listeners.SomeListenerProvider&quot;&amp;gt;&lt;/tt&gt;
-      &lt;br&gt;&lt;tt&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;/extension&amp;gt;&lt;/tt&gt;
-      
-      
-      
-         &lt;extension
-         point=&quot;org.eclipse.gmf.runtime.common.core.logListeners&quot;&gt;
-      &lt;LogListener class=&quot;aaaaa.MyLogListener&quot;/&gt;
-   &lt;/extension&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the class attribute must be the fully qualified name of 
-         a class that implements &lt;tt&gt;org.eclipse.core.runtime.ILogListener&lt;/tt&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2003, 2005  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.common.core/schema/propertiesConfiguration.exsd b/org.eclipse.gmf.runtime.common.core/schema/propertiesConfiguration.exsd
deleted file mode 100644
index 4c46ba8..0000000
--- a/org.eclipse.gmf.runtime.common.core/schema/propertiesConfiguration.exsd
+++ /dev/null

@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.core" id="propertiesConfiguration" name="Properties Configurations Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define plug-in-specific strings in external properties files, such that clients of the plug-in can refer to these strings without loading the plug-in itself (loading of the plug-in is deferred).
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="PropertiesConfiguration" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="PropertiesConfiguration">
-      <complexType>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The relative path to a properties file
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of a Properties configuration: 
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension
-         id=&quot;propertiesConfiguration&quot;
-         name=&quot;%ext.propertiesConfiguration&quot;
-         point=&quot;org.eclipse.gmf.runtime.common.core.propertiesConfiguration&quot;&gt;
-      &lt;PropertiesConfiguration path=&quot;properties/myProject.properties&quot;/&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2002, 2004 IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/AbstractCommand.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/AbstractCommand.java
deleted file mode 100644
index d8ce487..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/AbstractCommand.java
+++ /dev/null

@@ -1,264 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IOperationApprover;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.internal.command.ICommandWithSettableResult;
-
-/**
- * An abstract superclass for GMF {@link IUndoableOperation}s that do not
- * modify EMF model resources.
- * <p>
- * The operation provides a list of {@link IFile}s that are expected to be modified when
- * the operation is executed, undone or redone. An {@link IOperationApprover} is
- * registered with the {@link OperationHistoryFactory#getOperationHistory()} to
- * validate the modification to these resources.
- * <p>
- * This class is meant to be extended by clients.
- * 
- * @author khussey
- * @author ldamus
- *
- * @see org.eclipse.gmf.runtime.common.core.command.ICommand
- * @canBeSeenBy %partners
- */
-public abstract class AbstractCommand extends AbstractOperation
-		implements ICommand, ICommandWithSettableResult {
-
-	private final List affectedFiles;
-
-	private CommandResult commandResult;
-    
-    /**
-     * Initializes me with a label.
-     * 
-     * @param label
-     *            the operation label
-     */
-    public AbstractCommand(String label) {
-        this(label, null);
-    }
-
-	/**
-	 * Initializes me with a label and a list of {@link IFile}s that anticipate modifying
-	 * when I am executed, undone or redone.
-	 * 
-	 * @param label
-	 *            the operation label
-	 * @param affectedFiles
-	 *            the list of affected {@link IFile}s; may be <code>null</code>
-	 */
-	public AbstractCommand(String label, List affectedFiles) {
-		super(label);
-
-		if (affectedFiles == null) {
-			this.affectedFiles = new ArrayList(2);
-
-		} else {
-			this.affectedFiles = affectedFiles;
-		}
-	}
-
-	/**
-	 * Returns the {@link IFile}s that may be modified when the operation is
-	 * executed, undone or redone.
-	 */
-	public List getAffectedFiles() {
-		return affectedFiles;
-	}
-
-	// Documentation copied from the interface
-	public CommandResult getCommandResult() {
-		return commandResult;
-	}
-
-	/**
-	 * Sets the command result.
-	 * 
-	 * @param result
-	 *            the new result for this command.
-	 */
-	protected final void setResult(CommandResult result) {
-		this.commandResult = result;
-	}
-
-	// Documentation copied from the interface
-	public ICommand compose(IUndoableOperation operation) {
-
-		if (operation != null) {
-
-			return new CompositeCommand(getLabel()).compose(this)
-					.compose(operation);
-		}
-		return this;
-	}
-    
-	// Documentation copied from the interface
-    public ICommand reduce() {
-        return this;
-    }
-
-	/**
-	 * Delegates to {@link #doExecuteWithResult(IProgressMonitor, IAdaptable)} and sets
-	 * the command result.
-	 */
-	public IStatus execute(IProgressMonitor progressMonitor, IAdaptable info)
-			throws ExecutionException {
-		
-		IProgressMonitor monitor = progressMonitor != null ? progressMonitor
-				: new NullProgressMonitor();
-
-		CommandResult result = doExecuteWithResult(monitor, info);
-		setResult(result);
-		return result != null ? result.getStatus()
-	            : Status.OK_STATUS;
-	}
-
-	/**
-	 * Performs the actual work of executing this command. Subclasses must
-	 * implement this method to perform some operation.
-	 * 
-	 * @param progressMonitor
-	 *            the progress monitor provided by the operation history. Must
-	 *            never be <code>null</code>.
-	 * @param info
-	 *            the IAdaptable (or <code>null</code>) provided by the
-	 *            caller in order to supply UI information for prompting the
-	 *            user if necessary. When this parameter is not
-	 *            <code>null</code>, it should minimally contain an adapter
-	 *            for the org.eclipse.swt.widgets.Shell.class.
-	 * 
-	 * @return The result of executing this command. May be <code>null</code>
-	 *         if the execution status is OK, but there is no meaningful result
-	 *         to be returned.
-	 * 
-	 * @throws ExecutionException
-	 *             if, for some reason, I fail to complete the operation
-	 */
-	protected abstract CommandResult doExecuteWithResult(
-			IProgressMonitor progressMonitor, IAdaptable info)
-			throws ExecutionException;
-
-	/**
-	 * Delegates to {@link #doRedoWithResult(IProgressMonitor, IAdaptable)} and sets the
-	 * command result.
-	 */
-	public IStatus redo(IProgressMonitor progressMonitor, IAdaptable info)
-			throws ExecutionException {
-
-		IProgressMonitor monitor = progressMonitor != null ? progressMonitor
-				: new NullProgressMonitor();
-		
-		CommandResult result = doRedoWithResult(monitor, info);
-		setResult(result);
-		return result != null ? result.getStatus()
-	            : Status.OK_STATUS;
-	}
-
-	/**
-	 * Performs the actual work of redoing this command. Subclasses must
-	 * implement this method to perform the redo.
-	 * 
-	 * @param progressMonitor
-	 *            the progress monitor provided by the operation history. Must
-	 *            never be <code>null</code>.
-	 * @param info
-	 *            the IAdaptable (or <code>null</code>) provided by the
-	 *            caller in order to supply UI information for prompting the
-	 *            user if necessary. When this parameter is not
-	 *            <code>null</code>, it should minimally contain an adapter
-	 *            for the org.eclipse.swt.widgets.Shell.class.
-	 * 
-	 * @return The result of redoing this command. May be <code>null</code>
-	 *         if the execution status is OK, but there is no meaningful result
-	 *         to be returned.
-	 * 
-	 * @throws ExecutionException
-	 *             on failure to redo
-	 */
-	protected abstract CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-			IAdaptable info) throws ExecutionException;
-
-	/**
-	 * Delegates to {@link #doUndoWithResult(IProgressMonitor, IAdaptable)} and sets the
-	 * command result.
-	 */
-	public IStatus undo(IProgressMonitor progressMonitor, IAdaptable info)
-			throws ExecutionException {
-		
-		IProgressMonitor monitor = progressMonitor != null ? progressMonitor
-				: new NullProgressMonitor();
-
-		CommandResult result = doUndoWithResult(monitor, info);
-		setResult(result);
-		return result != null ? result.getStatus()
-	            : Status.OK_STATUS;
-	}
-
-	/**
-	 * Performs the actual work of undoing this command. Subclasses must
-	 * implement this method to perform the undo.
-	 * 
-	 * @param progressMonitor
-	 *            the progress monitor provided by the operation history. Must
-	 *            never be <code>null</code>.
-	 * @param info
-	 *            the IAdaptable (or <code>null</code>) provided by the
-	 *            caller in order to supply UI information for prompting the
-	 *            user if necessary. When this parameter is not
-	 *            <code>null</code>, it should minimally contain an adapter
-	 *            for the org.eclipse.swt.widgets.Shell.class.
-	 * 
-	 * @return The result of undoing this command. May be <code>null</code>
-	 *         if the execution status is OK, but there is no meaningful result
-	 *         to be returned.
-	 * 
-	 * @throws ExecutionException
-	 *             on failure to undo
-	 */
-	protected abstract CommandResult doUndoWithResult(IProgressMonitor progressMonitor,
-			IAdaptable info) throws ExecutionException;
-
-    public void dispose() {
-        super.dispose();
-        
-        // clear my contexts
-        IUndoContext[] contexts = getContexts();
-        for (int i = 0; i < contexts.length; i++) {
-            removeContext(contexts[i]);
-        }
-    }
-    
-    /**
-     * Internal method to set the command result.
-     * 
-     * @param result CommandResult to set
-     * @deprecated internal API
-     */
-    public void internalSetResult(CommandResult result) {
-        this.commandResult = result;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CommandResult.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CommandResult.java
deleted file mode 100644
index a96e160..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CommandResult.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-import org.eclipse.gmf.runtime.common.core.internal.l10n.CommonCoreMessages;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-
-/**
- * The result of a command execution. Command results have an IStatus and optionally
- * a return value (if applicable). GMF commands are assigned a command result
- * when they are executed, undone, or redone.
- * 
- * @author khussey
- * @author ldamus
- * 
- * @see org.eclipse.core.runtime.IStatus
- * @canBeSeenBy %partners
- */
-public final class CommandResult {
-
-	/**
-	 * Creates a new {@link IStatus#OK} command result.
-	 * 
-	 * @return a new OK command result with no return value
-	 * 
-	 */
-	public static final CommandResult newOKCommandResult() {
-		return new CommandResult(new Status(IStatus.OK, CommonCorePlugin
-				.getPluginId(), CommonCoreStatusCodes.OK, StringStatics.BLANK,
-				null), null);
-	}
-
-	/**
-	 * Creates a new {@link IStatus#OK} command result with the specified return
-	 * <code>value</code>.
-	 * 
-	 * @param value
-	 *            the command return result
-	 * @return a new OK command result with the return <code>value</code>
-	 * 
-	 */
-	public static final CommandResult newOKCommandResult(Object result) {
-		return new CommandResult(new Status(IStatus.OK, CommonCorePlugin
-				.getPluginId(), CommonCoreStatusCodes.OK, StringStatics.BLANK,
-				null), result);
-	}
-
-	/**
-	 * Creates a new {@link IStatus#CANCEL} command result with no return value.
-	 * 
-	 * @return a new CANCEL command result with no return value
-	 */
-	public static final CommandResult newCancelledCommandResult() {
-		return new CommandResult(
-				new Status(
-						IStatus.CANCEL,
-						CommonCorePlugin.getPluginId(),
-						CommonCoreStatusCodes.CANCELLED,
-						CommonCoreMessages.AbstractCommand__INFO__cancelOperation,
-						null), null);
-	}
-
-	/**
-	 * Creates a new {@link IStatus#ERROR} command result with no return value.
-	 * 
-	 * @param errorMessage
-	 *            the error message
-	 * @return a new ERROR command result with no return value
-	 */
-	public static final CommandResult newErrorCommandResult(String errorMessage) {
-		return new CommandResult(new Status(IStatus.ERROR, CommonCorePlugin
-				.getPluginId(), CommonCoreStatusCodes.COMMAND_FAILURE,
-				errorMessage, null), null);
-	}
-
-	/**
-	 * Creates a new {@link IStatus#ERROR} command result with no return value.
-	 * 
-	 * @param errorMessage
-	 *            the error message
-	 * @return a new ERROR command result with no return value
-	 */
-	public static final CommandResult newErrorCommandResult(Throwable throwable) {
-		return new CommandResult(new Status(IStatus.ERROR, CommonCorePlugin
-				.getPluginId(), CommonCoreStatusCodes.COMMAND_FAILURE,
-				throwable.getLocalizedMessage(), throwable), null);
-	}
-
-	/**
-	 * Creates a new {@link IStatus#WARNING} command result with a return
-	 * <code>value</code>.
-	 * 
-	 * @param warningMessage
-	 *            the warning message
-	 * @param value
-	 *            the command return result
-	 * @return a new WARNING command result with the return <code>value</code>
-	 */
-	public static final CommandResult newWarningCommandResult(
-			String warningMessage, Object result) {
-		return new CommandResult(
-				new Status(IStatus.WARNING, CommonCorePlugin.getPluginId(),
-						CommonCoreStatusCodes.OK, warningMessage, null), result);
-	}
-
-	/**
-	 * The return value for this command, if applicable.
-	 */
-	private final Object returnValue;
-
-	/**
-	 * The status of executing, undoing, or redoing this command.
-	 */
-	private final IStatus status;
-
-	/**
-	 * Constructs a new command result with the specified status and a default
-	 * return value.
-	 * 
-	 * @param status
-	 *            The status for the new command result.
-	 */
-	public CommandResult(IStatus status) {
-		this(status, null);
-	}
-
-	/**
-	 * Constructs a new command result with the specified status and return
-	 * value.
-	 * 
-	 * @param status
-	 *            The status for the new command result.
-	 * @param returnValue
-	 *            The return value for the new command result.
-	 */
-	public CommandResult(IStatus status, Object returnValue) {
-		super();
-
-		assert null != status : "null status"; //$NON-NLS-1$
-
-		this.status = status;
-		this.returnValue = returnValue;
-	}
-
-	/**
-	 * Retrieves the status of the command that is executed, undone or redone.
-	 * 
-	 * @return The status.
-	 */
-	public IStatus getStatus() {
-		return status;
-	}
-
-	/**
-	 * The value returned by the execute, undo or redo of a GMF operation.
-	 * 
-	 * @return the return value; may be <code>null</code>
-	 */
-	public Object getReturnValue() {
-		return returnValue;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CompositeCommand.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CompositeCommand.java
deleted file mode 100644
index 3adf8c8..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CompositeCommand.java
+++ /dev/null

@@ -1,943 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.ICompositeOperation;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-import org.eclipse.gmf.runtime.common.core.internal.l10n.CommonCoreMessages;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-
-/**
- * An undoable command that is composed of child {@link IUndoableOperation}s
- * that are not known to modify EMF model resources, but can contain
- * model-affecting children. Execute, undo, redo and dispose result in execute,
- * undo, redo and dispose on each child operation. The operation provides a list
- * of {@link IFile}s that may be modified when the operation is executed,
- * undone or redone.
- * <P>
- * The children are explicitly composed by a client before the composite is
- * executed. Children cannot be added or removed after the composite has been
- * executed.
- * <P>
- * The undo contexts of the composite are a union of the undo contexts of its
- * children.
- * <P>
- * If a child command returns a cancel or an error status during execution, undo
- * or redo, the remaining child commands are not processed and those that have
- * already been executed are rolled back.
- * 
- * @author ldamus
- */
-public class CompositeCommand
-    extends AbstractCommand
-    implements ICompositeCommand {
-
-    private final List children;
-
-    private boolean executed;
-
-    /**
-     * Initializes me with a label.
-     * 
-     * @param label
-     *            a user-readable label
-     */
-    public CompositeCommand(String label) {
-        this(label, null);
-    }
-
-    /**
-     * Initializes me with a label and a list of child operations.
-     * 
-     * @param label
-     *            a user-readable label
-     * @param children
-     *            a list of child {@link IUndoableOperation}s
-     */
-    public CompositeCommand(String label, List children) {
-        super(label, null);
-
-        if (children != null) {
-            this.children = new ArrayList(children);
-        } else {
-            this.children = new ArrayList(4);
-        }
-    }
-
-    /**
-     * Answers whether or not this composite operation has children.
-     * 
-     * @return <code>true</code> if the operation does not have children,
-     *         <code>false</code> otherwise.
-     */
-    public final boolean isEmpty() {
-        return size() < 1;
-    }
-
-    /**
-     * Obtains my nested operations. Note that the return result is mutable and
-     * is identical to my child-operation storage, so subclasses should be
-     * careful of adding or removing contents. This should ordinarily be done
-     * only via the {@link #add(IUndoableOperation)} and
-     * {@link #remove(IUndoableOperation)} methods because these maintain the
-     * undo contexts (or, equivalently, using the iterators).
-     * 
-     * @return my list of children
-     * 
-     * @see #add(IUndoableOperation)
-     * @see #remove(IUndoableOperation)
-     * @see #iterator()
-     * @see #listIterator(int)
-     */
-    protected List getChildren() {
-        return children;
-    }
-
-    // Documentation copied from interface
-    public int size() {
-        return getChildren().size();
-    }
-
-    /**
-     * Adds a child operation to me. This should only be done before I am
-     * executed. Has no effect if I already contain this operation as a child.
-     * 
-     * @param operation
-     *            a new child operation
-     * 
-     * @throws IllegalStateException
-     *             if I have already been successfully executed
-     */
-    public void add(IUndoableOperation operation) {
-
-        assertNotExecuted();
-
-        if (!getChildren().contains(operation)) {
-            getChildren().add(operation);
-            didAdd(operation);
-        }
-    }
-
-    /**
-     * Updates my undo contexts for the addition of a new child operation.
-     * 
-     * @param operation
-     *            a new child operation
-     */
-    private void didAdd(IUndoableOperation operation) {
-        IUndoContext[] childContexts = operation.getContexts();
-
-        for (int i = 0; i < childContexts.length; i++) {
-
-            if (!hasContext(childContexts[i])) {
-                addContext(childContexts[i]);
-            }
-        }
-    }
-
-    /**
-     * Removes a child operation from me. This should only be done before I am
-     * executed. Has no effect if I do not contain this operation as a child.
-     * <p>
-     * <b>Note</b> that I do not dispose an operation when it is removed from
-     * me. Although this is specified in the contract of the
-     * {@link ICompositeOperation} interface, this would not be correct, as I
-     * did not create that operation.
-     * </p>
-     * 
-     * @param operation
-     *            a child operation to remove
-     * 
-     * @throws IllegalStateException
-     *             if I have already been successfully executed
-     */
-    public void remove(IUndoableOperation operation) {
-
-        assertNotExecuted();
-
-        if (getChildren().remove(operation)) {
-            didRemove(operation);
-        }
-    }
-
-    /**
-     * Updates my undo contexts for the removal of a child operation.
-     * 
-     * @param operation
-     *            the child operation that was removed
-     */
-    private void didRemove(IUndoableOperation operation) {
-        IUndoContext[] childContexts = operation.getContexts();
-
-        for (int i = 0; i < childContexts.length; i++) {
-
-            if (!anyChildHasContext(childContexts[i])) {
-                removeContext(childContexts[i]);
-            }
-        }
-    }
-
-    /**
-     * Queries whether any of my children has the specified context.
-     * 
-     * @param ctx
-     *            a context
-     * 
-     * @return <code>false</code> if none of my children has the specified
-     *         context; <code>true</code>, otherwise
-     */
-    private boolean anyChildHasContext(IUndoContext ctx) {
-        boolean result = false;
-
-        for (Iterator iter = iterator(); !result && iter.hasNext();) {
-            result = ((IUndoableOperation) iter.next()).hasContext(ctx);
-        }
-
-        return result;
-    }
-
-    /**
-     * I can execute if I am not empty and all of my children can execute.
-     */
-    public boolean canExecute() {
-        boolean result = !isEmpty() && super.canExecute();
-
-        for (Iterator iter = iterator(); result && iter.hasNext();) {
-            result = ((IUndoableOperation) iter.next()).canExecute();
-        }
-
-        return result;
-    }
-
-    /**
-     * I can redo if I am not empty and all my children can all be redone.
-     */
-    public boolean canRedo() {
-        boolean result = !isEmpty() && super.canRedo();
-
-        for (Iterator iter = iterator(); result && iter.hasNext();) {
-            result = ((IUndoableOperation) iter.next()).canRedo();
-        }
-
-        return result;
-    }
-
-    /**
-     * I can undo if I am not empty and all my children can all be undone.
-     */
-    public boolean canUndo() {
-        boolean result = !isEmpty() && super.canUndo();
-
-        for (Iterator iter = iterator(); result && iter.hasNext();) {
-            result = ((IUndoableOperation) iter.next()).canUndo();
-        }
-
-        return result;
-    }
-
-    /**
-     * Disposes of each of my children.
-     */
-    public void dispose() {
-
-        for (Iterator iter = iterator(); iter.hasNext();) {
-            IUndoableOperation nextOperation = (IUndoableOperation) iter.next();
-            nextOperation.dispose();
-        }
-    }
-
-    /**
-     * Adds <code>command</code> to the list of commands with which this
-     * composite is composed.
-     * 
-     * @param operation
-     *            The command with which to compose this command.
-     * @return <code>this</code>.
-     */
-    public final ICommand compose(IUndoableOperation operation) {
-
-        if (operation != null) {
-            add(operation);
-        }
-        return this;
-    }
-    
-	/**
-	 * Appends a command onto a (possibly) existing composeite of commands.
-	 * 
-	 * @param command an existing command, which may be a composite, a single
-	 *     command, or <code>null</code>
-	 * @param next a command to append to the composite (may also be
-	 *     <code>null</code>, which produces no effect)
-	 * 
-	 * @return the new composite, which is just <code>next</code> if
-	 *     <code>command</code> was <code>null</code>
-	 */
-	public static ICommand compose(ICommand command, ICommand next) {
-		if (command == null) {
-			return next;
-		} else if (next != null) {
-			return command.compose(next);
-		} else {
-			return command;
-		}
-	}
-
-    /**
-	 * Returns the simplest form of this command that is equivalent. This is
-	 * useful for removing unnecessary nesting of commands.
-	 * <P>
-	 * If the composite has a single command, it returns the reduction of that
-	 * single command. Otherwise, it returns itself.
-	 * 
-	 * @return the simplest form of this command that is equivalent
-	 */
-	public ICommand reduce() {
-		switch (size()) {
-		case 1:
-			IUndoableOperation child = (IUndoableOperation) iterator().next();
-
-			if (child instanceof ICommand) {
-				ICommand cmd = ((ICommand) child).reduce();
-				/*
-				 * If label is missing on the resultant reduced command
-				 * and it is present on this command, then just copy the label
-				 * from this command to the resultant.
-				 */
-				if ((cmd.getLabel() == null || cmd.getLabel().length() == 0)
-						&& getLabel() != null && getLabel().length() > 0) {
-					cmd.setLabel(getLabel());
-				}
-				return cmd;
-			}
-		}
-		return this;
-	}
-
-    /**
-	 * Returns a list containing all of the return values from
-	 * <code>ICommand</code> children.
-	 */
-    protected List getReturnValues() {
-
-        List returnValues = new ArrayList();
-
-        for (Iterator i = iterator(); i.hasNext();) {
-            IUndoableOperation operation = (IUndoableOperation) i.next();
-
-            if (operation instanceof ICommand) {
-                ICommand command = (ICommand) operation;
-
-                CommandResult result = command.getCommandResult();
-
-                if (result != null) {
-                    Object returnValue = result.getReturnValue();
-
-                    if (returnValue != null) {
-
-                        if (getClass().isInstance(command)) {
-                            // unwrap the values from other composites
-                            if (returnValue != null
-                                && returnValue instanceof Collection) {
-                                returnValues.addAll((Collection) returnValue);
-
-                            } else {
-                                returnValues.add(returnValue);
-                            }
-
-                        } else {
-                            returnValues.add(returnValue);
-                        }
-                    }
-                }
-            }
-        }
-
-        return returnValues;
-    }
-
-    /**
-     * Implements the execution logic by sequential execution of my children.
-     */
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        List result = new ArrayList(size());
-
-        progressMonitor.beginTask(getLabel(), size());
-
-        try {
-
-            for (ListIterator iter = listIterator(); iter.hasNext();) {
-                IUndoableOperation next = (IUndoableOperation) iter.next();
-
-                try {
-                    IStatus status = next.execute(new SubProgressMonitor(
-                        progressMonitor, 1), info);
-                    result.add(status);
-                    int severity = status.getSeverity();
-
-                    if (severity == IStatus.CANCEL || severity == IStatus.ERROR) {
-
-                        // Undo the operation to date, excluding the current
-                        // child, and don't proceed
-                        Trace
-                            .trace(
-                                CommonCorePlugin.getDefault(),
-                                "Composite operation execution recovery: child command status is CANCEL or ERROR."); //$NON-NLS-1$
-                        // back-track over the operation that failed
-                        iter.previous();
-                        unwindFailedExecute(iter, info);
-                        break;
-
-                    } else if (progressMonitor.isCanceled()) {
-                        // Undo the operation to date, including the current
-                        // child, and don't proceed
-                        Trace
-                            .trace(CommonCorePlugin.getDefault(),
-                                "Composite operation redo recovery: child command monitor is cancelled."); //$NON-NLS-1$
-
-                        CommandResult cancelResult = CommandResult
-                            .newCancelledCommandResult();
-                        result.add(cancelResult.getStatus());
-
-                        unwindFailedExecute(iter, info);
-                        break;
-
-                    } else {
-                        progressMonitor.worked(1);
-                        executed = true;
-                    }
-
-                } catch (ExecutionException e) {
-                    // Undo the operation to date, and re-throw the exception
-                    // back-track over the operation that failed
-                    iter.previous();
-                    unwindFailedExecute(iter, info);
-                    Trace.throwing(CommonCorePlugin.getDefault(),
-                        CommonCoreDebugOptions.EXCEPTIONS_THROWING,
-                        CompositeCommand.class, "execute", e); //$NON-NLS-1$
-                    throw e;
-                }
-            }
-
-        } finally {
-            progressMonitor.done();
-        }
-
-        return new CommandResult(aggregateStatuses(result), getReturnValues());
-    }
-
-    /**
-     * Undoes the previous operations in the iterator.
-     * 
-     * @param iter
-     *            the execution iterator
-     * @param info
-     *            the execution info
-     */
-    private void unwindFailedExecute(ListIterator iter, IAdaptable info) {
-
-        while (iter.hasPrevious()) {
-            // unwind the child operations
-            IUndoableOperation prev = (IUndoableOperation) iter.previous();
-            if (!prev.canUndo()) {
-                // Can't unwind
-                Log.error(CommonCorePlugin.getDefault(),
-                    CommonCoreStatusCodes.EXECUTE_RECOVERY_FAILED,
-                    CommonCoreMessages.bind(
-                        CommonCoreMessages.executeRecoveryFailed,
-                        CommonCoreMessages.cannotUndoExecuted));
-                break;
-            }
-
-            try {
-                prev.undo(new NullProgressMonitor(), info);
-
-            } catch (ExecutionException inner) {
-                Log.error(CommonCorePlugin.getDefault(),
-                    CommonCoreStatusCodes.EXECUTE_RECOVERY_FAILED,
-                    CommonCoreMessages.bind(
-                        CommonCoreMessages.executeRecoveryFailed, inner
-                            .getLocalizedMessage()));
-                break;
-            }
-        }
-    }
-
-    /**
-     * I redo by asking my children to redo, in forward order.
-     */
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        final List result = new ArrayList(size());
-
-        progressMonitor.beginTask(getLabel(), size());
-
-        try {
-
-            for (ListIterator iter = listIterator(); iter.hasNext();) {
-                IUndoableOperation next = (IUndoableOperation) iter.next();
-
-                try {
-
-                    IStatus status = next.redo(new SubProgressMonitor(
-                        progressMonitor, 1), info);
-                    result.add(status);
-                    int severity = status.getSeverity();
-
-                    if (severity == IStatus.CANCEL || severity == IStatus.ERROR) {
-                        // Undo the operation to date, excluding the current
-                        // child, and don't proceed
-                        Trace
-                            .trace(CommonCorePlugin.getDefault(),
-                                "Composite operation redo recovery: child command status is CANCEL or ERROR."); //$NON-NLS-1$
-                        // back-track over the operation that failed
-                        iter.previous();
-                        unwindFailedRedo(iter, info);
-                        break;
-
-                    } else if (progressMonitor.isCanceled()) {
-                        // Undo the operation to date, including the current
-                        // child, and don't proceed
-                        Trace
-                            .trace(CommonCorePlugin.getDefault(),
-                                "Composite operation redo recovery: child command monitor is cancelled."); //$NON-NLS-1$
-
-                        CommandResult cancelResult = CommandResult
-                            .newCancelledCommandResult();
-                        result.add(cancelResult.getStatus());
-
-                        unwindFailedRedo(iter, info);
-                        break;
-
-                    } else {
-                        progressMonitor.worked(1);
-                        executed = true;
-                    }
-
-                } catch (ExecutionException e) {
-                    // Undo the operation to date, and re-throw the exception
-                    // back-track over the operation that failed
-                    iter.previous();
-                    unwindFailedRedo(iter, info);
-                    Trace.throwing(CommonCorePlugin.getDefault(),
-                        CommonCoreDebugOptions.EXCEPTIONS_THROWING,
-                        CompositeCommand.class, "redo", e); //$NON-NLS-1$
-                    throw e;
-                }
-            }
-
-        } finally {
-            progressMonitor.done();
-        }
-
-        return new CommandResult(aggregateStatuses(result), getReturnValues());
-    }
-
-    /**
-     * Undoes the previous operations in the iterator.
-     * 
-     * @param iter
-     *            the execution iterator
-     * @param info
-     *            the execution info
-     */
-    private void unwindFailedRedo(ListIterator iter, IAdaptable info) {
-
-        while (iter.hasPrevious()) {
-            // unwind the child operations
-            IUndoableOperation prev = (IUndoableOperation) iter.previous();
-            if (!prev.canUndo()) {
-                // Can't unwind
-                Log.error(CommonCorePlugin.getDefault(),
-                    CommonCoreStatusCodes.REDO_RECOVERY_FAILED,
-                    CommonCoreMessages.bind(
-                        CommonCoreMessages.redoRecoveryFailed,
-                        CommonCoreMessages.cannotUndo));
-                break;
-            }
-
-            try {
-                prev.undo(new NullProgressMonitor(), info);
-
-            } catch (ExecutionException inner) {
-                Log.error(CommonCorePlugin.getDefault(),
-                    CommonCoreStatusCodes.REDO_RECOVERY_FAILED,
-                    CommonCoreMessages.bind(
-                        CommonCoreMessages.redoRecoveryFailed, inner
-                            .getLocalizedMessage()));
-                break;
-            }
-        }
-    }
-
-    /**
-     * I undo by asking my children to undo, in reverse order.
-     */
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        final List result = new ArrayList(size());
-
-        progressMonitor.beginTask(getLabel(), size());
-
-        try {
-
-            for (ListIterator iter = listIterator(size()); iter.hasPrevious();) {
-                IUndoableOperation prev = (IUndoableOperation) iter.previous();
-
-                try {
-                    IStatus status = prev.undo(new SubProgressMonitor(
-                        progressMonitor, 1), info);
-                    result.add(status);
-                    int severity = status.getSeverity();
-
-                    if (severity == IStatus.CANCEL || severity == IStatus.ERROR) {
-                        // Redo the operation to date, excluding the current
-                        // child, and don't proceed
-                        Trace
-                            .trace(CommonCorePlugin.getDefault(),
-                                "Composite operation undo recovery: child command status is CANCEL or ERROR."); //$NON-NLS-1$
-                        // back-track over the operation that failed or was
-                        // cancelled
-                        iter.next();
-                        unwindFailedUndo(iter, info);
-                        break;
-
-                    } else if (progressMonitor.isCanceled()) {
-                        // Redo the operation to date, including the current
-                        // child, and don't proceed
-                        Trace
-                            .trace(CommonCorePlugin.getDefault(),
-                                "Composite operation undo recovery: child command monitor is cancelled."); //$NON-NLS-1$
-
-                        CommandResult cancelResult = CommandResult
-                            .newCancelledCommandResult();
-                        result.add(cancelResult.getStatus());
-
-                        unwindFailedUndo(iter, info);
-                        break;
-
-                    } else {
-                        progressMonitor.worked(1);
-                        executed = true;
-                    }
-
-                } catch (ExecutionException e) {
-                    // Redo the operation to date, and re-throw the exception
-                    // back-track over the operation that failed
-                    iter.next();
-                    unwindFailedUndo(iter, info);
-                    Trace.throwing(CommonCorePlugin.getDefault(),
-                        CommonCoreDebugOptions.EXCEPTIONS_THROWING,
-                        CompositeCommand.class, "undo", e); //$NON-NLS-1$
-                    throw e;
-                }
-            }
-
-        } finally {
-            progressMonitor.done();
-        }
-
-        return new CommandResult(aggregateStatuses(result), getReturnValues());
-    }
-
-    /**
-     * Redoes the next operations in the iterator.
-     * 
-     * @param iter
-     *            the execution iterator
-     * @param info
-     *            the execution info
-     */
-    private void unwindFailedUndo(ListIterator iter, IAdaptable info) {
-
-        while (iter.hasNext()) {
-            // unwind the child operations
-            IUndoableOperation next = (IUndoableOperation) iter.next();
-            if (!next.canRedo()) {
-                // Can't unwind
-                Log.error(CommonCorePlugin.getDefault(),
-                    CommonCoreStatusCodes.UNDO_RECOVERY_FAILED,
-                    CommonCoreMessages.bind(
-                        CommonCoreMessages.undoRecoveryFailed,
-                        CommonCoreMessages.cannotRedo));
-                break;
-            }
-
-            try {
-                next.redo(new NullProgressMonitor(), info);
-
-            } catch (ExecutionException inner) {
-                Log.error(CommonCorePlugin.getDefault(),
-                    CommonCoreStatusCodes.UNDO_RECOVERY_FAILED,
-                    CommonCoreMessages.bind(
-                        CommonCoreMessages.undoRecoveryFailed, inner
-                            .getLocalizedMessage()));
-                break;
-            }
-        }
-    }
-
-    /**
-     * Creates a suitable aggregate from these statuses. If there are no
-     * statuses to aggregate, then an OK status is returned. If there is a
-     * single status to aggregate, then it is returned. Otherwise, a
-     * multi-status is returned with the provided statuses as children.
-     * 
-     * @param statuses
-     *            the statuses to aggregate. May have zero, one, or more
-     *            elements (all must be {@link IStatus}es)
-     * 
-     * @return the multi-status
-     */
-    protected IStatus aggregateStatuses(List statuses) {
-        final IStatus result;
-
-        if (statuses.isEmpty()) {
-            result = Status.OK_STATUS;
-        } else if (statuses.size() == 1) {
-            result = ((IStatus) statuses.get(0));
-        } else {
-            // find the most severe status, to use its plug-in, code, and
-            // message
-            IStatus[] statusArray = (IStatus[]) statuses
-                .toArray(new IStatus[statuses.size()]);
-
-            IStatus worst = statusArray[0];
-            for (int i = 1; i < statusArray.length; i++) {
-                if (statusArray[i].getSeverity() > worst.getSeverity()) {
-                    worst = statusArray[i];
-                }
-            }
-
-            result = new MultiStatus(worst.getPlugin(), worst.getCode(),
-                statusArray, worst.getMessage(), null);
-        }
-
-        return result;
-    }
-
-    /**
-     * Answers whether or not I have been executed.
-     * 
-     * @return <code>true</code> if I have been executed, <code>false</code>
-     *         otherwise.
-     */
-    protected final boolean isExecuted() {
-        return executed;
-    }
-
-    /**
-     * Asserts that I have not yet been executed. Changes to my children are not
-     * permitted after I have been executed.
-     */
-    protected final void assertNotExecuted() {
-        if (isExecuted()) {
-            IllegalStateException exc = new IllegalStateException(
-                "Operation already executed"); //$NON-NLS-1$
-            Trace.throwing(CommonCorePlugin.getDefault(),
-                CommonCoreDebugOptions.EXCEPTIONS_THROWING,
-                CompositeCommand.class, "assertNotExecuted", exc); //$NON-NLS-1$
-            throw exc;
-        }
-    }
-
-    /**
-     * Returns a list containing all of the affected files from
-     * <code>ICommand</code> children.
-     */
-    public List getAffectedFiles() {
-
-        HashSet result = new HashSet();
-
-        for (Iterator i = iterator(); i.hasNext();) {
-            IUndoableOperation nextOperation = (IUndoableOperation) i.next();
-
-            if (nextOperation instanceof ICommand) {
-                List nextAffected = ((ICommand) nextOperation)
-                    .getAffectedFiles();
-
-                if (nextAffected != null) {
-                    result.addAll(nextAffected);
-                }
-            }
-        }
-        return new ArrayList(result);
-    }
-
-    /**
-     * Obtains an iterator to traverse my child operations. Removing children
-     * via this iterator correctly maintains my undo contexts.
-     * 
-     * @return an iterator of my children
-     */
-    public Iterator iterator() {
-        return new ChildIterator();
-    }
-
-    /**
-     * Obtains an iterator to traverse my child operations in either direction.
-     * Adding and removing children via this iterator correctly maintains my
-     * undo contexts.
-     * <p>
-     * <b>Note</b> that, unlike list iterators generally, this implementation
-     * does not permit the addition of an operation that I already contain (the
-     * composite does not permit duplicates). Moreover, only
-     * {@link IUndoableOperation}s may be added, otherwise
-     * <code>ClassCastException</code>s will result.
-     * </p>
-     * 
-     * @return an iterator of my children
-     */
-    public ListIterator listIterator() {
-        return new ChildListIterator(0);
-    }
-
-    /**
-     * Obtains an iterator to traverse my child operations in either direction,
-     * starting from the specified <code>index</code>. Adding and removing
-     * children via this iterator correctly maintains my undo contexts.
-     * <p>
-     * <b>Note</b> that, unlike list iterators generally, this implementation
-     * does not permit the addition of an operation that I already contain (the
-     * composite does not permit duplicates). Moreover, only
-     * {@link IUndoableOperation}s may be added, otherwise
-     * <code>ClassCastException</code>s will result.
-     * </p>
-     * 
-     * @param index
-     *            the index in my children at which to start iterating
-     * 
-     * @return an iterator of my children
-     */
-    public ListIterator listIterator(int index) {
-        return new ChildListIterator(index);
-    }
-
-    /**
-     * Custom iterator implementation that maintains my undo contexts correctly
-     * when elements are removed.
-     * 
-     * @author ldamus
-     */
-    private class ChildIterator
-        implements Iterator {
-
-        protected Object last;
-
-        protected final ListIterator iter;
-
-        ChildIterator() {
-            this(0);
-        }
-
-        ChildIterator(int index) {
-            iter = getChildren().listIterator(index);
-        }
-
-        public void remove() {
-            assertNotExecuted();
-
-            iter.remove();
-            didRemove((IUndoableOperation) last);
-            last = null;
-        }
-
-        public Object next() {
-            last = iter.next();
-            return last;
-        }
-
-        public boolean hasNext() {
-            return iter.hasNext();
-        }
-    }
-
-    /**
-     * Custom list-iterator implementation that maintains my undo contexts
-     * correctly, as well as uniqueness of the list contents.
-     * 
-     * @author ldamus
-     */
-    private class ChildListIterator
-        extends ChildIterator
-        implements ListIterator {
-
-        ChildListIterator(int index) {
-            super(index);
-        }
-
-        public void add(Object o) {
-            assertNotExecuted();
-
-            if (!getChildren().contains(o)) {
-                iter.add(o);
-                didAdd((IUndoableOperation) o);
-            }
-        }
-
-        public void set(Object o) {
-            assertNotExecuted();
-
-            if (!getChildren().contains(o)) {
-                didRemove((IUndoableOperation) last);
-                iter.set(o);
-                last = o;
-                didAdd((IUndoableOperation) o);
-            }
-        }
-
-        public int previousIndex() {
-            return iter.previousIndex();
-        }
-
-        public int nextIndex() {
-            return iter.nextIndex();
-        }
-
-        public Object previous() {
-            last = iter.previous();
-            return last;
-        }
-
-        public boolean hasPrevious() {
-            return iter.hasPrevious();
-        }
-    }
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/FileModificationValidator.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/FileModificationValidator.java
deleted file mode 100644
index d6146b0..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/FileModificationValidator.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.gmf.runtime.common.core.internal.command.BaseModificationValidator;
-
-/**
- * Static utility that approves the modification of files using an
- * {@link IModificationValidator}.
- * <P>
- * The modification validator can be set exactly once using
- * {@link #setModificationValidator(IModificationValidator)} before the first
- * request to validate files.
- * 
- * @author ldamus
- */
-public class FileModificationValidator {
-
-	private static IModificationValidator validator;
-
-	private FileModificationValidator() {
-		// not to be instantiated
-	}
-
-	/**
-	 * Set the modification validator to be used to check that files can be
-	 * modified.
-	 * <P>
-	 * This method may only be called once, and must be called before any
-	 * request to validate files. Attempts to set the validator will be ignored
-	 * after it has been already set, or after a default one has been created.
-	 * 
-	 * @param validator
-	 *            the modification validator
-	 */
-	public static void setModificationValidator(IModificationValidator v) {
-		if (validator == null) {
-			validator = v;
-		}
-	}
-
-	/**
-	 * Gets the validator.
-	 * 
-	 * @return the validator
-	 */
-	private static IModificationValidator getValidator() {
-		if (validator == null) {
-			validator = new BaseModificationValidator();
-		}
-		return validator;
-	}
-
-	/**
-	 * Checks that the <code>files</code> may be modified.
-	 * 
-	 * @return the approval status
-	 */
-	public static IStatus approveFileModification(IFile[] files) {
-		return getValidator().validateEdit(files);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/ICommand.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/ICommand.java
deleted file mode 100644
index 036e789..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/ICommand.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import java.util.List;
-
-import org.eclipse.core.commands.operations.IOperationApprover;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-
-/**
- * A self-composing undoable operation that has a {@link CommandResult} and a
- * list of affected {@link IFile}s.
- * <P>
- * Executing, undoing or redoing a command can have a result which clients can
- * obtain by using the {@link #getCommandResult()} method. For example,
- * executing a command that create a new entity may wish to make the new entity
- * accessible to clients through the {@link #getCommandResult()} method.
- * <P>
- * The command provides a list of {@link IFile}s that are expected to be
- * modified when the it is executed, undone or redone. An
- * {@link IOperationApprover} is registered with the
- * {@link OperationHistoryFactory#getOperationHistory()} to validate the
- * modification to these resources.
- * <P>
- * If an error occurs, or the progress monitor is canceled during execute, undo
- * or redo, the command should make every effort to roll back the changes it has
- * made up to that point.
- * 
- * @author khussey
- * @author ldamus
- * 
- * @canBeSeenBy %partners
- */
-public interface ICommand extends IUndoableOperation {
-
-	/**
-	 * Retrieves the result of executing, undoing, or redoing this command,
-	 * depending on which of these operations was last performed. This value can
-	 * be <code>null</code> if the operation has no meaningful result.
-	 * <P>
-	 * The value of this result is undefined if the command has not yet been
-	 * executed, undone or redone.
-	 * 
-	 * @return The result of executing, undoing or redoing this command.
-	 */
-	public abstract CommandResult getCommandResult();
-
-	/**
-	 * Returns the list of {@link IFile}s that are expected to be modified by
-	 * this command.
-	 * 
-	 * @return the list of {@link IFile}s that will be modified
-	 */
-	public abstract List getAffectedFiles();
-
-	/**
-	 * Returns a new command object that represents a composition of this
-	 * command with the specified <code>command</code> parameter.
-	 * 
-	 * @param operation
-	 *            The operation that is to be composed with this command.
-	 * @return A command that represents a composition of this command with the
-	 *         specified command.
-	 */
-	public abstract ICommand compose(IUndoableOperation operation);
-    
-    /**
-     * Returns the simplest form of this command that is equivalent. Use this
-     * method to remove unnecessary nesting of commands.
-     * 
-     * @return the simplest form of this command that is equivalent
-     */
-    public abstract ICommand reduce();
-    
-    /**
-     * Since not all commands have names, reduce() should propogate label from an
-     * upper command that may be thrown away to the resultant reduced command. The
-     * method is needed to assign the label to a nameless command, because
-     * <code>IUndoableOperation</code> is missing this method.
-     * 
-     * @param label command's new label
-     */
-    public abstract void setLabel(String label);
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/ICompositeCommand.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/ICompositeCommand.java
deleted file mode 100644
index d21aac1..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/ICompositeCommand.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.core.commands.operations.ICompositeOperation;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IFile;
-
-/**
- * A self-composing undoable operation that is has a {@link CommandResult}, a
- * list of affected {@link IFile}s, and is composed of child operations.
- * <P>
- * Does not extend <code>ICompositeOperation</code> because
- * <UL>
- * <LI> {@link #remove(IUndoableOperation)} does not dispose the removed
- * operation</LI>
- * <LI> Children are explicitely composed by the client. Adding to an open
- * composite through the operation history is not supported.</LI>
- * </UL>
- * 
- * @author ldamus
- */
-public interface ICompositeCommand
-    extends ICommand {
-
-    /**
-     * <p>
-     * Add the specified operation as a child of this operation.
-     * </p>
-     * 
-     * @param operation
-     *            the operation to be added. If the operation instance has
-     *            already been added, this method will have no effect.
-     */
-    public abstract void add(IUndoableOperation operation);
-
-    /**
-     * <p>
-     * Remove the specified operation from this operation.
-     * </p>
-     * <p>
-     * Unlike {@link ICompositeOperation}, this does not dispose of the removed
-     * operation since the composite did not create the operation.
-     * </p>
-     * 
-     * @param operation
-     *            the operation to be removed. The operation should be disposed
-     *            by the receiver. This method will have no effect if the
-     *            operation instance is not already a child.
-     */
-    public abstract void remove(IUndoableOperation operation);
-
-    /**
-     * Answers whether or not this composite operation has children.
-     * 
-     * @return <code>true</code> if the operation does not have children,
-     *         <code>false</code> otherwise.
-     */
-    public abstract boolean isEmpty();
-
-    /**
-     * Queries the number of child operations that I contain.
-     * 
-     * @return my size
-     */
-    public abstract int size();
-
-    /**
-     * Obtains an iterator to traverse my child operations. Removing children
-     * via this iterator correctly maintains my undo contexts.
-     * 
-     * @return an iterator of my children
-     */
-    public abstract Iterator iterator();
-
-    /**
-     * Obtains an iterator to traverse my child operations in either direction.
-     * Adding and removing children via this iterator correctly maintains my
-     * undo contexts.
-     * <p>
-     * <b>Note</b> that, unlike list iterators generally, this one does not
-     * permit the addition of an operation that I already contain (the composite
-     * does not permit duplicates). Moreover, only {@link IUndoableOperation}s
-     * may be added, otherwise <code>ClassCastException</code>s will result.
-     * </p>
-     * 
-     * @return an iterator of my children
-     */
-    public abstract ListIterator listIterator();
-
-    /**
-     * Obtains an iterator to traverse my child operations in either direction,
-     * starting from the specified <code>index</code>. Adding and removing
-     * children via this iterator correctly maintains my undo contexts.
-     * <p>
-     * <b>Note</b> that, unlike list iterators generally, this one does not
-     * permit the addition of an operation that I already contain (the composite
-     * does not permit duplicates). Moreover, only {@link IUndoableOperation}s
-     * may be added, otherwise <code>ClassCastException</code>s will result.
-     * </p>
-     * 
-     * @param index
-     *            the index in my children at which to start iterating
-     * 
-     * @return an iterator of my children
-     */
-    public abstract ListIterator listIterator(int index);
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/IModificationValidator.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/IModificationValidator.java
deleted file mode 100644
index 47ff4e5..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/IModificationValidator.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * A validator responsible for doing the actual validation on files.  The
- * validation determines whether files may be modified.
- * 
- * @author wdiu, Wayne Diu
- */
-public interface IModificationValidator {
-	
-	/**
-	 * Validates whether the array of IFile objects may be modified.
-	 * 
-	 * @param files an array of the IFile objects that will be modified 
-	 * @return IStatus which contains a code describing whether or not the modificationn may proceed
-	 */
-	public IStatus validateEdit(IFile files[]);
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/IdentityCommand.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/IdentityCommand.java
deleted file mode 100644
index 1e0d663..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/IdentityCommand.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.common.core.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-
-/**
- * A command that is always executable, undoable and redoable, but does nothing.
- * It always returns the same OK command result.
- * 
- * @author ldamus
- */
-public final class IdentityCommand
-    extends AbstractCommand {
-
-    /**
-     * The singleton instance.
-     */
-    public static final IdentityCommand INSTANCE = new IdentityCommand();
-
-    /**
-     * Initilizes me.
-     */
-    private IdentityCommand() {
-        super(StringStatics.BLANK, null);
-        setResult(CommandResult.newOKCommandResult());
-    }
-
-    /**
-     * Does nothing and returns an OK command result.
-     */
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        return getCommandResult();
-    }
-
-    /**
-     * Does nothing and returns an OK command result.
-     */
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        return getCommandResult();
-    }
-
-    /**
-     * Does nothing and returns an OK command result.
-     */
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        return getCommandResult();
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/OneTimeCommand.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/OneTimeCommand.java
deleted file mode 100644
index 539aae7..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/OneTimeCommand.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.command;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-
-/**
- * A command does its work once, and can never be undone or redone. It does not do
- * any work that invalidates the undo history in a linear undo model.
- * <P>
- * By default, it is assigned the <code>NULL_CONTEXT</code> when it is
- * constructed, and no other contexts can be added to it or removed from it.
- * <P>
- * This class is meant to be subclassed by clients who have work to do in a
- * command that should have no effect on the operation history.
- * 
- * @author ldamus
- */
-public abstract class OneTimeCommand
-    extends AbstractCommand {
-
-    /**
-     * The null undo context.
-     */
-    protected final static IUndoContext NULL_CONTEXT = new UndoContext();
-
-    /**
-     * Initializes me with a label.
-     * 
-     * @param label
-     *            the operation label
-     */
-    public OneTimeCommand(String label) {
-        this(label, null);
-    }
-
-    /**
-     * Initializes me with a label and a list of {@link IFile}s that anticipate
-     * modifying when I am executed.
-     * 
-     * @param label
-     *            the operation label
-     * @param affectedFiles
-     *            the list of affected {@link IFile}s; may be <code>null</code>
-     */
-    public OneTimeCommand(String label, List affectedFiles) {
-        super(label, affectedFiles);
-
-        // add a 'null' context to the operation (prevents memory leak in
-        // operation history)
-        super.addContext(NULL_CONTEXT);
-    }
-
-    /**
-     * Does nothing. The context will not be added to the operation.
-     */
-    public final void addContext(IUndoContext context) {
-        // ignore the request to add a context
-    }
-
-    /**
-     * Does nothing. The context will not be removed from the operation.
-     */
-    public final void removeContext(IUndoContext context) {
-        // ignore the request to remove a context
-    }
-
-    /**
-     * Not undoable. Returns <code>false</code>.
-     */
-    public final boolean canUndo() {
-        return false;
-    }
-
-    /**
-     * Not redoable. Returns <code>false</code>.
-     */
-    public final boolean canRedo() {
-        return false;
-    }
-
-    /**
-     * Not undoable. Throws an ExecutionException.
-     */
-    protected final CommandResult doUndoWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        ExecutionException e = new ExecutionException("undo not supported"); //$NON-NLS-1$
-        Trace.throwing(CommonCorePlugin.getDefault(),
-            CommonCoreDebugOptions.EXCEPTIONS_THROWING, getClass(),
-            "doUndoWithResult", e); //$NON-NLS-1$
-
-        throw e;
-    }
-
-    /**
-     * Not redoable. Throws an ExecutionException.
-     */
-    protected final CommandResult doRedoWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        ExecutionException e = new ExecutionException("redo not supported"); //$NON-NLS-1$
-        Trace.throwing(CommonCorePlugin.getDefault(),
-            CommonCoreDebugOptions.EXCEPTIONS_THROWING, getClass(),
-            "doRedoWithResult", e); //$NON-NLS-1$
-
-        throw e;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/UnexecutableCommand.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/UnexecutableCommand.java
deleted file mode 100644
index 38247c5..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/UnexecutableCommand.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.common.core.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * A command that cannot be executed. This is an implementation of the Null
- * Object pattern that can be used to provide a command object that can't be
- * executed to clients who require an
- * {@link org.eclipse.gmf.runtime.common.core.command.ICommand}.
- * 
- * @author melaasar
- * @author ldamus
- * 
- * @canBeSeenBy %partners
- */
-public class UnexecutableCommand extends AbstractCommand {
-
-	/**
-	 * The singleton instance.
-	 */
-	public static final UnexecutableCommand INSTANCE = new UnexecutableCommand();
-
-	/**
-	 * Creates an instance of an unexecutable command.
-	 */
-	protected UnexecutableCommand() {
-		super(null, null);
-	}
-
-	/**
-	 * @throws UnsupportedOperationException
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor,
-			IAdaptable info) throws ExecutionException {
-		
-		 throw new UnsupportedOperationException("doExecuteWithResult"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @throws UnsupportedOperationException
-	 */
-	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-			IAdaptable info) throws ExecutionException {
-		
-		throw new UnsupportedOperationException("doRedoWithResult"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @throws UnsupportedOperationException
-	 */
-	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor,
-			IAdaptable info) throws ExecutionException {
-		
-		throw new UnsupportedOperationException("doUndoWithResult"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @return false.
-	 */
-	public boolean canExecute() {
-		return false;
-	}
-
-	/**
-	 * @return false.
-	 */
-	public boolean canRedo() {
-		return false;
-	}
-
-	/**
-	 * @return false.
-	 */
-	public boolean canUndo() {
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/package.html b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/package.html
deleted file mode 100644
index 5348dae..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/package.html
+++ /dev/null

@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>
-Provides a set of classes for executing, undoing and redoing units of
-work, known as
-<i>Commands</i>. 
-</P>
-<P>
-Extends the Eclipse undoable operations framework with the following
-behaviour:
-<UL>
-<LI> self-composing operations </LI>
-<LI> return results from operations </LI>
-<LI> file modification approval for operations </LI>
-</P>
-
-<p>Commands should be executed, undone and redone through an instance of
-the {@link org.eclipse.core.commands.operations.IOperationHistory}. </p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCoreDebugOptions.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCoreDebugOptions.java
deleted file mode 100644
index 0268036..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCoreDebugOptions.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class CommonCoreDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonCoreDebugOptions() {
-		/* private constructor */
-	}
-
-	/** Debug option. */
-	public static final String DEBUG = CommonCorePlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	/** Debug option for tracing exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	
-	/** Debug option for tracing exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	/** Debug option for tracing method entering. */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	
-	/** Debug option for tracing method exiting. */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-	/** Debug option for tracing command admin. */
-	public static final String COMMANDS_ADMIN = DEBUG + "/commands/admin"; //$NON-NLS-1$
-	
-	/** Debug option for trasing command execution. */
-	public static final String COMMANDS_EXECUTE = DEBUG + "/commands/execute"; //$NON-NLS-1$
-	
-	/** Debug option for tracing command undo. */
-	public static final String COMMANDS_UNDO = DEBUG + "/commands/undo"; //$NON-NLS-1$
-	
-	/** Debug option for tracing command redo. */
-	public static final String COMMANDS_REDO = DEBUG + "/commands/redo"; //$NON-NLS-1$
-
-	/** Debug option for tracing service configuration. */
-	public static final String SERVICES_CONFIG = DEBUG + "/services/config"; //$NON-NLS-1$
-	
-	/** Debug option for tracing service activation. */
-	public static final String SERVICES_ACTIVATE = DEBUG + "/services/activate"; //$NON-NLS-1$
-	
-	/** Debug option for tracing service execution. */
-	public static final String SERVICES_EXECUTE = DEBUG + "/services/execute"; //$NON-NLS-1$
-	
-	/** Debug option for tracing on demand loading. */
-    public static final String ONDEMANEDLOADING = DEBUG + "/plugin/ondemand/loading";//$NON-NLS-1$
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCorePlugin.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCorePlugin.java
deleted file mode 100644
index fc16dad..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCorePlugin.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.internal;
-
-import org.eclipse.core.commands.operations.IOperationApprover;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.gmf.runtime.common.core.internal.command.FileModificationApprover;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.osgi.framework.BundleContext;
-
-/**
- * The common core plug-in.
- * 
- * @author khussey
- */
-public class CommonCorePlugin
-	extends Plugin {
-
-	/**
-	 * Extension point name for the log listeners extension point.
-	 */
-	protected static final String LOG_LISTENER_EXT_P_NAME = "logListeners"; //$NON-NLS-1$
-
-	/**
-	 * This plug-in's shared instance.
-	 */
-	private static CommonCorePlugin plugin;
-
-	/**
-	 * Creates a new plug-in runtime object.
-	 */
-	public CommonCorePlugin() {
-		super();
-
-		plugin = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static CommonCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Starts up this plug-in.
-	 */
-	public void start(BundleContext context)
-		throws Exception {
-		super.start(context);
-		configureLogListeners();
-		
-		// Register the file modification approver with the operation history.
-		IOperationApprover approver = new FileModificationApprover();
-		OperationHistoryFactory.getOperationHistory().addOperationApprover(
-				approver);
-	}
-    
-    
-
-	/**
-	 * Configure log listeners for log listeners extension.
-	 */
-	private void configureLogListeners() {
-		IExtensionRegistry reg = Platform.getExtensionRegistry();
-		IConfigurationElement[] elements = reg.getConfigurationElementsFor(
-			getPluginId(), LOG_LISTENER_EXT_P_NAME);
-		ILogListener listener = null;
-
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				listener = (ILogListener) elements[i]
-					.createExecutableExtension("class"); //$NON-NLS-1$
-				Platform.getLog(getDefault().getBundle()).addLogListener(
-					listener);
-			}
-		} catch (CoreException e) {
-			Trace.catching(CommonCorePlugin.getDefault(),
-				CommonCoreDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"configureLogListeners", e); //$NON-NLS-1$
-			Log.error(CommonCorePlugin.getDefault(),
-				CommonCoreStatusCodes.SERVICE_FAILURE, e.getMessage());
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCoreStatusCodes.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCoreStatusCodes.java
deleted file mode 100644
index 3f0c687..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/CommonCoreStatusCodes.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class CommonCoreStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonCoreStatusCodes() {
-		/* private constructor */
-	}
-
-	/**
-	 * Status code indicating that everything is OK.
-	 */
-	public static final int OK = 0;
-
-	/**
-	 * Status code indicating that an error occurred during plug-in start-up.
-	 */
-	public static final int PLUGIN_STARTUP_FAILURE = 1;
-
-	/**
-	 * Status code indicating that an error occurred during plug-in shut-down.
-	 */
-	public static final int PLUGIN_SHUTDOWN_FAILURE = 2;
-
-	/**
-	 * Status code indicating that an error occurred with internationalization.
-	 */
-	public static final int L10N_FAILURE = 3;
-
-	/**
-	 * Status code indicating that an error occurred with a command.
-	 */
-	public static final int COMMAND_FAILURE = 4;
-	
-	/**
-	 * Status code indicating that an error occurred with a service.
-	 */
-	public static final int SERVICE_FAILURE = 5;
-	
-	/**
-	 * Status code indicating that an operation was cancelled.
-	 */
-	public static final int CANCELLED = 6;
-	
-	/**
-	 * Status code indicating that an operation was rolled back due to live
-	 * validation errors.
-	 */
-	public static final int VALIDATION_FAILURE = 7;
-
-	/**
-	 * Encoding failure.
-	 */
-	public static final int ENCODING_FAILURE = 8;
-	
-	/**
-	 * Error status code indicating that the recovery of a failed execution also
-	 * failed.
-	 */
-	public static final int EXECUTE_RECOVERY_FAILED = 20;
-
-	/**
-	 * Error status code indicating that the recovery of a failed undo also
-	 * failed.
-	 */
-	public static final int UNDO_RECOVERY_FAILED = 21;
-
-	/**
-	 * Error status code indicating that the recovery of a failed redo also
-	 * failed.
-	 */
-	public static final int REDO_RECOVERY_FAILED = 22;
-	
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/BaseModificationValidator.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/BaseModificationValidator.java
deleted file mode 100644
index 5a3f99f..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/BaseModificationValidator.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.internal.command;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.gmf.runtime.common.core.command.IModificationValidator;
-
-/**
- * A validator responsible for doing the actual validation on files.  The
- * validation determines whether files may be modified.  It delegates to
- * IWorkspace's validateEdit.
- * 
- * @author wdiu, Wayne Diu
- */
-public class BaseModificationValidator implements IModificationValidator {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.command.IModificationValidator#validateEdit(org.eclipse.core.resources.IFile[])
-	 */
-	public IStatus validateEdit(IFile[] files) {
-		return ResourcesPlugin.getWorkspace().validateEdit(
-            files,
-            null);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/FileModificationApprover.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/FileModificationApprover.java
deleted file mode 100644
index 03e9c21..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/FileModificationApprover.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.internal.command;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.operations.IOperationApprover2;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-/**
- * Approves operations that implement the {@link ICommand} interface by checking
- * that their affected {@link IFile}s can be modified.
- * 
- * @author ldamus
- */
-public class FileModificationApprover
-    implements IOperationApprover2 {
-
-    /**
-     * Approves file modification for {@link ICommand}s.
-     */
-    public IStatus proceedExecuting(IUndoableOperation operation,
-            IOperationHistory history, IAdaptable info) {
-
-        if (operation instanceof ICommand) {
-            return approveFileModification((ICommand) operation);
-        }
-
-        return Status.OK_STATUS;
-    }
-
-    /**
-     * Approves file modification for {@link ICommand}s.
-     */
-    public IStatus proceedRedoing(IUndoableOperation operation,
-            IOperationHistory history, IAdaptable info) {
-
-        if (operation instanceof ICommand) {
-            return approveFileModification((ICommand) operation);
-        }
-
-        return Status.OK_STATUS;
-    }
-
-    /**
-     * Approves file modification for {@link ICommand}s.
-     */
-    public IStatus proceedUndoing(IUndoableOperation operation,
-            IOperationHistory history, IAdaptable info) {
-
-        if (operation instanceof ICommand) {
-            return approveFileModification((ICommand) operation);
-        }
-
-        return Status.OK_STATUS;
-    }
-
-    /**
-     * Checks that affected {@link IFile}s can be modified.
-     * 
-     * @return the approval status
-     */
-    private IStatus approveFileModification(ICommand fileModifier) {
-
-        List files = new ArrayList();
-
-        for (Iterator i = fileModifier.getAffectedFiles().iterator(); i
-            .hasNext();) {
-            IFile nextFile = (IFile) i.next();
-            
-            if ( nextFile == null ) 
-                continue;
-            
-            if (nextFile.exists()) {
-                // the file is in the workspace
-                files.add(nextFile);
-
-            } else {
-                // the file is not in the workspace
-            	IPath path = nextFile.getRawLocation();
-            	if (path == null) {
-					// cancel if we can't find the file
-                    setCommandResult(fileModifier, Status.CANCEL_STATUS);
-					return Status.CANCEL_STATUS;
-				}
-				File file = path.toFile();
-				if (file != null && file.exists() && !file.canWrite()) {
-					// cancel if we find a read-only file outside the
-					// workspace
-                    setCommandResult(fileModifier, Status.CANCEL_STATUS);
-					return Status.CANCEL_STATUS;
-				}	
-            }
-        }
-
-        IStatus status = FileModificationValidator
-            .approveFileModification((IFile[]) files.toArray(new IFile[] {}));
-        
-        if (!status.isOK()) {
-            setCommandResult(fileModifier, status);
-        }
-        
-        return status;
-    }
-    
-    /**
-     * Sets the command result of the specified command to a CommandResult
-     * having the specified status.
-     * 
-     * @param command ICommand to set the CommandResult for
-     * @param status IStatus of the CommandResult that will be set on the
-     * command
-     */
-    private void setCommandResult(ICommand command, IStatus status) {
-        if (command instanceof ICommandWithSettableResult) {
-            ((ICommandWithSettableResult) command).internalSetResult(new CommandResult(status));
-        }
-    }
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/ICommandWithSettableResult.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/ICommandWithSettableResult.java
deleted file mode 100644
index 5a58948..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/command/ICommandWithSettableResult.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.internal.command;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-
-/**
- * Internal interface designating a command that allows the setting of the
- * CommandResult
- * 
- * @author wdiu, Wayne Diu
- */
-public interface ICommandWithSettableResult {
-    
-    /**
-     * Internal method to set the command result.
-     * 
-     * @param result CommandResult to set
-     */    
-    public void internalSetResult(CommandResult result);
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/l10n/CommonCoreMessages.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/l10n/CommonCoreMessages.java
deleted file mode 100644
index 09ded24..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/l10n/CommonCoreMessages.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.common.core.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CommonCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.core.internal.l10n.CommonCoreMessages";//$NON-NLS-1$
-
-	private CommonCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String XToolsPlugin__ERROR__startupErrorMessage;
-	public static String XToolsPlugin__ERROR__shutdownErrorMessage;
-    public static String NavigatorCategoryDescriptor__ERROR__invalidXML;
-    public static String NavigatorContentTypeDescriptor__ERROR__invalidXML;
-	public static String AbstractCommand__INFO__cancelOperation;
-
-    public static String workspaceCommandInterrupted;
-    public static String workspaceCommandFailed;
-	public static String executeRecoveryFailed;
-	public static String cannotUndoExecuted;
-	public static String undoRecoveryFailed;
-	public static String cannotRedo;
-	public static String redoRecoveryFailed;
-	public static String cannotUndo;
-	public static String serviceProviderNotActivated;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonCoreMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/l10n/CommonCoreMessages.properties b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/l10n/CommonCoreMessages.properties
deleted file mode 100644
index 6858ed4..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/l10n/CommonCoreMessages.properties
+++ /dev/null

@@ -1,78 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# Error message used when startup of a plug-in fails.
-# {0} = Plugin name
-XToolsPlugin__ERROR__startupErrorMessage= IRJA0278E Error starting up {0} plug-in
-# Error message used when shutdown of a plug-in fails.
-# {0} = Plugin name
-XToolsPlugin__ERROR__shutdownErrorMessage= IRJA0279E Error shutting down {0} plug-in
-
-# Error message used when a command is cancelled
-AbstractCommand__INFO__cancelOperation = IRJA0280I The operation has been cancelled.
-
-# Used in log and trace statements for invalid XML.
-# {0} = Declaring XML extension name (followed by) ':' (followed by) XML element name
-NavigatorCategoryDescriptor__ERROR__invalidXML= IRJA0281E Invalid XML element ({0}).
-NavigatorContentTypeDescriptor__ERROR__invalidXML= IRJA0282E Invalid XML element ({0}).
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Problems in service provider API.
-# ==============================================================================
-
-#
-# Indicates that a service provider could not be activated.
-#
-serviceProviderNotActivated=The service provider {0} could not be activated.
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Problems in execution of operations on the operation history.
-# ==============================================================================
-
-
-# Indicates that the thread executing a workspace command was interrupted.
-workspaceCommandInterrupted=A workspace command was interrupted while waiting for its delegate command to complete.
-
-# Indicates that the execute, undo or redo of a workspace command failed.
-workspaceCommandFailed=A workspace command failed.
-
-# Indicates that the recovery of a failed execution also failed
-#   args:
-#     0 - reason for the failure.  This is either an exception message
-#         or the 'cannotUndoExecuted' message, below
-executeRecoveryFailed=Recovery of failure to execute an operation failed: {0}
-
-# Indicates that recovery of a failed redo failed because an operation could not undo
-cannotUndoExecuted=Cannot undo the operation that was executed
-
-# Indicates that the recovery of a failed undo also failed
-#   args:
-#     0 - reason for the failure.  This is either an exception message
-#         or the 'cannotRedo' message, below
-undoRecoveryFailed=Recovery of failure to undo an operation failed: {0}
-
-# Indicates that recovery of a failed undo failed because an operation could not redo
-cannotRedo=Cannot redo the operation that was undone
-
-# Indicates that the recovery of a failed redo also failed
-#   args:
-#     0 - reason for the failure.  This is either an exception message
-#         or the 'cannotUndo' message, below
-redoRecoveryFailed=Recovery of failure to redo an operation failed: {0}
-
-# Indicates that recovery of a failed redo failed because an operation could not undo
-cannotUndo=Cannot undo the operation that was redone
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/package.html b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/package.html
deleted file mode 100644
index d712966..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/internal/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-<h2>Package Specification</h2>
-<p>Nothing in this package is available outside the common core plug-in</p>
-<p>Each plug-in must create its own class equivalent to:
-<ul>
-<li>CommonCoreDebugOptions
-<li>CommonCorePlugin
-<li>CommonCoreStatusCodes
-</ul>
-</p>
-@canBeSeenBy org.eclipse.gmf.runtime.common.core.*
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/resources/IBookmark.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/resources/IBookmark.java
deleted file mode 100644
index 2145fb0..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/resources/IBookmark.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.resources;
-
-/**
- * Convenience interface for the bookmark type and its attributes
- * 
- * @author bagrodia Created on: Oct 2, 2003
- */
-public interface IBookmark
-	extends IMarker {
-
-	/** bookmark type */
-	public static final String TYPE = "org.eclipse.gmf.runtime.common.ui.services.bookmark"; //$NON-NLS-1$
-
-	/*
-	 * ====================================================================
-	 * Marker attributes:
-	 * ====================================================================
-	 */
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/resources/IMarker.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/resources/IMarker.java
deleted file mode 100644
index 9081e0a..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/resources/IMarker.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.resources;
-
-/**
- * Convenience interface for the marker type and its attributes
- * 
- * @author Michael Yee
- */
-public interface IMarker {
-
-	/** marker type */
-	public static final String TYPE = "org.eclipse.gmf.runtime.common.ui.services.marker"; //$NON-NLS-1$
-
-	/** Separator between multiple IDs in the {@link #ELEMENT_ID}attribute. */
-	public static final String ELEMENT_ID_SEPARATOR = " "; //$NON-NLS-1$
-
-	/*
-	 * ====================================================================
-	 * Marker attributes:
-	 * ====================================================================
-	 */
-	/** element guid */
-	public static final String ELEMENT_ID = "elementId"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/AbstractProvider.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/AbstractProvider.java
deleted file mode 100644
index 7d10730..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/AbstractProvider.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * The abstract parent of all service providers. Implements basic support for
- * thread-safe provider change notification.
- * <p>
- * Service implementers are expected to expose service specific provider classes
- * extending this class.
- * </p>
- * <p>
- * Service provider implementers never need to extend this class directly, they
- * instead derive their provider implementation from the service specific
- * provider class extending this interface.
- * </p>
- */
-public abstract class AbstractProvider
-	implements IProvider {
-
-	/**
-	 * The provider change listeners.
-	 */
-	private final List listeners = Collections
-		.synchronizedList(new ArrayList());
-
-	/**
-	 * Constructs a new abstract provider.
-	 */
-	protected AbstractProvider() {
-		super();
-	}
-
-	/**
-	 * Retrieves the value of the <code>listeners</code> instance variable.
-	 * 
-	 * @return The value of the <code>listeners</code> instance varible.
-	 */
-	private List getListeners() {
-		return listeners;
-	}
-
-	/**
-	 * Adds the specified listener to the list of provider change listeners for
-	 * this abstract provider.
-	 * 
-	 * @param listener
-	 *            The listener to be added.
-	 * 
-	 * @see IProvider#addProviderChangeListener(IProviderChangeListener)
-	 */
-	public void addProviderChangeListener(IProviderChangeListener listener) {
-	
-		assert null != listener : "addProviderChangeListener received NULL listener as argument"; //$NON-NLS-1$
-		
-		getListeners().add(listener);
-	}
-
-	/**
-	 * Removes the specified listener from the list of provider change listeners
-	 * for this abstract provider.
-	 * 
-	 * @param listener
-	 *            The listener to be removed.
-	 * 
-	 * @see IProvider#removeProviderChangeListener(IProviderChangeListener)
-	 */
-	public void removeProviderChangeListener(IProviderChangeListener listener) {
-		
-		assert null != listener : "removeProviderChangeListener received NULL listener as argument"; //$NON-NLS-1$
-		
-		getListeners().remove(listener);
-	}
-
-	/**
-	 * Notifies the listeners for this abstract provider that the specified
-	 * event has occurred.
-	 * 
-	 * @param event
-	 *            The provider change event to be fired.
-	 */
-	protected void fireProviderChange(ProviderChangeEvent event) {
-		
-		assert null != event : "fireProviderChange received NULL event as argument"; //$NON-NLS-1$
-		
-		List targets = null;
-		synchronized (getListeners()) {
-			targets = new ArrayList(getListeners());
-		}
-
-		for (Iterator i = targets.iterator(); i.hasNext();) {
-			((IProviderChangeListener) i.next()).providerChanged(event);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/AbstractProviderConfiguration.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/AbstractProviderConfiguration.java
deleted file mode 100644
index a6dfa14..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/AbstractProviderConfiguration.java
+++ /dev/null

@@ -1,1615 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Concrete subclasses can be used to assist in parsing service provider
- * descriptors to filter out and delay loading of service providers that do not
- * apply.
- * <P>
- * This abstract class contains a set of useful utilities for such concrete
- * subclasses.
- * 
- * @author melaasar, mmostafa
- * @canBeSeenBy %partners
- */
-public class AbstractProviderConfiguration {
-	/**
-	 * The name of the 'object' XML attribute.
-	 */
-	protected static final String OBJECT = "object"; //$NON-NLS-1$
-	
-	/**
-	 * The name of the 'id' XML attribute.
-	 */
-	protected static final String ID = "id"; //$NON-NLS-1$
-	
-	/**
-	 * The name of the 'class' XML attribute.
-	 */
-	protected static final String CLASS = "class"; //$NON-NLS-1$
- 
-	/**
-	 * The name of the 'method' XML attribute.
-	 */
-	protected static final String METHOD = "method"; //$NON-NLS-1$
-	
-	/**
-	 * The name of the 'method' XML attribute.
-	 */
-	protected static final String STATIC_METHOD = "staticMethod"; //$NON-NLS-1$
-	
-	/**
-	 * The name of the 'name' XML attribute.
-	 */
-	protected static final String NAME = "name"; //$NON-NLS-1$
-	
-	/**
-	 * The name of the 'value' XML attribute.
-	 */
-	protected static final String VALUE = "value"; //$NON-NLS-1$
-	
-	/**
-	 * The name of the 'notValue' XML attribute.
-	 */
-	protected static final String NOT_VALUE = "notValue"; //$NON-NLS-1$
-
-	/**
-	 * The name of the 'null' XML attribute value.
-	 */
-	protected static final String NULL = "null"; //$NON-NLS-1$
-	
-	/**
-	 * the name of the context param
-	 */
-	protected static final String contextParam = "%Context"; //$NON-NLS-1$
-
-	/**
-	 * A map to store previously successful class lookups.
-	 */
-	private static Map isAssignableTable = new HashMap();
-
-	/** 
-	 * A map to store previously failed class lookups.
-	 */
-	private static Map isNotAssignableTable = new HashMap();
-    
-    /**
-     * A map to hold the bundle to exception list
-     */
-    private static Map bundleToExceptionsSetMap = new HashMap();	
-	/**
-	 * a map of classes that get asked for methods they do not contain, by
-	 * the provider, the map is a class to a Set of method signatures
-	 */
-	private static ClassToMethodSignaturesSetMap passiveClasses = 
-		new ClassToMethodSignaturesSetMap();
-	
-	/**
-	 * a class to cach passive classes, passive classes are the classes we asked 
-	 * for a method with a specific signature and they faild to find it. The cach used 
-	 * so in the next time we can tell if the method does not exists oin the class
-	 * without calling getMethod by reflection, which improves the performance
-	 * @author mmostafa
-	 *
-	 */
-	private static class ClassToMethodSignaturesSetMap{
-		
-		/**
-		 * internal map for the cach, it is a map of Class to Set of method signature Strings
-		 */
-		Map classToMethodSignaturesSetMap = new HashMap();
-		
-		/**
-		 * adds a class and a method signature to the passive class cach
-		 * @param clazz		the class
-		 * @param signature	the method signature
-		 */
-		public void addMethod(Class clazz, String signature){
-			Set signatures = (Set)classToMethodSignaturesSetMap.get(clazz);
-			if (signatures==null){
-				signatures = new HashSet();
-				classToMethodSignaturesSetMap.put(clazz,signatures);
-			}
-			signatures.add(signature);
-		}
-		
-		/**
-		 * check if the class and the method signatrue are contained in the apssive collection,
-		 * which means we do  need need to call get method oon the class becuase we will not 
-		 * find it, this helps improving the performance.
-		 * @param clazz
-		 * @param signature
-		 * @return
-		 */
-		public boolean contains(Class clazz, String signature){
-			Set signatures = (Set)classToMethodSignaturesSetMap.get(clazz);
-			if (signatures==null)
-				return false;
-			return signatures.contains(signature);
-		}
-	}
-	
-	/**
-	 * internal class used to cach Methods, so we do not call getMethod too often 
-	 * @author mmostafa
-	 *
-	 */
-	private static class ClassToMethodSignatureToMethodCach{
-		
-		/**
-		 * internal map to hold the cached data, it is a map of Class => Map
-		 * of Singature string => method
-		 */
-		Map classToMethodSignatureToMethod = new HashMap();
-		
-		/**
-		 * adds a <code>Method</code> to the cach
-		 * @param clazz		the class we got the method from 
-		 * @param methodSignature	the method signature
-		 * @param method	the <code>Method</code>
-		 */
-		public void addMethod(Class clazz,String methodSignature, Method method ){
-			Map signatureToMethodMap = (Map)classToMethodSignatureToMethod.get(clazz);
-			if (signatureToMethodMap==null){
-				signatureToMethodMap = new HashMap();
-				classToMethodSignatureToMethod.put(clazz,signatureToMethodMap);
-			}
-			signatureToMethodMap.put(methodSignature,method);
-		}
-		
-		/**
-		 * gets a method from the cach using the class that owns it and the method 
-		 * signature.
-		 * @param clazz		the class that owns the method
-		 * @param methodSignature	the method signature
-		 * @return	the <code>Method</code> if found any, otherwise null
-		 */
-		public Method getMethod(Class clazz,String methodSignature){
-			Map signatureToMethodMap  = (Map)classToMethodSignatureToMethod.get(clazz);
-			if (signatureToMethodMap !=null){
-				return (Method)signatureToMethodMap.get(methodSignature);
-			}
-			return null;
-		}
-		
-	}
-	
-	/**
-	 * map for class to Method signature to method cach
-	 */
-	private static ClassToMethodSignatureToMethodCach
-		classToMethodSignatureToMethodCach = new ClassToMethodSignatureToMethodCach();
-	
-	
-	
-	/**
-	 * Gets the class name of <code>object</code>.
-	 * @param object the object for which the class name is to be found.
-	 * @return the class name
-	 */
-	static String getClassName( Object object ) {
-	    String cn = object.getClass().getName();
-	    return cn.substring( cn.lastIndexOf('.')+1);
-	}
-	
-	/**
-	 * A descriptor for an XML configuration element that identifies a class by
-	 * name and optionally its methods.
-	 */
-	public static class ObjectDescriptor {
-		/** 
-		 * The name of the class.
-		 */
-		private String contextClassName;
-		
-		/**
-		 * The ID of the plugin that contains the class.
-		 */
-		private String contextClassPlugin;
-		
-		/**
-		 * <code>true</code> if a syntax error has occurred,
-		 * <code>false</code> otherwise.
-		 */ 
-		private boolean syntaxError; 
-		
-		/**
-		 * A list of method descriptors for the class.
-		 */
-		private final List methods;
-		
-		/**
-		 * A list of method descriptors for the class.
-		 */
-		private final List staticMethods;
-
-		/**
-		 * Creates a new object descriptor from its configuration element.
-		 * 
-		 * @param configElement
-		 *            The configuration element.
-		 */
-		public ObjectDescriptor(IConfigurationElement configElement) {
-			this(configElement, CLASS);
-		}
-
-		/**
-		 * Creates a new object descriptor from its configuration element.
-		 * 
-		 * @param configElement
-		 *            The configuration element.
-		 * @param classNameTag
-		 *            The name of the 'class' XML attribute.
-		 */
-		public ObjectDescriptor(
-			IConfigurationElement configElement,
-			String classNameTag) {
-
-			 String s = configElement.getAttribute(classNameTag);
-			 if (s != null) {
-				 int start = s.indexOf("(");//$NON-NLS-1$
-				 if (start != -1) {
-					contextClassName = s.substring(0, start).trim();
-				 	int end = s.indexOf(")");//$NON-NLS-1$
-					if (end != -1 && end > start+1)
-						contextClassPlugin = s.substring(start+1, end);
-				 } else
-					contextClassName = s.trim();
-			 }
-
-			 IConfigurationElement[] methodConfigs =
-				configElement.getChildren(METHOD);
-			 
-			 IConfigurationElement[] staticMethodConfigs =
-				configElement.getChildren(STATIC_METHOD);
-
-			if (methodConfigs.length != 0) {
-				methods = new ArrayList(methodConfigs.length);
-				for (int i = 0; i < methodConfigs.length; i++) {
-					String name = methodConfigs[i].getAttribute(NAME);
-					if (name != null) {
-						try {
-							MethodDescriptor methodDescriptor =
-								new MethodDescriptor(name);
-							methodDescriptor.setCall(name.intern());
-							ValueDescriptor value =
-								new ValueDescriptor(methodConfigs[i]);
-							if (value != null)
-								methods.add(new MethodValueEntry(methodDescriptor, value));
-						} catch (Exception e) {
-							syntaxError = true;
-							Log.error(CommonCorePlugin.getDefault(), CommonCoreStatusCodes.SERVICE_FAILURE,	configElement.getDeclaringExtension().getContributor().getName()+ ".plugin.xml extension [" + configElement.getDeclaringExtension().getExtensionPointUniqueIdentifier() + "]: invalid syntax for method [" + name + "]");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						}
-					} else {
-						syntaxError = true;
-						Log.error(CommonCorePlugin.getDefault(), CommonCoreStatusCodes.SERVICE_FAILURE,	configElement.getDeclaringExtension().getContributor().getName()+ ".plugin.xml extension [" + configElement.getDeclaringExtension().getExtensionPointUniqueIdentifier() + "] : missing method name");  //$NON-NLS-1$ //$NON-NLS-2$ 
-					}
-				}
-			} 
-			else
-				methods = Collections.EMPTY_LIST;
-			
-			
-			if (staticMethodConfigs.length != 0) {
-				staticMethods = new ArrayList(staticMethodConfigs.length);
-				for (int i = 0; i < staticMethodConfigs.length; i++) {
-					String name = staticMethodConfigs[i].getAttribute(NAME);
-					if (name != null) {
-						try {
-							StaticMethodDescriptor methodDescriptor =
-								new StaticMethodDescriptor(name);
-							methodDescriptor.setCall(name.intern());
-							ValueDescriptor value =
-								new ValueDescriptor(staticMethodConfigs[i]);
-							if (value != null)
-								staticMethods.add(new MethodValueEntry(methodDescriptor, value));
-						} catch (Exception e) {
-							syntaxError = true;
-							Log.error(CommonCorePlugin.getDefault(), CommonCoreStatusCodes.SERVICE_FAILURE,	configElement.getDeclaringExtension().getContributor().getName()+ ".plugin.xml extension [" + configElement.getDeclaringExtension().getExtensionPointUniqueIdentifier() + "]: invalid syntax for method [" + name + "]");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						}
-					} else {
-						syntaxError = true;
-						Log.error(CommonCorePlugin.getDefault(), CommonCoreStatusCodes.SERVICE_FAILURE,	configElement.getDeclaringExtension().getContributor().getName()+ ".plugin.xml extension [" + configElement.getDeclaringExtension().getExtensionPointUniqueIdentifier() + "] : missing method name");  //$NON-NLS-1$ //$NON-NLS-2$ 
-					}
-				}
-			}else
-				staticMethods = Collections.EMPTY_LIST;
-			
-			
-			
-			if (contextClassName != null)
-				contextClassName = contextClassName.intern();
-			if (contextClassPlugin != null)
-				contextClassPlugin = contextClassPlugin.intern();
-		}
-
-		/**
-		 * Tests if the object descriptor applies to the given context object.
-		 * 
-		 * @param object
-		 *            The context object.
-		 * @return <code>true</code> if it applies; <code>false</code>
-		 *         otherwise
-		 */
-		public boolean sameAs(Object object) {
-			if (syntaxError)
-				return false;
-
-			Object targetObject = object;
-			if (contextClassName != null) {
-				if (!isAssignableTo(object.getClass(), contextClassName)) {
-					targetObject = getAdapter(object, contextClassName, contextClassPlugin);
-					if (targetObject == null)
-						return false;
-				}
-			} 
-			
-			for(Iterator iter = methods.iterator(); iter.hasNext();) {
-				MethodValueEntry entry = (MethodValueEntry)iter.next();
-				Object methodValue = invokeMethod(entry.method, targetObject);
-				
-				if (methodValue == null || !entry.value.sameAs(methodValue))
-					return false;
-			}
-			
-			for(Iterator iter = staticMethods.iterator(); iter.hasNext();) {
-				MethodValueEntry entry = (MethodValueEntry)iter.next();
-				Object methodValue = invokeStaticMethod((StaticMethodDescriptor)entry.method, targetObject);
-				
-				if (methodValue == null || !entry.value.sameAs(methodValue))
-					return false;
-			}
-			
-			return true;
-		}
-	}
-
-	/**
-	 * A descriptor for an XML configuration element that identifies a method by
-	 * name and its formal parameters.
-	 */
-	private static class MethodDescriptor {
-        
-        protected String dataForIntialize = NULL;
-		
-		/**
-		 * The method call.
-		 */
-		private String call;
-		
-		/**
-		 * The method name.
-		 */
-		private String name;
-		
-		/**
-		 * The array of method parameters.
-		 */
-		private Object parameterObjects[];
-		
-		/**
-		 * The array of method parameter types.
-		 */
-		private Class parameterTypes[];
-		
-		/**
-		 * The next cascading method descriptor.
-		 */
-		private MethodDescriptor next;
-
-		/**
-		 * The list of method parameters.
-		 */
-		private List parameters;
-		
-		/**
-		 * the method signature
-		 *
-		 */
-		private String signature = null;
-		
-		
-		protected MethodDescriptor(){
-			// empty 
-		}
-
-		/**
-		 * Creates a new method descriptor from a string representing the
-		 * method's full cascading invocation with parameters.
-		 * <P>
-		 * The format of the string is:
-		 * <P>
-		 * <code>method_name([params])[.method_name([params])]*</code>
-		 * <P>
-		 * Where:
-		 * <UL>
-		 * <LI>the <i>params </i> are comma-separated string literals without
-		 * double quotes.</LI>
-		 * <LI>only string <i>params </i> are allowed (no texual representation
-		 * of non-string params are allowed)</LI>
-		 * </UL>
-		 * <P>
-		 * For example:
-		 * <P>
-		 * <code>getPropertyValue(Source_Connection).getName()</code>
-		 * 
-		 * @param string
-		 *            the method invocation string
-		 */
-		public MethodDescriptor(String string) {
-            dataForIntialize = string;
-		}
-        
-        protected boolean isInitialized(){
-            return (dataForIntialize==null);
-        }
-
-        protected void initialize() {
-            //check if already initialized
-            if (isInitialized())
-                return;
-            try {
-                // set method name
-                dataForIntialize = parseName(dataForIntialize.trim());
-    			// set method parameters
-                dataForIntialize = parseParameterList(dataForIntialize.trim());
-    
-    			// fill the parameter objects and types arrays
-    			if (parameters != null && !parameters.isEmpty()) {
-    				Collections.reverse(parameters);
-    				parameterObjects = parameters.toArray();
-    				parameterTypes = new Class[parameterObjects.length];
-    				for (int i = 0; i < parameterObjects.length; i++) {
-    					String p = (String) parameterObjects[i];
-    					int objIndex = p.indexOf("[object]"); //$NON-NLS-1$
-    					boolean isObject = objIndex >= 0;
-    					int parseAsIndex = p.indexOf(":::"); //$NON-NLS-1$
-    					try {
-    						if (isObject && (parseAsIndex >= 0))
-    							// assume order: [object] before type:::param
-    							assert (objIndex < parseAsIndex);
-    						if (parseAsIndex >= 0) {
-    							// "type:::param"
-    							String parseAs =
-    								p.substring((isObject ? 8 : 0), parseAsIndex);
-    							String value =
-    								p.substring(parseAsIndex + 3, p.length());
-    							if (parseAs.equalsIgnoreCase("int")) { //$NON-NLS-1$
-    								parameterTypes[i] = Integer.class;
-    								parameterObjects[i] = Integer.decode(value);
-    							} else if (parseAs.equalsIgnoreCase("bool")) { //$NON-NLS-1$
-    								parameterTypes[i] = Boolean.class;
-    								parameterObjects[i] = Boolean.valueOf(value);
-    							} else if (parseAs.equalsIgnoreCase("double")) { //$NON-NLS-1$
-    								parameterTypes[i] = Double.class;
-    								parameterObjects[i] = Double.valueOf(value);
-    							}
-    							// if [object] present, set type to Object
-    							if (isObject)
-    								parameterTypes[i] = Object.class;
-    						} else if (isObject) { // "[object]param"
-    							String value = p.substring(8, p.length());
-    							parameterTypes[i] = Object.class;
-    							parameterObjects[i] = value;
-    						} else // "param"
-    							parameterTypes[i] = String.class;
-    					} catch (Exception e) {
-    						String value =
-    							p.substring(
-    								((parseAsIndex >= 0) ? parseAsIndex + 3 : 0),
-    								p.length());
-    						parameterObjects[i] = value;
-    						parameterTypes[i] = String.class;
-    					}
-    				}
-    			}
-    			parameters = null;
-    
-    			// set method parameters
-    			if (dataForIntialize.length() != 0) {
-    				if (dataForIntialize.charAt(0) != '.')
-    					throw new IllegalArgumentException();
-    				next = new MethodDescriptor(dataForIntialize.substring(1).trim());
-    			}
-    			
-    		 if (this.name != null)
-    				name = name.intern();
-            }finally{
-                dataForIntialize = null;
-            }
-        }
-
-		/**
-		 * Parses and returns the method name in a method invocation string.
-		 * 
-		 * @param string
-		 *            the method invocation string
-		 * @return the method name
-		 */
-		protected String parseName(String string) {
-			int index = string.indexOf('(');
-			if (index == -1)
-				throw new IllegalArgumentException(); 
-			name = string.substring(0, index).trim();
-			return string.substring(index + 1);
-		}
-
-		/**
-		 * Parses a method invocation string for the list of parameters, which
-		 * are placed in the <code>parameters</code> field.
-		 * 
-		 * @param string
-		 *            the method invocation string
-		 * @return the end part of the method invocation string that has not
-		 *         been parsed.
-		 */
-		protected String parseParameterList(String string) {
-			int index = -1;
-			String paramStr = null;
-			while (paramStr == null) {
-				index = string.indexOf(')', index + 1);
-				if (index == -1)
-					throw new IllegalArgumentException(); 
-				if (index == 0 || string.charAt(index - 1) != '\\')
-					paramStr = string.substring(0, index);
-			}
-			if (paramStr.length() != 0) {
-				parameters = new ArrayList();
-				parseParameters(paramStr.trim());
-			}
-			return string.substring(index + 1);
-		}
-
-		/**
-		 * Parses a string containing a list of method parameters and stores
-		 * them in the <code>parameters</code> field.
-		 * 
-		 * @param string
-		 *            the comma-separated list of method parameters.
-		 */
-		private void parseParameters(String string) {
-			int index = string.indexOf(',');
-			if (index != -1 && string.charAt(index - 1) != '\\') {
-				parseParameters(string.substring(index + 1).trim());
-				parameters.add(string.substring(0, index));
-			} else
-				parameters.add(string);
-		}
-
-		/**
-		 * Returns the method name.
-		 * 
-		 * @return the method name
-		 */
-		public String getName() {
-			return name;
-		}
-		
-		/**
-		 * Sets the method name.
-		 * @param the method name
-		 */
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		/**
-		 * Returns an array of string params.
-		 * 
-		 * @return the parameters
-		 */
-		public Object[] getParameters() {
-			return parameterObjects;
-		}
-
-		/**
-		 * Returns an array of parameter classes.
-		 * 
-		 * @return the parameter types
-		 */
-		public Class[] getParameterTypes() {
-			return parameterTypes;
-		}
-		
-		/**
-		 * sets the the array of params.
-		 * @param paramters
-		 */
-		protected void setParameters(Object[] paramters) {
-			parameterObjects = paramters;
-		}
-
-		/**
-		 * sets the the array of parameter types.
-		 * @param paramtersTypes
-		 */
-		public void setParameterTypes(Class[] paramterTypes) {
-			this.parameterTypes = paramterTypes;
-		}
-
-		/**
-		 * Returns the next cascading method descriptor, if any.
-		 * 
-		 * @return the next method descriptor, or <code>null</code> if there
-		 *         is none
-		 */
-		public MethodDescriptor getNext() {
-			return next;
-		}
-		
-		/**
-		 * sets the next cascading method descriptor, if any.
-		 * @param next
-		 */
-		protected void setNext(MethodDescriptor next) {
-			this.next = next;
-		}
-
-		/**
-		 * Gets the method call.
-		 * 
-		 * @return the method call.
-		 */
-		public String getCall() {
-			return call;
-		}
-		
-		/**
-		 * Sets the method call.
-		 * 
-		 * @param call
-		 *            the new method call
-		 */
-		public void setCall(String call) {
-			this.call = call;
-		}
-		
-		/**
-		 * Gets the Paramters List
-		 * @return The list of method parameters.
-		 */
-		protected List getParamtersList(){
-			return parameters;
-		}
-		
-		/**
-		 * Sets the Paramters List
-		 * @param Parameterlist
-		 */
-		protected void setParamtersList(List parameters1){
-			this.parameters = parameters1;
-		}
-		
-		/**
-		 * utility method used to get the signature of the method this method descriptor
-		 * descripe.
-		 * @return the signature of the method
-		 */
-		public String getSignature(){
-			if (this.signature==null){
-				StringBuffer sb = 
-					new StringBuffer();
-				sb.append(name);
-				sb.append('(');
-				if(parameterTypes!=null)
-					for(int index= 0 ; index < parameterTypes.length ; index++){
-						Class clazz = parameterTypes[index];
-						sb.append(clazz.getName());
-						if(index<parameterTypes.length-1)
-							sb.append(',');
-					}
-				sb.append(')');
-				signature = sb.toString();
-			}
-			return signature;
-			
-		}
-	}
-
-	
-	private static class StaticMethodDescriptor extends MethodDescriptor {
-        
-		/**
-		 * the plugin Name
-		 */
-		private String pluginID;
-		
-		/**
-		 * the Class Name
-		 */
-		private String className;
-		
-		/**
-		 * Creates a new method descriptor from a string representing the
-		 * method's full cascading invocation with parameters.
-		 * <P>
-		 * The format of the string is:
-		 * <P>
-		 * <code>PluginID\ClassName.method_name([params])[.method_name([params])]*</code>
-		 * <P>
-		 * Where:
-		 * <UL>
-		 * <LI>the <i>params </i> are comma-separated string literals without
-		 * double quotes.</LI>
-		 * <LI>only string <i>params </i> are allowed (no texual representation
-		 * of non-string params are allowed)</LI>
-		 * <LI>to identify a parameter as the current context you put %
-		 * </UL>
-		 * <P>
-		 * For example:
-		 * <P>
-		 * <code>MyPluginID\MyClass.MyStaticFunction(%,"some value")</code>
-		 * 
-		 * @param string
-		 *            the method invocation string
-		 */
-		public StaticMethodDescriptor(String string) {
-            dataForIntialize = string;
-		}
-        
-        public void initialize() {
-            // check if already initialized
-            if (isInitialized())
-                return;
-            try {
-                // set plugin ID
-                dataForIntialize = parsePluginID(dataForIntialize.trim());
-    			// set class Name 
-                dataForIntialize = parseClassName(dataForIntialize.trim());
-    			// set method name
-                dataForIntialize = parseName(dataForIntialize.trim());
-    			// set method parameters
-                dataForIntialize = parseParameterList(dataForIntialize.trim());
-    
-    			List parameters = getParamtersList();
-    			
-    			// fill the parameter objects and types arrays
-    			if (parameters != null && !parameters.isEmpty()) {
-    				Collections.reverse(parameters);
-    				Object[] parameterObjects = parameters.toArray();
-    				Class[] parameterTypes = new Class[parameterObjects.length];
-    				for (int i = 0; i < parameterObjects.length; i++) {
-    					String p = (String) parameterObjects[i];
-    					int objIndex = p.indexOf("[object]"); //$NON-NLS-1$
-    					boolean isObject = objIndex >= 0;
-    					int parseAsIndex = p.indexOf(":::"); //$NON-NLS-1$
-    					try {
-    						if (isObject && (parseAsIndex >= 0))
-    							// assume order: [object] before type:::param
-    							assert (objIndex < parseAsIndex);
-    						if (parseAsIndex >= 0) {
-    							// "type:::param"
-    							String parseAs =
-    								p.substring((isObject ? 8 : 0), parseAsIndex);
-    							String value =
-    								p.substring(parseAsIndex + 3, p.length());
-    							if (parseAs.equalsIgnoreCase("int")) { //$NON-NLS-1$
-    								parameterTypes[i] = Integer.class;
-    								parameterObjects[i] = Integer.decode(value);
-    							} else if (parseAs.equalsIgnoreCase("bool")) { //$NON-NLS-1$
-    								parameterTypes[i] = Boolean.class;
-    								parameterObjects[i] = Boolean.valueOf(value);
-    							} else if (parseAs.equalsIgnoreCase("double")) { //$NON-NLS-1$
-    								parameterTypes[i] = Double.class;
-    								parameterObjects[i] = Double.valueOf(value);
-    							}
-    							// if [object] present, set type to Object
-    							if (isObject)
-    								parameterTypes[i] = Object.class;
-    						} else if (isObject) { // "[object]param"
-    							String value = p.substring(8, p.length());
-    							parameterTypes[i] = Object.class;
-    							parameterObjects[i] = value;
-    						} else if (p.startsWith(contextParam)){// "param" 
-    							parameterTypes[i] = getParameterType(p);
-    							parameterObjects[i] = "%Context"; //$NON-NLS-1$
-    						}
-    						else
-    							parameterTypes[i] = String.class;
-    					} catch (Exception e) {
-    						String value =
-    							p.substring(
-    								((parseAsIndex >= 0) ? parseAsIndex + 3 : 0),
-    								p.length());
-    						parameterObjects[i] = value;
-    						parameterTypes[i] = String.class;
-    					}
-    				}
-    				setParameters(parameterObjects);
-    				setParameterTypes(parameterTypes);
-    			}
-    			parameters = null;
-    
-    			// set method parameters
-    			if (dataForIntialize.length() != 0) {
-    				if (dataForIntialize.charAt(0) != '.')
-    					throw new IllegalArgumentException();
-    				setNext(new MethodDescriptor(dataForIntialize.substring(1).trim()));
-    			}
-    			
-    		 if (getName() != null)
-    				setName(getName().intern());
-            }finally{
-                dataForIntialize = null;
-            }
-        }
-
-		
-		/**
-		 * parse the passed paramter to extract the paramter's class
-		 * @param p		the parapemter 
-		 * @return
-		 */
-		private Class getParameterType(String parameter) {
-			int startIndex = parameter.indexOf("["); //$NON-NLS-1$
-			int endIndex = parameter.indexOf("]"); //$NON-NLS-1$
-			if(startIndex==-1 || endIndex==-1)
-				throw new IllegalArgumentException(); 
-			String parameterTypeString= parameter.substring(startIndex+1,endIndex).trim();
-			
-			endIndex = parameterTypeString.indexOf('/');
-			if(endIndex==-1 || endIndex==parameterTypeString.length()-1)
-				throw new IllegalArgumentException(); 
-			String parameterPluginID = parameterTypeString.substring(0,endIndex).trim();
-			String parameterClassName = parameterTypeString.substring(endIndex + 1);
-			Class clazz = loadClass(parameterClassName,parameterPluginID);
-			if(clazz==null)
-				clazz =  Object.class;
-			return clazz;
-		}
-
-		/**
-		 * Parses and returns the Plugin ID in a method invocation string.
-		 * 
-		 * @param string
-		 *            the method invocation string
-		 * @return the plugin name
-		 */
-		private String parsePluginID(String string) {
-			int index = string.indexOf('/');
-			if (index == -1)
-				throw new IllegalArgumentException(); 
-			pluginID = string.substring(0, index).trim();
-			return string.substring(index + 1);
-		}
-		
-		/**
-		 * Parses and returns the Plugin ID in a method invocation string.
-		 * 
-		 * @param string
-		 *            the method invocation string
-		 * @return the plugin name
-		 */
-		private String parseClassName(String string) {
-			int index = string.indexOf('(');
-			if (index == -1)
-				throw new IllegalArgumentException(); 
-			index = string.lastIndexOf('.',index);
-			if (index == -1)
-				throw new IllegalArgumentException(); 
-			className = string.substring(0, index).trim();
-			return string.substring(index + 1);
-		}
-		
-	public String getPluginID(){
-			return pluginID;
-		}
-		
-		public String getClassName(){
-			return className;
-		}
-	
-	}
-	
-	
-	/**
-	 * A descriptor for an XML configuration element that identifies a method
-	 * result by its type and <code>toString()</code> value.
-	 */
-	private static class ValueDescriptor {
-		
-		/**
-		 * The valid value literals.
-		 */
-		private Set valueLiterals;
-		
-		/**
-		 * The invalid valud literals.
-		 */
-		private Set notValueLiterals;
-		
-		/**
-		 * The valid value objects.
-		 */
-		private List valueObjects;
-		
-		/**
-		 * The invalid value objects.
-		 */
-		private List notValueObjects;
-
-		/**
-		 * Creates a new value descriptor from its configuration element.
-		 * 
-		 * @param configElement
-		 *            The configuration element.
-		 */
-		public ValueDescriptor(IConfigurationElement configElement) {
-			valueLiterals = new HashSet();
-			String s = configElement.getAttribute(VALUE);
-			if (s != null)
-				parseValueLiteralString(s, valueLiterals);
-
-			notValueLiterals = new HashSet();
-			s = configElement.getAttribute(NOT_VALUE);
-			if (s != null)
-				parseValueLiteralString(s, notValueLiterals);
-
-			IConfigurationElement[] valueConfigs = configElement.getChildren(VALUE);
-			valueObjects = new ArrayList(valueConfigs.length);
-			for (int i=0; i<valueConfigs.length; i++)
-				valueObjects.add(new ObjectDescriptor(valueConfigs[i]));
-
-			IConfigurationElement[] notValueConfigs = configElement.getChildren(NOT_VALUE);
-			notValueObjects = new ArrayList(notValueConfigs.length);
-			for (int i=0; i<notValueConfigs.length; i++)
-				notValueObjects.add(new ObjectDescriptor(notValueConfigs[i]));
-		}
-		
-		/**
-		 * Parse the string <code>s</code>, which is a comma-separated list
-		 * of value literals and place them in the given <code>list</code>.
-		 * 
-		 * @param s
-		 *            the string to be parsed
-		 * @param list
-		 *            the set of literal string values from <code>s</code>.
-		 */
-		private void parseValueLiteralString(String s, Set list) {
-			// parse the string comma-separated string literals ignoring escaped commas
-			int start = 0;
-			int end = s.indexOf(',');
-			while (end != -1) {
-				if (s.charAt(end-1) == '\\') {
-					s = s.substring(0, end-1) + s.substring(end);
-					end = s.indexOf(',', end);
-					continue;
-				}
-				list.add(s.substring(start, end).trim().intern());
-				start = end +1;
-				end = s.indexOf(',', start);
-			}
-			list.add(s.substring(start).trim().intern());
-		}
-		
-		/**
-		 * Returns <code>true</code> if I am the same as <code>object</code>,
-		 * <code>false</code> otherwise.
-		 * 
-		 * @param object
-		 *            the object to be tested
-		 * @return <code>true</code> if I am the same as <code>object</code>,
-		 *         <code>false</code> otherwise.
-		 */
-		public boolean sameAs(Object object) {
-			if (!valueLiterals.isEmpty()) {
-				if (!valueLiterals.contains(object.toString()))
-					return false;
-			}
-			if (!notValueLiterals.isEmpty()) {
-				if (notValueLiterals.contains(object.toString()))
-					return false;
-			}
-			if (!valueObjects.isEmpty()) {
-				if (!isObjectinList(object, valueObjects))
-					return false;
-			}
-			if (!notValueObjects.isEmpty()) {
-				if (isObjectinList(object, notValueObjects))
-					return false;
-			}
-			return true;
-		}
-		
-		/**
-		 * Answers whether or not an object in <code>list</code> is the
-		 * {@link #sameAs(Object)}<code>object</code>.
-		 * 
-		 * @param object
-		 *            the object to find
-		 * @param list
-		 *            the list of objects
-		 * @return <code>true</code> if an object in <code>list</code> is
-		 *         the {@link #sameAs(Object)}<code>object</code>,
-		 *         <code>false</code> otherwise.
-		 */
-		private boolean isObjectinList(Object object, List list) {
-			Iterator i = list.iterator();
-			while (i.hasNext()) {
-				if (((ObjectDescriptor)i.next()).sameAs(object))
-					return true;
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * Describes a method value using a method descriptor and a value descriptor.
-	 */
-	private static class MethodValueEntry {
-		
-		/**
-		 * The method descriptor.
-		 */
-		public MethodDescriptor method;
-		
-		/**
-		 * The value descriptor.
-		 */
-		public ValueDescriptor value;
-
-		/**
-		 * Creates a new method value entry.
-		 * @param method the method descriptor
-		 * @param value the value descriptor
-		 */
-		public MethodValueEntry(MethodDescriptor method, ValueDescriptor value) {
-			super();
-			this.method = method;
-			this.value = value;
-		}
-	}
-
-	/**
-	 * A helper method to return a list of objects whose ids are given in a
-	 * comma-separated string and whose instances are given in an object map.
-	 * 
-	 * @param objectsIds
-	 *            A comma-separated object ids string
-	 * @param objectMap
-	 *            A map of object ids to their instances
-	 * @param configElement
-	 *            The configuration element, used for error logging
-	 * @return a list of object instances whose ids are given or
-	 *         <code>null</code> if no ids matched any instances
-	 */
-	protected static List getObjectList(String objectsIds, Map objectMap, IConfigurationElement configElement) {
-		if (objectsIds == null)
-			return null;
-		StringTokenizer ids = new StringTokenizer(objectsIds.trim(), ","); //$NON-NLS-1$
-		if (!ids.hasMoreTokens())
-			return null;
-		
-		List objectList = new ArrayList();
-		while (ids.hasMoreTokens()) {
-			String objectId = ids.nextToken().trim();
-			Object objectVal = objectMap.get(objectId);
-			if (objectVal != null)
-				objectList.add(objectVal);
-			else {
-				Log.error(CommonCorePlugin.getDefault(), CommonCoreStatusCodes.SERVICE_FAILURE, configElement.getDeclaringExtension().getContributor().getName()+ ".plugin.xml extension [" + configElement.getDeclaringExtension().getExtensionPointUniqueIdentifier() + "]: object id (" + objectId + ") is not in the list " + objectMap.keySet());  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-			}
-		}
-		return objectList;
-	}
-
-	/**
-	 * Parses the comma-separated <code>s</code> string and returns a set of
-	 * the individual entries in the string.
-	 * 
-	 * @param s
-	 *            A comma-separated string
-	 * @return a set of the individual entries in the string.
-	 */
-	protected static Set getStrings(String s) {
-		if (s == null)
-			return null;
-		Set stringList = new HashSet();
-		StringTokenizer ids = new StringTokenizer(s.trim(), ","); //$NON-NLS-1$
-		while (ids.hasMoreTokens()) {
-			stringList.add(ids.nextToken().trim());
-		}
-		return stringList.isEmpty() ? null : stringList;
-	}
-
-	/**
-	 * Tests if an object matches at least one in the list of object descriptors
-	 * passed.
-	 * 
-	 * @param object
-	 *            the object for which to find a match
-	 * @param objects
-	 *            the list of object in which to find a match
-	 * @return <code>true</code> if there was a match, <code>false</code>
-	 *         otherwise
-	 */
-	protected static boolean objectMatches(Object object, List objects) {
-		if (object != null) {
-			for (Iterator i = objects.iterator(); i.hasNext();) {
-				ObjectDescriptor desc = (ObjectDescriptor) i.next();
-				if (desc.sameAs(object))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * A utility method to load a class using its name and a given class loader.
-	 * 
-	 * @param className
-	 *            The class name
-	 * @param bundle
-	 *            The class loader
-	 * @return The loaded class or <code>null</code> if could not be loaded
-	 */
-	 /*protected static Class loadClass(String className, Bundle bundle) {
-		try {
-			return bundle.loadClass(className);
-		} catch (ClassNotFoundException e) {
-			return null;
-		}
-	}*/
-	
-	/**
-	 * A utility method to load a class using its name and a given class loader.
-	 * 
-	 * @param className
-	 *            The class name
-	 * @param bundle
-	 *            The class loader
-	 * @return The loaded class or <code>null</code> if could not be loaded
-	 */
-	protected static Class loadClass(String className, String pluginId) {
-		StringBuffer keyStringBuf = new StringBuffer(className.length()
-			+ pluginId.length() + 2); // 2 is for . and extra.
-		keyStringBuf.append(pluginId);
-		keyStringBuf.append('.');
-		keyStringBuf.append(className);
-		String keyString = keyStringBuf.toString();
-		WeakReference ref = (WeakReference) successLookupTable.get(keyString);
-		Class found = (ref != null) ? (Class) ref.get()
-			: null;
-		if (found == null) {
-			if (ref != null)
-				successLookupTable.remove(keyString);
-			if (!failureLookupTable.contains(keyString)) {
-				try {
-					Bundle bundle = basicGetPluginBundle(pluginId);
-					if (bundle!=null){
-                        // never load the class if the bundle is not active other wise
-                        // we will cause the plugin to load
-                        // unless the class is in the exception list
-                        int state = bundle.getState();
-                        if ( state == org.osgi.framework.Bundle.ACTIVE || isInExceptionList(bundle,className)){
-    						found = bundle.loadClass(className);
-    						successLookupTable.put(keyString, new WeakReference(found));
-                            if (state == org.osgi.framework.Bundle.ACTIVE){
-                                bundleToExceptionsSetMap.remove(bundle);
-                            }
-                        }
-					}else{
-						failureLookupTable.add(keyString);
-					}
-				} catch (ClassNotFoundException e) {
-					failureLookupTable.add(keyString);
-				}
-			}
-		}
-		return found;
-	}
-	
-	
-	private static boolean isInExceptionList(Bundle bundle, String className) {
-        String packageName = className.substring(0,className.lastIndexOf('.'));
-        Set exceptionSet = (Set)bundleToExceptionsSetMap.get(bundle);
-        if (exceptionSet==null){
-            Dictionary dict = bundle.getHeaders();
-            String value = (String)dict.get("Eclipse-LazyStart"); //$NON-NLS-1$
-            if (value!=null){
-                int index  = value.indexOf("exceptions"); //$NON-NLS-1$
-                if (index!=-1){
-                    try {
-                        int start = value.indexOf('"',index+1);
-                        int end = value.indexOf('"',start+1);
-                        String exceptions = value.substring(start+1,end);
-                        exceptionSet = new HashSet(2);
-                        StringTokenizer tokenizer = new StringTokenizer(exceptions, ","); //$NON-NLS-1$
-                        while (tokenizer.hasMoreTokens()) {
-                            exceptionSet.add(tokenizer.nextToken().trim());
-                        }
-                    }catch(IndexOutOfBoundsException exception){
-                        // this means the MF did not follow the documented format for the exceptions list
-                        // so i'll consider it empty
-                        exceptionSet = Collections.EMPTY_SET;
-                    }
-                    
-                }else{
-                    exceptionSet = Collections.EMPTY_SET;
-                }
-            }else{
-                exceptionSet = Collections.EMPTY_SET;
-            }
-            bundleToExceptionsSetMap.put(bundle, exceptionSet);
-        }
-        return exceptionSet.contains(packageName);
-    }
-
-    /**
-	 * Given a bundle id, it checks if the bundle is found and activated. If it
-	 * is, the method returns the bundle, otherwise it returns <code>null</code>.
-	 * 
-	 * @param pluginId
-	 *            the bundle ID
-	 * @return the bundle, if found
-	 */
-	protected static Bundle getPluginBundle(String pluginId) {
-		Bundle bundle = basicGetPluginBundle(pluginId);
-		if (null != bundle && bundle.getState() == org.osgi.framework.Bundle.ACTIVE)
-			return bundle;
-		return null;
-	}
-    
-    private static Bundle basicGetPluginBundle(String pluginId) {
-        return Platform.getBundle(pluginId);   
-    }
-
-	/**
-	 * Tests if the given class is assignable to the given class name. Optimized
-	 * to look first in a cache of previously retrieved results.
-	 * 
-	 * @param clazz
-	 *            the class to be tested
-	 * @param className
-	 *            the class name to test against
-	 * @return <code>true</code> if the class is assignable to the class name,
-	 *         <code>false</code> otherwise.
-	 */
-	protected static boolean isAssignableTo(Class clazz, String className) {
-		if (clazz == null)
-			return false;
-
-		if ( contains(isNotAssignableTable, clazz, className) ) {
-			return false;
-		}
-		
-		if ( contains(isAssignableTable, clazz, className) ) {
-			return true;
-		}
-	
-		boolean result = isAssignableToNoCache(clazz,className);
-		
-		if (result) {
-			add(isAssignableTable, clazz, className);
-		} else {
-			add(isNotAssignableTable, clazz, className);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests if the given class is assignable to the given class name.
-	 * 
-	 * @param clazz
-	 *            the class to be tested
-	 * @param className
-	 *            the class name to test against
-	 * @return <code>true</code> if the class is assignable to the class name,
-	 *         <code>false</code> otherwise.
-	 */
-	private static boolean isAssignableToNoCache(Class clazz, String className) {
-// mgoyal: This approach isn't safe to use as it can cause incorrect
-// plugin load. Documenting this approach for further analysis. Don't
-// remove or uncomment this.
-//		try {
-//			if(clazz.getName().equals(className))
-//				return true;
-//			
-//			ClassLoader clsLoader = clazz.getClassLoader();
-//			if(clsLoader != null) {
-//				Class testCls = clsLoader.loadClass(className);
-//				if(testCls != null && testCls.isAssignableFrom(clazz))
-//					return true;
-//			}
-//			return false;
-//		} catch (ClassNotFoundException e) {
-//			return false;
-//		}
-//		
-		
-		// test the class itself
-		if (clazz.getName().equals(className))
-			return true;
-		
-		// test all the interfaces the class implements
-		Class[] interfaces = clazz.getInterfaces();
-		for (int i = 0; i < interfaces.length; i++) {
-			if (checkInterfaceHierarchy(interfaces[i], className))
-				return true;
-		}
-		
-		// test superclass
-		return isAssignableTo(clazz.getSuperclass(), className);
-	}
-
-	/**
-	 * A map of classes that have been successfully loaded, keyed on the class
-	 * name optionally prepended by the plugin ID, if specified.
-	 */
-	private static Map successLookupTable = new HashMap();
-	
-	/**
-	 * A map of classes that could not be loaded, keyed on the class name
-	 * optionally prepended by the plugin ID, if specified.
-	 */
-	private static Set failureLookupTable = new HashSet();
-
-	/**
-	 * Gets an adapter for <code>object</code> to the class described by
-	 * <code>className</code> qualified by the optional <code>pluginId</code>.
-	 * 
-	 * @param object
-	 *            the object to be adapted
-	 * @param className
-	 *            the name of the adapter class
-	 * @param pluginId
-	 *            the optional plugin ID (can be <code>null/code>)
-	 * @return the adapted object, or <code>null</code> if it couldn't be found
-	 */
-	protected static Object getAdapter(Object object, String className, String pluginId) {
-		if (!(object instanceof IAdaptable))
-			return null;
-		if(pluginId != null) {
-			Class theClass = loadClass(className,pluginId);
-			return theClass != null ? ((IAdaptable) object).getAdapter(theClass) : null;
-		}
-		return null;
-	}
-
-	/**
-	 * A utility method to invoke a cascading list of methods.
-	 * 
-	 * @param methodDescriptor
-	 *            the first method descriptor
-	 * @param object
-	 *            The object to invoke the method on
-	 * @return the value of the invokation
-	 */
-	protected static Object invokeMethod(MethodDescriptor methodDescriptor, Object object) {
-		String methodSignature = null;
-		Class clazz =null;
-		try {
-			if (methodDescriptor == null || object == null)
-				return null;
-            if (!methodDescriptor.isInitialized()){
-                methodDescriptor.initialize();
-            }
-			methodSignature = methodDescriptor.getSignature();
-			clazz = object.getClass();
-			if (passiveClasses.contains(clazz,methodSignature))
-				return null;
-			Method method = classToMethodSignatureToMethodCach.
-				getMethod(clazz,methodSignature);
-			if(method==null){
-				method = clazz.getMethod(methodDescriptor.getName(),
-										 methodDescriptor.getParameterTypes());
-				classToMethodSignatureToMethodCach.addMethod(clazz,methodSignature,method);
-			}
-			Object valueObj = 
-				method.invoke(object, methodDescriptor.getParameters());
-			if (methodDescriptor.getNext() == null)
-				return valueObj == null ? NULL : valueObj;
-			return invokeMethod(methodDescriptor.getNext(), valueObj);
-		} catch (Exception e) {
-			passiveClasses.addMethod(clazz,methodSignature);
-			return null;
-		}
-	}
-	
-	/**
-	 * A utility method to invoke a cascading list of methods.
-	 * 
-	 * @param StaticMethodDescriptor
-	 *            the static method descriptor
-	 * @param object
-	 *            The context object to use (it could be null)
-	 * @return the value of the invokation
-	 */
-	protected static Object invokeStaticMethod(StaticMethodDescriptor methodDescriptor, Object object) {
-		try {
-			if (methodDescriptor == null)
-				return null;
-            if (!methodDescriptor.isInitialized()){
-                methodDescriptor.initialize();
-            }
-			
-			Object[] valuesCopy = null;
-            if (methodDescriptor.getParameters() != null) {
-                valuesCopy = (Object[]) methodDescriptor.getParameters()
-                    .clone();
-                for (int i = 0; i < valuesCopy.length; i++) {
-                    if (valuesCopy[i].equals(contextParam)) {
-                        valuesCopy[i] = object;
-                    }
-                }
-            }
-			
-			Method method = getStaticMethod(methodDescriptor);
-			Object valueObj = 
-				method.invoke(object, valuesCopy);
-
-			if (methodDescriptor.getNext() == null)
-				return valueObj == null ? NULL : valueObj;
-			return invokeMethod(methodDescriptor.getNext(), valueObj);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	/**
-	 * utility method used to get a static method object
-	 * @param pluginID			the plugin that owns the class
-	 * @param className			the class to use to call hte static method
-	 * @param methodName		the method to get
-	 * @param ParameterTypes	the parameter types 
-	 * @return					the  method object
-	 */
-	private static Method getStaticMethod(StaticMethodDescriptor staticMethodDescriptor) {
-		Class theClass = loadClass(staticMethodDescriptor.getClassName(),
-									staticMethodDescriptor.getPluginID());
-		if (theClass==null)
-			return null;
-		Method theMethod = null;
-		try {
-			String methodSignature = staticMethodDescriptor.getSignature(); 
-			theMethod = classToMethodSignatureToMethodCach.getMethod(theClass,methodSignature);
-			if(theMethod==null){
-			   theMethod = theClass.getMethod(staticMethodDescriptor.getName(),
-											staticMethodDescriptor.getParameterTypes());
-				classToMethodSignatureToMethodCach.addMethod(theClass,methodSignature,theMethod);
-			}
-		} catch (SecurityException e) {
-			// no special handling needed;
-		} catch (NoSuchMethodException e) {
-			// no special handling needed;
-		}
-		return theMethod;
-	}
-
-	/**
-	 * Check the interfaces the whole way up. If one of them matches
-	 * <code>className</code> return <code>true</code>. Optimized to look
-	 * first in a cache of previously retrieved results.
-	 * 
-	 * @param interfaceToCheck
-	 *            The interface whose name we are testing.
-	 * @param className
-	 *            the name of the interface to we are trying to match
-	 * @return <code>true</code> if one of the interfaces in the hierarchy
-	 *         matches <code>className</code>,<code>false</code>
-	 *         otherwise.
-	 */
-	private static boolean checkInterfaceHierarchy(Class interfaceToCheck, String className) {
-		
-		if ( contains(isNotAssignableTable, interfaceToCheck, className) ) {
-			return false;
-		}
-		
-		if ( contains(isAssignableTable, interfaceToCheck, className) ) {
-			return true;
-		}
-		
-		boolean result = checkInterfaceHierarchyNoCache(interfaceToCheck,className);
-		
-		if (result) {
-			add(isAssignableTable, interfaceToCheck, className);
-		} else {
-			add(isNotAssignableTable, interfaceToCheck, className);
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Check the interfaces the whole way up. If one of them matches
-	 * <code>className</code> return <code>true</code>.
-	 * 
-	 * @param interfaceToCheck
-	 *            The interface whose name we are testing.
-	 * @param className
-	 *            the name of the interface to we are trying to match
-	 * @return <code>true</code> if one of the interfaces in the hierarchy
-	 *         matches <code>className</code>,<code>false</code>
-	 *         otherwise.
-	 */
-	private static boolean checkInterfaceHierarchyNoCache(Class interfaceToCheck, String className) {
-		if(interfaceToCheck.getName().equals(className))
-			return true;
-		Class[] superInterfaces = interfaceToCheck.getInterfaces();
-		for (int i = 0; i < superInterfaces.length; i++) {
-			if(checkInterfaceHierarchy(superInterfaces[i], className))
-				return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Determines whether the <code>map</code> contains an entry for the
-	 * <key,value>pair.
-	 * 
-	 * @param map
-	 *            the map in which to find the key and value
-	 * @param key
-	 *            the key
-	 * @param value
-	 *            the value
-	 * @return <code>true</code> if the map contains the key/value pair,
-	 *         <code>false</code> otherwise
-	 */
-	private static boolean contains(Map map, Object key, String value) {
-		
-		boolean result = false;
-		
-		Object val = map.get(key);
-		if (val != null) {
-			Set values = (Set)val;
-			result = values.contains(value);
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Adds the <key,value>pair to the <code>map</code>.
-	 * 
-	 * @param map
-	 *            the map in which to add the value
-	 * @param key
-	 *            the key
-	 * @param value
-	 *            the value
-	 */
-	private static void add(Map map, Object key, String value) {
-		
-		Set values = (Set)map.get(key);
-		if (values == null) {
-			values = new HashSet();
-			map.put(key, values);
-		}
-		
-		values.add(value);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ExecutionStrategy.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ExecutionStrategy.java
deleted file mode 100644
index 251b57b..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ExecutionStrategy.java
+++ /dev/null

@@ -1,293 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.service.Service.ProviderDescriptor;
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * An enumeration of provider execution strategies.
- * <P>
- * Each service provider has a <code>ProviderPriority</code> that is declared
- * in its extension descriptor. It is the
- * {@link org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy} that
- * determines how service provider priorities are used to select a provider to
- * service each client request. For example, if the
- * {@link org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy#FIRST} 
- * is used, the provider with the highest priority will give an answer to the
- * request.
- * 
- * @see org.eclipse.gmf.runtime.common.core.service
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public abstract class ExecutionStrategy extends EnumeratedType {
-
-	/**
-	 * The list of pre-defined provider priorities.
-	 */
-	public static final ProviderPriority[] PRIORITIES =
-		{
-			ProviderPriority.HIGHEST,
-			ProviderPriority.HIGH,
-			ProviderPriority.MEDIUM,
-			ProviderPriority.LOW,
-			ProviderPriority.LOWEST };
-
-	/**
-	 * An internal unique identifier for provider execution strategies.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * Executes an operation on the first provider of the highest priority
-	 * that provides the operation.
-	 */
-	public static final ExecutionStrategy FIRST =
-		new ExecutionStrategy("First") { //$NON-NLS-1$
-		
-		private static final long serialVersionUID = 1L;
-
-		public List execute(Service service, IOperation operation) {
-			for (int i = 0; i < PRIORITIES.length; ++i) {
-				List providers = service.getProviders(this, PRIORITIES[i], operation);
-
-				if (providers.size() != 0) {
-					return Collections.singletonList(operation.execute((IProvider) providers.get(0)));
-				}
-			}
-
-			return Collections.EMPTY_LIST;
-		}
-
-		public List getUncachedProviders(
-			Service service,
-			ProviderPriority priority,
-			IOperation operation) {
-
-			List descriptors = service.getProviders(priority);
-			int size = descriptors.size();
-
-			for (int i = 0; i < size; ++i) {
-				ProviderDescriptor descriptor = (ProviderDescriptor)descriptors.get(i);
-
-				if (Service.safeProvides(descriptor, operation)) {
-					return Collections.singletonList(descriptor.getProvider());
-				}
-			}
-
-			return Collections.EMPTY_LIST;
-		}
-	};
-
-	/**
-	 * Executes an operation on the last provider of the lowest priority
-	 * that provides the operation.
-	 */
-	public static final ExecutionStrategy LAST =
-		new ExecutionStrategy("Last") { //$NON-NLS-1$
-
-		private static final long serialVersionUID = 1L;
-
-		public List execute(Service service, IOperation operation) {
-			for (int i = PRIORITIES.length; --i >= 0;) {
-				List providers = service.getProviders(this, PRIORITIES[i], operation);
-				int size = providers.size();
-
-				if (size != 0) {
-					return Collections.singletonList(
-						operation.execute(
-							(IProvider) providers.get(size - 1)));
-				}
-			}
-
-			return Collections.EMPTY_LIST;
-		}
-
-		public List getUncachedProviders(
-				Service service,
-				ProviderPriority priority,
-				IOperation operation) {
-
-			List descriptors = service.getProviders(priority);
-
-			for (int i = descriptors.size(); --i >= 0;) {
-				ProviderDescriptor descriptor = (ProviderDescriptor)descriptors.get(i);
-
-				if (Service.safeProvides(descriptor, operation)) {
-					return Collections.singletonList(descriptor.getProvider());
-				}
-			}
-
-			return Collections.EMPTY_LIST;
-		}
-	};
-
-	/**
-	 * Executes an operation on all providers that provide the operation, in
-	 * order from highest to lowest priority.
-	 */
-	public static final ExecutionStrategy FORWARD =
-		new ExecutionStrategy("Forward") { //$NON-NLS-1$
-		
-		private static final long serialVersionUID = 1L;
-
-		public List execute(Service service, IOperation operation) {
-			List results = new ArrayList();
-
-			for (int i = 0; i < PRIORITIES.length; ++i) {
-				List providers = service.getProviders(this, PRIORITIES[i], operation);
-				int size = providers.size();
-
-				for (int j = 0; j < size; ++j) {
-					results.add(operation.execute((IProvider) providers.get(j)));
-				}
-			}
-
-			return results;
-		}
-	};
-
-	/**
-	 * Executes an operation on all providers that provide the operation, in
-	 * reverse order from lowest to highest priority.
-	 */
-	public static final ExecutionStrategy REVERSE =
-		new ExecutionStrategy("Reverse") { //$NON-NLS-1$
-		
-		private static final long serialVersionUID = 1L;
-
-		public List execute(Service service, IOperation operation) {
-			List results = new ArrayList();
-
-			for (int i = PRIORITIES.length; --i >= 0;) {
-				List providers = service.getProviders(this, PRIORITIES[i], operation);
-
-				for (int j = providers.size(); --j >= 0;) {
-					results.add(operation.execute((IProvider) providers.get(j)));
-				}
-			}
-
-			return results;
-		}
-	};
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final ExecutionStrategy[] VALUES =
-		{ FIRST, LAST, FORWARD, REVERSE };
-
-	/**
-	 * Constructs a new execution strategy with the specified name.
-	 *
-	 * @param name The name of the new execution strategy.
-	 */
-	protected ExecutionStrategy(String name) {
-		super(name, nextOrdinal++);
-	}
-
-	/**
-	 * Constructs a new execution strategy with the specified name and ordinal.
-	 *
-	 * @param name The name of the new execution strategy.
-	 * @param ordinal The ordinal for the new execution strategy.
-	 */
-	protected ExecutionStrategy(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Retrieves the list of constants for this enumerated type.
-	 *
-	 * @return The list of constants for this enumerated type.
-	 */
-	protected List getValues() {
-		return Collections.unmodifiableList(Arrays.asList(VALUES));
-	}
-
-	/**
-	 * Executes the specified operation on providers obtained from the
-	 * specified service, according to this execution strategy.
-	 *
-	 * @param service The service from which to obtain the providers.
-	 * @param operation The operation to be executed.
-	 * @return The list of results.
-	 */
-	public abstract List execute(Service service, IOperation operation);
-
-	/**
-	 * Retrieves a list of providers of the specified priority that provide the
-	 * specified operation.
-	 * 
-	 * @param service The service used by the strategy
-	 * @param priority The priority of providers to be retrieved.
-	 * @param operation The operation that the provides must provide.
-	 * @return A list of uncached providers.
-	 */
-	public List getUncachedProviders(
-		Service service,
-		ProviderPriority priority,
-		IOperation operation) {
-
-		List descriptors = service.getProviders(priority);
-		int size = descriptors.size();
-		List providers = new ArrayList(size);
-
-		for (int i = 0; i < size; ++i) {
-			ProviderDescriptor descriptor = (ProviderDescriptor)descriptors.get(i);
-
-			if (Service.safeProvides(descriptor, operation)) {
-				providers.add(descriptor.getProvider());
-			}
-		}
-
-		return providers;
-	}
-
-	/**
-	 * Retrieves a list of providers of the specified priority.
-	 * 
-	 * @param service The service used by the strategy
-	 * @param priority The priority of providers to be retrieved.
-	 * @return A list of providers of the specified priority.
-	 */
-	protected final List getProviders(Service service, ProviderPriority priority) {
-		return service.getProviders(priority); 
-	}
-
-	/**
-	 * Retrieves a list of providers of the specified priority that provide the
-	 * specified operation. If this service is optimized, the result will be
-	 * cached the first time it is retrieved. If caching is pessimistic, the 
-	 * providers from the cache will be checked first. 
-	 * 
-	 * @param service The service used by the strategy
-	 * @param strategy The strategy used by the service
-	 * @param priority The priority of providers to be retrieved.
-	 * @param operation The operation that the provides must provide.
-	 * @return A list of providers (from the cache, if appropriate).
-	 */
-	protected final List getProviders(
-		Service service,
-		ExecutionStrategy strategy,
-		ProviderPriority priority,
-		IOperation operation) {
-		return service.getProviders(strategy, priority, operation); 
-	}	
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IOperation.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IOperation.java
deleted file mode 100644
index c581610..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IOperation.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-/**
- * The interface for all service provider operations.
- * <p>
- * Service implementers are expected to expose service specific classes
- * implementing this interface.
- * </p>
- * <p>
- * Service provider implementers never need to implement this interface, they
- * instead use the service specific implementation in their provider
- * implementation.
- * </p>
- * 
- * @see IProvider#provides
- */
-public interface IOperation {
-
-	/**
-	 * Executes this operation on the specified provider.
-	 * <p>
-	 * Service implementers generally implement this method by first casting the
-	 * provider to their service specific {@link IProvider}-derived class and
-	 * then by delegating it the execution. Delegation is accomplished through
-	 * the service specific provider derived class API.
-	 * </p>
-	 * 
-	 * @param provider
-	 *            The provider on which to execute the operation.
-	 * @return The result of executing this operation.
-	 */
-	public Object execute(IProvider provider);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProvider.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProvider.java
deleted file mode 100644
index 9047ac5..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProvider.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-/**
- * The interface for all service providers. Specifies a part of the contract
- * between a service and its providers:
- * <ul>
- * <li>A service can listen to its provider
- * <li>A service can request a provider whether it wants to support a given
- * request
- * </ul>
- * <p>
- * Service implementers are expected to expose service specific classes
- * implementing this interface.
- * </p>
- * <p>
- * Service provider implementers never need to implement this interface
- * directly, they instead derive their provider implementation from the service
- * specific implementation of this interface.
- * </p>
- */
-public interface IProvider {
-
-	/**
-	 * Adds the specified listener to the list of provider change listeners for
-	 * this provider.
-	 * 
-	 * @param listener
-	 *            The listener to be added.
-	 */
-	public void addProviderChangeListener(IProviderChangeListener listener);
-
-	/**
-	 * Indicates whether this provider provides the specified operation.
-	 * <p>
-	 * </p>
-	 * <p>
-	 * </p>
-	 * Providers generally cast the operation to a service specific
-	 * {@link IOperation}-derived class in order to determine whether they
-	 * support the request.
-	 * 
-	 * @return <code>true</code> if this provider provides the operation;
-	 *         <code>false</code> otherwise.
-	 * @param operation
-	 *            The operation in question.
-	 */
-	public boolean provides(IOperation operation);
-
-	/**
-	 * Removes the specified listener from the list of provider change listeners
-	 * for this provider.
-	 * 
-	 * @param listener
-	 *            The listener to be removed.
-	 */
-	public void removeProviderChangeListener(IProviderChangeListener listener);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProviderChangeListener.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProviderChangeListener.java
deleted file mode 100644
index aac3465..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProviderChangeListener.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-import java.util.EventListener;
-
-/**
- * An interface for types that listen to service provider changes.
- * <p>
- * Service implementers are expected to implement this interface within their
- * service should they need to know about state change in their providers.
- * </p>
- * <p>
- * Service provider implementers never need to implement this interface.
- * </p>
- * 
- * @see IProvider#addProviderChangeListener
- * @see IProvider#removeProviderChangeListener
- */
-public interface IProviderChangeListener
-	extends EventListener {
-
-	/**
-	 * Handles an event indicating that a provider has changed.
-	 * 
-	 * @param event
-	 *            The provider change event to be handled.
-	 */
-	public void providerChanged(ProviderChangeEvent event);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProviderPolicy.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProviderPolicy.java
deleted file mode 100644
index f6de71a..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/IProviderPolicy.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-/**
- * The interface for all service providers lightweight's implementation. Specifies
- * a single part of the contract between a service and its providers:
- * <ul>
- * <li>A service can request a provider whether it wants to support a given
- * request
- * </ul>
- * <p>
- * Service implementers are not expected to implement this interface.
- * </p>
- * <p>
- * Service provider implementers should implement this interface directly in a
- * lightweight plug-in should they need to be more aggressive at preventing the
- * loading of the provider heavyweight plug-in. A provider need to expose the
- * class implementing this interface in the class attribute of a Policy
- * sub-element in their provider extension descriptor.
- * </p>
- * Provider's plugin.xml
- * <p>
- * 
- * <pre>
- * 
- *     &lt;extension
- *        id=&quot;...&quot;
- *        name=&quot;...&quot;
- *        point=&quot;...&quot;&gt;
- *        &lt;XXXProvider
- *           class=&quot;...&quot;&gt;
- *           &lt;Priority
- *              name=&quot;...&quot;&gt;
- *           &lt;/Priority&gt;
- *           &lt;Policy
- *              class=&quot;com.example.myClass&quot;
- *              plugin=&quot;com.example.myLightWeightPlugin&quot;/&gt;
- *        &lt;/XXXProvider&gt;
- *     &lt;/extension&gt;
- *  
- * </pre>
- * 
- * </p>
- */
-public interface IProviderPolicy {
-
-	/**
-	 * Indicates whether this provider provides the specified operation.
-	 * <p>
-	 * <p>
-	 * Providers generally cast the operation to a service specific
-	 * {@link IOperation}-derived class in order to determine whether they
-	 * support the request.
-	 * 
-	 * @return <code>true</code> if this provider provides the operation;
-	 *         <code>false</code> otherwise.
-	 * @param operation
-	 *            The operation in question.
-	 */
-	public boolean provides(IOperation operation);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ProviderChangeEvent.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ProviderChangeEvent.java
deleted file mode 100644
index 53d1615..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ProviderChangeEvent.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-import java.util.EventObject;
-
-/**
- * An event that indicates when a provider changes.
- * 
- * Service implementers are expected to expose service specific sub-classes to
- * help listeners understand the exact nature of the state change. They are not
- * expected to instantiate these events.
- * <p>
- * </p>
- * <p>
- * </p>
- * Service provider implementers never need to subclass this interface or its
- * subclasses, they instead instantiate the service specific subclass in their
- * provider implementation when they need to notify listeners of a state change.
- * 
- * @see AbstractProvider#addProviderChangeListener(IProviderChangeListener)
- * @see IProviderChangeListener#providerChanged(ProviderChangeEvent)
- * @see IProvider#addProviderChangeListener(IProviderChangeListener)
- * @see IProvider#removeProviderChangeListener(IProviderChangeListener)
- */
-public class ProviderChangeEvent
-	extends EventObject {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructs a new provider change event for the specified provider.
-	 * 
-	 * @param source
-	 *            The provider that changed.
-	 */
-	public ProviderChangeEvent(IProvider source) {
-		super(source);
-	}
-
-	/**
-	 * Sets the <code>source</code> instance variable to the specified value.
-	 * 
-	 * This method is reserved for internal use.
-	 * 
-	 * @param source
-	 *            The new value for the <code>source</code> instance variable.
-	 */
-	public void setSource(IProvider source) {
-		assert null != source : "setSource received NULL provider as argument"; //$NON-NLS-1$
-		
-		assert (source instanceof org.eclipse.gmf.runtime.common.core.service.Service);
-
-		this.source = source;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ProviderPriority.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ProviderPriority.java
deleted file mode 100644
index 519d183..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ProviderPriority.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-
-/**
- * An enumeration of service provider priorities.
- * <P>
- * Each service provider has a <code>ProviderPriority</code> that is declared
- * in its extension descriptor. It is the
- * {@link org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy} that
- * determines how service provider priorities are used to select a provider to
- * service each client request. For example, if the
- * {@link org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy#FIRST} 
- * is used, the provider with the highest priority will give an answer to the
- * request.
- * 
- * @see org.eclipse.gmf.runtime.common.core.service
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public class ProviderPriority extends EnumeratedType {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for provider priorities.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * The lowest provider priority.
-	 */
-	public static final ProviderPriority LOWEST = new ProviderPriority("Lowest"); //$NON-NLS-1$
-
-	/**
-	 * The second-lowest provider priority.
-	 */
-	public static final ProviderPriority LOW = new ProviderPriority("Low"); //$NON-NLS-1$
-
-	/**
-	 * The middle provider priority.
-	 */
-	public static final ProviderPriority MEDIUM = new ProviderPriority("Medium"); //$NON-NLS-1$
-
-	/**
-	 * The second-highest provider priority.
-	 */
-	public static final ProviderPriority HIGH = new ProviderPriority("High"); //$NON-NLS-1$
-
-	/**
-	 * The highest provider priority.
-	 */
-	public static final ProviderPriority HIGHEST = new ProviderPriority("Highest"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final ProviderPriority[] VALUES =
-		{ LOWEST, LOW, MEDIUM, HIGH, HIGHEST };
-
-	/**
-	 * Retrieves the provider priority with the specified name.
-	 * 
-	 * @param name The name of the provider priority to be retrieved.
-	 * @return The provider priority with the specified name.
-	 * @exception IllegalArgumentException If a provider priority with the
-	 *                                      specified name does not exist.
-	 */
-	public static ProviderPriority parse(String name) {
-		for (int i = 0; i < VALUES.length; i++) {
-			if (VALUES[i].getName().equals(name)) {
-				return VALUES[i];
-			}
-		}
-
-		IllegalArgumentException iae = new IllegalArgumentException(name);
-		Trace.throwing(CommonCorePlugin.getDefault(), CommonCoreDebugOptions.EXCEPTIONS_THROWING, ProviderPriority.class, "parse", iae); //$NON-NLS-1$
-		throw iae;
-	}
-
-	/**
-	 * Constructs a new provider priority with the specified name.
-	 * 
-	 * @param name The name of the new provider priority.
-	 */
-	private ProviderPriority(String name) {
-		super(name, nextOrdinal++);
-	}
-
-	/**
-	 * Constructs a new provider priority with the specified name and ordinal.
-	 * 
-	 * @param name The name of the new provider priority.
-	 * @param ordinal The ordinal for the new provider priority .
-	 */
-	protected ProviderPriority(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Retrieves the list of constants for this enumerated type.
-	 * 
-	 * @return The list of constants for this enumerated type.
-	 */
-	protected List getValues() {
-		return Collections.unmodifiableList(Arrays.asList(VALUES));
-	}
-
-	/**
-	 * Compares this provider priority with the specified object for order.
-	 * Returns a negative integer, zero, or a positive integer as this provider
-	 * priority is less than, equal to, or greater than the specified object.
-	 * 
-	 * @param object The object to be compared.
-	 * @return A negative integer, zero, or a positive integer as this
-	 *          provider priority is less than, equal to, or greater than the
-	 *          specified object.
-	 * @exception ClassCastException If the specified object's type
-	 *                                prevents it from being compared to
-	 *                                this provider priority.
-	 */
-	public int compareTo(Object object) {
-		List values = getValues();
-		return values.indexOf(this) - values.indexOf(object);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/Service.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/Service.java
deleted file mode 100644
index 0fb1921..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/Service.java
+++ /dev/null

@@ -1,902 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.service;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-import org.eclipse.gmf.runtime.common.core.internal.l10n.CommonCoreMessages;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-
-/**
- * 
- * A <code>Service</code> does some specific piece of work for clients by
- * delegating the actual work done to one or more service providers. Client
- * requests are made using {@link org.eclipse.gmf.runtime.common.core.service.IOperation}
- * s.
- * <P>
- * Modeling platform services should subclass this class.
- * <P>
- * Each service provider has a
- * {@link org.eclipse.gmf.runtime.common.core.service.ProviderPriority} that is
- * declared in its extension descriptor. It is the
- * {@link org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy} that
- * determines how service provider priorities are used to select a provider to
- * service each client request. For example, if the
- * {@link org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy#FIRST} 
- * is used, the provider with the highest priority will give an answer to the
- * request.
- * <P>
- * A <code>Service</code> may choose to have the following performance
- * optimizations:
- * <UL>
- * <LI>optimized, so that providers that provide for an operation are cached
- * the first time they are retrieved and the cache used when an operation is
- * executed. If the service is not optimized, all of the service providers may
- * be considered each time an operation is executed.</LI>
- * <LI>optmistic, so that an optimized service always trusts the contents of
- * its cache to contain providers that provide for the given operation. If the
- * optimized service is not optimistic, it double-checks the contents of the
- * cache to make sure that the cached providers still provide for the operation.
- * </LI>
- * </UL>
- * 
- * @see org.eclipse.gmf.runtime.common.core.service
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public abstract class Service
-	extends AbstractProvider
-	implements IProvider, IProviderChangeListener {
-
-	/**
-	 * A descriptor for providers defined by a configuration element.
-	 * 
-	 * @author khussey
-	 */
-	public static class ProviderDescriptor
-		extends AbstractProvider
-		implements IProvider, IProviderChangeListener {
-		
-		protected boolean policyInitialized = false;
-		
-		private String providerClassName;
-
-		/**
-		 * The name of the 'class' XML attribute.
-		 */
-		protected static final String A_CLASS = "class"; //$NON-NLS-1$
-
-		/**
-		 * The name of the 'plugin' XML attribute.
-		 * 
-		 */
-		protected static final String A_PLUGIN = "plugin"; //$NON-NLS-1$
-
-		/**
-		 * The name of the 'Policy' XML element.
-		 */
-		protected static final String E_POLICY = "Policy"; //$NON-NLS-1$
-
-		/**
-		 * The configuration element describing this descriptor's provider.
-		 */
-		private final IConfigurationElement element;
-
-		/**
-		 * The provider for which this object is a descriptor.
-		 */
-		protected IProvider provider;
-
-		/**
-		 * The policy associated with this descriptor's provider (if specified).
-		 */
-		protected IProviderPolicy policy;
-		
-		/**
-		 * Tracks the failure of the provider class intantiation, so that a
-		 * failure to create the class is logged only once.
-		 */
-		private boolean providerClassInstantiationFailed = false;
-
-		/**
-		 * Constructs a new provider descriptor for the specified configuration
-		 * element.
-		 * 
-		 * @param element The configuration element describing the provider.
-		 */
-		protected ProviderDescriptor(IConfigurationElement element) {
-			super();
-			this.element = element;
-		}
-
-		/**
-		 * Retrieves the configuration element describing this descriptor's
-		 * provider.
-		 * 
-		 * @return The configuration element describing this descriptor's
-		 *         provider.
-		 */
-		protected final IConfigurationElement getElement() {
-			return element;
-		}
-
-		/**
-		 * Retrieves the provider for which this object is a descriptor.
-		 * Lazy-initializes the value by instantiating the class described by
-		 * this provider descriptor's configuration element.
-		 * 
-		 * @return The provider for which this object is a descriptor.
-		 */
-		public IProvider getProvider() {
-			if (null == provider && !providerClassInstantiationFailed) {
-				CommonCorePlugin corePlugin = CommonCorePlugin.getDefault();
-
-				try {
-					Log.info(corePlugin, CommonCoreStatusCodes.OK, "Activating provider '" + element.getAttribute(A_CLASS) + "'..."); //$NON-NLS-1$ //$NON-NLS-2$
-					provider = (IProvider)element.createExecutableExtension(A_CLASS);
-					provider.addProviderChangeListener(this);
-					Trace.trace(corePlugin, CommonCoreDebugOptions.SERVICES_ACTIVATE, "Provider '" + provider + "' activated."); //$NON-NLS-1$ //$NON-NLS-2$
-				
-				} catch (CoreException ce) {
-					
-					if (provider == null) {
-						// remember that the provider class could not be instantiated
-						providerClassInstantiationFailed = true;
-					}
-					
-					Trace.catching(corePlugin, CommonCoreDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getProvider", ce); //$NON-NLS-1$
-					IStatus status = ce.getStatus();
-					Log.log(
-						corePlugin,
-						status.getSeverity(),
-						CommonCoreStatusCodes.SERVICE_FAILURE,
-						CommonCoreMessages.bind(CommonCoreMessages.serviceProviderNotActivated, element.getAttribute(A_CLASS)),
-						status.getException());
-				}
-			}
-			return provider;
-		}
-
-		/**
-		 * Retrieves the policy associated with this descriptor's provider (if
-		 * specified). Lazy-initializes the value by instantiating the class
-		 * described by this provider descriptor's configuration element, if
-		 * specified.
-		 * 
-		 * @return The policy associated with this descriptor's provider (if
-		 *         specified).
-		 */
-		protected IProviderPolicy getPolicy() {
-			if (!policyInitialized) {
-				policyInitialized = true;
-				IConfigurationElement[] elements = element.getChildren(E_POLICY);
-				working: {
-					if (elements.length == 0) 
-						break working; // no child elements
-
-					CommonCorePlugin corePlugin = CommonCorePlugin.getDefault();
-
-					try {
-						Log.info(corePlugin, CommonCoreStatusCodes.OK, "Activating provider policy '" + elements[0].getAttribute(A_CLASS) + "'..."); //$NON-NLS-1$ //$NON-NLS-2$
-
-						// the following results in a core dump on Solaris if
-						// the policy plug-in cannot be found
-						
-						policy = (IProviderPolicy)element.createExecutableExtension(E_POLICY);
-						
-						Trace.trace(corePlugin, CommonCoreDebugOptions.SERVICES_ACTIVATE, "Provider policy '" + policy + "' activated."); //$NON-NLS-1$ //$NON-NLS-2$
-					} catch (CoreException ce) {
-						Trace.catching(corePlugin, CommonCoreDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getPolicy", ce); //$NON-NLS-1$
-						IStatus status = ce.getStatus();
-						Log.log(
-							corePlugin,
-							status.getSeverity(),
-							CommonCoreStatusCodes.SERVICE_FAILURE,
-							status.getMessage(),
-							status.getException());
-					}
-				}
-			}
-			return policy;
-		}
-
-		/**
-		 * Indicates whether this provider descriptor can provide the
-		 * functionality described by the specified <code>operation</code>.
-		 * 
-		 * @param operation
-		 *            The operation in question.
-		 * @return <code>true</code> if this descriptor's policy or provider
-		 *         provides the operation; <code>false</code> otherwise.
-		 */
-		public boolean provides(IOperation operation) {
-			if (!policyInitialized){
-				policy = getPolicy();
-				policyInitialized = true;
-			}
-
-			if (null != policy) {
-				try {
-					return policy.provides(operation);
-				}
-				catch (Throwable e) {
-					Log.log(
-						CommonCorePlugin.getDefault(),
-						IStatus.ERROR,
-						CommonCoreStatusCodes.SERVICE_FAILURE,
-						"Ignoring provider since policy " + policy + " threw an exception or error in the provides() method",  //$NON-NLS-1$ //$NON-NLS-2$
-						e);
-					
-					// re-throw fatal errors
-					if (e instanceof ThreadDeath) {
-						throw (ThreadDeath) e;
-					}
-
-					if (e instanceof VirtualMachineError) {
-						throw (VirtualMachineError) e;
-					}
-					
-					return false;
-				}
-			}
-
-			IProvider theProvider = getProvider();
-
-			return (theProvider != null) ?
-				safeProvides(theProvider, operation) : false;
-		}
-
-		/**
-		 * Handles an event indicating that a provider has changed.
-		 * 
-		 * @param event The provider change event to be handled.
-		 */
-		public void providerChanged(ProviderChangeEvent event) {
-			fireProviderChange(event);
-		}
-		
-		/**
-		 * Returns the provider's class name, if it can be found.
-		 */
-		public String toString() {
-
-			if (providerClassName == null) {
-				if (getElement() != null && getElement().isValid()) {
-					// get the provider class name
-					providerClassName = getElement().getAttribute(A_CLASS);
-				}
-				if (providerClassName == null) {
-					// use the object ID if no provider class name can be found
-					providerClassName = super.toString();
-				}
-			}
-
-			return providerClassName;
-		}
-
-	}
-
-	/**
-	 * A pattern for error messages indicating an invalid XML element.
-	 * 
-	 */
-	protected static final String INVALID_ELEMENT_MESSAGE_PATTERN = "Invalid XML element ({0})."; //$NON-NLS-1$
-
-	/**
-	 * The name of the 'name' XML attribute.
-	 */
-	private static final String A_NAME = "name"; //$NON-NLS-1$
-
-	/**
-	 * The name of the 'Priority' XML element.
-	 */
-	private static final String E_PRIORITY = "Priority"; //$NON-NLS-1$
-
-	/**
-	 * The size of a cache which is indexed by {@link ProviderPriority} ordinals.
-	 */
-	private static final int priorityCount;
-
-	// Initialize priorityCount.
-	static {
-		// any priority will do to get the list of values
-		List priorities = ProviderPriority.HIGHEST.getValues();
-		int maxOrdinal = 0;
-
-		for (Iterator i = priorities.iterator(); i.hasNext();) {
-			int ordinal = ((ProviderPriority) i.next()).getOrdinal();
-
-			if (maxOrdinal < ordinal)
-				maxOrdinal = ordinal;
-		}
-
-		priorityCount = maxOrdinal + 1;
-	}
-	
-	/**
-	 * List of providers class names that have thrown exceptions in the provides() method.
-	 * Used to prevent logging repeatedly for the same failed provider.
-	 */
-	private static final List ignoredProviders = new ArrayList();
-
-	/**
-	 * The cache of providers (for optimization) indexed by
-	 * {@link ProviderPriority} ordinals.
-	 */
-	private final Map[] cache;
-
-	/**
-	 * The lists of registered providers.
-	 */
-	private final ArrayList[] providers;
-	
-	/**
-	 * Whether the service uses optimistic caching.
-	 */
-	private final boolean optimistic;
-
-	/**
-	 * Constructs a new service that is not optimized.
-	 */
-	protected Service() {
-		this(false);
-	}
-
-	/**
-	 * Constructs a new service that is (not) optimized as specified.
-	 * <P>
-	 * If the service is optimized, the service providers that provide for an
-	 * operation are cached the first time they are retrieved. When an operation
-	 * is executed, this cache is used to find the service providers for the
-	 * execution. If the service is not optimized, all of the service providers
-	 * may be considered each time an operation is executed.
-	 * 
-	 * @param optimized
-	 *            <code>true</code> if the new service is optimized,
-	 *            <code>false</code> otherwise.
-	 */
-	protected Service(boolean optimized) {
-		this(optimized, true);
-	}
-
-	/**
-	 * Constructs a new service that is (not) optimized as specified.
-	 * <P>
-	 * If the service is optimized, the service providers that provide for an
-	 * operation are cached the first time they are retrieved. When an operation
-	 * is executed, this cache is used to find the service providers for the
-	 * execution. If the service is not optimized, all of the service providers
-	 * may be considered each time an operation is executed.
-	 * <P>
-	 * If the optimized service is optimistic, it always trusts the contents of
-	 * its cache to contain providers that provide for the given operation. If
-	 * the optimized service is not optimistic, it double-checks the contents of
-	 * the cache to make sure that the cached providers still provide for the
-	 * operation.
-	 * <P>
-	 * The value of <code>optimistic</code> is meaningless if
-	 * <code>optimized</code> is false.
-	 * 
-	 * @param optimized
-	 *            <code>true</code> if the new service is optimized,
-	 *            <code>false</code> otherwise.
-	 * @param optimistic
-	 *            <code>true</code> if the new service uses optmistic caching,
-	 *            <code>false</code> otherwise.
-	 */
-	protected Service(boolean optimized, boolean optimistic) {
-		super();
-
-		if (optimized) {
-			cache = new Map[priorityCount];
-
-			for (int ordinal = priorityCount; --ordinal >= 0;) {
-				cache[ordinal] = createPriorityCache();
-			}
-		} else {
-			cache = null;
-		}
-		this.optimistic = optimistic;
-
-		providers = new ArrayList[priorityCount];
-
-		for (int ordinal = priorityCount; --ordinal >= 0;)
-			providers[ordinal] = new ArrayList(0);
-	}
-
-	/**
-	 * Creates a map for caching service providers keyed by
-	 * the values returned in {@link #getCachingKey(IOperation)}.
-	 * 
-	 * @return the new map
-	 */
-	protected Map createPriorityCache() {
-		return new WeakHashMap();
-	}
-	
-	/**
-	 * Gets the key used to cache service providers that provide for
-	 * <code>operation</code> in the map created by
-	 * {@link #createPriorityCache()}.
-	 * 
-	 * @param operation <code>IOperation</code> for which the key will be retrieved
-	 * @return the key into the service providers cache
-	 */
-	protected Object getCachingKey(IOperation operation) {
-		return operation;
-	}
-
-	/**
-	 * Answers whether or not this service is optimized by caching its service
-	 * providers.
-	 * <P>
-	 * If the service is optimized, the service providers that provide for an
-	 * operation are cached the first time they are retrieved. When an operation
-	 * is executed, this cache is used to find the service providers for the
-	 * execution. If the service is not optimized, all of the service providers
-	 * may be considered each time an operation is executed.
-	 * 
-	 * @return <code>true</code> if the new service is optimized,
-	 *         <code>false</code> otherwise.
-	 */
-	protected final boolean isOptimized() {
-		return null != cache;
-	}
-
-	/**
-	 * Answers whether or not this service uses optimistic caching. This value
-	 * is only meaningful if {@link #isOptimized()}returns <code>true</code>.
-	 * <P>
-	 * If the optimized service is optimistic, it always trusts the contents of
-	 * its cache to contain providers that provide for the given operation. If
-	 * the optimized service is not optimistic, it double-checks the contents of
-	 * the cache to make sure that the cached providers still provide for the
-	 * operation.
-	 * 
-	 * @return <code>true</code> if the new service uses optmistic caching,
-	 *         <code>false</code> otherwise.
-	 */
-	protected final boolean isOptimistic() {
-		return optimistic;
-	}
-
-	/**
-	 * Clears the service provider cache (if this service is optimized).
-	 */
-	protected final void clearCache() {
-		if (null != cache) {
-			for (int ordinal = priorityCount; --ordinal >= 0;) {
-				cache[ordinal].clear();
-			}
-		}
-	}
-
-	/**
-	 * Retrieves a complete list of all the providers registered with this
-	 * service that have the specified <code>priority</code>.
-	 * <P>
-	 * This method does not consider the optimized state of the service.
-	 * @param priority
-	 *            The priority of providers to be retrieved.
-	 * @return A complete list of providers of the specified priority.
-	 */
-	final List getProviders(ProviderPriority priority) {
-		return providers[priority.getOrdinal()];
-	}
-
-	/**
-	 * Retrieves a list of providers of the specified <code>priority</code>
-	 * that provide for the specified <code>operation</code>.
-	 * <P>
-	 * If the service is optimized, the result will be cached the first time it
-	 * is retrieved. If caching is not optimistic, the providers from the cache
-	 * will be asked again if they still provide for the operation.
-	 * 
-	 * @param strategy
-	 *            The strategy used by the service.
-	 * @param priority
-	 *            The priority of providers to be retrieved.
-	 * @param operation
-	 *            The operation that the provides must provide.
-	 * @return A list of providers that provide for the operation (from the
-	 *         cache, if appropriate).
-	 */
-	protected final List getProviders(
-		ExecutionStrategy strategy,
-		ProviderPriority priority,
-		IOperation operation) {
-
-		assert null != priority : "getProviders received null priority as argument"; //$NON-NLS-1$
-		assert null != operation : "getproviders received null operation as argument"; //$NON-NLS-1$
-
-		List providerList;
-
-		if (null == cache) {
-			providerList = strategy.getUncachedProviders(this, priority, operation);
-		} else {
-			Object cachingKey = getCachingKey(operation);
-			Map map = cache[priority.getOrdinal()];
-			providerList = (List)map.get(cachingKey);
-
-			if (null != providerList) {
-				if (optimistic)
-					return providerList;
-
-				int n = providerList.size();
-
-				if (n != 0) {
-					for (int i = 0;;) {
-						IProvider provider = (IProvider)providerList.get(i);
-
-						if (!safeProvides(provider, operation))
-							break;
-
-						if (++i == n)
-							return providerList;
-					}
-				}
-			}
-
-			providerList = strategy.getUncachedProviders(this, priority, operation);
-			map.put(cachingKey, providerList);
-		}
-
-		return providerList;
-	}
-	
-	/**
-	 * Retrieves a list of all providers of all priorities for this service.
-	 * 
-	 * @return A list of all providers of all priorities.
-	 */
-	protected final List getAllProviders() {
-		int i;
-		int n = priorityCount;
-		int total;
-
-		for (i = n, total = 0; --i >= 0;)
-			total += providers[i].size();
-
-		List allProviders = new ArrayList(total);
-
-		for (i = 0; i < n; ++i)
-			allProviders.addAll(providers[i]);
-
-		return allProviders;
-	}
-
-	/**
-	 * Registers the <code>provider</code> as a provider for this service,
-	 * with the specified <code>priority</code>.
-	 * 
-	 * @param priority
-	 *            The priority at which to add the provider.
-	 * @param provider
-	 *            The provider to be added.
-	 */
-	protected final void addProvider(
-		ProviderPriority priority,
-		ProviderDescriptor provider) {
-
-		assert null != priority : "null ProviderPriority"; //$NON-NLS-1$
-		assert null != provider : "null ProviderDescriptor"; //$NON-NLS-1$
-
-		int ordinal = priority.getOrdinal();
-
-		if (null != cache) {
-			cache[ordinal].clear();
-		}
-
-		providers[ordinal].add(provider);
-		provider.addProviderChangeListener(this);
-	}
-
-	/**
-	 * Removes the <code>provider</code> as a provider for this service.
-	 * 
-	 * @param provider
-	 *            The provider to be removed.
-	 */
-	protected final void removeProvider(ProviderDescriptor provider) {
-		assert null != provider : "null provider"; //$NON-NLS-1$
-		
-		for (int i = 0, n = priorityCount; i < n; ++i) {
-			if (providers[i].remove(provider)) {
-				provider.removeProviderChangeListener(this);
-				clearCache();
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Executes the <code>operation</code> based on the specified execution
-	 * <code>strategy</code>.
-	 * 
-	 * @param strategy
-	 *            The execution strategy to use.
-	 * @param operation
-	 *            The operation to be executed.
-	 * @return The list of results.
-	 */
-	protected final List execute(
-		ExecutionStrategy strategy,
-		IOperation operation) {
-
-		assert null != strategy : "null strategy"; //$NON-NLS-1$
-		assert null != operation : "null operation"; //$NON-NLS-1$
-
-		List results = strategy.execute(this, operation);
-		
-		if (Trace.shouldTrace(CommonCorePlugin.getDefault(), CommonCoreDebugOptions.SERVICES_EXECUTE)) {
-			Trace.trace(
-					CommonCorePlugin.getDefault(),
-					CommonCoreDebugOptions.SERVICES_EXECUTE,
-					"Operation '" + operation + "' executed using strategy '" + strategy + "'."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-
-		return results;
-	}
-
-	/**
-	 * Executes the <code>operation</code> based on the specified execution
-	 * <code>strategy</code>. If the result is a single object, return it.
-	 * Otherwise return <code>null</code>.
-	 * 
-	 * @param strategy
-	 *            The execution strategy to use.
-	 * @param operation
-	 *            The operation to be executed.
-	 * @return The unique result.
-	 */
-	protected final Object executeUnique(
-			ExecutionStrategy strategy,
-			IOperation operation) {
-
-		List results = execute(strategy, operation);
-
-		return results.size() == 1 ? results.get(0) : null;
-	}
-
-	/**
-	 * Indicates whether or not this service can provide the functionality
-	 * described by the specified <code>operation</code>.
-	 * <P>
-	 * This method does not consider the optimized state of the service. All of
-	 * the providers registered with the service are consulted to determine if
-	 * they provide for the operation.
-	 * 
-	 * @param operation
-	 *            The operation that describes the requested functionality.
-	 * @return <code>true</code> if any of this service's providers provide
-	 *         the operation; <code>false</code> otherwise.
-	 */
-	public final boolean provides(IOperation operation) {
-		assert null != operation : "null operation passed to provides(IOperation)"; //$NON-NLS-1$
-
-		for (int priority = 0, n = priorityCount; priority < n; ++priority)
-		{
-			List providerList = providers[priority];
-			int providerCount = providerList.size();
-
-			for (int provider = 0; provider < providerCount; ++provider)
-				if (safeProvides(((IProvider)providerList.get(provider)), operation))
-					return true;
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Indicates whether or not this service can provide the functionality
-	 * described by the specified <code>operation</code> using the given
-	 * execution <code>strategy</code>.
-	 * <P>
-	 * This method considers the optimized state of the service. If the service
-	 * is optimized, it will consult only those providers that have been cached.
-	 * 
-	 * @param operation
-	 *            The operation in question.
-	 * @param strategy
-	 *            The strategy to be used.
-	 * @return <code>true</code> if any of this service's providers provide
-	 *         the operation; <code>false</code> otherwise.
-	 */
-	protected final boolean provides(ExecutionStrategy strategy, IOperation operation) {
-		assert null != strategy : "null strategy";  //$NON-NLS-1$
-		assert null != operation : "null operation"; //$NON-NLS-1$
-
-		for (int i = 0; i < ExecutionStrategy.PRIORITIES.length; ++i) {
-			ProviderPriority priority = ExecutionStrategy.PRIORITIES[i];
-			List providerList = getProviders(strategy, priority, operation);
-			int providerCount = providerList.size();
-
-			for (int provider = 0; provider < providerCount; ++provider)
-				if (safeProvides (((IProvider)providerList.get(provider)), operation))
-					return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Handles an event indicating that a provider has changed.
-	 * 
-	 * @param event
-	 *            The provider change event to be handled.
-	 */
-	public final void providerChanged(ProviderChangeEvent event) {
-		assert null != event : "null event"; //$NON-NLS-1$
-
-		event.setSource(this);
-		fireProviderChange(event);
-	}
-
-	/**
-	 * Registers the service providers described by the extensions of the
-	 * specified namespace and extension point name with this service.
-	 *
-	 * @param namespace the namespace for the given extension point 
-	 *		(e.g. <code>"org.eclipse.gmf.runtime.common.core"</code>)
-	 * @param extensionPointName the simple identifier of the 
-	 *		extension point (e.g. <code>"parserProviders"</code>)
-	 */
-	public final void configureProviders(String namespace, String extensionPointName) {
-		configureProviders(Platform.getExtensionRegistry()
-									.getExtensionPoint(namespace, extensionPointName)
-									.getConfigurationElements());
-	}
-
-	/**
-	 * Registers the service providers described by the specified configuration
-	 * <code>elements</code> with this service.
-	 * 
-	 * @param elements
-	 *            The configuration elements describing the providers.
-	 */
-	public final void configureProviders(IConfigurationElement[] elements) {
-		assert null != elements : "null elements"; //$NON-NLS-1$
-
-		for (int i = 0; i < elements.length; ++i)
-		{
-			IConfigurationElement element = elements[i];
-
-			try
-			{
-				addProvider(ProviderPriority.parse(getPriority(element)),
-						newProviderDescriptor(element));
-			}
-			finally
-			{
-				if (Trace.shouldTrace(CommonCorePlugin.getDefault(), CommonCoreDebugOptions.SERVICES_CONFIG))
-				{
-					IExtension extension = element.getDeclaringExtension();
-					String identifier = extension.getUniqueIdentifier();
-
-					if (identifier == null)
-						identifier = String.valueOf(extension.getNamespaceIdentifier());
-
-					extension.getExtensionPointUniqueIdentifier();
-
-					Trace.trace(CommonCorePlugin.getDefault(), CommonCoreDebugOptions.SERVICES_CONFIG,
-							"Provider of '" + extension.getExtensionPointUniqueIdentifier() //$NON-NLS-1$
-								+ "' configured from extension '" + identifier + "'."); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-
-		for (int i = priorityCount; --i >= 0;)
-			providers[i].trimToSize();
-	}
-
-	/**
-	 * Get the priority of the Provider's configuration element
-	 * 
-	 * @param element
-	 *            The configuration elements describing the provider.
-	 * @return the priority of the specified configuration element
-	 */
-	public String getPriority(IConfigurationElement element) {
-		return element.getChildren(E_PRIORITY)[0].getAttribute(A_NAME);
-	}
-
-	/**
-	 * Creates a new provider descriptor for the specified configuration
-	 * <code>element</code>.
-	 * 
-	 * @param element
-	 *            The configuration element from which to create the descriptor.
-	 * @return A new provider descriptor.
-	 */
-	protected ProviderDescriptor newProviderDescriptor(IConfigurationElement element) {
-		return new ProviderDescriptor(element);
-	}
-	
-	/**
-	 * Safely calls a provider's provides() method.
-	 * 
-	 * The provider must not be null.
-	 * 
-	 * Returns true if there were no exceptions thrown and the provides() method
-	 * returns true.  Returns false if an exception was thrown or the provides()
-	 * method returns false.
-	 * 
-	 * An entry is added to the log if the provider threw an exception.  
-	 * 
-	 * @param provider to safely execute the provides() method
-	 * @param operation passed into the provider's provides() method
-	 * @return true if there were no exceptions thrown and the provides() method
-	 * returns true.  Returns false if an exception was thrown or the provides()
-	 * method returns false.
-	 */
-	static boolean safeProvides(IProvider provider, IOperation operation) {
-		assert provider != null;
-		
-		try {
-			return provider.provides(operation);
-		}
-		catch (Throwable e) {
-			
-			String providerClassName = provider.getClass().getName();
-			
-			if (!ignoredProviders.contains(providerClassName)) {
-				// remember the ignored provider so that the error is only logged once per provider
-				ignoredProviders.add(providerClassName);
-				
-				Log.log(
-					CommonCorePlugin.getDefault(),
-					IStatus.ERROR,
-					CommonCoreStatusCodes.SERVICE_FAILURE,
-					"Ignoring provider " + provider + " since it threw an exception or error in the provides() method", //$NON-NLS-1$ //$NON-NLS-2$
-					e);
-			}
-			
-			// re-throw fatal errors
-			if (e instanceof ThreadDeath) {
-				throw (ThreadDeath) e;
-			}
-
-			if (e instanceof VirtualMachineError) {
-				throw (VirtualMachineError) e;
-			}
-			return false;
-		}
-		
-	}
-	
-	/**
-	 * Package private access to the list of ignored providers. Providers are
-	 * ignored when they cause a runtime exception  or error to be thrown in their {{@link #provides(IOperation)}}
-	 * method.
-	 * 
-	 * @return the list of ignored providers.
-	 */
-	static List getIgnoredProviders() {
-		return ignoredProviders;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/package.html b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/package.html
deleted file mode 100644
index 36e03d9..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/package.html
+++ /dev/null

@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Provides the base interfaces for all service providers. The following examples are some of the services in the modeling platform:
-<ul>
-<li>Layout Service
-<li>Property Service
-<li>Decorator Service
-</ul>
-<p>
-The modeling platform consists of a set of services whose requests are fulfilled by service providers that implement {@link org.eclipse.gmf.runtime.common.core.service.IProvider IProvider}.
-Each service exposes an extension-point that providers extend to be discovered and used. This package contains classes that define the abstract contract for service providers.</p>
-</p>
-
-<h2>Package Specification</h2>
-<p>
-When it receives a client request, a service typically embeds the request information in an {@link org.eclipse.gmf.runtime.common.core.service.IOperation IOperation} and then evaluates the 
-extensions of its defined extension-point to find potential providers for the request. To determine to which providers to delegate a request,
-a service uses two sequential filters:
-<ol>
-<li>The service evaluates the information in each provider's extension descriptor. The service extension-point schema typically filters 
-out most providers in this step and prevents the unnecessary loading of a provider. 
-<li>The service requests information from each provider about whether it can support the request. The provider's
-{@link org.eclipse.gmf.runtime.common.core.service.IProvider#provides IProvider.provides} implementation performs this action.
-</ol>
-</p>
-<p>
-Typically, the service sorts the providers that passed the filters according to the priority that the service provider extension descriptor defines. 
-Depending on the service and the request, the service might request one or more providers to perform the operation. After the required providers are defined, the service
-delegates the execution of the request for each provider to the operation's {@link org.eclipse.gmf.runtime.common.core.service.IOperation#execute IOperation.execute} implementation.
-Each service provides its own IOperation subclass that subsequently delegates to the provider.
-</p>
-<p>
-Most services expose an abstract class implementing IProvider that providers should subclass. The abstract class specifies the contract between the service and its providers since 
-it specifies the API to perform requests. The abstract class usually extends 
-{@link org.eclipse.gmf.runtime.common.core.service.AbstractProvider AbstractProvider} to leverage the notification support of this class.
-</p>
-<p>
- Some services require notification from a provider if the provider's state changes. This notification occurs through the
- {@link org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener IProviderChangeListener} interface. These types of service connect to their provider using
- {@link org.eclipse.gmf.runtime.common.core.service.IProvider#addProviderChangeListener addProviderChangeListener} and disconnect using
- {@link org.eclipse.gmf.runtime.common.core.service.IProvider#removeProviderChangeListener removeProviderChangeListener}. Services often
- provide their own derived {@link org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent ProviderChangeEvent} classes to convey more
- service-specific information about the state change.
-</p>
-<p>
-Sometimes, it is impossible to provide enough information in a service provider extension descriptor to avoid
-the unnecessary loading of the provider plug-in. When the cost of loading a provider plug-in is high, it might be preferable to move
-the implementation of {@link org.eclipse.gmf.runtime.common.core.service.IProvider#provides IProvider.provides} to a lightweight plug-in. 
-To do this, a service provider extension descriptor should include a "Policy" subelement with
-a class attribute that references a class that implements {@link org.eclipse.gmf.runtime.common.core.service.IProviderPolicy IProviderPolicy}. This
-interface is a subset of IProvider that only includes the
-{@link org.eclipse.gmf.runtime.common.core.service.IProviderPolicy#provides IProviderPolicy.provides} member.
-</p>
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/CompositeRunnable.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/CompositeRunnable.java
deleted file mode 100644
index 4b4d90d..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/CompositeRunnable.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-
-/**
- * A utility class that is a composite of runnables
- * 
- * @author Yasser Lulu
- * @canBeSeenBy %partners
- */
-public class CompositeRunnable
-	implements Runnable {
-
-	/**
-	 * The iterator to use to get runnables
-	 */
-	private Runnable[] runnables;
-
-	/**
-	 * Constructor for CompositeRunnable.
-	 * 
-	 * @param runnables list of runnable to be composed into a <code>CompositeRunnable</code>
-	 */
-	public CompositeRunnable(Runnable[] runnables) {
-		this.runnables = runnables;
-	}
-
-	/**
-	 * The body of the runnable that runs the composite list of rannables.
-	 * @see java.lang.Runnable#run()
-	 */
-	public void run() {
-		try {
-			for (int i = 0; i < runnables.length; i++) {
-				runnables[i].run();
-			}
-		} catch (Exception ex) {
-			Trace.catching(CommonCorePlugin.getDefault(),
-				CommonCoreDebugOptions.EXCEPTIONS_CATCHING, getClass(), "run", //$NON-NLS-1$
-				ex);
-		} finally {
-			runnables = null;
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/EnumeratedType.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/EnumeratedType.java
deleted file mode 100644
index 0271907..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/EnumeratedType.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * An enumeration of constants based on the typesafe enum pattern.
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public abstract class EnumeratedType
-	implements Serializable {
-
-	/**
-	 * The name of this enumerated value.
-	 */
-	private final transient String name;
-
-	/**
-	 * The ordinal for this enumerated value.
-	 */
-	private final int ordinal;
-
-	/**
-	 * Concrete subclasses should define a private static field to generate
-	 * ordinals and a private constructor as follows:
-	 * <p>
-	 * <code>
-	 * private static int nextOrdinal = 0;
-	 *
-	 * private Subclass(String name) {
-	 *     super(name, nextOrdinal++);
-	 * }
-	 * </code>
-	 * 
-	 * @param name
-	 *            The name of the new enumerated type.
-	 * @param ordinal
-	 *            The ordinal for the new enumerated type.
-	 */
-	protected EnumeratedType(String name, int ordinal) {
-		super();
-
-		this.name = name;
-		this.ordinal = ordinal;
-	}
-
-	/**
-	 * Retrieves the value of the <code>name</code> instance variable.
-	 * 
-	 * @return The value of the <code>name</code> instance variable.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Retrieves the value of the <code>ordinal</code> instance variable.
-	 * 
-	 * @return The value of the <code>ordinal</code> instance variable.
-	 */
-	public final int getOrdinal() {
-		return ordinal;
-	}
-
-	/**
-	 * Retrieves the list of constants for this enumerated type.
-	 * <p>
-	 * Concrete subclasses should define a private static array of values and
-	 * a(n) (final) implementation of this method as follows:
-	 * <p>
-	 * <code>
-	 * private static final Subclass[] VALUES = { ... };
-	 * 
-	 * protected final List getValues() {
-	 *     return Collections.unmodifiableList(Arrays.asList(VALUES));
-	 * }
-	 * </code>
-	 * 
-	 * @return The list of constants for this enumerated type.
-	 */
-	protected abstract List getValues();
-
-	/**
-	 * Indicates whether some other object is "equal to" this enumerated type.
-	 * 
-	 * @return <code>true</code> if this enumerated type is the same as the
-	 *         object argument; <code>false</code> otherwise.
-	 * @param object
-	 *            The reference object with which to compare.
-	 * 
-	 * @see java.lang.Object#equals(Object)
-	 */
-	public final boolean equals(Object object) {
-		return super.equals(object);
-	}
-
-	/**
-	 * Retrieves a hash code value for this enumerated type. This method is
-	 * supported for the benefit of hashtables such as those provided by
-	 * <code>java.util.Hashtable</code>.
-	 * 
-	 * @return A hash code value for this enumerated type.
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
-	public final int hashCode() {
-		return super.hashCode();
-	}
-
-	/**
-	 * Retrieves a textual representation of this enumerated type.
-	 * 
-	 * @return A textual representation of this enumerated type.
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getName();
-	}
-
-	/**
-	 * Designates an alternative object to be used when reading an enumerated
-	 * type from a stream.
-	 * 
-	 * @return The alternative enumerated type object.
-	 * @throws ObjectStreamException
-	 * @see java.io.Serializable
-	 */
-	protected final Object readResolve()
-		throws ObjectStreamException {
-		return getValues().get(getOrdinal());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/FileCopyUtil.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/FileCopyUtil.java
deleted file mode 100644
index 54a3568..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/FileCopyUtil.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Utility class for copying files and folders
- * 
- * @author gsturov
- * @canBeSeenBy %partners
- */
-public class FileCopyUtil {
-
-	/**
-	 * Private constructor
-	 */
-	private FileCopyUtil() {
-		/* empty method body */
-	}
-
-	/**
-	 * Copies the contents of a source folder to a target folder
-	 * 
-	 * @param sourceFolder
-	 *            the source folder
-	 * @param targetFolder
-	 *            the target folder
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	public static void copyFolder(String sourceFolder, String targetFolder)
-		throws FileNotFoundException, IOException {
-		assert (new File(sourceFolder).isDirectory());
-		assert (new File(targetFolder).isDirectory());
-
-		File source = new File(sourceFolder);
-		String[] files = source.list();
-		for (int i = 0; i < files.length; i++) {
-			File f = new File(sourceFolder + File.separator + files[i]);
-			if (f.isDirectory())
-				copyFolder(sourceFolder, targetFolder, files[i]);
-			else
-				copyFile(sourceFolder, targetFolder, files[i]);
-		}
-	}
-
-	/**
-	 * Copies a source file to a target folder
-	 * 
-	 * @param sourceFile
-	 *            the source file
-	 * @param targetFolder
-	 *            the target folder
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	public static void copyFile(String sourceFile, String targetFolder)
-		throws FileNotFoundException, IOException {
-		assert (new File(sourceFile).isFile());
-		assert (new File(targetFolder).isDirectory());
-
-		File source = new File(sourceFile);
-		copyFile(source.getParent(), targetFolder, source.getName());
-	}
-
-	/**
-	 * Copies a folder in a source folder to a target folder
-	 * 
-	 * @param sourceFolder
-	 *            the source folder
-	 * @param targetFolder
-	 *            the target folder
-	 * @param name
-	 *            the folder to copy
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	private static void copyFolder(String sourceFolder, String targetFolder,
-			String name)
-		throws FileNotFoundException, IOException {
-		File target = new File(targetFolder + File.separator + name);
-		target.mkdir();
-		copyFolder(sourceFolder + File.separator + name, targetFolder
-			+ File.separator + name);
-	}
-
-	/**
-	 * Copies a file in a source folder to a target folder
-	 * 
-	 * @param sourceFolder
-	 *            the source folder
-	 * @param targetFolder
-	 *            the target folder
-	 * @param name
-	 *            the file to copy
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	private static void copyFile(String sourceFolder, String targetFolder,
-			String name)
-		throws FileNotFoundException, IOException {
-		copyFile(sourceFolder, targetFolder, name, name);
-	}
-
-	/**
-	 * Copies a file in a source folder to a target folder
-	 * 
-	 * @param sourceFolder
-	 *            the source folder
-	 * @param targetFolder
-	 *            the target folder
-	 * @param sourceName
-	 *            of the source file to copy
-	 * @param targetName
-	 *            of the destination file to copy to
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	public static void copyFile(String sourceFolder, String targetFolder,
-			String sourceName, String targetName)
-		throws FileNotFoundException, IOException {
-		InputStream is = new FileInputStream(sourceFolder + File.separator
-			+ sourceName);
-		OutputStream os = new FileOutputStream(targetFolder + File.separator
-			+ targetName);
-		byte[] buffer = new byte[102400];
-		while (true) {
-			int len = is.read(buffer);
-			if (len < 0)
-				break;
-			os.write(buffer, 0, len);
-		}
-		is.close();
-		os.close();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/HashUtil.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/HashUtil.java
deleted file mode 100644
index 20009a7..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/HashUtil.java
+++ /dev/null

@@ -1,274 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-/**
- * A utility for generating unique hash values.
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public final class HashUtil {
-
-	/**
-	 * An arbitrary constant non-zero value.
-	 */
-	protected static final int CONSTANT = 17;
-
-	/**
-	 * An odd prime.
-	 */
-	protected static final int PRIME = 37;
-
-	/**
-	 * Constructs a new hash util.
-	 */
-	private HashUtil() {
-		super();
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, boolean field) {
-		return PRIME * base + (field ? 0
-			: 1);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(boolean field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, byte field) {
-		return PRIME * base + field;
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(byte field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, char field) {
-		return PRIME * base + field;
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(char field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, short field) {
-		return PRIME * base + field;
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(short field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, int field) {
-		return PRIME * base + field;
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, long field) {
-		return PRIME * base + (int) (field ^ (field >>> 32));
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(long field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, float field) {
-		return PRIME * base + Float.floatToIntBits(field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(float field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(int base, double field) {
-		return hash(base, Double.doubleToLongBits(field));
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified field, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified field.
-	 * @param field
-	 *            The field which to retrieve a hash value.
-	 */
-	public static int hash(double field) {
-		return hash(CONSTANT, field);
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified object, based on the
-	 * specified base value.
-	 * 
-	 * @return A hash value for the specified object.
-	 * @param base
-	 *            The value on which to base the hash value.
-	 * @param object
-	 *            The object for which to retrieve a hash value.
-	 */
-	public static int hash(int base, Object object) {
-		return PRIME * base + (null == object ? 0
-			: object.hashCode());
-	}
-
-	/**
-	 * Retrieves a unique hash value for the specified object, based on a
-	 * constant base value.
-	 * 
-	 * @return A hash value for the specified object.
-	 * @param object
-	 *            The object for which to retrieve a hash value.
-	 */
-	public static int hash(Object object) {
-		return hash(CONSTANT, object);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/IAdaptableSelection.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/IAdaptableSelection.java
deleted file mode 100644
index b5007ca..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/IAdaptableSelection.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * A common tag interface that is supported by viewers that want to enable access to
- * their selection.
- * <p>
- * API clients should <b>not</b> implement this interface.
- * </p>
- * <p>
- * API clients typically use the interface when implementing selectionChanged methods in 
- * IActionDelegate.
- * </p>
- * <p>
- * Example:
- * <pre>
- * 
- *  	public void selectionChanged(IAction action, final ISelection selection) {
- * 
- * 		if (selection instanceof IStructuredSelection) {
- * 
- * 			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- * 
- * 			Object firstSelection = structuredSelection.getFirstElement();
- * 
- * 			if (firstSelection instanceof IAdaptableSelection) {
- * 
- * 				myExpectedObject = (...) ((IAdaptableSelection) firstSelection).getAdapter( ... );
- * 			}
- * 		}
- *   }
- *  
- * </pre>
- */
-public interface IAdaptableSelection
-	extends IAdaptable {
-	// Tag interface
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/INullObject.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/INullObject.java
deleted file mode 100644
index 1189c9f..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/INullObject.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-/**
- * A specification of classes that implement the <em>Null Object</em> pattern.
- * Implementors of this interface have a unique instance that represents a
- * pointer-safe <code>null</code>. The interpretation of <code>null</code>
- * may vary; it may mean absence of a value, invalid value, etc. 
- * <p>
- * API clients should <b>not</b> implement this interface.
- * </p>
- */
-public interface INullObject {
-
-	/**
-	 * Queries whether <code>this</code> is the <code>null</code> instance of a
-	 * given implementation class. The <code>null</code> instance must be unique.
-	 * 
-	 * @return <code>true</code> if I am the special "null" instance;
-	 *         <code>false</code>, otherwise
-	 */
-	boolean isNull();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/IUpdateable.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/IUpdateable.java
deleted file mode 100644
index fc8e4d3..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/IUpdateable.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Tests if an element is updatable
- * 
- * @author Michael Yee
- * @canBeSeenBy %partners
- */
-public interface IUpdateable {
-    /**
-     * Tests if an element is updatable
-     * @param adaptable element to test
-     * @return boolean true if element is updatable, otherwise false
-     */
-    public boolean isUpdateable(IAdaptable adaptable);
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Log.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Log.java
deleted file mode 100644
index 8bbcb89..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Log.java
+++ /dev/null

@@ -1,250 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-
-/**
- * A utility for logging errors, warnings, and information. Provides a simple
- * interface for generating logs based on status objects.
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public class Log {
-
-	/**
-	 * private constructor for the static class.
-	 */
-	protected Log() {
-		super();
-	}
-	
-	/**
-	 * The default log listener for this log utility.
-	 */
-	private static final ILog fLog = CommonCorePlugin.getDefault().getLog();
-
-	/**
-	 * Retrieves the default log listener for this log utility.
-	 * 
-	 * @return The default log listener for this log utility.
-	 */
-	protected static ILog getDefault() {
-		return fLog;
-	}
-	
-	/**
-	 * Responds to a log request for the specified plug-in based on the
-	 * specified status object. Statuses with severity of error or warning
-	 * result in the generation of a platform log for the specified plug-in; all
-	 * log requests are forward to the default log listener.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param status
-	 *            The status object on which to base the log.
-	 *  
-	 */
-	public static void log(Plugin plugin, IStatus status) {
-		switch (status.getSeverity()) {
-			case IStatus.ERROR:
-			case IStatus.WARNING:
-				getDefault().log(status);
-				break;
-			default:
-				/*
-				 * The Eclipse logging facility does not have the concept of
-				 * logging levels. Anything logged to the plugins logger will
-				 * automatically be logged to the .log file. The Common Logging
-				 * implementation provides the common log file
-				 * (CommonBaseEvents.log) with the associated extension point
-				 * and preference page but is not related to the .log file.
-				 * Since we do not want to Eclipse log poluted with "plug-in
-				 * started" messages, we do not log these.
-				 * 
-				 * getDefault().log(status);
-				 */
-				break;
-		}
-	}
-
-	/**
-	 * Generates a log for the specified plug-in, with the specified severity,
-	 * status code, and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param severity
-	 *            The severity of the log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void log(Plugin plugin, int severity, int code, String message) {
-
-		log(plugin, severity, code, message, null);
-	}
-
-	/**
-	 * Generates a log for the specified plug-in, with the specified severity,
-	 * status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param severity
-	 *            The severity of the log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void log(Plugin plugin, int severity, int code,
-			String message, Throwable throwable) {
-
-		//
-		// Status ctor requires a non-null message
-		String msg = message == null ? "" //$NON-NLS-1$
-			: message;
-
-		try {
-			log(plugin, new Status(severity, plugin.getBundle()
-				.getSymbolicName(), code, msg, throwable));
-		} catch (IllegalArgumentException iae) {
-			Trace.catching(CommonCorePlugin.getDefault(),
-				CommonCoreDebugOptions.EXCEPTIONS_CATCHING, Log.getDefault()
-					.getClass(), "log", iae); //$NON-NLS-1$
-			Log.error(CommonCorePlugin.getDefault(),
-				CommonCoreStatusCodes.SERVICE_FAILURE, "log", iae); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Generates an error log for the specified plug-in, with the specified
-	 * status code and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void error(Plugin plugin, int code, String message) {
-		error(plugin, code, message, null);
-	}
-	
-	/**
-	 * Generates an error log for the specified plug-in, with the specified
-	 * status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void error(Plugin plugin, int code, String message,
-			Throwable throwable) {
-
-		log(plugin, IStatus.ERROR, code, message, throwable);
-	}
-
-	/**
-	 * Generates a warning log for the specified plug-in, with the specified
-	 * status code and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void warning(Plugin plugin, int code, String message) {
-		warning(plugin, code, message, null);
-	}
-
-	/**
-	 * Generates a warning log for the specified plug-in, with the specified
-	 * status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void warning(Plugin plugin, int code, String message,
-			Throwable throwable) {
-
-		log(plugin, IStatus.WARNING, code, message, throwable);
-	}
-
-	/**
-	 * Generates an information log for the specified plug-in, with the
-	 * specified status code and message.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 *  
-	 */
-	public static void info(Plugin plugin, int code, String message) {
-		info(plugin, code, message, null);
-	}
-
-	/**
-	 * Generates an information log for the specified plug-in, with the
-	 * specified status code, message, and throwable.
-	 * 
-	 * @param plugin
-	 *            The plug-in for which to generate a log.
-	 * @param code
-	 *            The status code for the log.
-	 * @param message
-	 *            The message for the log.
-	 * @param throwable
-	 *            The throwable for the log.
-	 *  
-	 */
-	public static void info(Plugin plugin, int code, String message,
-			Throwable throwable) {
-
-		log(plugin, IStatus.INFO, code, message, throwable);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/ObjectAdapter.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/ObjectAdapter.java
deleted file mode 100644
index 4c3e0b0..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/ObjectAdapter.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * An adapter that allows for the setting of the object later.
- * 
- * @author cmahoney
- * @canBeSeenBy %partners
- */
-public class ObjectAdapter
-	implements IAdaptable {
-
-	/** the object */
-	private List theList = new ArrayList();
-
-	/**
-	 * Constructor for an ObjectAdapter.
-	 */
-	public ObjectAdapter() {
-		super();
-	}
-
-	/**
-	 * Constructor for an ObjectAdapter.
-	 * @param object The object that can adapt.
-	 */
-	public ObjectAdapter(Object object) {
-		super();
-		assert null != object : "ObjectAdapter constructor received NULL as argument"; //$NON-NLS-1$
-		setObject(object);
-	}
-
-	/**
-	 * Constructor for an ObjectAdapter.
-	 * @param list The list to adapt.
-	 */
-	public ObjectAdapter(List list) {
-		super();
-		assert null != list : "ObjectAdapter received NULL list as argument"; //$NON-NLS-1$
-		theList.addAll(list);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		ListIterator li = theList.listIterator();
-		while (li.hasNext()) {
-			Object theObject = li.next();
-			if (theObject != null
-				&& adapter.isAssignableFrom(theObject.getClass()))
-				return theObject;
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the object.
-	 * 
-	 * @param theObject
-	 *            The object to set.
-	 */
-	public void setObject(Object theObject) {
-		theList = new ArrayList();
-		theList.add(theObject);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/PropertiesConfigurationManager.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/PropertiesConfigurationManager.java
deleted file mode 100644
index 26c1dc2..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/PropertiesConfigurationManager.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-import org.osgi.framework.Bundle;
-
-/**
- * Manages the properties files declared in the textConfiguration extensions
- * 
- * @author myee
- * @canBeSeenBy %partners
- */
-public class PropertiesConfigurationManager {
-
-	/**
-	 * Extension point name for the properties configuration extension point.
-	 */
-	private static final String PROPERTIES_CONFIGURATION_EXT_P_NAME = "propertiesConfiguration"; //$NON-NLS-1$ 
-
-	/**
-	 * The path attribute describing the relative location to the properties
-	 * file
-	 */
-	private static final String PATH_ATTRIBUTE = "path";//$NON-NLS-1$
-
-	/**
-	 * Maps plug-in id to its properties map
-	 */
-	private static Map pluginIdToPropertiesMap = null;
-
-	/**
-	 * private constructor.
-	 */
-	private PropertiesConfigurationManager() {
-		super();
-	}
-	
-	/**
-	 * Gets the string for the given key
-	 * 
-	 * @param pluginId
-	 *            the id of the plug-in defining the string
-	 * @param key
-	 *            the key
-	 * @return the string, or <code>null</code> if the mapping is not found
-	 */
-	public static String getString(String pluginId, String key) {
-		Map propertiesMap = (Map) getPluginIdToPropertiesMap().get(pluginId);
-		if (propertiesMap == null) {
-			// lazy initialize the properties map for the given plug-in
-			propertiesMap = new HashMap();
-			getPluginIdToPropertiesMap().put(pluginId, propertiesMap);
-
-			// load the properties files for all extensions in the plug-in
-			IExtension[] extensions = Platform.getExtensionRegistry()
-				.getExtensionPoint(CommonCorePlugin.getPluginId(),
-					PROPERTIES_CONFIGURATION_EXT_P_NAME).getExtensions();
-			for (int i = 0; i < extensions.length; ++i) {
-				if (extensions[i].getContributor().getName().equals(pluginId)) {
-					loadProperties(propertiesMap, extensions[i]
-						.getConfigurationElements());
-				}
-			}
-		}
-
-		return (String) propertiesMap.get(key);
-	}
-
-	/**
-	 * Gets the pluginIdToPropertiesMap map
-	 * 
-	 * @return the pluginIdToPropertiesMap map
-	 */
-	private static Map getPluginIdToPropertiesMap() {
-		if (pluginIdToPropertiesMap == null) {
-			// lazy initialize the map
-			pluginIdToPropertiesMap = new HashMap();
-		}
-		return pluginIdToPropertiesMap;
-	}
-
-	/**
-	 * Lods the properties files described by the configuration elements.
-	 * 
-	 * @param propertiesMap
-	 *            the map to hold the properties files
-	 * @param elements
-	 *            The configuration elements describing the properties files.
-	 */
-	private static void loadProperties(Map propertiesMap,
-			IConfigurationElement[] elements) {
-
-		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement element = elements[i];
-
-			// get the relative path of the properties file
-			String relativePath = element.getAttribute(PATH_ATTRIBUTE);
-			
-			Bundle bundle = Platform.getBundle(
-					element.getDeclaringExtension().getContributor().getName());
-			
-			assert bundle != null;
-			
-			URL url = FileLocator.find(bundle, new Path(relativePath), null);
-			
-			if (url == null) {
-				Log.error(CommonCorePlugin.getDefault(),
-					CommonCoreStatusCodes.SERVICE_FAILURE,
-					"Couldn't find relative path " + relativePath + " in " //$NON-NLS-1$ //$NON-NLS-2$
-						+ element.getDeclaringExtension().getContributor().getName());
-			}
-			
-			InputStream is = null;
-			// get the file
-			try {
-				is = url.openStream();
-				Properties properties = new Properties();
-				properties.load(is);
-				propertiesMap.putAll(properties);
-				
-			} catch (IOException e) {
-				handleException(e);
-			}
-			finally {
-				
-				if (is != null) {
-					try {
-						is.close();
-					} catch (IOException e) {
-						handleException(e);
-					}
-					
-				}
-				
-			}
-
-		}
-	}	
-
-	/**
-	 * Log and trace the exception
-	 * 
-	 * @param e
-	 *            the exception
-	 */
-	private static void handleException(Exception e) {
-		Trace.catching(CommonCorePlugin.getDefault(),
-			CommonCoreDebugOptions.EXCEPTIONS_CATCHING,
-			PropertiesConfigurationManager.class, "configureProperties", e); //$NON-NLS-1$
-		Log.error(CommonCorePlugin.getDefault(),
-			CommonCoreStatusCodes.SERVICE_FAILURE, e.getMessage(), e);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Proxy.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Proxy.java
deleted file mode 100644
index c7c73eb..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Proxy.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-
-/**
- * A proxy object that handles exceptions.
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public abstract class Proxy {
-
-	/**
-	 * The real object for this proxy.
-	 */
-	private Object realObject;
-
-	/**
-	 * Constructs a new proxy for the specified object.
-	 * 
-	 * @param realObject
-	 *            The obect for which to create a proxy.
-	 */
-	protected Proxy(Object realObject) {
-
-		super();
-
-		assert null != realObject : "null argument passed to proxy"; //$NON-NLS-1$
-
-		this.realObject = realObject;
-	}
-
-	/**
-	 * Retrieves the value of the <code>realObject</code> instance variable.
-	 * 
-	 * @return The value of the <code>realObject</code> instance variable.
-	 */
-	public Object getRealObject() {
-		return realObject;
-	}
-
-	/**
-	 * Sets the value of the <code>realObject</code> instance variable.
-	 * 
-	 * @param realObject
-	 *            The obect for which to create a proxy.
-	 */
-	public void setRealObject(Object realObject) {
-
-		assert null != realObject : "null argument passed setRealObject"; //$NON-NLS-1$
-
-		this.realObject = realObject;
-	}
-
-	/**
-	 * Handles the specified exception.
-	 * 
-	 * @param exception
-	 *            The exception to be handled
-	 */
-	protected void handle(Exception exception) {
-		Trace.catching(CommonCorePlugin.getDefault(),
-			CommonCoreDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-			"handle", exception); //$NON-NLS-1$
-		RuntimeException cre = new RuntimeException(exception);
-		Trace.throwing(CommonCorePlugin.getDefault(),
-			CommonCoreDebugOptions.EXCEPTIONS_THROWING, getClass(),
-			"handle", cre); //$NON-NLS-1$
-		throw cre;
-	}
-
-	/**
-	 * Retrieves a hash code value for this proxy. This method is supported for
-	 * the benefit of hashtables such as those provided by
-	 * <code>java.util.Hashtable</code>.
-	 * 
-	 * @return A hash code value for this proxy.
-	 * 
-	 * @see Object#hashCode()
-	 */
-	public final int hashCode() {
-		return getRealObject().hashCode();
-	}
-
-	/**
-	 * Indicates whether some other proxy is "equal to" this proxy.
-	 * 
-	 * @return <code>true</code> if this proxy is the same as the proxy
-	 *         argument; <code>false</code> otherwise.
-	 * @param proxy
-	 *            The reference proxy with which to compare.
-	 */
-	private boolean equals(Proxy proxy) {
-		return null == getRealObject() ? null == proxy.getRealObject()
-			: getRealObject().equals(proxy.getRealObject());
-	}
-
-	/**
-	 * Indicates whether some other object is "equal to" this proxy.
-	 * 
-	 * @return <code>true</code> if this proxy is the same as the object
-	 *         argument; <code>false</code> otherwise.
-	 * @param object
-	 *            The reference object with which to compare.
-	 * 
-	 * @see Object#equals(Object)
-	 */
-	public final boolean equals(Object object) {
-		return object instanceof Proxy && equals((Proxy) object);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/RequestCollapser.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/RequestCollapser.java
deleted file mode 100644
index 6909444..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/RequestCollapser.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-
-/**
- * This class is used to collapse multiple requests by simply spawning a thread
- * the first time it receives a request, execute that request in the thread, and
- * once the thread finishes execution it will come back to execute the next
- * request if any. The request collapsing stems from the fact that while the
- * thread is busy executing one request, all the newly posted ones will be
- * ignored except for the most recent.
- * 
- * @author Yasser Lulu
- * @canBeSeenBy %partners
- */
-public class RequestCollapser {
-
-	/**
-	 * the most recent runnable request posted by client
-	 */
-	private Runnable request;
-
-	/**
-	 * The thread used to post/execute requests
-	 */
-	private Thread thread;
-
-	/**
-	 * the thread class spawned to execute commands
-	 */
-	private class PostedThread
-		extends Thread {
-
-		public void run() {
-			Runnable req = null;
-			while (isInterrupted() == false) {
-				req = null;
-				synchronized (RequestCollapser.this) {
-					while ((req = getRequest()) == null) {
-						try {
-							RequestCollapser.this.wait();
-						} catch (InterruptedException ie) {
-							Trace.catching(CommonCorePlugin.getDefault(),
-								CommonCoreDebugOptions.EXCEPTIONS_CATCHING,
-								getClass(), "run", //$NON-NLS-1$
-								ie);
-							Log.info(CommonCorePlugin.getDefault(),
-								CommonCoreStatusCodes.OK,
-								"PostedThread received interruption"); //$NON-NLS-1$
-							return;
-						}
-					}
-				}
-				executeRequest(req);
-			}
-		}
-	} //thread-class
-
-	/**
-	 * executes the runnable request
-	 * 
-	 * @param runnable
-	 *            The request Runnable to execute
-	 */
-	protected void executeRequest(Runnable runnable) {
-		runnable.run();
-	}
-
-	/**
-	 * returns the most recently posted request and nullifies it afterwards so
-	 * it doesn't return it again if invoked again immedialtely
-	 * 
-	 * @return Runnable The request or null if none has been posted
-	 */
-	protected synchronized Runnable getRequest() {
-		Runnable req = request;
-		request = null;
-		return req;
-	}
-
-	/**
-	 * Posts the request from the client to run in the thread at the next
-	 * possible chance. The posted request will overwrite any previous one
-	 * 
-	 * @param runnable
-	 *            the Runnable request to run
-	 */
-	public synchronized void postRequest(Runnable runnable) {
-		this.request = runnable;
-		notify();
-	}
-
-	/**
-	 * Constructor for RequestCollapser.
-	 */
-	public RequestCollapser() {
-		thread = new PostedThread();
-		thread.setDaemon(true);
-	}
-
-	/**
-	 * Start this automation object by starting the thread.
-	 */
-	public synchronized void start() {
-		thread.start();
-	}
-
-	/**
-	 * Stops this automation object by interrupting the thread.
-	 */
-	public synchronized void stop() {
-		request = null;
-		thread.interrupt();
-		thread = null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringMatcher.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringMatcher.java
deleted file mode 100644
index ad8b7cb..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringMatcher.java
+++ /dev/null

@@ -1,517 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.util.Vector;
-
-/**
- * A string pattern matcher, supporting wildcard characters.
- * 
- * This class is cloned from org.eclipse.ui.internal.misc.StringMatcher
- * 
- * @canBeSeenBy %partners
- */
-public class StringMatcher {
-
-	/** The pattern */
-	protected String fPattern;
-
-	/** The pattern length */
-	protected int fLength; // pattern length
-
-	/** Ignore wildcards */
-	protected boolean fIgnoreWildCards;
-
-	/** Ignore case */
-	protected boolean fIgnoreCase;
-
-	/** Has a leading wildcard */
-	protected boolean fHasLeadingStar;
-
-	/** Has a trailing wildcard */
-	protected boolean fHasTrailingStar;
-
-	/** The given pattern is split into * separated segments */
-	protected String fSegments[];
-
-	/** Boundary value beyond which we don't need to search in the text */
-	protected int fBound = 0;
-
-	/** The single wildcard character */
-	protected static final char fSingleWildCard = '\u0000';
-
-	/**
-	 * Keeps track of the internal position of the matcher.
-	 */
-	public static class Position {
-
-		/*
-		 * (Non JavaDoc)
-		 */
-		private int start; //inclusive
-
-		/*
-		 * (Non JavaDoc)
-		 */
-		private int end; //exclusive
-
-		/**
-		 * Creates a new position.
-		 * 
-		 * @param start
-		 *            the start position.
-		 * @param end
-		 *            the start position.
-		 */
-		public Position(int start, int end) {
-			this.start = start;
-			this.end = end;
-		}
-
-		/**
-		 * Retrieve the starting position.
-		 * 
-		 * @return the starting position.
-		 */
-		public int getStart() {
-			return start;
-		}
-
-		/**
-		 * Retrieve the ending position.
-		 * 
-		 * @return the ending position.
-		 */
-		public int getEnd() {
-			return end;
-		}
-	}
-
-	/**
-	 * StringMatcher constructor takes in a String object that is a simple
-	 * pattern which may contain <code>'*'</code> for 0 or more characters and <code>'?'</code> 
-	 * for exactly one character.
-	 * 
-	 * Literal characters must be escaped in the pattern e.g., <code>"\*"</code>
-	 * means literal <code>"*"</code>, etc.
-	 * 
-	 * Escaping any other character (including the escape character itself),
-	 * just results in that character in the pattern. e.g., <code>"\a"</code>
-	 * means <code>"a"</code> and <code>"\\"</code> means <code>"\"</code>
-	 * 
-	 * If invoking the StringMatcher with string literals in Java, don't forget
-	 * escape characters are represented by <code>"\\"</code>.
-	 * 
-	 * @param pattern
-	 *            the pattern to match text against
-	 * @param ignoreCase
-	 *            if true, case is ignored
-	 * @param ignoreWildCards
-	 *            if true, wild cards and their escape sequences are ignored
-	 *            (everything is taken literally).
-	 */
-	public StringMatcher(String pattern, boolean ignoreCase,
-			boolean ignoreWildCards) {
-		if (pattern == null)
-			throw new IllegalArgumentException();
-		fIgnoreCase = ignoreCase;
-		fIgnoreWildCards = ignoreWildCards;
-		fPattern = pattern;
-		fLength = pattern.length();
-
-		if (fIgnoreWildCards) {
-			parseNoWildCards();
-		} else {
-			parseWildCards();
-		}
-	}
-
-	/**
-	 * Find the first occurrence of the pattern between
-	 * <code>start</code)(inclusive) 
-	 * and <code>end</code>(exclusive).  
-	 * @param text <code>String</code> the String object to search in 
-	 * @param start <code>int</code>, the starting index of the search range, inclusive
-	 * @param end <code>int</code>, the ending index of the search range, exclusive
-	 * @return an <code>StringMatcher.Position</code> object that keeps the starting 
-	 * (inclusive) and ending positions (exclusive) of the first occurrence of the 
-	 * pattern in the specified range of the text; return null if not found or subtext
-	 * is empty (start==end). A pair of zeros is returned if pattern is empty string
-	 * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
-	 * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
-	 */
-	public StringMatcher.Position find(String text, int start, int end) {
-		if (text == null)
-			throw new IllegalArgumentException();
-
-		int tlen = text.length();
-		if (start < 0)
-			start = 0;
-		if (end > tlen)
-			end = tlen;
-		if (end < 0 || start >= end)
-			return null;
-		if (fLength == 0)
-			return new Position(start, start);
-		if (fIgnoreWildCards) {
-			int x = posIn(text, start, end);
-			if (x < 0)
-				return null;
-			return new Position(x, x + fLength);
-		}
-
-		int segCount = fSegments.length;
-		if (segCount == 0)//pattern contains only '*'(s)
-			return new Position(start, end);
-
-		int curPos = start;
-		int matchStart = -1;
-		int i;
-		for (i = 0; i < segCount && curPos < end; ++i) {
-			String current = fSegments[i];
-			int nextMatch = regExpPosIn(text, curPos, end, current);
-			if (nextMatch < 0)
-				return null;
-			if (i == 0)
-				matchStart = nextMatch;
-			curPos = nextMatch + current.length();
-		}
-		if (i < segCount)
-			return null;
-		return new Position(matchStart, curPos);
-	}
-
-	/**
-	 * match the given <code>text</code> with the pattern
-	 * 
-	 * @return true if matched eitherwise false
-	 * @param text
-	 *            <code>String</code>, a String object
-	 */
-	public boolean match(String text) {
-		return match(text, 0, text.length());
-	}
-
-	/**
-	 * Given the starting (inclusive) and the ending (exclusive) positions in
-	 * the <code>text</code>, determine if the given substring matches with
-	 * aPattern
-	 * 
-	 * @return true if the specified portion of the text matches the pattern
-	 * @param text
-	 *            <code>String</code> a String object that contains the
-	 *            substring to match
-	 * @param start
-	 *            <code>int</code> marks the starting position (inclusive) of
-	 *            the substring
-	 * @param end
-	 *            <code>int</code> marks the ending index (exclusive) of the
-	 *            substring
-	 */
-	public boolean match(String text, int start, int end) {
-		if (null == text)
-			throw new IllegalArgumentException();
-
-		if (start > end)
-			return false;
-
-		if (fIgnoreWildCards)
-			return (end - start == fLength)
-				&& fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
-		int segCount = fSegments.length;
-		if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) // pattern
-			// contains
-			// only
-			// '*'(s)
-			return true;
-		if (start == end)
-			return fLength == 0;
-		if (fLength == 0)
-			return start == end;
-
-		int tlen = text.length();
-		if (start < 0)
-			start = 0;
-		if (end > tlen)
-			end = tlen;
-
-		int tCurPos = start;
-		int bound = end - fBound;
-		if (bound < 0)
-			return false;
-		int i = 0;
-		String current = fSegments[i];
-		int segLength = current.length();
-
-		/* process first segment */
-		if (!fHasLeadingStar) {
-			if (!regExpRegionMatches(text, start, current, 0, segLength)) {
-				return false;
-			} else {
-				++i;
-				tCurPos = tCurPos + segLength;
-			}
-		}
-		if ((fSegments.length == 1) && (!fHasLeadingStar)
-			&& (!fHasTrailingStar)) {
-			// only one segment to match, no wildcards specified
-			return tCurPos == end;
-		}
-		/* process middle segments */
-		while (i < segCount) {
-			current = fSegments[i];
-			int currentMatch;
-			int k = current.indexOf(fSingleWildCard);
-			if (k < 0) {
-				currentMatch = textPosIn(text, tCurPos, end, current);
-				if (currentMatch < 0)
-					return false;
-			} else {
-				currentMatch = regExpPosIn(text, tCurPos, end, current);
-				if (currentMatch < 0)
-					return false;
-			}
-			tCurPos = currentMatch + current.length();
-			i++;
-		}
-
-		/* process final segment */
-		if (!fHasTrailingStar && tCurPos != end) {
-			int clen = current.length();
-			return regExpRegionMatches(text, end - clen, current, 0, clen);
-		}
-		return i == segCount;
-	}
-
-	/**
-	 * This method parses the given pattern into segments seperated by wildcard
-	 * '*' characters. Since wildcards are not being used in this case, the
-	 * pattern consists of a single segment.
-	 */
-	private void parseNoWildCards() {
-		fSegments = new String[1];
-		fSegments[0] = fPattern;
-		fBound = fLength;
-	}
-
-	/**
-	 * Parses the given pattern into segments seperated by wildcard '*'
-	 * characters.
-	 * 
-	 * @param p,
-	 *            a String object that is a simple regular expression with '*'
-	 *            and/or '?'
-	 */
-	private void parseWildCards() {
-		if (fPattern.startsWith("*"))//$NON-NLS-1$
-			fHasLeadingStar = true;
-		if (fPattern.endsWith("*")) {//$NON-NLS-1$
-			/* make sure it's not an escaped wildcard */
-			if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
-				fHasTrailingStar = true;
-			}
-		}
-
-		Vector temp = new Vector();
-
-		int pos = 0;
-		StringBuffer buf = new StringBuffer();
-		while (pos < fLength) {
-			char c = fPattern.charAt(pos++);
-			switch (c) {
-				case '\\':
-					if (pos >= fLength) {
-						buf.append(c);
-					} else {
-						char next = fPattern.charAt(pos++);
-						/* if it's an escape sequence */
-						if (next == '*' || next == '?' || next == '\\') {
-							buf.append(next);
-						} else {
-							/* not an escape sequence, just insert literally */
-							buf.append(c);
-							buf.append(next);
-						}
-					}
-					break;
-				case '*':
-					if (buf.length() > 0) {
-						/* new segment */
-						temp.addElement(buf.toString());
-						fBound += buf.length();
-						buf.setLength(0);
-					}
-					break;
-				case '?':
-					/*
-					 * append special character representing single match
-					 * wildcard
-					 */
-					buf.append(fSingleWildCard);
-					break;
-				default:
-					buf.append(c);
-			}
-		}
-
-		/* add last buffer to segment list */
-		if (buf.length() > 0) {
-			temp.addElement(buf.toString());
-			fBound += buf.length();
-		}
-
-		fSegments = new String[temp.size()];
-		temp.copyInto(fSegments);
-	}
-
-	/**
-	 * @param text
-	 *            a string which contains no wildcard
-	 * @param start
-	 *            the starting index in the text for search, inclusive
-	 * @param end
-	 *            the stopping point of search, exclusive
-	 * @return the starting index in the text of the pattern , or -1 if not
-	 *         found
-	 */
-	protected int posIn(String text, int start, int end) {//no wild card in
-		// pattern
-		int max = end - fLength;
-
-		if (!fIgnoreCase) {
-			int i = text.indexOf(fPattern, start);
-			if (i == -1 || i > max)
-				return -1;
-			return i;
-		}
-
-		for (int i = start; i <= max; ++i) {
-			if (text.regionMatches(true, i, fPattern, 0, fLength))
-				return i;
-		}
-
-		return -1;
-	}
-
-	/**
-	 * Return the position of regulat expression in specified string.
-	 * 
-	 * @param text
-	 *            a simple regular expression that may only contain '?'(s)
-	 * @param start
-	 *            the starting index in the text for search, inclusive
-	 * @param end
-	 *            the stopping point of search, exclusive
-	 * @param p
-	 *            a simple regular expression that may contains '?'
-	 * @return the starting index in the text of the pattern , or -1 if not
-	 *         found
-	 */
-	protected int regExpPosIn(String text, int start, int end, String p) {
-		int plen = p.length();
-
-		int max = end - plen;
-		for (int i = start; i <= max; ++i) {
-			if (regExpRegionMatches(text, i, p, 0, plen))
-				return i;
-		}
-		return -1;
-	}
-
-	/**
-	 * Return the position of regulat expression in specified string.
-	 * 
-	 * @param text
-	 *            a simple regular expression that may only contain '?'(s)
-	 * @param start
-	 *            the starting index in the text for search, inclusive
-	 * @param end
-	 *            the stopping point of search, exclusive
-	 * @param p
-	 *            a simple regular expression that may contains '?'
-	 * @return the starting index in the text of the pattern , or -1 if not
-	 *         found
-	 */
-	
-	/**
-	 * Check if the specified regular expression matches string.
-	 * 
-	 * @param text a simple regular expression
-	 * @param tStart the starting index in the text for search, inclusive
-	 * @param p a simple regular expression that may contains '?'
-	 * @param pStart
-	 * @param plen
-	 * @return true if reular expression matches, false otherwise
-	 */
-	protected boolean regExpRegionMatches(String text, int tStart, String p,
-			int pStart, int plen) {
-		while (plen-- > 0) {
-			char tchar = text.charAt(tStart++);
-			char pchar = p.charAt(pStart++);
-
-			/* process wild cards */
-			if (!fIgnoreWildCards) {
-				/* skip single wild cards */
-				if (pchar == fSingleWildCard) {
-					continue;
-				}
-			}
-			if (pchar == tchar)
-				continue;
-			if (fIgnoreCase) {
-				if (Character.toUpperCase(tchar) == Character
-					.toUpperCase(pchar))
-					continue;
-				// comparing after converting to upper case doesn't handle all
-				// cases;
-				// also compare after converting to lower case
-				if (Character.toLowerCase(tchar) == Character
-					.toLowerCase(pchar))
-					continue;
-			}
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @param text
-	 *            the string to match
-	 * @param start
-	 *            the starting index in the text for search, inclusive
-	 * @param end
-	 *            the stopping point of search, exclusive
-	 * @param p
-	 *            a string that has no wildcard
-	 * @return the starting index in the text of the pattern , or -1 if not
-	 *         found
-	 */
-	protected int textPosIn(String text, int start, int end, String p) {
-
-		int plen = p.length();
-		int max = end - plen;
-
-		if (!fIgnoreCase) {
-			int i = text.indexOf(p, start);
-			if (i == -1 || i > max)
-				return -1;
-			return i;
-		}
-
-		for (int i = start; i <= max; ++i) {
-			if (text.regionMatches(true, i, p, 0, plen))
-				return i;
-		}
-
-		return -1;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringStatics.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringStatics.java
deleted file mode 100644
index 09c41a7..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringStatics.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * This class contains string statics that are not to be translated.
- * 
- * @author wdiu, Wayne Diu
- * @canBeSeenBy %partners
- */
-public class StringStatics {
-
-	/** Prevent instantiation with a private constructor */
-	private StringStatics() {
-		/* private constructor */
-	}
-
-	/** The empty string */
-	public static final String BLANK = ""; //$NON-NLS-1$
-
-	/** The period . */
-	public static final String PERIOD = "."; //$NON-NLS-1$
-
-	/** The forward slash / */
-	public static final String FORWARD_SLASH = "/"; //URLs //$NON-NLS-1$
-
-	/** The backward slash / */
-	public static final String BACKWARD_SLASH = "\\"; //$NON-NLS-1$
-
-	/** The ellipsis ... */
-	public static final String ELLIPSIS = "..."; //$NON-NLS-1$
-
-	/** The space */
-	public static final String SPACE = " "; //$NON-NLS-1$
-
-	/** The colon : */
-	public static final String COLON = ":"; //$NON-NLS-1$
-
-	/** The double colon :: */
-	public static final String DOUBLE_COLON = "::"; //$NON-NLS-1$
-
-	/** The newline for a particular platform */
-	public static final String PLATFORM_NEWLINE = System
-		.getProperty("line.separator"); //$NON-NLS-1$
-
-	/** The newline for the Windows platform */
-	public static final String WINDOWS_NEWLINE = "\r\n"; //$NON-NLS-1$
-
-	/** The newline for the Unix platform */
-	public static final String UNIX_NEWLINE = "\n"; //$NON-NLS-1$
-
-	/** The separator defined by File.separator */
-	public static final String FILE_SEPARATOR = File.separator;
-
-	/** The separator defined by IPath.SEPARATOR */
-	public static final String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR);
-
-	/** The apostrophe ' */
-	public static final String APOSTROPHE = "'"; //$NON-NLS-1$
-
-	/** The apostrophe ' */
-	public static final String AMPERSAND = "&"; //$NON-NLS-1$
-
-	/** The greater than symbol > */
-	public static final String GREATER_THAN = ">"; //$NON-NLS-1$
-
-	/** The equals = */
-	public static final String EQUALS = "="; //$NON-NLS-1$
-
-	/** The version separator in a plugin name for release _ */
-	public static final String PLUGIN_VERSION_SEPARATOR = "_"; //$NON-NLS-1$
-
-	/** The Underscore * */
-	public static final String UNDER_SCORE = "_"; //$NON-NLS-1$
-
-	/** The hyphen * */
-	public static final String HYPHEN = "-"; //$NON-NLS-1$
-
-	/** The comma * */
-	public static final String COMMA = ",";//$NON-NLS-1$
-	
-	/** Open Parenthesis */
-	public static final String OPEN_PARENTHESIS = "("; //$NON-NLS-1$
-	
-	/** Close Parenthesis */
-	public static final String CLOSE_PARENTHESIS = ")"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringUtil.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringUtil.java
deleted file mode 100644
index 3199b4d..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringUtil.java
+++ /dev/null

@@ -1,603 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreDebugOptions;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin;
-import org.eclipse.gmf.runtime.common.core.internal.CommonCoreStatusCodes;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * In JDK 1.3 we don't have the luxury of replaceAll as in JDK 1.4.
- * The replace methods from this string class are intended to be used
- * until JDK 1.4 is used.
- * 
- * For completely different implementations of the replace methods, please see
- * http://forum.java.sun.com/thread.jsp?forum=31&thread=284142&message=1109785
- * 
- * Replacing a whole word is completely different from replacing all instances.
- * To avoid confusion, the method names are different too.
- * 
- * @author wdiu, Wayne Diu
- * @canBeSeenBy %partners
- */
-public class StringUtil {
-
-	/**
-	 * Delimiters to mark the beginning or end of a string, used for
-	 * replaceWholeWords
-	 */
-	private static String delims = " !:;{}(),.?'\"\\\t\n\r"; //$NON-NLS-1$
-	
-	/**
-	 * Internet protocol delimiter ://
-	 */
-	private static final String PROTOCOL_DELIMITER = "://"; //$NON-NLS-1$
-	
-	/**
-	 * Length of the internet protocol delimiter ://
-	 */
-	private static final int PROTOCOL_DELIMITER_LENGTH = PROTOCOL_DELIMITER.length();
-	
-	/**
-	 * Default URL Encoding method.  UTF-8.
-	 */
-	private static final String URL_ENCODING = "UTF-8"; //$NON-NLS-1$
-	
-	/**
-	 * UTF-8 encoded %.  %25
-	 */
-	private static final String ENCODED_PERCENT = "%25"; //$NON-NLS-1$
-	
-
-	/**
-	 * private constructor for the static class.
-	 */
-	private StringUtil() {
-		super();
-	}
-	
-	/**
-	 * Replace the first instance of part of a string with another string
-	 * starting from a point in the string.
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 * @param from in, out.  from[0] contains where to start initially
-	 * and is changed to where it left off.
-	 * @return the string containing the first instance of source found
-	 * starting from a point in the string replaced with dest and in the
-	 * from parameter, the end index of where the last replacement was made
-	 */
-	private static String replaceFrom(
-		String string,
-		String source,
-		String dest,
-		boolean caseSensitive,
-		int[] from) {
-		if (source.compareTo(StringStatics.BLANK) == 0)
-			return string;
-		int stringLength = string.length(),
-			sourceLength = source.length(),
-			destLength = dest.length();
-		while (from[0] + sourceLength <= stringLength) {
-			int compareResult;
-			if (caseSensitive)
-				compareResult =
-					string.substring(
-						from[0],
-						from[0] + sourceLength).compareTo(
-						source);
-			else
-				compareResult =
-					string.substring(
-						from[0],
-						from[0] + sourceLength).compareToIgnoreCase(
-						source);
-			//not case sensitive
-			if (compareResult == 0) {
-				//System.out.println("matched " + string.substring(i, i + sourceLength) + " with " + source);
-				int fromIndex = from[0];
-				from[0] += destLength;
-				return string.substring(0, fromIndex)
-					+ dest
-					+ string.substring(fromIndex + sourceLength, stringLength);
-			}
-			//System.out.println("did not match " + string.substring(i, i + sourceLength) + " with " + source);
-			from[0]++;
-		}
-		return string;
-	}
-
-	/**
-	 * Replace the first instance of part of a string with another string
-	 * starting from a point in the string.
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 * @param from where to start
-	 * @return the string containing the first instance of source found
-	 * starting from a point in the string replaced with dest
-	 */
-	private static String replaceFrom(
-		String string,
-		String source,
-		String dest,
-		boolean caseSensitive,
-		int from) {
-		int fromArray[] = new int[1];
-		fromArray[0] = from;
-		return replaceFrom(string, source, dest, caseSensitive, fromArray);
-	}
-
-	/**
-	 * Replace the first instance of part of a string with another string.
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 * @return the string containing the first instance of source replaced
-	 * with dest
-	 */
-	public static String replace(
-		String string,
-		String source,
-		String dest,
-		boolean caseSensitive) {
-		return replaceFrom(string, source, dest, caseSensitive, 0);
-	}
-
-	/**
-	 * Replace all instances of part of a string with another string
-	 * starting from a point in the string.
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 * @param from where to start
-	 * @return the string containing all instances of source replaced with dest
-	 */
-	private static String replaceAll(
-		String string,
-		String source,
-		String dest,
-		boolean caseSensitive,
-		int from) {
-		int fromArray[] = new int[1];
-		fromArray[0] = from;
-		String newString =
-			replaceFrom(string, source, dest, caseSensitive, fromArray);
-		from = fromArray[0];
-		//I don't see the need for compareTo or compareToIgnoreCase depending on caseSensitive,
-		//but maybe I should like in the replace method
-		if (newString.compareTo(string) == 0) { //it's the same, so return
-			return newString;
-		} else { //still something left to change
-			return replaceAll(newString, source, dest, caseSensitive, from);
-		}
-	}
-
-	/**
-	 * Replace all instances of part of a string with another string
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 * @return the string containing all instances of source replaced with dest
-	 */
-	public static String replaceAll(
-		String string,
-		String source,
-		String dest,
-		boolean caseSensitive) {
-		return replaceAll(string, source, dest, caseSensitive, 0);
-	}
-
-	/**
-	 * Replaces whole words found in one string with another string.
-	 * The whole words are delimted by delimiters defined in the DELIMTERES
-	 * constant.
-	 * 
-	 * @param string is the string that contains the substring to be replaced
-	 * @param pattern is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 * @param fromArray 0th element contains index of where to start searching
-	 * @return the string containing one instances of source replaced with dest
-	 */
-	private static String replaceWholeWordsFrom(
-		String string,
-		String pattern,
-		String dest,
-		boolean caseSensitive,
-		int[] fromArray) {
-
-		boolean frontOK = false, backOK = false;
-		// find index of the first occurence of the pattern string
-		int index =
-			(caseSensitive)
-				? string.indexOf(pattern, fromArray[0])
-				: string.toUpperCase().indexOf(
-					pattern.toUpperCase(),
-					fromArray[0]);
-
-		//by default, if (index < 0) frontOK = false;
-		// make sure that the front of the found pattern is prefixed with either
-		// a delimeter character or nothing, since we are replacing WHOLE words
-		// mark the front of the string to be OK if that is the case. Do similar
-		// check for the back of the string
-		if (index == 0)
-			frontOK = true;
-		else if (index > 0) {
-			if (delims.indexOf(string.charAt(index - 1)) >= 0) {
-				frontOK = true;
-			}
-		}
-
-		//front is ok, check back
-		if (frontOK) {
-			if (index + pattern.length() >= string.length())
-				backOK = true;
-			else if (
-				delims.indexOf(string.charAt((index + pattern.length()))) >= 0)
-				backOK = true;
-
-			if (backOK) {
-				fromArray[0] = (index - 1 < 0) ? 0 : index + dest.length();
-				return string.substring(0, (index - 1 < 0) ? 0 : index)
-					+ dest
-					+ ((index + pattern.length() > string.length())
-						? StringStatics.BLANK
-						: string.substring(
-							index + pattern.length(),
-							string.length()));
-			}
-		}
-
-		if (index >= 0 /*&& (!frontOK || !backOK)*/
-			&& index + 1 < string.length()) {
-			fromArray[0] = index + 1;
-			return replaceWholeWordsFrom(
-				string,
-				pattern,
-				dest,
-				caseSensitive,
-				fromArray);
-		}
-
-		return string;
-
-	}
-
-	/**
-	 * Replaces whole words found in one string with another string.
-	 * The whole words are delimted by delimiters defined in the DELIMTERES
-	 * constant.
-	 * 
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 *
-	 * @return the string containing the first instance of source replaced with
-	 * dest.
-	 */
-	public static String replaceWholeWords(
-		String string,
-		String source,
-		String dest,
-		boolean caseSensitive) {
-
-		int fromArray[] = new int[] {0};
-		
-		return replaceWholeWordsFrom(
-			string,
-			source,
-			dest,
-			caseSensitive,
-			fromArray);
-	}
-
-	/**
-	 * Replaces whole words found in one string with another string.
-	 * The whole words are delimted by delimiters defined in the DELIMTERES
-	 * constant.
-	 * 
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that will be replaced if it is found
-	 * in the string
-	 * @param dest what the substring will be replaced with if it is found
-	 * in the string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 *
-	 * @return the string containing all instances of source replaced with
-	 * dest.
-	 */
-	public static String replaceAllWholeWords(
-		String string,
-		String source,
-		String dest,
-		boolean caseSensitive) {
-
-		int fromArray[] = new int[] {0};
-		
-		String oldResult = null,
-			result =
-				replaceWholeWordsFrom(
-					string,
-					source,
-					dest,
-					caseSensitive,
-					fromArray);
-		while (oldResult == null || !result.equals(oldResult)) {
-			oldResult = result;
-			result =
-				replaceWholeWordsFrom(
-					oldResult,
-					source,
-					dest,
-					caseSensitive,
-					fromArray);
-		}
-		return result;
-	}
-
-	/**
-	 * Returns if a substring was found as a whole word in a string.
-	 * The whole words are delimted by delimiters defined in the DELIMTERES
-	 * constant.
-	 * 
-	 * @param string is the string that contains the substring to be replaced
-	 * @param source is the substring that we are checking for in string
-	 * @param caseSensitive true to do a case sensitive search, false to do
-	 * a case insensitive search
-	 *
-	 * @return boolean true if the string was found as a word, false if the
-	 * string was not found as a word.
-	 */
-	public static boolean doesWordExist(
-		String string,
-		String source,
-		boolean caseSensitive) {
-		StringTokenizer st = new StringTokenizer(string);
-
-		while (st.hasMoreTokens()) {
-			String token = st.nextToken();
-
-			//== 0 if equal.
-			if (((caseSensitive) && (token.compareTo(source) == 0))
-				|| ((!caseSensitive)
-					&& (token.toUpperCase().compareTo(source.toUpperCase())
-						== 0))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Do not use Integer.parseInt().  This is doing something different.
-	 * Based on code from Gleb's SetMultiplicityDialog.
-	 * 
-	 * @param string to check if it is a valid positive integer
-	 * @return true if it's a valid positive integer, false if it isn't
-	 */
-	public static boolean isValidPositiveInteger(String string) {
-		for (int i = 0; i < string.length(); i++) {
-			if (string.charAt(i) < '0' || string.charAt(i) > '9')
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Encode the url string
-	 * 
-	 * @param url String to encode
-	 * @return String encoded URL
-	 */
-	public static String encodeURL(String url) {
-		//find the ://
-		int protocolIndex = url.indexOf(PROTOCOL_DELIMITER);
-		
-		if (protocolIndex > 0) {
-			String start = url.substring(0, protocolIndex + PROTOCOL_DELIMITER_LENGTH);
-
-			//find the first / after ;//
-			int slashIndex = url.indexOf('/', protocolIndex + PROTOCOL_DELIMITER_LENGTH);
-			if (slashIndex == -1) {
-				slashIndex = url.length(); 
-			}
-			
-			String domain = url.substring(protocolIndex + PROTOCOL_DELIMITER_LENGTH, slashIndex);
-
-//			This code has been commented until we migrate to Java 2
-//			IDN is only available in Java 2
-//			private static final String DOMAIN_ENCODING = "ISO-8859-1";
-//			try {
-//				domain = java.net.IDN.toASCII(domain, DOMAIN_ENCODING);
-//			} catch (IllegalArgumentException e) {
-//				//this should not be logged, just do not convert the domain string
-//			}
-
-			//may be empty
-			String end = url.substring(slashIndex, url.length());
-			end = encodePercentage(end);
-			end = encode(end);
-			
-			return start + domain + end;
-		}
-		return url;
-	}
-	
-	/**
-	 * Encodes %s in a string to %25 when not followed by a valid hex number.
-	 *  
-	 * @param string to encode
-	 * @return String with %25 encoded
-	 */
-	private static String encodePercentage(String string) {
-		for (int index = string.indexOf('%'); index != -1; ) {
-			int length = string.length();
-			
-			if (length > index + 2) {
-				//check the next 2 digits
-				if (!isOKForHex(string.charAt(index + 1)) || !isOKForHex(string.charAt(index + 2))) {
-					//encode % at index
-					string = replace(string, index, ENCODED_PERCENT);
-				}
-			}
-			else {
-				//the string is too short for the numbers after % to be a valid
-				//hex number
-				string = replace(string, index, ENCODED_PERCENT);
-			}
-			
-			index = string.indexOf('%', index + 1);
-		}
-		
-		return string;
-	}
-
-	/**
-	 * Verifies that a given character could be part of a valid hex number.
-	 * 
-	 * @param aChar checks that this char could be part of a valid hex number.
-	 * @return true if the character could be part of a valid hex number.
-	 */
-	private static boolean isOKForHex(char aChar) {
-		if ((aChar >= '0') && (aChar <= '9')) {
-			return true;
-		}
-		if ((aChar >= 'a') && (aChar <= 'f')) {
-			return true;
-		}
-		if ((aChar >= 'A') && (aChar <= 'F')) {
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Returns a replaced string made up of the original string replaced with
-	 * newPart at position index.
-	 * 
-	 * @param original String to replace
-	 * @param index position to replace at
-	 * @param newPart the new String to be replaced at position index
-	 * @return replaced String made up of the original string replaced with
-	 * newPart at position index.
-	 */
-	private static String replace(String original, int index, String newPart) {
-		return original.substring(0, index) + newPart + original.substring(index + 1);
-	}
-	
-	/**
-	 * Finds a position of a special character that shouldn't be url encoded
-	 * starting from the given start index.
-	 * 
-	 * Special characters are % / & = + ?
-	 * 
-	 * @param string look for the special character in this string
-	 * @param start index to start looking at the string from
-	 * 
-	 * @return position of a special character that shouldn't be url encoded
-	 * starting from the given start index.  -1 if it could not find a special
-	 * character that shouldn't be url encoded.
-	 */
-	private static int findUnEncodeableCharacter(String string, int start) {
-		if (start >= string.length())
-			return -1;
-		int indices[] = new int[] {string.indexOf('%', start),
-			string.indexOf('/', start), string.indexOf('&', start),
-			string.indexOf('=', start), string.indexOf('+', start),
-			string.indexOf('?', start)};
-		int index = -1;
-		for (int i = 0; i < indices.length; i++) {
-			if (indices[i] != -1 && indices[i] < index || index == -1) {
-				index = indices[i];
-			}
-		}
-		return index;
-	}
-
-	/**
-	 * Runs URLEncoder.encode on a string, but excludes the special characters
-	 * that should not be encoded.
-	 * 
-	 * It assumes that percentages that need to be encoded have already been
-	 * encoded.  This may be done using the encodePercentage method.  Therefore,
-	 * percentage characters are treated as special characters.
-	 * 
-	 * Special characters are determined by the findUnEncodeableCharacter
-	 * method.
-	 * 
-	 * @param string
-	 * @return
-	 */
-	private static String encode(String string) {
-		int beginIndex = findUnEncodeableCharacter(string, 0);
-		
-		if (beginIndex == -1) beginIndex = 0;
-		
-		while (beginIndex < string.length()) {
-			int endIndex = findUnEncodeableCharacter(string, beginIndex + 1);
-			if (endIndex == -1) endIndex = string.length();
-			
-			String begin = string.substring(0, beginIndex + 1);
-			String middle = string.substring(beginIndex + 1, endIndex);
-			String end = string.substring(endIndex);
-			
-			//encode the middle
-			try {
-				middle = URLEncoder.encode(middle, URL_ENCODING);
-			} catch (UnsupportedEncodingException e) {
-				//UTF-8 should never be unavailable
-				Log.error(CommonCorePlugin.getDefault(), CommonCoreStatusCodes.ENCODING_FAILURE, URL_ENCODING + " unsupported."); //$NON-NLS-1$
-				Trace.catching(CommonCorePlugin.getDefault(), CommonCoreDebugOptions.EXCEPTIONS_CATCHING, StringUtil.class, "encode", e); //$NON-NLS-1$
-			}
-			
-			beginIndex = begin.length() + middle.length();
-			string = begin + middle + end;
-		}
-		return string;
-		
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Trace.java b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Trace.java
deleted file mode 100644
index 77b0778..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Trace.java
+++ /dev/null

@@ -1,514 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.core.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * A utility for tracing debug information. Provides a simple interface for
- * filtering and generating trace output.
- * 
- * @author khussey
- * @canBeSeenBy %partners
- */
-public class Trace {
-
-	/**
-	 * private constructor for the static class.
-	 */
-	private Trace() {
-		super();
-	}
-	
-	/**
-	 * String containing an open parenthesis.
-	 * 
-	 */
-	protected static final String PARENTHESIS_OPEN = "("; //$NON-NLS-1$
-
-	/**
-	 * String containing a close parenthesis.
-	 * 
-	 */
-	protected static final String PARENTHESIS_CLOSE = ")"; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the changing of values.
-	 * 
-	 */
-	protected static final String PREFIX_CHANGING = "CHANGING "; //$NON-NLS-1$
-	
-	/**
-	 * Prefix for tracing the catching of throwables.
-	 * 
-	 */
-	protected static final String PREFIX_CATCHING = "CAUGHT "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the throwing of throwables.
-	 * 
-	 */
-	protected static final String PREFIX_THROWING = "THROWN "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the entering of methods.
-	 * 
-	 */
-	protected static final String PREFIX_ENTERING = "ENTERING "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the exiting of methods.
-	 * 
-	 */
-	protected static final String PREFIX_EXITING = "EXITING "; //$NON-NLS-1$
-
-	/**
-	 * Separator for methods.
-	 * 
-	 */
-	protected static final String SEPARATOR_METHOD = "#"; //$NON-NLS-1$
-
-	/**
-	 * Separator for parameters.
-	 * 
-	 */
-	protected static final String SEPARATOR_PARAMETER = ", "; //$NON-NLS-1$
-
-	/**
-	 * Separator for return values.
-	 * 
-	 */
-	protected static final String SEPARATOR_RETURN = ":"; //$NON-NLS-1$
-
-	/**
-	 * Separator containing a space.
-	 * 
-	 */
-	protected static final String SEPARATOR_SPACE = " "; //$NON-NLS-1$
-	
-	/**
-	 * Label indicating old value.
-	 * 
-	 */
-	protected static final String LABEL_OLD_VALUE = "old="; //$NON-NLS-1$
-
-	/**
-	 * Label indicating new value.
-	 * 
-	 */
-	protected static final String LABEL_NEW_VALUE = "new="; //$NON-NLS-1$
-	
-
-	/**
-	 * The cached debug options (for optimization).
-	 */
-	private static final Map cachedOptions = new HashMap();
-
-	/**
-	 * Retrieves a Boolean value indicating whether tracing is enabled for the
-	 * specified plug-in.
-	 * 
-	 * @return Whether tracing is enabled for the plug-in.
-	 * @param plugin The plug-in for which to determine trace enablement.
-	 * 
-	 */
-	protected static boolean shouldTrace(Plugin plugin) {
-		return plugin.isDebugging();
-	}
-
-	/**
-	 * Retrieves a Boolean value indicating whether tracing is enabled for the
-	 * specified debug option of the specified plug-in.
-	 * 
-	 * @return Whether tracing is enabled for the debug option of the plug-in.
-	 * @param plugin The plug-in for which to determine trace enablement.
-	 * @param option The debug option for which to determine trace enablement.
-	 * 
-	 */
-	public static boolean shouldTrace(Plugin plugin, String option) {
-		if (shouldTrace(plugin)) {
-			Boolean value = null;
-			
-			synchronized (cachedOptions) {
-				value = (Boolean) cachedOptions.get(option);
-	
-				if (null == value) {
-					value = Boolean.valueOf(Platform.getDebugOption(option));
-	
-					cachedOptions.put(option, value);
-				}
-			}
-			
-			return value.booleanValue();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Retrieves a textual representation of the specified argument.
-	 * 
-	 * @return A textual representation of the specified argument.
-	 * @param argument The argument for which to retrieve a textual
-	 *                  representation.
-	 * 
-	 */
-	protected static String getArgumentString(Object argument) {
-		return String.valueOf(argument);
-	}
-
-	/**
-	 * Retrieves a textual representation of the specified arguments.
-	 * 
-	 * @return A textual representation of the specified arguments.
-	 * @param arguments The arguments for which to retrieve a textual
-	 *                   representation.
-	 * 
-	 */
-	protected static String getArgumentsString(Object[] arguments) {
-		StringBuffer buffer = new StringBuffer();
-
-		for (int i = 0; i < arguments.length; i++) {
-			buffer.append(getArgumentString(arguments[i]));
-
-			if (i < arguments.length - 1) {
-				buffer.append(SEPARATOR_PARAMETER);
-			}
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 * Traces the specified message.
-	 * 
-	 * @param message The message to be traced.
-	 * 
-	 */
-	protected static void trace(String message) {
-		System.out.println(message);
-	}
-
-	/**
-	 * Traces the specified message from the specified plug-in.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param message The message to be traced.
-	 * 
-	 */
-	public static void trace(Plugin plugin, String message) {
-		if (shouldTrace(plugin)) {
-			trace(message);
-		}
-	}
-
-	/**
-	 * Traces the specified message from the specified plug-in for the specified
-	 * debug option.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param message The message to be traced.
-	 * 
-	 */
-	public static void trace(Plugin plugin, String option, String message) {
-		if (shouldTrace(plugin, option)) {
-			trace(message);
-		}
-	}
-	
-	/**
-	 * Traces the changing of a value.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param valueDescription The description of the value which is changing.
-	 * @param oldValue The old value.
-	 * @param newValue The new value.
-	 */
-	public static void changing(
-	        Plugin plugin,
-	        String option,
-	        String valueDescription,
-	        Object oldValue,
-	        Object newValue) {
-		    
-	        if (shouldTrace(plugin, option)) {
-	            trace(
-	                PREFIX_CHANGING
-	                	+ valueDescription
-	                	+ SEPARATOR_SPACE
-	                	+ LABEL_OLD_VALUE
-	                	+ getArgumentString(oldValue)
-	                	+ SEPARATOR_PARAMETER
-	                   	+ LABEL_NEW_VALUE
-	                	+ getArgumentString(newValue)
-						);
-	        }
-	    }
-	
-	/**
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class in which the value is changing.
-	 * @param methodName The name of the method in which the value is changing.
-	 * @param valueDescription The description of the value which is changing.
-	 * @param oldValue The old value.
-	 * @param newValue The new value.
-	 */
-	public static void changing(
-        Plugin plugin,
-        String option,
-        Class clazz,
-        String methodName,
-        String valueDescription,
-        Object oldValue,
-        Object newValue) {
-	    
-        if (shouldTrace(plugin, option)) {
-            trace(
-                PREFIX_CHANGING
-                	+ valueDescription
-                	+ SEPARATOR_SPACE
-                	+ LABEL_OLD_VALUE
-                	+ getArgumentString(oldValue)
-                	+ SEPARATOR_PARAMETER
-                   	+ LABEL_NEW_VALUE
-                	+ getArgumentString(newValue)
-                	+ SEPARATOR_SPACE
-                	+ PARENTHESIS_OPEN
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_CLOSE
-					);
-        }
-    }
-
-	/**
-	 * Traces the catching of the specified throwable in the specified method of
-	 * the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class in which the throwable is being caught.
-	 * @param methodName The name of the method in which the throwable is being
-	 *                    caught.
-	 * @param throwable The throwable that is being caught.
-	 * 
-	 */
-	public static void catching(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Throwable throwable) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_CATCHING
-					+ throwable.getMessage()
-					+ SEPARATOR_SPACE
-					+ PARENTHESIS_OPEN
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_CLOSE);
-
-			throwable.printStackTrace(System.err);
-		}
-	}
-
-	/**
-	 * Traces the throwing of the specified throwable from the specified method
-	 * of the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class from which the throwable is being thrown.
-	 * @param methodName The name of the method from which the throwable is
-	 *                    being thrown.
-	 * @param throwable The throwable that is being thrown.
-	 * 
-	 */
-	public static void throwing(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Throwable throwable) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_THROWING
-					+ throwable.getMessage()
-					+ SEPARATOR_SPACE
-					+ PARENTHESIS_OPEN
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_CLOSE);
-
-			throwable.printStackTrace(System.err);
-		}
-	}
-
-	/**
-	 * Traces the entering into the specified method of the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being entered.
-	 * @param methodName The name of method that is being entered.
-	 * 
-	 */
-	public static void entering(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_ENTERING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName);
-		}
-	}
-
-	/**
-	 * Traces the entering into the specified method of the specified class,
-	 * with the specified parameter.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being entered.
-	 * @param methodName The name of method that is being entered.
-	 * @param parameter The parameter to the method being entered.
-	 * 
-	 */
-	public static void entering(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Object parameter) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_ENTERING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_OPEN
-					+ getArgumentString(parameter)
-					+ PARENTHESIS_CLOSE);
-		}
-	}
-
-	/**
-	 * Traces the entering into the specified method of the specified class,
-	 * with the specified parameters.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being entered.
-	 * @param methodName The name of method that is being entered.
-	 * @param parameters The parameters to the method being entered.
-	 * 
-	 */
-	public static void entering(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Object[] parameters) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_ENTERING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ PARENTHESIS_OPEN
-					+ getArgumentsString(parameters)
-					+ PARENTHESIS_CLOSE);
-		}
-	}
-
-	/**
-	 * Traces the exiting from the specified method of the specified class.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being exited.
-	 * @param methodName The name of method that is being exited.
-	 * 
-	 */
-	public static void exiting(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_EXITING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName);
-		}
-	}
-
-	/**
-	 * Traces the exiting from the specified method of the specified class,
-	 * with the specified return value.
-	 * 
-	 * @param plugin The plug-in from which to trace.
-	 * @param option The debug option for which to trace.
-	 * @param clazz The class whose method is being exited.
-	 * @param methodName The name of method that is being exited.
-	 * @param returnValue The return value of the method being exited.
-	 * 
-	 */
-	public static void exiting(
-		Plugin plugin,
-		String option,
-		Class clazz,
-		String methodName,
-		Object returnValue) {
-
-		if (shouldTrace(plugin, option)) {
-
-			trace(
-				PREFIX_EXITING
-					+ clazz.getName()
-					+ SEPARATOR_METHOD
-					+ methodName
-					+ SEPARATOR_RETURN
-					+ getArgumentString(returnValue));
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/package.html b/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/package.html
deleted file mode 100644
index ad30e1e..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/package.html
+++ /dev/null

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Provides miscellaneous utility classes that are applicable to the modeling platform.
-
-<h2>Package Specification</h2>
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/.classpath b/org.eclipse.gmf.runtime.common.ui.action.ide/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.ui.action.ide/.cvsignore b/org.eclipse.gmf.runtime.common.ui.action.ide/.cvsignore
deleted file mode 100644
index edfb53f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-doc
-org

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/.project b/org.eclipse.gmf.runtime.common.ui.action.ide/.project
deleted file mode 100644
index 7663f8d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.action.ide</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/org.eclipse.gmf.runtime.common.ui.action.ide/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.action.ide/META-INF/MANIFEST.MF
deleted file mode 100644
index f547a33..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.action.ide
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.action.ide.internal.CommonUIActionIDEPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.action.ide.actions.global,
- org.eclipse.gmf.runtime.common.ui.action.ide.global,
- org.eclipse.gmf.runtime.common.ui.action.ide.internal;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/about.html b/org.eclipse.gmf.runtime.common.ui.action.ide/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/build.properties b/org.eclipse.gmf.runtime.common.ui.action.ide/build.properties
deleted file mode 100644
index 65bfb42..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/plugin.properties b/org.eclipse.gmf.runtime.common.ui.action.ide/plugin.properties
deleted file mode 100644
index 4912acf..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/plugin.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Common UI Services - Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = GMF Common UI Action IDE
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/plugin.xml b/org.eclipse.gmf.runtime.common.ui.action.ide/plugin.xml
deleted file mode 100644
index 02fc374..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/plugin.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<plugin>
-
-    
-</plugin>

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/CloseResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/CloseResourceGlobalActionHandler.java
deleted file mode 100644
index e82fa6d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/CloseResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.CloseResourceAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that closes resources using the Eclipse
- * {@link org.eclipse.ui.actions.CloseResourceAction}.
- * 
- * @author ldamus
- */
-public class CloseResourceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		CloseResourceAction closeAction = new CloseResourceAction(getShell(cntxt.getActivePart()));
-		closeAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		closeAction.run();
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		
-		if (super.canHandle(cntxt)) {
-			for (Iterator i = getResourceSelection((IStructuredSelection)cntxt.getSelection()).iterator(); i.hasNext();) {
-				IResource nextResource = (IResource) i.next();
-				if (nextResource.getType() != IResource.PROJECT
-					|| !((IProject) nextResource).isOpen()) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/CopyResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/CopyResourceGlobalActionHandler.java
deleted file mode 100644
index 0d6d57e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/CopyResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n.CommonUIActionIDEMessages;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.ResourceTransfer;
-
-/**
- * Global action handler that copies resources.
- * 
- * @author ldamus
- */
-public class CopyResourceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-
-		List selectedResources = getResourceSelection(
-			(IStructuredSelection) cntxt.getSelection()).toList();
-		IResource[] resources = (IResource[]) selectedResources
-			.toArray(new IResource[selectedResources.size()]);
-
-		// Get the file names and a string representation
-		final int length = resources.length;
-		int actualLength = 0;
-		String[] fileNames = new String[length];
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < length; i++) {
-			IPath location = resources[i].getLocation();
-
-			if (location != null)
-				fileNames[actualLength++] = location.toOSString();
-			if (i > 0)
-				buf.append("\n"); //$NON-NLS-1$
-			buf.append(resources[i].getName());
-		}
-		// was one or more of the locations null?
-		if (actualLength < length) {
-			String[] tempFileNames = fileNames;
-			fileNames = new String[actualLength];
-			for (int i = 0; i < actualLength; i++)
-				fileNames[i] = tempFileNames[i];
-		}
-
-		setClipboard(resources, fileNames, buf.toString(), cntxt
-			.getActivePart());
-		return null;
-	}
-
-	/**
-	 * Set the clipboard contents. Prompt to retry if clipboard is busy.
-	 * 
-	 * @param resources
-	 *            the resources to copy to the clipboard
-	 * @param fileNames
-	 *            file names of the resources to copy to the clipboard
-	 * @param names
-	 *            string representation of all names
-	 */
-	private void setClipboard(IResource[] resources, String[] fileNames,
-			String names, IWorkbenchPart part) {
-		try {
-			Clipboard clipboard = new Clipboard(Display.getCurrent());
-
-			// set the clipboard contents
-			if (fileNames.length > 0) {
-				clipboard
-					.setContents(new Object[] {resources, fileNames, names},
-						new Transfer[] {ResourceTransfer.getInstance(),
-							FileTransfer.getInstance(),
-							TextTransfer.getInstance()});
-			} else {
-				clipboard.setContents(new Object[] {resources, names},
-					new Transfer[] {ResourceTransfer.getInstance(),
-						TextTransfer.getInstance()});
-			}
-		} catch (SWTError e) {
-			if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD)
-				throw e;
-			if (MessageDialog.openQuestion(getShell(part),
-				CommonUIActionIDEMessages.CopyToClipboardProblemDialog_title,
-				CommonUIActionIDEMessages.CopyToClipboardProblemDialog_message))
-				setClipboard(resources, fileNames, names, part);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/DeleteResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/DeleteResourceGlobalActionHandler.java
deleted file mode 100644
index 4da73d5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/DeleteResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.DeleteResourceAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that delete resources using the Eclipse 
- * {@link org.eclipse.ui.actions.DeleteResourceAction}.
- * 
- * @author ldamus
- */
-public class DeleteResourceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		DeleteResourceAction deleteAction =
-			new DeleteResourceAction(getShell(cntxt.getActivePart()));
-		deleteAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		deleteAction.run();
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		DeleteResourceAction deleteAction = new DeleteResourceAction(getShell(cntxt.getActivePart()));
-		deleteAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		return super.canHandle(cntxt) && deleteAction.isEnabled();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalBookmarkAction.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalBookmarkAction.java
deleted file mode 100644
index b3336cf..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalBookmarkAction.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.ide.global.IDEGlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.ide.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n.CommonUIActionIDEMessages;
-
-/** Global Bookmark Action
- * <p>
- * This action provides the mechanism for enabling the Edit->Add Bookmark...
- * menu item.
- * <p>
- * @author Kevin Cornell
- */
-public class GlobalBookmarkAction extends GlobalAction {
-
-    /**
-     * @param workbenchPage
-     */
-    public GlobalBookmarkAction(IWorkbenchPage workbenchPage) {
-        super(workbenchPage);
-    }
-
-    /**
-     * @param workbenchPart
-     */
-    public GlobalBookmarkAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-     */
-    public void init() {
-        /* Set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : getActionId());
-
-        /* Set the label */
-        setText(CommonUIActionIDEMessages.GlobalBookmarkAction_label);
-
-        /* Set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-        super.init();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return IDEGlobalActionId.BOOKMARK;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-     */
-    protected boolean isSelectionListener() {
-        return true;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalCloseProjectAction.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalCloseProjectAction.java
deleted file mode 100644
index 97c954b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalCloseProjectAction.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.ide.global.IDEGlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.ide.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n.CommonUIActionIDEMessages;
-
-/**
- * Global action to close a project resource.
- * 
- * @author ldamus
- */
-public class GlobalCloseProjectAction
-	extends GlobalAction {
-
-	/**
-	 * Creates a new action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page
-	 */
-	public GlobalCloseProjectAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Creates a new action.
-	 * 
-	 * @param workbenchPart
-	 *            the workbench part
-	 */
-	public GlobalCloseProjectAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.IDisposableAction#init()
-	 */
-	public void init() {
-		setId(getWorkbenchActionConstant() != null ? getWorkbenchActionConstant()
-			: getActionId());
-
-		setText(CommonUIActionIDEMessages.GlobalCloseProjectAction_label);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return IDEGlobalActionId.CLOSE_PROJECT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.global.GlobalAction#getWorkbenchActionConstant()
-	 */
-	public String getWorkbenchActionConstant() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (isEnabled()) {
-			super.run();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.global.GlobalAction#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		super.doRun(progressMonitor);
-
-		// Normally, global action enablement is refreshed on selection change,
-		// but in the
-		// case of opening and closing projects, the enablement should be
-		// calculated immediately.
-		refresh();
-
-		GlobalAction openProjectAction = IDEGlobalActionManager.getInstance()
-			.getGlobalAction(getWorkbenchPart(), IDEGlobalActionId.OPEN_PROJECT);
-
-		if (openProjectAction != null) {
-			openProjectAction.refresh();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalOpenProjectAction.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalOpenProjectAction.java
deleted file mode 100644
index cbc03cd..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/GlobalOpenProjectAction.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.ide.global.IDEGlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.ide.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n.CommonUIActionIDEMessages;
-
-/**
- * Global action to open a project resource.
- * 
- * @author ldamus
- */
-public class GlobalOpenProjectAction
-	extends GlobalAction {
-
-	/**
-	 * Creates a new action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page
-	 */
-	public GlobalOpenProjectAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Creates a new action.
-	 * 
-	 * @param workbenchPart
-	 *            the workbench part
-	 */
-	public GlobalOpenProjectAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.IDisposableAction#init()
-	 */
-	public void init() {
-		setId(getWorkbenchActionConstant() != null ? getWorkbenchActionConstant()
-			: getActionId());
-
-		setText(CommonUIActionIDEMessages.GlobalOpenProjectAction_label);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return IDEGlobalActionId.OPEN_PROJECT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.global.GlobalAction#getWorkbenchActionConstant()
-	 */
-	public String getWorkbenchActionConstant() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (isEnabled()) {
-			super.run();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.global.GlobalAction#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		super.doRun(progressMonitor);
-
-		// Normally, global action enablement is refreshed on selection change,
-		// but in the
-		// case of opening and closing projects, the enablement should be
-		// calculated immediately.
-		refresh();
-
-		GlobalAction closeProjectAction = IDEGlobalActionManager.getInstance()
-			.getGlobalAction(getWorkbenchPart(), IDEGlobalActionId.CLOSE_PROJECT);
-
-		if (closeProjectAction != null) {
-			closeProjectAction.refresh();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/IDEGlobalActionManager.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/IDEGlobalActionManager.java
deleted file mode 100644
index ec6abed..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/IDEGlobalActionManager.java
+++ /dev/null

@@ -1,223 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.ide.global.IDEGlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;
-
-
-/**
- * This class subclasses GlobalActionManager and includes support for IDE global
- * actions, which include the bookmark action, the open project action, and the
- * close project action.
- * 
- * @author wdiu, Wayne Diu
- */
-public class IDEGlobalActionManager extends GlobalActionManager {
-
-	/**
-	 * Static list of action ID strings
-	 */
-	private static final List actionIdStrings = new ArrayList();
-	
-	static {
-		actionIdStrings.add(IDEGlobalActionId.BOOKMARK);
-		actionIdStrings.add(IDEGlobalActionId.OPEN_PROJECT);
-		actionIdStrings.add(IDEGlobalActionId.CLOSE_PROJECT);
-	}
-
-	/**
-	 * Create the singleton.
-	 */
-	private static IDEGlobalActionManager instance = new IDEGlobalActionManager();
-	
-	/**
-	 * Create the singleton.
-	 */
-	private static GlobalActionManager globalActionManager = GlobalActionManager.getInstance();
-	
-	/**
-	 * Return the singleton.
-	 */
-	public static GlobalActionManager getInstance() {
-		return instance;
-	}
-	
-	/**
-	 * Constructor for IDEGlobalActionManager.  Adds several action ids for
-	 * ide actions.
-	 */
-	private IDEGlobalActionManager() {
-		Iterator it = actionIdStrings.iterator();
-		while (it.hasNext()) {
-			String id = (String) it.next();
-			addActionId(id);
-		}
-	}	
-	
-	/**
-	 * Creates a GlobalAction.
-	 * 
-	 * @param page The workbench page
-	 * @param id   The action id
-	 * 
-	 * @return GlobalAction
-	 */
-	public GlobalAction createActionHandler(IWorkbenchPage page, String id) {
-		GlobalAction action = null;
-		
-		if (id.equals(IDEGlobalActionId.BOOKMARK))
-			action = new GlobalBookmarkAction(page);
-		else
-			action = globalActionManager.createActionHandler(page, id);
-
-		// this initialization should be moved to the client to call
-		if (action != null)
-			action.init();
-		return action;
-	}
-
-
-	/**
-	 * Creates a GlobalAction.
-	 * 
-	 * @param part The workbench part
-	 * @param id The action id
-	 * 
-	 * @return GlobalAction
-	 */
-	public GlobalAction createActionHandler(final IWorkbenchPart part, String id) {
-		GlobalAction action = null;
-
-		if (id.equals(IDEGlobalActionId.BOOKMARK))
-			action = new GlobalBookmarkAction(part);
-		else if (id.equals(IDEGlobalActionId.OPEN_PROJECT))
-			action = new GlobalOpenProjectAction(part);
-		else if (id.equals(IDEGlobalActionId.CLOSE_PROJECT))
-			action = new GlobalCloseProjectAction(part);
-		else
-			action = globalActionManager.createActionHandler(part, id);
-
-		if (action != null) {
-			// this initialization should be moved to the client to call
-			action.init();
-			
-			// the action will only refresh on selection changes in the specified part
-			action.setPartSelector(new IPartSelector() {
-				public boolean selects(IWorkbenchPart p) {
-					return part == p;
-				}
-			});
-		}
-		return action;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalActionManager#createGlobalActions(org.eclipse.ui.IWorkbenchPart, java.lang.String[])
-	 */
-	public GlobalAction[] createGlobalActions(IWorkbenchPart part,
-			String[] actionIds) {
-		
-		//superclass will handle the ids from actionIdStrings
-		//rest are delegated to global action manager
-		List forSuper = new ArrayList(), forGlobalActionManager = new ArrayList();
-		for (int i = 0; i < actionIds.length; i++) {
-			if (actionIdStrings.contains(actionIds[i])) {
-				forSuper.add(actionIds[i]);
-			}
-			else {
-				forGlobalActionManager.add(actionIds[i]);
-			}
-		}
-		
-		String[] superArray = new String[forSuper.size()], globalActionManagerArray = new String[forGlobalActionManager.size()];
-		forSuper.toArray(superArray);
-		forGlobalActionManager.toArray(globalActionManagerArray);
-		
-		GlobalAction[] actions1 = globalActionManager.createGlobalActions(part, globalActionManagerArray);
-		GlobalAction[] actions2 = new GlobalAction[0];
-		if (superArray.length > 0) {
-			actions2 = super.createGlobalActions(part, superArray);
-		}
-		
-		GlobalAction[] allActions = new GlobalAction[actions1.length + actions2.length]; 
-		System.arraycopy(actions1, 0, allActions, 0, actions1.length);
-		System.arraycopy(actions2, 0, allActions, actions1.length, actions2.length);
-		
-		return allActions;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalActionManager#createGlobalActions(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public GlobalAction[] createGlobalActions(IWorkbenchPart part) {
-		GlobalAction[] actions1 = globalActionManager.createGlobalActions(part);
-		GlobalAction[] actions2 = super.createGlobalActions(part);
-		
-		GlobalAction[] allActions = new GlobalAction[actions1.length + actions2.length]; 
-		System.arraycopy(actions1, 0, allActions, 0, actions1.length);
-		System.arraycopy(actions2, 0, allActions, actions1.length, actions2.length);
-		
-		return allActions;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalActionManager#getGlobalAction(org.eclipse.ui.IWorkbenchPart, java.lang.String)
-	 */
-	public GlobalAction getGlobalAction(IWorkbenchPart part, String actionId) {
-		GlobalAction action = super.getGlobalAction(part, actionId);
-		return action != null ? action  : globalActionManager.getGlobalActionHandler(part, actionId);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalActionManager#getGlobalActionHandler(org.eclipse.ui.IWorkbenchPart, java.lang.String)
-	 */
-	public GlobalAction getGlobalActionHandler(IWorkbenchPart part,
-			String globalActionId) {
-		GlobalAction action = super.getGlobalActionHandler(part, globalActionId);
-		return action != null ? action  : globalActionManager.getGlobalActionHandler(part, globalActionId);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalActionManager#refreshGlobalActions(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void refreshGlobalActions(IWorkbenchPart part) {
-		globalActionManager.refreshGlobalActions(part);
-		super.refreshGlobalActions(part);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalActionManager#setGlobalActionHandlers(org.eclipse.ui.IActionBars, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setGlobalActionHandlers(IActionBars bar, IWorkbenchPart part) {
-		globalActionManager.setGlobalActionHandlers(bar, part);
-		super.setGlobalActionHandlers(bar, part);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalActionManager#unSetGlobalActionHandlers(org.eclipse.ui.IActionBars, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void unSetGlobalActionHandlers(IActionBars bar, IWorkbenchPart part) {
-		globalActionManager.unSetGlobalActionHandlers(bar, part);
-		super.unSetGlobalActionHandlers(bar, part);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/MoveResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/MoveResourceGlobalActionHandler.java
deleted file mode 100644
index acfb523..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/MoveResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.MoveResourceAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that moves resources using the Eclipse 
- * {@link org.eclipse.ui.actions.MoveResourceAction}.
- * 
- * @author ldamus
- */
-public class MoveResourceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.core.global.AbstractGlobalActionHandler#getCommand()
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		MoveResourceAction moveAction =
-			new MoveResourceAction(getShell(cntxt.getActivePart()));
-		moveAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		moveAction.run();
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/OpenFileGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/OpenFileGlobalActionHandler.java
deleted file mode 100644
index a0eaf16..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/OpenFileGlobalActionHandler.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.actions.OpenFileAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that opens files using the Eclipse 
- * {@link org.eclipse.ui.actions.OpenFileAction}.
- * 
- * @author ldamus
- */
-public class OpenFileGlobalActionHandler extends AbstractGlobalActionHandler {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		OpenFileAction openAction =
-			new OpenFileAction(
-				cntxt.getActivePart().getSite().getPage());
-		openAction.selectionChanged(getResourceSelection((IStructuredSelection) cntxt.getSelection()));
-		openAction.run();
-		return null;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		IStructuredSelection selection =
-			(IStructuredSelection) cntxt.getSelection();
-		return getResourceSelection((IStructuredSelection) cntxt.getSelection()).size() == selection.size();
-	}
-	
-	/**
-	 * Gets a structured selection containing all of the IFiles in the
-	 * context selection. Selected elements may either by IFiles or may
-	 * adapt to IFile.
-	 * 
-	 * @param selection the context selection for which to retrieve a <code>IStructuredSelection</code>
-	 * @return the selection of file resources
-	 */
-	protected IStructuredSelection getResourceSelection(IStructuredSelection selection) {
-		
-		List result = new ArrayList();
-
-		for (Iterator i = selection.iterator(); i.hasNext();) {
-			Object nextSelected = i.next();
-
-			if (nextSelected instanceof IFile) {
-				result.add(nextSelected);
-				
-			} else if (nextSelected instanceof IAdaptable) {
-				IAdaptable adaptable = (IAdaptable) nextSelected;
-				IFile file = (IFile) adaptable.getAdapter(IFile.class);
-				if (file != null) {
-					result.add(file);
-				}
-			}
-		}
-		return new StructuredSelection(result);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/OpenResouceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/OpenResouceGlobalActionHandler.java
deleted file mode 100644
index 88323de..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/OpenResouceGlobalActionHandler.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.OpenResourceAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that opens resources using the Eclipse 
- * {@link org.eclipse.ui.actions.OpenResourceAction}.
- * 
- * @author ldamus
- */
-public class OpenResouceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		OpenResourceAction openAction =
-			new OpenResourceAction(getShell(cntxt.getActivePart()));
-		openAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		openAction.run();
-
-		
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		
-		if (super.canHandle(cntxt)) {
-			for (Iterator i = getResourceSelection((IStructuredSelection)cntxt.getSelection()).iterator(); i.hasNext();) {
-				IResource nextResource = (IResource) i.next();
-				if (nextResource.getType() != IResource.PROJECT
-					|| ((IProject) nextResource).isOpen()) {
-					return false;
-				}
-			}
-		}
-		return super.canHandle(cntxt);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/PasteResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/PasteResourceGlobalActionHandler.java
deleted file mode 100644
index e547ba5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/PasteResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;
-import org.eclipse.ui.actions.CopyProjectOperation;
-import org.eclipse.ui.part.ResourceTransfer;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that pastes resources.
- * 
- * @author ldamus
- */
-public class PasteResourceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-
-		ResourceTransfer resTransfer = ResourceTransfer.getInstance();
-		Clipboard clipboard = new Clipboard(Display.getCurrent());
-		IResource[] resourceData = (IResource[]) clipboard
-			.getContents(resTransfer);
-		clipboard.dispose();
-		
-		if (resourceData != null && resourceData.length > 0) {
-			if (resourceData[0].getType() == IResource.PROJECT) {
-
-				for (int i = 0; i < resourceData.length; i++) {
-					CopyProjectOperation operation = new CopyProjectOperation(
-						getShell(cntxt.getActivePart()));
-					operation.copyProject((IProject) resourceData[i]);
-				}
-			} else {
-
-				IContainer container = getContainer((IStructuredSelection)cntxt.getSelection());
-
-				CopyFilesAndFoldersOperation operation = new CopyFilesAndFoldersOperation(
-					getShell(cntxt.getActivePart()));
-				operation.copyResources(resourceData, container);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the container to hold the pasted resources.
-	 */
-	private IContainer getContainer(IStructuredSelection sel) {
-		List selection = getResourceSelection(sel).toList();
-		if (selection.get(0) instanceof IFile) {
-			return ((IFile) selection.get(0)).getParent();
-		}
-		return (IContainer) selection.get(0);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-
-		if (super.canHandle(cntxt)) {
-			
-			ResourceTransfer resTransfer = ResourceTransfer.getInstance();
-			Clipboard clipboard = new Clipboard(Display.getCurrent());
-			IResource[] resourceData = (IResource[]) clipboard
-				.getContents(resTransfer);
-
-			clipboard.dispose();
-			return resourceData != null && resourceData.length > 0;
-		}
-		return false;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/RefreshResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/RefreshResourceGlobalActionHandler.java
deleted file mode 100644
index 768248c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/RefreshResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.RefreshAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-
-/**
- * Global action handler that closes resources using the Eclipse
- * {@link org.eclipse.ui.actions.RefreshAction}.
- * 
- * @author ldamus
- */
-public class RefreshResourceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		RefreshAction refreshAction = new RefreshAction(getShell(cntxt.getActivePart()));
-		refreshAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		refreshAction.run();
-		return null;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/RenameResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/RenameResourceGlobalActionHandler.java
deleted file mode 100644
index f77402b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/RenameResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.actions.global;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.ui.actions.RenameResourceAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ResourceGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.common.ui.util.IInlineTextEditorPart;
-
-/**
- * Global action handler that renames resources using an inline
- * editor on the active workbench part. The active part must adapt to 
- * {@link org.eclipse.gmf.runtime.common.ui.util.IInlineTextEditorPart}.
- * 
- * @author ldamus
- */
-public class RenameResourceGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		
-		RenameResourceAction renameAction =
-			new RenameResourceAction(getShell(cntxt.getActivePart()));
-
-		IInlineTextEditorPart part =
-			(IInlineTextEditorPart) cntxt.getActivePart().getAdapter(
-				IInlineTextEditorPart.class);
-
-		if (part != null) {
-			StructuredViewer viewer = part.getViewer();
-			if (viewer instanceof TreeViewer) {
-				TreeViewer treeViewer = (TreeViewer) viewer;
-				if (treeViewer != null) {
-					renameAction =
-						new RenameResourceAction(
-							getShell(cntxt.getActivePart()),
-							treeViewer.getTree());
-				}
-			}
-		}
-
-		renameAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		renameAction.run();
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/package.html b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/package.html
deleted file mode 100644
index c5cb5e2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/actions/global/package.html
+++ /dev/null

@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of IDE global actions and global action handlers
-for use with the Global Action Handler Service.</p>
-
-<p>The {@link
-org.eclipse.gmf.runtime.common.ui.action.ide.actions.global.IDEGlobalActionManager}
-IDEGlobalActionManager in this package supports IDE global actions,
-including actions that are dependent on resources and projects.</p>
-
-<p>For example, here are some of the actions supported by the manager:</p>
-<ul>
-	<li>Close Resource</li>
-	<li>Copy Resource</li>
-	<li>Delete Resource</li>
-	<li>Move Resource</li>
-	<li>Open Resource</li>
-	<li>Paste Resource</li>
-	<li>Refresh Resource</li>
-	<li>Rename Resource</li>
-	<li>Close Project</li>
-	<li>Open Project</li>
-	<li>Bookmark</li>
-</ul>
-</p>
-
-@see org.eclipse.gmf.runtime.common.ui.action.ide.global 
-@see org.eclipse.gmf.runtime.common.ui.services.action.global
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/global/IDEGlobalActionId.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/global/IDEGlobalActionId.java
deleted file mode 100644
index acf1e0a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/global/IDEGlobalActionId.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.global;
-
-import org.eclipse.ui.ide.IDEActionFactory;
-
-/**
- * Action IDs for global actions with IDE dependencies.
- * 
- * @author wdiu, Wayne Diu
- */
-public final class IDEGlobalActionId {
-
-	/**
-	 * Private constructor prevents instantiating this class
-	 */
-	private IDEGlobalActionId() {
-		//Private constructor prevents instantiating this class
-	}
-
-	/** Action id for the add bookmark action */
-	public static final String BOOKMARK = IDEActionFactory.BOOKMARK.getId();
-
-	/** Action id for the open project action */
-	public static final String OPEN_PROJECT = IDEActionFactory.OPEN_PROJECT
-		.getId();
-
-	/** Action id for the close project action */
-	public static final String CLOSE_PROJECT = IDEActionFactory.CLOSE_PROJECT
-		.getId();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/global/package.html b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/global/package.html
deleted file mode 100644
index 3ad875f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/global/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a class that specifies the ids of several supported IDE Global
-Actions.</p>
-
-@see org.eclipse.gmf.runtime.common.ui.action.ide.global 
-@see org.eclipse.gmf.runtime.common.ui.action.ide.actions.global 
-@see org.eclipse.gmf.runtime.common.ui.services.action.global
-@canBeSeenBy %partners
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/CommonUIActionIDEPlugin.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/CommonUIActionIDEPlugin.java
deleted file mode 100644
index cd1e0c2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/CommonUIActionIDEPlugin.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main class for the plugin.
- * 
- * @author Wayne Diu, wdiu
- */
-public class CommonUIActionIDEPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared instance.
-	 */
-	private static CommonUIActionIDEPlugin INSTANCE;
-
-	/**
-	 * The constructor.
-	 */
-	public CommonUIActionIDEPlugin() {
-		INSTANCE = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the shared instance of <code>CommonUIActionIDEPlugin</code>
-	 */
-	public static CommonUIActionIDEPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/IHelpContextIds.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/IHelpContextIds.java
deleted file mode 100644
index f06456f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/IHelpContextIds.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.ide.internal;
-
-
-/**
- * Help context IDs for this plugin, org.eclipse.gmf.runtime.common.ui.action
- * 
- * @author Wayne Diu, wdiu
- */
-public interface IHelpContextIds {
-	
-	/**
-	 * Point to this until the help context id is receievd 
-	 */
-    public static final String PX_U_DEFAULT_CS_HELP = "org.eclipse.ui.help_contents_action_context"; //$NON-NLS-1$     
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/CommonUIActionIDEMessages.java b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/CommonUIActionIDEMessages.java
deleted file mode 100644
index 2556fbc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/CommonUIActionIDEMessages.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CommonUIActionIDEMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n.CommonUIActionIDEMessages";//$NON-NLS-1$
-
-	private CommonUIActionIDEMessages() {
-		// Do not instantiate
-	}
-
-	public static String GlobalBookmarkAction_label;
-	public static String GlobalCloseProjectAction_label;
-	public static String GlobalOpenProjectAction_label;
-	public static String CopyToClipboardProblemDialog_title;
-	public static String CopyToClipboardProblemDialog_message;
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonUIActionIDEMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/CommonUIActionIDEMessages.properties b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/CommonUIActionIDEMessages.properties
deleted file mode 100644
index 7561744..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/CommonUIActionIDEMessages.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Global Action Labels - Translation Instruction: section to be translated
-# ==============================================================================
-GlobalBookmarkAction_label=Add Bookmar&k...
-GlobalCloseProjectAction_label=&Close Project
-GlobalOpenProjectAction_label=&Open Project
-
-CopyToClipboardProblemDialog_title=Problem Copying to Clipboard
-CopyToClipboardProblemDialog_message=There was a problem when accessing the system clipboard. Retry?

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/package.html b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/package.html
deleted file mode 100644
index 9f74f87..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/l10n/package.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes to manage the string, image, font and cursor resources for 
-the org.eclipse.gmf.runtime.common.ui.action plugin.</p>
-
-<p>Messages and labels on GUI components that need to be localized (adapted 
-for a specific region or language) should be placed in the <code>messages.properties</code>
-file in this package.</p>
-
-<p>Classes in the org.eclipse.gmf.runtime.common.ui.action.ide plugin should use the 
-{@link org.eclipse.gmf.runtime.common.ui.action.ide.internal.l10n.ResourceManager} class to 
-access to the I18N resources that is needs.</p>
-
-
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.action.ide.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/package.html b/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/package.html
deleted file mode 100644
index 13c96e2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/src/org/eclipse/gmf/runtime/common/ui/action/ide/internal/package.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Internal class to manage this plugin.</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.action.ide.*
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/.classpath b/org.eclipse.gmf.runtime.common.ui.action/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.ui.action/.cvsignore b/org.eclipse.gmf.runtime.common.ui.action/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.common.ui.action/.options b/org.eclipse.gmf.runtime.common.ui.action/.options
deleted file mode 100644
index 7c0fd77..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.options
+++ /dev/null

@@ -1,14 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.common.ui.action plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.common.ui.action plug-in
-org.eclipse.gmf.runtime.common.ui.action/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting=false

diff --git a/org.eclipse.gmf.runtime.common.ui.action/.project b/org.eclipse.gmf.runtime.common.ui.action/.project
deleted file mode 100644
index 523defa..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.action</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/org.eclipse.gmf.runtime.common.ui.action/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.action/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a1732a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.action
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.action.actions,
- org.eclipse.gmf.runtime.common.ui.action.actions.global,
- org.eclipse.gmf.runtime.common.ui.action.global,
- org.eclipse.gmf.runtime.common.ui.action.global.providers,
- org.eclipse.gmf.runtime.common.ui.action.internal;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.action.internal.global;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.action.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.action.util
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.common.ui.action/about.html b/org.eclipse.gmf.runtime.common.ui.action/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/build.properties b/org.eclipse.gmf.runtime.common.ui.action/build.properties
deleted file mode 100644
index aa1e711..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = .options,\
-               icons/,\
-               META-INF/,\
-               plugin.properties,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/copy_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/copy_edit.gif
deleted file mode 100644
index 71d7c95..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/copy_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/cut_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/cut_edit.gif
deleted file mode 100644
index d044e59..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/cut_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/delete_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/delete_edit.gif
deleted file mode 100644
index b6922ac..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/delete_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/move_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/move_edit.gif
deleted file mode 100644
index 2edee9a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/move_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/paste_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/paste_edit.gif
deleted file mode 100644
index 4ebf6aa..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/paste_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/print_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/print_edit.gif
deleted file mode 100644
index 045de75..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/print_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/redo_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/redo_edit.gif
deleted file mode 100644
index c84e5b1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/redo_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/refresh_nav.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/refresh_nav.gif
deleted file mode 100644
index 3ca04d0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/refresh_nav.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/rename_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/rename_edit.gif
deleted file mode 100644
index cf20952..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/rename_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/save_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/save_edit.gif
deleted file mode 100644
index 499dd0c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/save_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/undo_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/undo_edit.gif
deleted file mode 100644
index eae118a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/ctool16/undo_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/copy_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/copy_edit.gif
deleted file mode 100644
index e9bc65e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/copy_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/cut_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/cut_edit.gif
deleted file mode 100644
index bd43144..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/cut_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/delete_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/delete_edit.gif
deleted file mode 100644
index 9e14298..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/delete_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/move_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/move_edit.gif
deleted file mode 100644
index d906a05..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/move_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/paste_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/paste_edit.gif
deleted file mode 100644
index c545ff8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/paste_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/print_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/print_edit.gif
deleted file mode 100644
index 89793e2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/print_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/redo_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/redo_edit.gif
deleted file mode 100644
index 11f2897..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/redo_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/refresh_nav.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/refresh_nav.gif
deleted file mode 100644
index 1f55189..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/refresh_nav.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/rename_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/rename_edit.gif
deleted file mode 100644
index 250ca78..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/rename_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/save_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/save_edit.gif
deleted file mode 100644
index ad505a9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/save_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/undo_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/undo_edit.gif
deleted file mode 100644
index fb807bf..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/dtool16/undo_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/copy_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/copy_edit.gif
deleted file mode 100644
index 71d7c95..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/copy_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/cut_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/cut_edit.gif
deleted file mode 100644
index d044e59..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/cut_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/delete_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/delete_edit.gif
deleted file mode 100644
index b6922ac..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/delete_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/move_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/move_edit.gif
deleted file mode 100644
index 2edee9a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/move_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/paste_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/paste_edit.gif
deleted file mode 100644
index 4ebf6aa..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/paste_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/print_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/print_edit.gif
deleted file mode 100644
index 045de75..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/print_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/redo_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/redo_edit.gif
deleted file mode 100644
index c84e5b1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/redo_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/refresh_nav.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/refresh_nav.gif
deleted file mode 100644
index 3ca04d0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/refresh_nav.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/rename_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/rename_edit.gif
deleted file mode 100644
index cf20952..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/rename_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/save_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/save_edit.gif
deleted file mode 100644
index 499dd0c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/save_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/undo_edit.gif b/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/undo_edit.gif
deleted file mode 100644
index eae118a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/icons/full/etool16/undo_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.action/plugin.properties b/org.eclipse.gmf.runtime.common.ui.action/plugin.properties
deleted file mode 100644
index 20f93db..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/plugin.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Common UI Services - Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = GMF Common UI Action
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/CommonActionConstants.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/CommonActionConstants.java
deleted file mode 100644
index b9d6d27..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/CommonActionConstants.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions;
-
-/**
- * Various strings used by the menus and actions in the modeler domain.
- * @author ldamus
- */
-public class CommonActionConstants {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 */
-	private CommonActionConstants() {
-		super();
-	}
-
-	/**
-	 * Edit menu: name of Repeat global action (value
-	 * <code>"org.eclipse.gmf.runtime.common.ui.edit.repeat"</code>).
-	 */
-	public static final String REPEAT = "org.eclipse.gmf.runtime.common.ui.edit.repeat"; //$NON-NLS-1$
-
-	/**
-	 * The menu ID for the common file menu.
-	 */
-	public static final String FILE_MENU_ID = "org.eclipse.gmf.runtime.common.ui.actions.FileMenu"; //$NON-NLS-1$
-
-	/**
-	 * The menu ID for the common edit menu.
-	 */
-	public static final String EDIT_MENU_ID = "org.eclipse.gmf.runtime.common.ui.actions.EditMenu"; //$NON-NLS-1$
-
-	/**
-	 * The menu ID for the common edit menu.
-	 */
-	public static final String REFACTOR_MENU_ID = "org.eclipse.gmf.runtime.common.ui.actions.RefactorMenu"; //$NON-NLS-1$
-	
-	/**
-	 * The menu ID for the common navigate menu.
-	 */
-	public static final String NAVIGATE_MENU_ID = "org.eclipse.gmf.runtime.common.ui.actions.NavigateMenu"; //$NON-NLS-1$
-	
-	/**
-	 * The add context menu group name.
-	 */
-	public static final String ADD_GROUP = "addGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The add additions context menu group name.
-	 */
-	public static final String ADD_GROUP_ADDITIONS = "addGroupAdditions"; //$NON-NLS-1$
-	
-	/**
-	 * The navigate context menu group name.
-	 */
-	public static final String NAVIGATE_GROUP = "navigateGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The post navigate context menu group name.
-	 */
-	public static final String POST_NAVIGATE_GROUP = "postNavigateGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The file context menu group name.
-	 */
-	public static final String FILE_GROUP = "fileGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The edit context menu group name.
-	 */
-	public static final String EDIT_GROUP = "editGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The edit context menu copy group name.
-	 */
-	public static final String EDIT_COPY_GROUP = "copyGroup"; //$NON-NLS-1$
-
-	/**
-	 * The edit context menu delete group name.
-	 */
-	public static final String EDIT_DELETE_GROUP = "deleteGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The edit context menu modify group name.
-	 */
-	public static final String EDIT_MODIFY_GROUP = "modifyGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The edit context menu undo group name.
-	 */
-	public static final String EDIT_UNDO_GROUP = "undoGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The edit context menu rename group name.
-	 */
-	public static final String RENAME_GROUP = "renameGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The properties context menu group name.
-	 */
-	public static final String PROPERTIES_GROUP = "propertiesGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The pre-properties context menu group name.
-	 */
-	public static final String PRE_PROPERTIES_GROUP = "prePropertiesGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The edit context menu import group name.
-	 */
-	public static final String IMPORT_GROUP = "importGroup"; //$NON-NLS-1$
-
-	/**
-	 * The refactor context menu modify group name.
-	 */
-	public static final String REFACTOR_MODIFY_GROUP = "modifyGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The additions context menu group name.
-	 */
-	public static final String ADDITIONS_GROUP = "additionsGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The file context menu group name.
-	 */
-	public static final String MISCELLANEOUS_GROUP = "miscellaneousGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The validate context menu group name.
-	 */
-	public static final String VALIDATE_GROUP = "validateGroup"; //$NON-NLS-1$
-	
-	/**
-	 * The find context menu group name.
-	 */
-	public static final String FIND_GROUP = "findGroup"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/IPrintActionHelper.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/IPrintActionHelper.java
deleted file mode 100644
index b2ea896..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/IPrintActionHelper.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * An interface to implement for bringing up the print dialog.
- * 
- * See ModelerPrintActionHelper for an explanation on why I use it for print
- * preview.
- * 
- * @author Wayne Diu, wdiu
- */
-public interface IPrintActionHelper {
-
-	/**
-	 * The method that brings up the print dialog
-	 * 
-	 * @param workbenchPart the workbench part containing the diagram to
-	 * print
-	 */
-	public void doPrint(IWorkbenchPart workbenchPart);
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/PropertyWindowActionDelegate.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/PropertyWindowActionDelegate.java
deleted file mode 100644
index 82f092c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/PropertyWindowActionDelegate.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IViewActionDelegate;
-
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionDelegate;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.util.WorkbenchPartActivator;
-
-/**
- * Action delegate to show the properties window or give it focus if it's
- * already visible.
- * 
- * @author ldamus
- */
-public class PropertyWindowActionDelegate
-	extends AbstractActionDelegate
-	implements IEditorActionDelegate, IViewActionDelegate, IActionDelegate2 {
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionDelegate#doRun(IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		Trace.trace(CommonUIActionPlugin.getDefault(), CommonUIActionDebugOptions.METHODS_ENTERING, "PropertyWindowActionDelegate.doRun Entering"); //$NON-NLS-1$
-		WorkbenchPartActivator.showPropertySheet();
-		Trace.trace(CommonUIActionPlugin.getDefault(), CommonUIActionDebugOptions.METHODS_EXITING, "PropertyWindowActionDelegate.doRun Exiting"); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardContentsHelper.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardContentsHelper.java
deleted file mode 100644
index b71a4bb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardContentsHelper.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This class is responsible for getting the contents from the clipboard.
- * 
- * @author cmahoney
- */
-public class ClipboardContentsHelper {
-
-	/**
-	 * The singleton instance of <code>ClipboardContentsHelper</code>.
-	 */
-	private static ClipboardContentsHelper instance;
-
-	/**
-	 * Retrieves the singleton instance of <code>ClipboardContentsHelper</code>.
-	 * 
-	 * @return the singleton instance of <code>ClipboardContentsHelper</code>
-	 */
-	public static ClipboardContentsHelper getInstance() {
-		if (instance == null) {
-			instance = new ClipboardContentsHelper();
-		}
-		return instance;
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	protected ClipboardContentsHelper() {
-		// nothing to initialize
-	}
-
-	/**
-	 * Returns the system clipboard contents
-	 * 
-	 * @param dataType
-	 *            The transfer agent
-	 * @return Object Data associated with the transfer agent
-	 */
-	public Object getClipboardContents(Transfer dataType) {
-		/* check the data type */
-		assert null != dataType;
-
-		/* create the clipboard instance */
-		Clipboard clipboard = new Clipboard(Display.getCurrent());
-
-		/* get the data from the clipboard */
-		Object data = clipboard.getContents(dataType);
-
-		/* free the system resources associated with the clipboard */
-		clipboard.dispose();
-
-		return data;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardManager.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardManager.java
deleted file mode 100644
index 29235f2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardManager.java
+++ /dev/null

@@ -1,342 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.gmf.runtime.common.ui.util.CustomDataTransfer;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-
-/**
- * This class is used to add/retrieve data to/from the system clipboard. This
- * class should be used within the global action infrastructure framework.
- * 
- * @author Vishy Ramaswamy
- */
-public final class ClipboardManager {
-	
-	/**
-	 * String constant for the common format (paste on ME or a daigram (usually
-	 * as a result of Harvesting)
-	 */
-	public static final String COMMON_FORMAT = "COMMON_FORMAT"; //$NON-NLS-1$
-
-	/**
-	 * Create the ClipboardManager
-	 */
-	private static ClipboardManager instance = new ClipboardManager();
-
-	/**
-	 * Attribute for the cache
-	 */
-	private Hashtable list = new Hashtable();
-
-	/**
-	 * The clipboard state
-	 */
-	private ClipboardState clipboardState = ClipboardState.NORMAL;
-
-	/**
-	 * Constructor for ClipboardManager.
-	 */
-	private ClipboardManager() {
-		super();
-	}
-
-	/**
-	 * Return the singleton.
-	 * 
-	 * @return a singleton instance of <code>ClipboardManager</code>
-	 */
-	public static ClipboardManager getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Returns the system clipboard contents
-	 * 
-	 * @param dataType
-	 *            The transfer agent
-	 * @return Object Data associated with the transfer agent
-	 */
-	public Object getClipboardContents(Transfer dataType,
-			ClipboardContentsHelper helper) {
-		return helper.getClipboardContents(dataType);
-	}
-
-	/**
-	 * Adds data to the internal cache. The clipboard state is reset to NORMAL.
-	 * 
-	 * @param data
-	 *            The data for the transfer agent
-	 * @param dataType
-	 *            The transfer agent
-	 */
-	public void addToCache(Object data, Transfer dataType) {
-		addToCache(data, dataType, ClipboardState.NORMAL);
-	}
-
-	/**
-	 * Adds data to the internal cache. The clipboard state is set to the
-	 * specified value.
-	 * 
-	 * @param data
-	 *            The data for the transfer agent
-	 * @param dataType
-	 *            The transfer agent
-	 * @param state
-	 *            The clipboard state
-	 */
-	public void addToCache(Object data, Transfer dataType, ClipboardState state) {
-
-		/* add it to the cache */
-		if (data != null && dataType != null) {
-
-			/* check if transfer type is custom data */
-			if (dataType instanceof CustomDataTransfer) {
-				/* if the data is correct */
-				if (data instanceof ICustomData[]) {
-					/* append to the already existing list */
-					ICustomData[] array = (ICustomData[]) getList().get(
-						CustomDataTransfer.getInstance());
-					if (array != null) {
-						List oldlist = Arrays.asList(array);
-						List newlist = Arrays.asList((ICustomData[]) data);
-						List compound = new ArrayList();
-						compound.addAll(oldlist);
-						compound.addAll(newlist);
-						array = new ICustomData[compound.size()];
-						compound.toArray(array);
-						getList().put(CustomDataTransfer.getInstance(), array);
-					} else {
-						getList().put(CustomDataTransfer.getInstance(), data);
-					}
-					this.clipboardState = state;
-				}
-			} else {
-				/* add to the cache */
-				getList().put(dataType, data);
-				this.clipboardState = state;
-			}
-		}
-	}
-
-	/**
-	 * Flushes the chache to the system clipboard and clears the cache NOTE:
-	 * visibility changed from (protected) to (public) to support Harvesting
-	 * feature
-	 */
-	public void flushCacheToClipboard() {
-		if (getList().size() > 0) {
-
-			/* create the clipboard instance */
-			Clipboard clipboard = new Clipboard(Display.getCurrent());
-
-			/* copy the data to an array */
-			ArrayList data = new ArrayList();
-			data.addAll(getList().values());
-
-			/* copy the keys to an array */
-			ArrayList keys = new ArrayList();
-			keys.addAll(getList().keySet());
-
-			Transfer[] transfer = new Transfer[keys.size()];
-			keys.toArray(transfer);
-
-			/* set the clipboard contents */
-			clipboard.setContents(data.toArray(), transfer);
-
-			/* free the system resources associated with the clipboard */
-			clipboard.dispose();
-
-			/* clear the list */
-			getList().clear();
-		}
-	}
-
-	/**
-	 * Clear the cache
-	 */
-	protected void clearCache() {
-		getList().clear();
-	}
-
-	/**
-	 * Returns a platform specific list of the data types currently available on
-	 * the system clipboard.
-	 * 
-	 * <p>
-	 * Note: <code>getAvailableTypeNames</code> is a utility for writing a
-	 * Transfer sub-class. It should NOT be used within an application because
-	 * it provides platform specific information.
-	 * </p>
-	 * 
-	 * @return a platform specific list of the data types currently available
-	 *          on the system clipboard
-	 */
-	public String[] getAvailableTypeNames() {
-
-		String[] types = new String[0];
-
-		/* create the clipboard instance */
-		Clipboard clipboard = new Clipboard(Display.getCurrent());
-
-		/* copy the data to an array */
-		types = clipboard.getAvailableTypeNames();
-
-		/* free the system resources associated with the clipboard */
-		clipboard.dispose();
-
-		return types;
-	}
-
-	/**
-	 * Returns the list.
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getList() {
-		return list;
-	}
-
-	/**
-	 * Removes the transfer agent from the cache
-	 * 
-	 * @param dataType
-	 *            The transfer agent
-	 */
-	public void removeFromCache(Transfer dataType) {
-		assert null != dataType;
-		getList().remove(dataType);
-	}
-
-	/**
-	 * Checks if the cache has the specified transfer agent
-	 * 
-	 * @param dataType
-	 *            The transfer agent
-	 * @return boolean
-	 */
-	public boolean doesCacheHaveType(Transfer dataType) {
-		assert null != dataType;
-		return getList().containsKey(dataType);
-	}
-	
-	/**
-	 * Checks if the system clipboard has any ICustomData with the specified
-	 * format
-	 * 
-	 * @param format
-	 *            The format
-	 * @return boolean
-	 */
-	public boolean doesClipboardHaveData(String format, ClipboardContentsHelper contentsHelper) {
-		assert null != format;
-
-		/* get the clipboard data for the custom format */
-		Object data = getClipboardContents(CustomDataTransfer.getInstance(), contentsHelper);
-
-		/* check if the format exists */
-		if (data != null && data instanceof ICustomData[]) {
-			ICustomData[] array = (ICustomData[]) data;
-
-			for (int i = 0; i < array.length; i++) {
-				if (format.equals(array[i].getFormatType())) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if the system clipboard has any data with the specified transfer
-	 * agent
-	 * 
-	 * @param dataType
-	 *            The transfer agent
-	 * @return boolean
-	 */
-	public boolean doesClipboardHaveData(Transfer dataType, ClipboardContentsHelper contentsHelper) {
-		assert null != dataType;
-
-		/* get the clipboard data for the transfer */
-		Object data = getClipboardContents(dataType, contentsHelper);
-
-		/* check if the data exists */
-		if (data != null) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	/**
-	 * Gets the ICustomData associated with the specified format from the system
-	 * clipboard.
-	 * 
-	 * @param format
-	 *            The format
-	 * @return ICustomData[]
-	 */
-	public ICustomData[] getClipboardData(String format, ClipboardContentsHelper contentsHelper) {
-		assert null != format;
-
-		/* get the clipboard data for the custom format */
-		Object data = getClipboardContents(CustomDataTransfer.getInstance(), contentsHelper);
-
-		/* check if the format exists */
-		if (data != null && data instanceof ICustomData[]) {
-			ICustomData[] array = (ICustomData[]) data;
-
-			ArrayList dataList = new ArrayList();
-			for (int i = 0; i < array.length; i++) {
-				if (format.equals(array[i].getFormatType())) {
-					dataList.add(array[i]);
-				}
-			}
-
-			/* return the array */
-			if (!dataList.isEmpty()) {
-				array = new ICustomData[dataList.size()];
-				dataList.toArray(array);
-
-				return array;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return Returns the clipboard state.
-	 */
-	public ClipboardState getClipboardState() {
-		return clipboardState;
-	}
-
-	/**
-	 * @param clipboardState
-	 *            The clipboard state to set.
-	 */
-	public void setClipboardState(ClipboardState clipboardState) {
-		this.clipboardState = clipboardState;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardState.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardState.java
deleted file mode 100644
index 362d0ac..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ClipboardState.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * Enumeration class for the clipboard state.
- * 
- * @author dmisic
- */
-public class ClipboardState
-	extends EnumeratedType {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for this enumerated type.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * Clipboard state: NORMAL
-	 */
-	public static final ClipboardState NORMAL = new ClipboardState("Normal"); //$NON-NLS-1$
-
-	/**
-	 * Clipboard state: PRE_OVERWRITE
-	 */
-	public static final ClipboardState PRE_OVERWRITE = new ClipboardState(
-		"PreOverwrite"); //$NON-NLS-1$
-
-	/**
-	 * Clipboard state: OVERWRITE
-	 */
-	public static final ClipboardState OVERWRITE = new ClipboardState(
-		"Overwrite"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final ClipboardState[] VALUES = {NORMAL, PRE_OVERWRITE,
-		OVERWRITE};
-
-	/**
-	 * Constructs a new clipboard state with the specified name. The method is
-	 * private so that the class can not be directly instantiated.
-	 * 
-	 * @param name
-	 *            The name of the state
-	 */
-	private ClipboardState(String name) {
-		super(name, nextOrdinal++);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.internal.util.EnumeratedType#getValues()
-	 */
-	protected List getValues() {
-		return Collections.unmodifiableList(Arrays.asList(VALUES));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalActionManager.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalActionManager.java
deleted file mode 100644
index 5e2e314..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalActionManager.java
+++ /dev/null

@@ -1,511 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalCloseAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalCopyAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalCutAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalDeleteAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalFindAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalMoveAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalOpenAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalPasteAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalPropertiesAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalRefreshAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalRenameAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalRevertAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalSaveAction;
-import org.eclipse.gmf.runtime.common.ui.action.internal.actions.global.GlobalSelectAllAction;
-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;
-
-/**
- * This class manages all the global actions. It has methods to create
- * global actions, add these actions to a menu and set these actions as
- * the workbench global actions handlers.
- * 
- * @author Vishy Ramaswamy
- */
-public class GlobalActionManager {
-
-	/**
-	 * Attribute for the list of actions.
-	 */
-	private Hashtable listOfActions = new Hashtable();
-
-	/**
-	 * Attribute for the list of global action ids.
-	 */
-	private Vector listOfActionIds = new Vector();
-
-	/**
-	 * Create the singleton.
-	 */
-	private static GlobalActionManager instance = new GlobalActionManager();
-
-	/**
-	 * Return the singleton.
-	 * 
-	 * @return a singleton instance of <code>GlobalActionManager</code>
-	 */
-	public static GlobalActionManager getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Constructor for GlobalActionManager.
-	 */
-	protected GlobalActionManager() {
-		super();
-
-		addActionId(GlobalActionId.CUT);
-		addActionId(GlobalActionId.COPY);
-		addActionId(GlobalActionId.PASTE);
-		addActionId(GlobalActionId.DELETE);
-		addActionId(GlobalActionId.SELECT_ALL);
-		addActionId(GlobalActionId.UNDO);
-		addActionId(GlobalActionId.REDO);
-		addActionId(GlobalActionId.PRINT);
-		addActionId(GlobalActionId.OPEN);
-		addActionId(GlobalActionId.CLOSE);
-		addActionId(GlobalActionId.MOVE);
-		addActionId(GlobalActionId.RENAME);
-		addActionId(GlobalActionId.FIND);
-		addActionId(GlobalActionId.PROPERTIES);
-		addActionId(GlobalActionId.SAVE);
-		addActionId(GlobalActionId.REFRESH);
-		addActionId(GlobalActionId.REVERT);
-	}
-
-	/**
-	 * Returns the <code>GlobalAction</code> for the given part and action id
-	 * 
-	 * @param globalActionId An action id
-	 * @param part The <code>IWorkbenchPart</code>
-	 * 
-	 * @return GlobalAction
-	 */
-	public GlobalAction getGlobalActionHandler(final IWorkbenchPart part,
-		String globalActionId) {
-		assert null != part;
-		assert null != globalActionId;
-
-		/* variable for the action to be returned */
-		GlobalAction action = null;
-
-		/* Check if the part exists in the cache */
-		Hashtable actionList = (Hashtable) getListOfActions().get(part);
-		if (actionList != null) {
-			/* Check if the action id exists */
-			action = (GlobalAction) actionList.get(globalActionId);
-			if (action == null) {
-				/* create the action */
-				action = createActionHandler(part, globalActionId);
-				if (action == null) {
-					return action;
-				}
-
-				/* update the list of actions for the part */
-				actionList.put(globalActionId, action);
-
-				/* update the part with the new action list */
-				getListOfActions().put(part, actionList);
-			}
-		} else {
-			/* create an action list for the part */
-			actionList = new Hashtable();
-
-			/* create the action */
-			action = createActionHandler(part, globalActionId);
-			if (action == null) {
-				return action;
-			}
-
-			/* add the action to the action list */
-			actionList.put(globalActionId, action);
-
-			/* update the part with the new action list */
-			getListOfActions().put(part, actionList);
-
-			/* register as a part listener so that the cache can be cleared
-			 * when the part is disposed */
-			part.getSite().getPage().addPartListener(new IPartListener() {
-				
-				private IWorkbenchPart localPart = part;
-
-
-				/* (non-Javadoc)
-				 * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-				 */
-				public void partActivated(IWorkbenchPart workbenchPart) {
-					/* method not implemented */
-				}
-
-				/* (non-Javadoc)
-				 * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-				 */
-				public void partBroughtToTop(IWorkbenchPart workbenchPart) {
-					/* method not implemented */
-				}
-
-				/* (non-Javadoc)
-				 * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-				 */
-				public void partClosed(IWorkbenchPart workbenchPart) {
-					/* remove the cache associated with the part */
-					if (workbenchPart != null && localPart == workbenchPart && getListOfActions().containsKey(workbenchPart)) {
-						getListOfActions().remove(workbenchPart);
-						workbenchPart.getSite().getPage().removePartListener(this);
-						localPart = null;
-					}
-				}
-
-
-				/* (non-Javadoc)
-				 * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-				 */
-				public void partDeactivated(IWorkbenchPart workbenchPart) {
-					/* method not implemented */
-				}
-
-				/* (non-Javadoc)
-				 * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-				 */
-				public void partOpened(IWorkbenchPart workbenchPart) {
-					/* method not implemented */
-				}
-			});
-		}
-
-		return action;
-	}
-
-	/**
-	 * Creates an GlobalAction.
-	 * 
-	 * @param page The workbench page
-	 * @param id   The action id
-	 * 
-	 * @return GlobalAction
-	 */
-	public GlobalAction createActionHandler(IWorkbenchPage page, String id) {
-		GlobalAction action = null;
-
-		if (id.equals(GlobalActionId.CUT))
-			action = new GlobalCutAction(page);
-		else if (id.equals(GlobalActionId.COPY))
-			action = new GlobalCopyAction(page);
-		else if (id.equals(GlobalActionId.PASTE))
-			action = new GlobalPasteAction(page);
-		else if (id.equals(GlobalActionId.UNDO))
-			action = new GlobalUndoAction(page);
-		else if (id.equals(GlobalActionId.REDO))
-			action = new GlobalRedoAction(page);
-		else if (id.equals(GlobalActionId.DELETE))
-			action = new GlobalDeleteAction(page);
-		else if (id.equals(GlobalActionId.SELECT_ALL))
-			action = new GlobalSelectAllAction(page);
-		else if (id.equals(GlobalActionId.PRINT))
-			action = new GlobalPrintAction(page);
-		else if (id.equals(GlobalActionId.MOVE))
-			action = new GlobalMoveAction(page);
-		else if (id.equals(GlobalActionId.OPEN))
-			action = new GlobalOpenAction(page);
-		else if (id.equals(GlobalActionId.CLOSE))
-			action = new GlobalCloseAction(page);
-		else if (id.equals(GlobalActionId.RENAME))
-			action = new GlobalRenameAction(page);
-		else if (id.equals(GlobalActionId.REFRESH))
-			action = new GlobalRefreshAction(page);
-		else if (id.equals(GlobalActionId.REVERT))
-				action = new GlobalRevertAction(page);
-		else if (id.equals(GlobalActionId.FIND))
-			action = new GlobalFindAction(page);
-		else if (id.equals(GlobalActionId.PROPERTIES))
-			action = new GlobalPropertiesAction(page);
-		else if (id.equals(GlobalActionId.SAVE))
-			action = new GlobalSaveAction(page);
-
-		// this initialization should be moved to the client to call
-		if (action != null)
-			action.init();
-		return action;
-	}
-
-	/**
-	 * Creates an GlobalAction.
-	 * 
-	 * @param part The workbench part
-	 * @param id The action id
-	 * 
-	 * @return GlobalAction
-	 */
-	public GlobalAction createActionHandler(final IWorkbenchPart part, String id) {
-		GlobalAction action = null;
-
-		if (id.equals(GlobalActionId.CUT))
-			action = new GlobalCutAction(part);
-		else if (id.equals(GlobalActionId.COPY))
-			action = new GlobalCopyAction(part);
-		else if (id.equals(GlobalActionId.PASTE))
-			action = new GlobalPasteAction(part);
-		else if (id.equals(GlobalActionId.UNDO))
-			action = new GlobalUndoAction(part);
-		else if (id.equals(GlobalActionId.REDO))
-			action = new GlobalRedoAction(part);
-		else if (id.equals(GlobalActionId.DELETE))
-			action = new GlobalDeleteAction(part);
-		else if (id.equals(GlobalActionId.SELECT_ALL))
-			action = new GlobalSelectAllAction(part);
-		else if (id.equals(GlobalActionId.PRINT))
-			action = new GlobalPrintAction(part);
-		else if (id.equals(GlobalActionId.MOVE))
-			action = new GlobalMoveAction(part);
-		else if (id.equals(GlobalActionId.OPEN))
-			action = new GlobalOpenAction(part);
-		else if (id.equals(GlobalActionId.CLOSE))
-			action = new GlobalCloseAction(part);
-		else if (id.equals(GlobalActionId.RENAME))
-			action = new GlobalRenameAction(part);
-		else if (id.equals(GlobalActionId.REFRESH))
-			action = new GlobalRefreshAction(part);
-		else if (id.equals(GlobalActionId.REVERT))
-			action = new GlobalRevertAction(part);
-		else if (id.equals(GlobalActionId.FIND))
-			action = new GlobalFindAction(part);
-		else if (id.equals(GlobalActionId.PROPERTIES))
-			action = new GlobalPropertiesAction(part);
-		else if (id.equals(GlobalActionId.SAVE))
-			action = new GlobalSaveAction(part);
-
-		if (action != null) {
-			// this initialization should be moved to the client to call
-			action.init();  
-			
-			// the action will only refresh on selection changes in the specified part
-			action.setPartSelector(new IPartSelector() {
-				public boolean selects(IWorkbenchPart p) {
-					return part == p;
-				}
-			});
-		}
-		return action;
-	}
-
-	/**
-	 * Returns the listOfActions.
-	 * @return Hashtable
-	 */
-	private Hashtable getListOfActions() {
-		return listOfActions;
-	}
-
-	/**
-	 * Creates default list of all global actions
-	 * @param part The workbench part
-	 * @return GlobalAction[] An array of GlobalAction
-	 */
-	public GlobalAction[] createGlobalActions(IWorkbenchPart part) {
-		assert null != part;
-		Vector list = new Vector();
-
-		/* Loop through all the actions */
-		for (int i = 0; i < getListOfActionIds().size(); i++) {
-			GlobalAction action = getGlobalActionHandler(part,
-				(String) getListOfActionIds().elementAt(i));
-			if (action != null) {
-				list.addElement(action);
-			}
-		}
-
-		GlobalAction[] array = new GlobalAction[list.size()];
-		list.copyInto(array);
-
-		return array;
-	}
-
-	/**
-	 * Creates specified list of global actions
-	 * @param part The workbench part
-	 * @param actionIds List of actions ids
-	 * @return GlobalAction[] An array of GlobalAction
-	 */
-	public GlobalAction[] createGlobalActions(IWorkbenchPart part,
-		String[] actionIds) {
-		assert null != part;
-		assert null != actionIds;
-		assert (actionIds.length > 0);
-
-		/* Go through all the actions */
-		Vector list = new Vector();
-		GlobalAction action = null;
-		for (int i = 0; i < actionIds.length; i++) {
-			action = getGlobalActionHandler(part, actionIds[i]);
-			if (action != null) {
-				list.addElement(action);
-			}
-		}
-
-		GlobalAction[] array = new GlobalAction[list.size()];
-		list.copyInto(array);
-
-		return array;
-	}
-
-	/** Get Global Action
-	 * 
-	 * This method obtains the specific global action for the given part.
-	 * If the action does not exist, null is returned.
-	 * 
-	 * @param part the workbench part associated with the global action
-	 * @param actionId the ID of the global action to locate
-	 * @return GlobalAction the global action, or null if none is defined for the part
-	 */
-	public GlobalAction getGlobalAction(IWorkbenchPart part, String actionId) {
-		assert null != part;
-		assert null != actionId;
-		GlobalAction action = null;
-
-		/* Get the action list for this part and return the desired action if defined. */
-		Hashtable actionList = (Hashtable) getListOfActions().get(part);
-		if (actionList != null) {
-			action = (GlobalAction) actionList.get(actionId);
-		}
-
-		return action;
-	}
-
-	/**
-	 * Set the global actions as the workbench global action handlers
-	 * 
-	 * @param bar The action bars
-	 * @param part The workbench part
-	 */
-	public void setGlobalActionHandlers(IActionBars bar, IWorkbenchPart part) {
-		assert null != bar;
-		assert null != part;
-
-		/* Check if the part exists in the cache */
-		if (!getListOfActions().containsKey(part)) {
-			/* Create default list of all global actions */
-			createGlobalActions(part);
-		}
-
-		/* Get the action list */
-		Hashtable actionList = (Hashtable) getListOfActions().get(part);
-		if (actionList == null) {
-			return;
-		}
-
-		/* Enumerate through all the actions */
-		Enumeration enumeration = actionList.elements();
-		while (enumeration.hasMoreElements()) {
-			IAction action = (IAction) enumeration.nextElement();
-			if (action.getId() != null) {
-				bar.setGlobalActionHandler(action.getId(), action);
-			}
-		}
-
-		/* Refresh the action bars */
-		bar.updateActionBars();
-	}
-
-	/**
-	 * Unset the global actions as the workbench global action handlers
-	 * @param bar The action bars
-	 * @param part The workbench part
-	 */
-	public void unSetGlobalActionHandlers(IActionBars bar, IWorkbenchPart part) {
-		assert null != bar;
-		assert null != part;
-
-		/* Check if the part exists in the cache */
-		if (!getListOfActions().containsKey(part)) {
-			/* Create default list of all global actions */
-			createGlobalActions(part);
-		}
-
-		/* Get the action list */
-		Hashtable actionList = (Hashtable) getListOfActions().get(part);
-		if (actionList == null) {
-			return;
-		}
-
-		/* Enumerate through all the actions */
-		Enumeration enumeration = actionList.elements();
-		while (enumeration.hasMoreElements()) {
-			IAction action = (IAction) enumeration.nextElement();
-			if (action.getId() != null) {
-				bar.setGlobalActionHandler(action.getId(), null);
-			}
-		}
-
-		/* Refresh the action bars */
-		bar.updateActionBars();
-	}
-
-	/**
-	 * Refreshes the global actions for the given part
-	 * 
-	 * @param part The workbench part
-	 */
-	public void refreshGlobalActions(IWorkbenchPart part) {
-		assert null != part;
-
-		/* Check if the part exists in the cache */
-		if (!getListOfActions().containsKey(part)) {
-			return;
-		}
-
-		/* Get the action list */
-		Hashtable actionList = (Hashtable) getListOfActions().get(part);
-		if (actionList == null) {
-			return;
-		}
-
-		/* Enumerate through all the actions */
-		Enumeration enumeration = actionList.elements();
-		while (enumeration.hasMoreElements()) {
-			((GlobalAction) enumeration.nextElement()).refresh();
-		}
-	}
-
-	/**
-	 * Returns the listOfActionIds.
-	 * @return Vector
-	 */
-	private Vector getListOfActionIds() {
-		return listOfActionIds;
-	}
-	
-	/**
-	 * Adds an ActionId to the list of action ids.
-	 * 
-	 * @param actionId String action id to add.
-	 */
-	protected void addActionId(String actionId) {
-		//list is initialized in declaration
-		getListOfActionIds().addElement(actionId);		
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java
deleted file mode 100644
index 92ea7b4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionPluginImages;
-
-/**
- * Global action for printing
- * 
- * @author Wayne Diu, wdiu
- */
-public final class GlobalPrintAction extends GlobalAction {
-
-	/**
-	 * Imagedescriptor for the print action
-	 */
-	private static final ImageDescriptor PRINT_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-		(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_PRINT_EDIT_ETOOL16);
-	/**
-	 * Imagedescriptor for the print action
-	 */
-	private static final ImageDescriptor DISABLED_PRINT_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-		(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_PRINT_EDIT_DTOOL16);
-		
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalPrintAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-
-	/**
-	 * @param workbenchPart
-	 */
-	public GlobalPrintAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		/* set the id */
-		setId(getWorkbenchActionConstant());
-
-		/* set the label */
-		setText(CommonUIActionMessages.GlobalPrintAction_label);
-
-		/* change the image in case someone tries this from a context menu,
-		 * not needed from the file menu */
-		setImageDescriptor(PRINT_IMAGE);
-		setHoverImageDescriptor(PRINT_IMAGE);
-		setDisabledImageDescriptor(DISABLED_PRINT_IMAGE);
-
-		/* set the context sensitive help */
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.PRINT;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#refresh()
-	 */
-	public void refresh() {
-		//also only allows printing for windows, don't test for windows in the
-		//global action handler's canHandle, because that's for selection
-		//changes
-		setEnabled(!getGlobalActionHandlerData().isEmpty() && System.getProperty("os.name").toUpperCase().startsWith("WIN")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalRedoAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalRedoAction.java
deleted file mode 100644
index 448a9c1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalRedoAction.java
+++ /dev/null

@@ -1,324 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.operations.RedoActionHandler;
-
-/**
- * Global Redo Action.
- * <P>
- * Extension of the GMF {@link GlobalAction} class that delegates redo behaviour
- * to the undoable operation framework's {@link RedoActionHandler}.
- * <P>
- * The undo context can be set through {@link #setUndoContext(IUndoContext)}.
- * If it is not explicitly set, the undo context will be derived by adapting the
- * workbench part to {@link IUndoContext}.
- * 
- * @author vramaswa
- */
-public final class GlobalRedoAction extends GlobalAction {
-
-	/**
-	 * My operation framework action handler delegate.
-	 */
-	private RedoActionHandler delegate;
-
-	/**
-	 * My undo context.
-	 */
-	private IUndoContext undoContext;
-
-	/**
-	 * Property change listener to listen for changes in my delegate.
-	 */
-	private IPropertyChangeListener listener;
-
-	/**
-	 * Initializes me with a workbench page.
-	 * 
-	 * @param workbenchPage
-	 *            the page
-	 */
-	public GlobalRedoAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Initializes me with a workbench part.
-	 * 
-	 * @param workbenchPart
-	 *            the part
-	 */
-	public GlobalRedoAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.REDO;
-	}
-
-	/**
-	 * Extends the superclass implementation to update the operation history
-	 * undo action handler to which I delegate.
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		super.setWorkbenchPart(workbenchPart);
-		initializeWithContext(getUndoContext());
-	}
-
-	/**
-	 * Initializes me with a new undo <code>context</code>.
-	 * 
-	 * @param context
-	 *            the undo context
-	 */
-	protected void initializeWithContext(IUndoContext context) {
-		if (delegate != null) {
-			delegate.removePropertyChangeListener(getDelegateListener());
-			delegate.dispose();
-			delegate = null;
-		}
-
-		if (context != null) {
-			IWorkbenchPart part = getWorkbenchPart();
-
-			if (part != null) {
-				delegate = new RedoActionHandler(part.getSite(), context);
-				delegate.setPruneHistory(true);
-				delegate.addPropertyChangeListener(getDelegateListener());
-			}
-		}
-
-		// force enablement update in UI
-		boolean enabled = isEnabled();
-		firePropertyChange(IAction.ENABLED, Boolean.valueOf(!enabled), Boolean
-				.valueOf(enabled));
-	}
-
-	/**
-	 * Gets my property change listener to listen for changes in my delegate.
-	 */
-	private IPropertyChangeListener getDelegateListener() {
-		if (listener == null) {
-			listener = new IPropertyChangeListener() {
-
-				public void propertyChange(PropertyChangeEvent event) {
-					// propagate to my own listeners
-					firePropertyChange(event.getProperty(),
-							event.getOldValue(), event.getNewValue());
-				}
-			};
-		}
-		return listener;
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		if (delegate != null) {
-			return delegate.getImageDescriptor();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public ImageDescriptor getDisabledImageDescriptor() {
-		if (delegate != null) {
-			return delegate.getDisabledImageDescriptor();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public ImageDescriptor getHoverImageDescriptor() {
-		if (delegate != null) {
-			return delegate.getHoverImageDescriptor();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public String getText() {
-		if (delegate != null) {
-			return delegate.getText();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public String getToolTipText() {
-		if (delegate != null) {
-			return delegate.getToolTipText();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public String getDescription() {
-		if (delegate != null) {
-			return delegate.getDescription();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public boolean isEnabled() {
-		if (delegate != null) {
-			return delegate.isEnabled();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public boolean isHandled() {
-		if (delegate != null) {
-			return delegate.isHandled();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public void setChecked(boolean checked) {
-		if (delegate != null) {
-			delegate.setChecked(checked);
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		if (delegate != null) {
-			Object key = new Object();
-			if (GlobalUndoRedoLock.INSTANCE.acquire(key)) {
-				try {
-					delegate.run();
-				} finally {
-					GlobalUndoRedoLock.INSTANCE.release(key);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public void refresh() {
-		if (delegate != null) {
-			delegate.update();
-		}
-		setText(getText());
-	}
-
-	/**
-	 * Sets my undo context. It will no longer be derived from the workbench
-	 * part.
-	 * 
-	 * @param undoContext
-	 *            my undo context
-	 */
-	public final void setUndoContext(IUndoContext context) {
-		this.undoContext = context;
-		initializeWithContext(context);
-	}
-
-	/**
-	 * Gets my undo context. If it has not been explicitly set, derives the undo
-	 * context from my workbench part.
-	 * 
-	 * @return my undo context. May be <code>null</code> if no one has set my
-	 *         undo context and my workbench part does not adapt to
-	 *         {@link IUndoContext}.
-	 */
-	public final IUndoContext getUndoContext() {
-
-		if (undoContext == null) {
-			IWorkbenchPart part = getWorkbenchPart();
-
-			if (part != null) {
-				return (IUndoContext) part.getAdapter(IUndoContext.class);
-			}
-		}
-		return undoContext;
-	}
-
-	/**
-	 * Listens to the operation history events.
-	 */
-	protected boolean isOperationHistoryListener() {
-		return true;
-	}
-
-	/**
-	 * Sets my delegate to <code>null</code>.
-	 */
-	public void dispose() {
-
-		if (delegate != null) {
-		    // Doesn't call delegate.dispose() because the delegate is itself a
-            // part listener and will dispose of itself when its part closes.
-            // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=131781
-			delegate.removePropertyChangeListener(getDelegateListener());
-			delegate = null;
-		}
-
-		super.dispose();
-	}
-	
-	/**
-	 * No work indicator type since my delegate takes care of showing progress.
-	 */
-	public WorkIndicatorType getWorkIndicatorType() {
-		return WorkIndicatorType.NONE;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalUndoAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalUndoAction.java
deleted file mode 100644
index f85ca5e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalUndoAction.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.operations.UndoActionHandler;
-
-/**
- * Global Undo Action.
- * <P>
- * Extension of the GMF {@link GlobalAction} class that delegates undo behaviour
- * to the undoable operation framework's {@link UndoActionHandler}.
- * <P>
- * The undo context can be set through {@link #setUndoContext(IUndoContext)}.
- * If it is not explicitly set, the undo context will be derived by adapting the
- * workbench part to {@link IUndoContext}.
- * 
- * @author vramaswa
- * @author ldamus
- */
-public final class GlobalUndoAction extends GlobalAction {
-
-	/**
-	 * My operation framework action handler delegate.
-	 */
-	private UndoActionHandler delegate;
-
-	/**
-	 * My undo context.
-	 */
-	private IUndoContext undoContext;
-
-	/**
-	 * Property change listener to listen for changes in my delegate.
-	 */
-	private IPropertyChangeListener listener;
-
-	/**
-	 * Initializes me with a workbench page.
-	 * 
-	 * @param workbenchPage
-	 *            the page
-	 */
-	public GlobalUndoAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Initilizes me with a workbench part.
-	 * 
-	 * @param workbenchPart
-	 *            the part
-	 */
-	public GlobalUndoAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.UNDO;
-	}
-
-	/**
-	 * Extends the superclass implementation to update the operation history
-	 * undo action handler to which I delegate.
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		super.setWorkbenchPart(workbenchPart);
-		initializeWithContext(getUndoContext());
-	}
-	
-    /**
-     * Initializes me with a new undo <code>context</code>.
-     * 
-     * @param context
-     *            the undo context
-     */
-    protected void initializeWithContext(IUndoContext context) {
-		if (delegate != null) {
-			delegate.removePropertyChangeListener(getDelegateListener());
-			delegate.dispose();
-			delegate = null;
-		}
-
-		if (context != null) {
-			IWorkbenchPart part = getWorkbenchPart();
-
-			if (part != null) {
-				delegate = new UndoActionHandler(part.getSite(), context);
-				delegate.setPruneHistory(true);
-				delegate.addPropertyChangeListener(getDelegateListener());
-			}
-		}
-		
-		// force enablement update in UI
-		boolean enabled = isEnabled();
-		firePropertyChange(IAction.ENABLED, Boolean.valueOf(!enabled), Boolean
-				.valueOf(enabled));
-    }
-
-	/**
-	 * Gets my property change listener to listen for changes in my delegate.
-	 */
-	private IPropertyChangeListener getDelegateListener() {
-		if (listener == null) {
-			listener = new IPropertyChangeListener() {
-
-				public void propertyChange(PropertyChangeEvent event) {
-					// propagate to my own listeners
-					firePropertyChange(event.getProperty(),
-							event.getOldValue(), event.getNewValue());
-				}
-			};
-		}
-		return listener;
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		if (delegate != null) {
-			return delegate.getImageDescriptor();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public ImageDescriptor getDisabledImageDescriptor() {
-		if (delegate != null) {
-			return delegate.getDisabledImageDescriptor();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public ImageDescriptor getHoverImageDescriptor() {
-		if (delegate != null) {
-			return delegate.getHoverImageDescriptor();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public String getText() {
-		if (delegate != null) {
-			return delegate.getText();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public String getToolTipText() {
-		if (delegate != null) {
-			return delegate.getToolTipText();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public String getDescription() {
-		if (delegate != null) {
-			return delegate.getDescription();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public boolean isEnabled() {
-		if (delegate != null) {
-			return delegate.isEnabled();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public boolean isHandled() {
-		if (delegate != null) {
-			return delegate.isHandled();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public void setChecked(boolean checked) {
-		if (delegate != null) {
-			delegate.setChecked(checked);
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		if (delegate != null) {
-			Object key = new Object();
-			if (GlobalUndoRedoLock.INSTANCE.acquire(key)) {
-				try {
-					delegate.run();
-				} finally {
-					GlobalUndoRedoLock.INSTANCE.release(key);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Delegates to the operation framework action handler.
-	 */
-	public void refresh() {
-		if (delegate != null) {
-			delegate.update();
-		}
-		setText(getText());
-	}
-
-	/**
-	 * Sets my undo context.
-	 * 
-	 * @param undoContext
-	 *            my undo context
-	 */
-	public final void setUndoContext(IUndoContext context) {
-		this.undoContext = context;
-		initializeWithContext(context);
-	}
-
-	/**
-	 * Gets my undo context. If it has not been explicitly set, derives the undo
-	 * context from my workbench part.
-	 * 
-	 * @return my undo context. May be <code>null</code> if no one has set my
-	 *         undo context and my workbench part does not adapt to
-	 *         {@link IUndoContext}.
-	 */
-	public final IUndoContext getUndoContext() {
-
-		if (undoContext == null) {
-			IWorkbenchPart part = getWorkbenchPart();
-
-			if (part != null) {
-				return (IUndoContext) part.getAdapter(IUndoContext.class);
-			}
-		}
-		return undoContext;
-	}
-
-	/**
-	 * Listens to the operation history events.
-	 */
-	protected boolean isOperationHistoryListener() {
-		return true;
-	}
-
-    /**
-     * Sets my delegate to <code>null</code>.
-     */
-	public void dispose() {
-
-		if (delegate != null) {
-            // Doesn't call delegate.dispose() because the delegate is itself a
-            // part listener and will dispose of itself when its part closes.
-            // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=131781
-			delegate.removePropertyChangeListener(getDelegateListener());
-			delegate = null;
-		}
-
-		super.dispose();
-	}
-	
-	/**
-	 * No work indicator type since my delegate takes care of showing progress.
-	 */
-	public WorkIndicatorType getWorkIndicatorType() {
-		return WorkIndicatorType.NONE;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalUndoRedoLock.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalUndoRedoLock.java
deleted file mode 100644
index 862a63f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalUndoRedoLock.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-/**
- * Locking mechanism used by {@link GlobalUndoAction} and {@link GlobalRedoAction}
- * to prevent nested undo / redo actions from occuring.
- */
-final class GlobalUndoRedoLock {
-
-	/**
-	 * Lock instance.
-	 */
-	public static final GlobalUndoRedoLock INSTANCE = new GlobalUndoRedoLock();
-
-	/**
-	 * The locking object.
-	 */
-	private Object owner = null;
-	
-	/**
-	 * Private constructor.
-	 */
-	private GlobalUndoRedoLock() {
-		// private
-	}
-
-	/**
-	 * Acquires the lock if the lock is free and returns true, otherwise false.
-	 * 
-	 * @param key the key Object which can release the lock.
-	 * @return <code>true</code> if lock acquired, otherwise <code>false</code>
-	 */
-	synchronized boolean acquire(Object key) {
-		if (owner == null) {
-			owner = key;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Releases the lock if the key is correct. If the key is incorrect,
-	 * then an IllegalArgumentException is thrown.
-	 * 
-	 * @param key the key which acquired the lock
-	 */
-	synchronized void release(Object key) {
-		if (owner == key) {
-			owner = null;
-			return;
-		}
-		if (owner == null) {
-			return;
-		}
-		throw new IllegalArgumentException("Unable to release lock, incorrect key."); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ResourceGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ResourceGlobalActionHandler.java
deleted file mode 100644
index d6a5918..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ResourceGlobalActionHandler.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that works with the resources in the context selection.
- * 
- * @author ldamus
- */
-public abstract class ResourceGlobalActionHandler extends AbstractGlobalActionHandler {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		IStructuredSelection selection =
-			(IStructuredSelection) cntxt.getSelection();
-		return getResourceSelection((IStructuredSelection)cntxt.getSelection()).size() == selection.size();
-	}
-
-	/**
-	 * Gets a structured selection containing all of the IResources in the
-	 * context selection. Selected elements may either by IResources or may
-	 * adapt to IResource.
-	 * 
-	 * @param selection the context selection for which <code>IStructuredSelection</code> will be retrieved
-	 * @return the selection of file resources
-	 */
-	protected IStructuredSelection getResourceSelection(IStructuredSelection selection) {
-
-		List result = new ArrayList();
-
-		for (Iterator i = selection.iterator(); i.hasNext();) {
-			Object nextSelected = i.next();
-
-			if (nextSelected instanceof IResource) {
-				result.add(nextSelected);
-
-			} else if (nextSelected instanceof IAdaptable) {
-				IAdaptable adaptable = (IAdaptable) nextSelected;
-				IResource resource =
-					(IResource) adaptable.getAdapter(IResource.class);
-				if (resource != null) {
-					result.add(resource);
-				}
-			}
-		}
-		return new StructuredSelection(result);
-	}
-	
-	/**
-	 * Gets the shell from the global action context.
-	 * 
-	 * @param part the <code>IWorkbenchPart</code> for which a <code>Shell</code> will be retrieved
-	 * @return the shell
-	 */
-	protected Shell getShell(IWorkbenchPart part) {
-		if (part != null) {
-			IWorkbenchPartSite site = part.getSite();
-			if (site != null) {
-				return site.getShell();
-			}
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ResourcePropertiesGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ResourcePropertiesGlobalActionHandler.java
deleted file mode 100644
index 7ae58d2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/ResourcePropertiesGlobalActionHandler.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.actions.global;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.dialogs.PropertyDialogAction;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Global action handler that opens a property page on resources using the
- * Eclipse {@link org.eclipse.ui.dialogs.PropertyDialogAction}.
- * 
- * @author ldamus
- */
-public class ResourcePropertiesGlobalActionHandler
-	extends ResourceGlobalActionHandler {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		PropertyDialogAction propertyAction = new PropertyDialogAction(
-			cntxt.getActivePart().getSite(), cntxt.getActivePart().getSite()
-				.getSelectionProvider());
-		propertyAction.selectionChanged(getResourceSelection((IStructuredSelection)cntxt.getSelection()));
-		propertyAction.run();
-		propertyAction.dispose();
-		propertyAction = null;
-		return null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/package.html b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/package.html
deleted file mode 100644
index 9f39536..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/package.html
+++ /dev/null

@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of common global actions and global action handlers
-for use with the Global Action Handler Service.</p>
-
-<p>Modeling platform global actions are managed by an instance of the
-{@link
-org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager} in
-this package. It should be used to create global actions, add them to
-menus and set them as the workbench global actions handlers for a given
-workbench part. For example, here are some of the actions supported by
-the manager:
-<ul>
-	<li>Cut</li>
-	<li>Copy</li>
-	<li>Paste</li>
-	<li>Move</li>
-	<li>Rename</li>
-	<li>Delete</li>
-	<li>Refresh</li>
-	<li>Find</li>
-	<li>Save</li>
-	<li>Print</li>
-	<li>Undo</li>
-	<li>Redo</li>
-</ul>
-</p>
-
-@see org.eclipse.gmf.runtime.common.ui.action.global 
-@see org.eclipse.gmf.runtime.common.ui.services.action.global
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/package.html b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/package.html
deleted file mode 100644
index 7775d5d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of common action delegates and action handlers 
-for use with the modeling platform.</p>
-
-@see org.eclipse.gmf.runtime.common.ui.action.actions 
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/GlobalAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/GlobalAction.java
deleted file mode 100644
index 3b0e750..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/GlobalAction.java
+++ /dev/null

@@ -1,426 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.global;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalActionHandlerData;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.GlobalActionContext;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.GlobalActionHandlerContext;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.GlobalActionHandlerService;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerProvider;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * The abstract parent of all concrete global actions. A concrete global action
- * needs to override the <code>getActionId()</code> method. The concrete
- * global action could override the <code>createContext()</code> and
- * <code>createCompoundCommand()</code> methods.
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class GlobalAction
-	extends AbstractActionHandler {
-
-	/**
-	 * Associated IWorkbenchActionConstant if one exists
-	 */
-	private final String workbenchActionConstant = getActionId();
-
-	/**
-	 * Default label for this global action.
-	 */
-	private String defaultLabel;
-
-	/**
-	 * Creates a GlobalAction.
-	 * 
-	 * @param workbenchPart
-	 *            The part associated with this action
-	 */
-	public GlobalAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-
-		assert null != workbenchPart;
-
-		/* Disable the action when it is created */
-		setEnabled(false);
-	}
-
-	/**
-	 * Creates a GlobalAction.
-	 * 
-	 * @param workbenchPage
-	 *            The part associated with this action
-	 */
-	public GlobalAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-
-		assert null != workbenchPage;
-
-		/* Disable the action when it is created */
-		setEnabled(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		Vector list = new Vector();
-
-		/* Get the handler data */
-		List handlerInfo = getGlobalActionHandlerData();
-		for (Iterator i = handlerInfo.iterator(); i.hasNext();) {
-			/* get the next element */
-			GlobalActionHandlerData data = (GlobalActionHandlerData) i.next();
-
-			/* Get the command */
-			ICommand command = data.getHandler().getCommand(data.getContext());
-			if (command != null) {
-				list.addElement(command);
-			}
-		}
-
-		if (list.size() <= 0) {
-			return;
-		}
-
-		/* Create the composite operation */
-		IUndoableOperation operation = createCompositeCommand(list).reduce();
-        try {
-            IStatus status = getOperationHistory()
-                .execute(operation, progressMonitor, null);
-            
-    		if (!status.isOK()) {
-    			/* log status error */
-    			Log.log(CommonUIActionPlugin.getDefault(), status);
-    		}
-        } catch (ExecutionException e) {
-            Trace.catching(CommonUIActionPlugin.getDefault(),
-                CommonUIActionDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "doRun", e); //$NON-NLS-1$
-            Log.error(CommonUIActionPlugin.getDefault(),
-                CommonUIActionStatusCodes.ACTION_FAILURE, e
-                    .getLocalizedMessage(), e);
-        }
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#refresh()
-	 */
-	public void refresh() {
-		boolean enable = false;
-		try {
-			/* Get the handler data */
-			List handlerInfo = getGlobalActionHandlerData();
-
-			// Reset the label to the default
-			if (defaultLabel != null) {
-				setText(defaultLabel);
-			}
-
-			/* Check the handlers for enablement status */
-			for (Iterator i = handlerInfo.iterator(); i.hasNext();) {
-				/* Get the next element */
-				GlobalActionHandlerData data = (GlobalActionHandlerData) i
-					.next();
-
-				/* Check the enablement */
-				if (data.getHandler().canHandle(data.getContext())) {
-					if (!enable) {
-						enable = true;
-					}
-				}
-
-				/* Update the label, if appropriate */
-				if (handlerInfo.size() == 1) {
-					String label = data.getHandler()
-						.getLabel(data.getContext());
-					if (label != null) {
-						setText(label);
-					}
-				}
-			}
-		} catch (Throwable exception) {
-			enable = false;
-			Trace.catching(CommonUIActionPlugin.getDefault(),
-				CommonUIActionDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"refresh", exception); //$NON-NLS-1$
-
-			IStatus status = new Status(IStatus.WARNING, CommonUIActionPlugin
-				.getPluginId(), CommonUIActionStatusCodes.GENERAL_UI_FAILURE, String
-				.valueOf(exception.getMessage()), exception);
-
-			Log.log(CommonUIActionPlugin.getDefault(), status);
-		}
-
-		/* Set the enablement of the action */
-		setEnabled(enable);
-	}
-
-	/**
-	 * Returns the <code>GlobalActionId</code> handled by this action
-	 * 
-	 * @return int
-	 */
-	public abstract String getActionId();
-
-    /**
-     * Returns a <code>CompositeCommand</code> whose undo context is derived from my workbench part.
-     * 
-     * @param commands a list of commands to compose into a <code>CompositeCommand</code>
-     * @return the CompositeCommand
-     */
-    protected CompositeCommand createCompositeCommand(List commands) {
-        assert null != commands;
-        
-        CompositeCommand result = new CompositeCommand(getLabel(), commands);
-        IUndoContext undoContext = getUndoContext();
-        
-        if (undoContext != null) {
-            result.addContext(undoContext);
-        }
-        return result;
-    }
-    
-    /**
-     * Gets the undo context from my workbench part. May be <code>null</code>.
-     * 
-     * @return my undo context
-     */
-    protected IUndoContext getUndoContext() {
-        IWorkbenchPart part = getWorkbenchPart();
-
-        if (part != null) {
-            return (IUndoContext) part.getAdapter(IUndoContext.class);
-        }
-        return null;
-    }
-
-
-	/**
-     * Returns a <code>IGlobalActionContext</code>
-     * 
-     * @return IGlobalActionContext
-     */
-	protected IGlobalActionContext createContext() {
-		/* Create the global action context */
-		return new GlobalActionContext(getWorkbenchPart(), getSelection(),
-			getLabel(), getActionId());
-	}
-
-	/**
-	 * Returns a list of <code>GlobalActionHandlerData</code>. Handles
-	 * different types of selections
-	 * 
-	 * @return List
-	 */
-	protected List getGlobalActionHandlerData() {
-		/* Check if the selection is a text selection */
-		if (getSelection() instanceof ITextSelection) {
-			return getGlobalActionHandlerData((ITextSelection) getSelection());
-		} else if (getSelection() instanceof IStructuredSelection) {
-			return getGlobalActionHandlerData((IStructuredSelection) getSelection());
-		}
-
-		return new ArrayList();
-	}
-
-	/**
-	 * Returns a list of <code>GlobalActionHandlerData</code> for a given list
-	 * of element types
-	 * 
-	 * @param listOfElementTypes
-	 *            list of unique element types
-	 * @return List
-	 */
-	private List getGlobalActionHandlerData(List listOfElementTypes) {
-		assert null != listOfElementTypes;
-
-		/* Get the global action handler for unique element types */
-		ArrayList listOfHandlers = new ArrayList();
-		Iterator iterator = listOfElementTypes.iterator();
-		while (iterator.hasNext()) {
-			/* Get the element type */
-			Class clazz = (Class) iterator.next();
-
-			/* Create the global action handler context */
-			GlobalActionHandlerContext context = new GlobalActionHandlerContext(
-				getWorkbenchPart(), getActionId(), clazz, false);
-
-			/* Get the handler */
-			IGlobalActionHandler handler = GlobalActionHandlerService
-				.getInstance().getGlobalActionHandler(context);
-
-			/* Get a compatible one if no handler is found for a direct match */
-			if (handler == null) {
-				/* Create the global action handler context */
-				context = new GlobalActionHandlerContext(getWorkbenchPart(),
-					getActionId(), clazz, true);
-
-				/* Get the handler */
-				handler = GlobalActionHandlerService.getInstance()
-					.getGlobalActionHandler(context);
-			}
-
-			/* Add to the list */
-			if (handler != null && !listOfHandlers.contains(handler)) {
-				listOfHandlers.add(handler);
-			}
-		}
-
-		/* Create the global action handler data and add it to the list */
-		ArrayList handlerData = new ArrayList();
-		IGlobalActionContext actionContext = createContext();
-		for (int i = 0; i < listOfHandlers.size(); i++) {
-			/* Get the next handler */
-			IGlobalActionHandler handler = (IGlobalActionHandler) listOfHandlers
-				.get(i);
-
-			/* Create the global action handler data */
-			handlerData
-				.add(new GlobalActionHandlerData(handler, actionContext));
-		}
-
-		/* Return the handler data */
-		return handlerData;
-	}
-
-	/**
-	 * Returns a list of <code>GlobalActionHandlerData</code> for selection of
-	 * type <code>IStructuredSelection</code>. This methods queries the
-	 * <code>GlobalActionHandlerService</code> for all the global action
-	 * handlers associated with this action.
-	 * 
-	 * @param selection
-	 *            The <code>IStructuredSelection</code>
-	 * @return List
-	 */
-	private List getGlobalActionHandlerData(IStructuredSelection selection) {
-		assert null != selection;
-
-		/* Create a unique list of element types */
-		ArrayList listOfElementTypes = new ArrayList();
-
-		if (selection.isEmpty()) {
-			// Use the NullElementType to signify that global action handlers
-			// should be found that provide regardless of the selected types.
-			listOfElementTypes.add(IGlobalActionHandlerProvider.NullElementType.class);
-
-		} else {
-			/* Get the selection as an object array */
-			Object[] array = selection.toArray();
-
-			for (int i = 0; i < array.length; i++) {
-				if (!listOfElementTypes.contains(array[i].getClass())) {
-					listOfElementTypes.add(array[i].getClass());
-				}
-			}
-		}
-
-		/* Get the global action handler for unique element types */
-		return getGlobalActionHandlerData(listOfElementTypes);
-	}
-
-	/**
-	 * Returns a list of <code>GlobalActionHandlerData</code> for selection of
-	 * type <code>ITextSelection</code>. This methods queries the
-	 * <code>GlobalActionHandlerService</code> for all the global action
-	 * handlers associated with this action.
-	 * 
-	 * @param selection
-	 *            The <code>ITextSelection</code>
-	 * @return List
-	 */
-	private List getGlobalActionHandlerData(ITextSelection selection) {
-		assert null != selection;
-
-		/* Get the element type */
-		Class clazz = selection.getClass();
-
-		/* Create a unique list of element types */
-		ArrayList listOfElementTypes = new ArrayList();
-		listOfElementTypes.add(clazz);
-
-		/* Get the global action handler for unique element types */
-		return getGlobalActionHandlerData(listOfElementTypes);
-	}
-
-	/**
-	 * Returns the workbenchActionConstant.
-	 * 
-	 * @return String
-	 */
-	protected String getWorkbenchActionConstant() {
-		return workbenchActionConstant;
-	}
-
-	/**
-	 * Returns a list with a GlobalActionHandlerData object containing a context
-	 * of Object. You can have getObjectContextGlobalActionHandlerData call this
-	 * instead.
-	 * 
-	 * @return List with a GlobalActionHandlerData object containing a context
-	 *         of Object
-	 */
-	protected List getObjectContextGlobalActionHandlerData() {
-		GlobalActionHandlerContext context = new GlobalActionHandlerContext(
-			getWorkbenchPart(), getActionId(), Object.class, false);
-
-		IGlobalActionHandler globalActionHandler = GlobalActionHandlerService
-			.getInstance().getGlobalActionHandler(context);
-
-		if (globalActionHandler == null) {
-			//an error may occur, OK because someone is playing with the xml
-			return new ArrayList();
-		}
-
-		GlobalActionHandlerData data = new GlobalActionHandlerData(
-			globalActionHandler, createContext());
-
-		ArrayList list = new ArrayList();
-		list.add(data);
-		return list;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		super.init();
-		defaultLabel = getLabel();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/GlobalActionId.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/GlobalActionId.java
deleted file mode 100644
index 8505d17..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/GlobalActionId.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.global;
-
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * Class with the global action id constants
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalActionId {
-
-    /**
-     * This class should not be instantiated since it is a static constant
-     * class.
-     */
-    private GlobalActionId() {
-		 /* private constructor */
-    }
-
-    /** Action id for the cut action */
-    public static final String CUT = ActionFactory.CUT.getId();
-
-    /** Action id for the copy action */
-    public static final String COPY = ActionFactory.COPY.getId();
-
-    /** Action id for the paste action */
-    public static final String PASTE = ActionFactory.PASTE.getId();
-
-    /** Action id for the move action */
-    public static final String MOVE = ActionFactory.MOVE.getId();
-
-    /** Action id for the rename action */
-    public static final String RENAME = ActionFactory.RENAME.getId();
-
-    /** Action id for the delete action */
-    public static final String DELETE = ActionFactory.DELETE.getId();
-
-    /** Action id for the select all action */
-    public static final String SELECT_ALL = ActionFactory.SELECT_ALL.getId();
-
-    /** Action id for the undo action */
-    public static final String UNDO = ActionFactory.UNDO.getId();
-
-    /** Action id for the redo action */
-    public static final String REDO = ActionFactory.REDO.getId();
-
-    /** Action id for the print action */
-    public static final String PRINT = ActionFactory.PRINT.getId();
-
-    /** Action id for the properties action */
-    public static final String PROPERTIES = ActionFactory.PROPERTIES.getId();
-
-    /** Action id for the refresh action */
-    public static final String REFRESH = ActionFactory.REFRESH.getId();
-    
-    /** Action id for the revert action */
-    public static final String REVERT = ActionFactory.REVERT.getId();
-
-    /** Action id for the save action */
-    public static final String SAVE = ActionFactory.SAVE.getId();
-
-    /** Action id for the find action */
-    public static final String FIND = ActionFactory.FIND.getId();
-
-    /** Action id for the open action.
-     * <p>The "open" action is not an eclipse retargetable action and therefore
-     * no workbench action constant is defined. However, the string must be
-     * defined here so that the ProviderDescriptor.provides() method (defined
-     * in GlobalActionHandlerService) will find the action handler provider
-     * with a defined XML property: actionId="open".</p> 
-     */
-    public static final String OPEN = "open"; //$NON-NLS-1$
-
-    /** Action id for the close action */
-    public static final String CLOSE = ActionFactory.CLOSE.getId();
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/package.html b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/package.html
deleted file mode 100644
index 25cca09..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/package.html
+++ /dev/null

@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes for creating global actions for use with 
-the Global Action Handler Service.</p>
-
-<p>Global actions are action handlers for Eclipse <i>retargetable</i>
-actions. The real action handler work is delegated to the {@link
-org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler}s
-provided by the {@link
-org.eclipse.gmf.runtime.common.ui.services.action.global.GlobalActionHandlerService}
-for the active workbench part.</p>
-
-<p>Modeling platform global action implementations should subclass the
-{@link org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction}
-class in this package. Each global action has a {@link
-org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId} by which
-it can be identified in the <code>org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders</code>
-extension point.</p>
-
-@see org.eclipse.gmf.runtime.common.ui.services.action.global
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/providers/EditorGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/providers/EditorGlobalActionHandlerProvider.java
deleted file mode 100644
index 6cbb5d7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/providers/EditorGlobalActionHandlerProvider.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.global.providers;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext;
-
-/**
- * Provides common action handlers for global actions on editors.
- * 
- * @author ldamus
- */
-public class EditorGlobalActionHandlerProvider
-	extends AbstractGlobalActionHandlerProvider {
-
-	/**
-	 * My REVERT action handler.
-	 */
-	IGlobalActionHandler revertHandler = new RevertGlobalActionHandler();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.services.action.global.AbstractGlobalActionHandlerProvider#getGlobalActionHandler(org.eclipse.gmf.runtime.common.ui.internal.services.action.global.IGlobalActionHandlerContext)
-	 */
-	public IGlobalActionHandler getGlobalActionHandler(
-			IGlobalActionHandlerContext context) {
-
-		String actionId = context.getActionId();
-
-		if (actionId != null && GlobalActionId.REVERT.equals(actionId)) {
-			return revertHandler;
-		}
-
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/providers/RevertGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/providers/RevertGlobalActionHandler.java
deleted file mode 100644
index 7283279..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/providers/RevertGlobalActionHandler.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.global.providers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-import org.eclipse.gmf.runtime.common.ui.editors.IRevertiblePart;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * A default global action handler for the revert retargetable action.
- * 
- * @author ldamus
- */
-public class RevertGlobalActionHandler
-	extends AbstractGlobalActionHandler {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.internal.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext context) {
-		IRevertiblePart revertablePart = getRevertablePart(context
-			.getActivePart());
-
-		if (revertablePart != null) {
-			return revertablePart.isDirty();
-		}
-
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.internal.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext context) {
-
-		IRevertiblePart revertablePart = getRevertablePart(context
-			.getActivePart());
-
-		if (revertablePart != null) {
-
-			if (confirmRevert()) {
-				revertablePart.doRevertToSaved();
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Prompts the user for confirmation of the revert action.
-	 * 
-	 * @return <code>true</code> if the user confirms that they want to
-	 *         revert, <code>false</code> otherwise.
-	 */
-	private boolean confirmRevert() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow();
-
-		if (window != null) {
-
-			String message = CommonUIActionMessages.RevertGlobalActionHandler_messageBox_message
-				+ "\n\n" + CommonUIActionMessages.RevertGlobalActionHandler_messageBox_prompt; //$NON-NLS-1$
-
-			MessageBox messageBox = new MessageBox(window.getShell(), SWT.YES
-				| SWT.NO | SWT.CANCEL | SWT.ICON_QUESTION);
-
-			messageBox.setText(CommonUIActionMessages.RevertGlobalActionHandler_messageBox_title);
-			messageBox.setMessage(message);
-
-			if (messageBox.open() == SWT.YES) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Casts or adapts the <code>workbenchPart</code> to an
-	 * <code>IRevertiblePart</code>, if possible.
-	 * 
-	 * @param workbenchPart
-	 *            the part
-	 * @return the <code>IRevertiblePart</code>, or <code>null</code> if
-	 *         the <code>workbenchPart</code> could not be adapted to an
-	 *         <code>IRevertiblePart</code>.
-	 */
-	private IRevertiblePart getRevertablePart(IWorkbenchPart workbenchPart) {
-
-		IRevertiblePart revertablePart = null;
-
-		if (workbenchPart != null) {
-
-			if (workbenchPart instanceof IRevertiblePart) {
-				revertablePart = (IRevertiblePart) workbenchPart;
-
-			} else {
-				revertablePart = (IRevertiblePart) workbenchPart
-					.getAdapter(IRevertiblePart.class);
-			}
-		}
-
-		return revertablePart;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionDebugOptions.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionDebugOptions.java
deleted file mode 100644
index cf7094b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionDebugOptions.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author ldamus
- *
- */
-public final class CommonUIActionDebugOptions {
-
-    /**
-     * This class should not be instantiated since it is a static constant
-     * class.
-     * 
-     */
-    private CommonUIActionDebugOptions() {
-		/* private constructor */
-	}
-    
-    /** Debug option. */
-    public static final String DEBUG = CommonUIActionPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-    /** Debug option to trace exception catching. */
-    public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-    
-    /** Debug option to trace exception throwing. */
-    public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-    /** Debug option to trace method entering. */
-    public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-    
-    /** Debug option to trace method exiting. */
-    public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionPlugin.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionPlugin.java
deleted file mode 100644
index 43d7a3e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionPlugin.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.common.ui.action.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CommonUIActionPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared instance.
-	 */
-	private static CommonUIActionPlugin INSTANCE;
-
-	/**
-	 * The constructor.
-	 */
-	public CommonUIActionPlugin() {
-		INSTANCE = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return a shared instance of <code>CommonUIActionPlugin</code>
-	 */
-	public static CommonUIActionPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionStatusCodes.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionStatusCodes.java
deleted file mode 100644
index 5589a85..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/CommonUIActionStatusCodes.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author ldamus
- *
- */
-public final class CommonUIActionStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonUIActionStatusCodes() {
-		/* private constructor */
-	}
-
-	/**
-	 * Status code indicating that everything is OK.
-	 */
-	public static final int OK = 0;
-
-	/**
-	 * Status code indicating that an error occurred during plug-in start-up.
-	 */
-	public static final int PLUGIN_STARTUP_FAILURE = 1;
-
-	/**
-	 * Status code indicating that an error occurred during plug-in shut-down.
-	 */
-	public static final int PLUGIN_SHUTDOWN_FAILURE = 2;
-
-	/**
-	 * Status code indicating that an error occurred with an action.
-	 */
-	public static final int ACTION_FAILURE = 3;
-
-	/**
-	 * Status code indicating that an error occurred with a service.
-	 */
-	public static final int SERVICE_FAILURE = 4;
-    
-    /**
-     * Status code indicating that an error occurred with a resource, such
-     * as loading an image file.
-     */
-    public static final int RESOURCE_FAILURE = 5;
-    
-    /**
-     * Status code indicating that a UI error occurred.
-     */
-    public static final int GENERAL_UI_FAILURE = 6;
-
-	/**
-	 * Status code warning that an exception was ignored
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 7;
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/IHelpContextIds.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/IHelpContextIds.java
deleted file mode 100644
index fa65d88..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/IHelpContextIds.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal;
-
-
-/**
- * Help context IDs for this plugin, org.eclipse.gmf.runtime.common.ui.action
- * 
- * @author Wayne Diu, wdiu
- */
-public interface IHelpContextIds {
-	
-	/**
-	 * Point to this until the help context id is receievd 
-	 */
-    public static final String PX_U_DEFAULT_CS_HELP = "org.eclipse.ui.help_contents_action_context"; //$NON-NLS-1$     
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java
deleted file mode 100644
index 3136f2f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global Close Action
- * 
- * @author Michael Yee
- */
-public class GlobalCloseAction extends GlobalAction {
-
-    /**
-     * Constructor for GlobalCloseAction
-     * @param workbenchPart The part associated with this action
-     */
-    public GlobalCloseAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-
-    /**
-     * @param workbenchPage
-     */
-    public GlobalCloseAction(IWorkbenchPage workbenchPage) {
-        super(workbenchPage);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-     */
-    public void init() {
-
-        // Set the id
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : getActionId());
-
-        // Set the label
-        setText(CommonUIActionMessages.GlobalCloseAction_label);
-
-        // Do not define image descriptors. The "Close" action does not have one.
-
-        // Set the context sensitive help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-        super.init();
-   }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.CLOSE;
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java
deleted file mode 100644
index 7247150..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global Copy Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalCopyAction extends GlobalAction {
-
-	/**
-	 * Action definition id of the copy action.
-	 */
-	private static final String COPY = "org.eclipse.gmf.runtime.common.ui.actions.global.copy"; //$NON-NLS-1$
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalCopyAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param workbenchPart the <code>IWorkbenchPart</code> associated with this action
-	 */
-	public GlobalCopyAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		/* set the id */
-		setId(
-			getWorkbenchActionConstant() != null
-				? getWorkbenchActionConstant()
-				: COPY);
-
-		/* set the label */
-		setText(CommonUIActionMessages.CopyAction_label);
-
-		/*  set the image */
-		ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-		setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		setHoverImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED));
-
-		/*  set the context sensitive help */
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.COPY;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		super.doRun(progressMonitor);
-
-		/* Flush the clipboard manager */
-		ClipboardManager.getInstance().flushCacheToClipboard();
-
-		/* Set the paste action enablement for this part */
-		GlobalAction paste =
-			GlobalActionManager.getInstance().getGlobalAction(
-				getWorkbenchPart(),
-				GlobalActionId.PASTE);
-		if (paste != null) {
-			paste.refresh();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java
deleted file mode 100644
index 84e063d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global Cut Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalCutAction extends GlobalAction {
-
-    /**
-     * Action definition id of the cut action.
-     */
-    private static final String CUT = "org.eclipse.gmf.runtime.common.ui.actions.global.cut"; //$NON-NLS-1$
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalCutAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-    /**
-     * @param workbenchPart
-     */
-    public GlobalCutAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init(){
-        /* set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : CUT);
-
-        /* set the label */
-        setText(CommonUIActionMessages.GlobalCutAction_label);
-
-        /*  set the image */
-        ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-        setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
-        setHoverImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
-        setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED));
-
-        /* set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.CUT;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-     */
-    protected void doRun(IProgressMonitor progressMonitor) {
-        super.doRun(progressMonitor);
-
-        /* Flush the clipboard manager */
-        ClipboardManager.getInstance().flushCacheToClipboard();
-
-        /* Set the paste action enablement for this part */
-        GlobalAction paste =
-            GlobalActionManager.getInstance().getGlobalAction(
-                getWorkbenchPart(),
-                GlobalActionId.PASTE);
-        if (paste != null) {
-            paste.refresh();
-        }
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java
deleted file mode 100644
index 8645b8b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global Delete Action
- * 
- * @author vramaswa
- */
-public final class GlobalDeleteAction extends GlobalAction {
-
-	/**
-	 * Action definition id of the delete action.
-	 */
-	private static final String DELETE = "org.eclipse.gmf.runtime.common.ui.actions.global.delete"; //$NON-NLS-1$
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalDeleteAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * @param workbenchPart
-	 */
-	public GlobalDeleteAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		/* Set the id */
-		setId(
-			getWorkbenchActionConstant() != null
-				? getWorkbenchActionConstant()
-				: DELETE);
-
-		/* Set the label */
-		setText(CommonUIActionMessages.GlobalDeleteAction_label);
-
-		/* Set the image */
-		ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-		setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-		setHoverImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-		setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
-
-		/* Set the context sensitive help */
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.DELETE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java
deleted file mode 100644
index fc2bf8d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global Find Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalFindAction extends GlobalAction {
-
-	/**
-	 * Action definition id of the find action.
-	 */
-	private static final String FIND = "org.eclipse.gmf.runtime.common.ui.actions.global.find"; //$NON-NLS-1$
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalFindAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * @param workbenchPart
-	 */
-	public GlobalFindAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		/* set the id */
-		setId(
-			getWorkbenchActionConstant() != null
-				? getWorkbenchActionConstant()
-				: FIND);
-
-		/* set the label */
-		setText(CommonUIActionMessages.GlobalFindAction_label);
-
-		/*  set the context sensitive help */
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.FIND;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#refresh()
-	 */
-	public void refresh() {
-		setEnabled(!getGlobalActionHandlerData().isEmpty());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java
deleted file mode 100644
index 2079e87..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionPluginImages;
-
-/**
- * Global Move Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalMoveAction extends GlobalAction {
-
-	/**
-	 * Action definition id of the move action.
-	 */
-	private static final String MOVE = "org.eclipse.gmf.runtime.common.ui.actions.global.move"; //$NON-NLS-1$
-
-	/**
-	 * Imagedescriptor for the move action
-	 */
-	private static final ImageDescriptor MOVE_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-		(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_MOVE_EDIT_ETOOL16);
-		
-	/**
-	 * Imagedescriptor for the move action
-	 */
-	private static final ImageDescriptor DISABLED_MOVE_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-		(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_MOVE_EDIT_DTOOL16);
-		
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalMoveAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * @param workbenchPart
-	 */
-	public GlobalMoveAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		/* set the id */
-		setId(
-			getWorkbenchActionConstant() != null
-				? getWorkbenchActionConstant()
-				: MOVE);
-
-		/* set the label */
-		setText(CommonUIActionMessages.GlobalMoveAction_label);
-
-		/*  set the image */
-		setImageDescriptor(MOVE_IMAGE);
-		setHoverImageDescriptor(MOVE_IMAGE);
-		setDisabledImageDescriptor(DISABLED_MOVE_IMAGE);
-
-		/*  set the context sensitive help */
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.MOVE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java
deleted file mode 100644
index 66a2e02..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/** 
- * Global Open Action - this action provides a global "open" type of action. 
- * 
- * <p>Typically, a double click on some UI representation for a document 
- * causes that document to be opened. In order to override the default 
- * double click behaviour, a contribution should be added for this "open" 
- * action and when the view/editor processes a double click, it should obtain 
- * this action from the Global Action Manager and call its run method to 
- * perform the desired navigation which in turn will call the appropriate 
- * global action handler.
- * 
- * @author Kevin Cornell
- */
-public final class GlobalOpenAction extends GlobalAction {
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalOpenAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-    /**
-     * @param workbenchPart
-     */
-    public GlobalOpenAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-        /* Set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : getActionId());
-
-        /* Set the label */
-        setText(CommonUIActionMessages.GlobalOpenAction_label);
-
-        /* Do not define image dewscriptors. The "Open" command does not have them. */
-
-        /* Set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-   }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.OPEN;
-    }
-
-    /**
-     * Returns the workbenchActionConstant. Since there is no equivalent workbench
-     * (retargetable) action for open, return NULL. This will prevent the global action
-     * manager from attempting to add this action to the part's action bars. 
-     * (see GlobalActionManager.setGlobalActionHandlers()). 
-     * 
-     * If a future version of Eclipse provides a retargetable "open" action, simply delete 
-     * this method from here and use the superclass method.
-     * 
-     * @return String
-     */
-    public String getWorkbenchActionConstant() {
-        return null;
-    }
-
-    /** 
-     * This method overrides the default run() method in AbstractActionHandler to prevent
-     * calls being made when in an invalid state. When a double click occurs, a workbench
-     * part should obtain this global action, and if enabled call this run() method. 
-     * However,  if this method is called when the action is not enabled, the corresponding
-     * action handlers could be in an invalid state. Therefore, only perform the run() if
-     * the action is enabled.
-     */
-    public void run() {
-        if (isEnabled()) {
-            super.run();
-        }
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPasteAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPasteAction.java
deleted file mode 100644
index b0444b5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPasteAction.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global Paste Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalPasteAction extends GlobalAction {
-
-    /**
-     * Action definition id of the paste action.
-     */
-    private static final String PASTE = "org.eclipse.gmf.runtime.common.ui.actions.global.paste"; //$NON-NLS-1$
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalPasteAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-    /**
-     * @param workbenchPart
-     */
-    public GlobalPasteAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-        /* set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : PASTE);
-
-        /* set the label */
-        setText(CommonUIActionMessages.GlobalPasteAction_label);
-
-        /* set the image */
-        ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-        setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-        setHoverImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-        setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED));
-
-        /* set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-        super.init();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.PASTE;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java
deleted file mode 100644
index 86c185e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global Properties Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalPropertiesAction extends GlobalAction {
-
-    /**
-     * Action definition id of the properties action.
-     */
-    private static final String PROPERTIES = "org.eclipse.gmf.runtime.common.ui.actions.global.properties"; //$NON-NLS-1$
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalPropertiesAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-
-    /**
-     * @param workbenchPart
-     */
-    public GlobalPropertiesAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-	    /* set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : PROPERTIES);
-
-        /* set the label */
-        setText(CommonUIActionMessages.GlobalPropertiesAction_label);
-
-        /*  set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.PROPERTIES;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java
deleted file mode 100644
index 56128d1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionPluginImages;
-
-/**
- * Global Refresh Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalRefreshAction extends GlobalAction {
-
-    /**
-     * Action definition id of the REFRESH action.
-     */
-    private static final String REFRESH = "org.eclipse.gmf.runtime.common.ui.actions.global.refresh"; //$NON-NLS-1$
-
-    /**
-     * Imagedescriptor for the REFRESH action
-     */
-    private static final ImageDescriptor REFRESH_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-    	(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_REFRESH_NAV_ETOOL16);
-    
-    /**
-     * Imagedescriptor for the REFRESH action
-     */
-    private static final ImageDescriptor DISABLED_REFRESH_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-    	(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_REFRESH_NAV_DTOOL16);
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalRefreshAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-
-    /**
-     * @param workbenchPart
-     */
-    public GlobalRefreshAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-	    /* set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : REFRESH);
-
-        /* set the label */
-        setText(CommonUIActionMessages.GlobalRefreshAction_label);
-
-        /*  set the image */
-        setImageDescriptor(REFRESH_IMAGE);
-        setHoverImageDescriptor(REFRESH_IMAGE);
-        setDisabledImageDescriptor(DISABLED_REFRESH_IMAGE);
-
-        /*  set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.REFRESH;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java
deleted file mode 100644
index 74ab789..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionPluginImages;
-
-/**
- * Global Rename Action
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalRenameAction extends GlobalAction {
- 
-    /**
-     * Action definition id of the rename action.
-     */
-    private static final String RENAME = "org.eclipse.gmf.runtime.common.ui.actions.global.rename"; //$NON-NLS-1$
-
-    /**
-     * Imagedescriptor for the rename action
-     */
-    private static final ImageDescriptor RENAME_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-    	(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_RENAME_EDIT_ETOOL16);
-
-    /**
-     * Imagedescriptor for the rename action
-     */
-    private static final ImageDescriptor DISABLED_RENAME_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-    	(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_RENAME_EDIT_DTOOL16);
-    
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalRenameAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-    /**
-     * @param workbenchPart
-     */
-    public GlobalRenameAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-	    /* set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : RENAME);
-
-        /* set the label */
-        setText(CommonUIActionMessages.GlobalRenameAction_label);
-
-        /*  set the image */
-        setImageDescriptor(RENAME_IMAGE);
-        setHoverImageDescriptor(RENAME_IMAGE);
-        setDisabledImageDescriptor(DISABLED_RENAME_IMAGE);
-
-        /*  set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.RENAME;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRevertAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRevertAction.java
deleted file mode 100644
index 721ed89..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRevertAction.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.ISaveablePart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global action for the retargetable "REVERT" action.
- * 
- * @author ldamus
- */
-public class GlobalRevertAction
-	extends GlobalAction {
-
-	/**
-	 * Action definition id of the REVERT action.
-	 */
-	private static final String REVERT = "org.eclipse.gmf.runtime.common.ui.actions.global.revert"; //$NON-NLS-1$
-
-	/**
-	 * Constructs a new action instance.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page
-	 */
-	public GlobalRevertAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Constructs a new action instance.
-	 * 
-	 * @param workbenchPart
-	 *            the workbench part
-	 */
-	public GlobalRevertAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.REVERT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.global.GlobalAction#init()
-	 */
-	public void init() {
-
-		// Set the ID
-		setId(getWorkbenchActionConstant() != null ? getWorkbenchActionConstant()
-			: REVERT);
-
-		// Set the label
-		setText(CommonUIActionMessages.GlobalRevertAction_label);
-
-		super.init();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.AbstractActionHandler#isPropertyListener()
-	 */
-	protected boolean isPropertyListener() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IPropertyListener#propertyChanged(java.lang.Object,
-	 *      int)
-	 */
-	public void propertyChanged(Object source, int propId) {
-		if (propId == ISaveablePart.PROP_DIRTY) {
-			refresh();
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java
deleted file mode 100644
index 125bdb1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.CommonUIActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionPluginImages;
-
-/**
- * Global Save Action
- * 
- * @author vramaswa
- */
-public final class GlobalSaveAction extends GlobalAction {
-
-	/**
-	 * Action definition id of the save action.
-	 */
-	private static final String SAVE = "org.eclipse.gmf.runtime.common.ui.actions.global.save"; //$NON-NLS-1$
-
-	/**
-	 * Imagedescriptor for the save action
-	 */
-	private static final ImageDescriptor SAVE_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-		(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_SAVE_EDIT_ETOOL16);
-		
-	/**
-	 * Imagedescriptor for the save action
-	 */
-	private static final ImageDescriptor DISABLED_SAVE_IMAGE = CommonUIActionPlugin.imageDescriptorFromPlugin
-		(CommonUIActionPlugin.getPluginId(), CommonUIActionPluginImages.IMG_SAVE_EDIT_DTOOL16);
-	
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalSaveAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-
-	/**
-	 * @param workbenchPart
-	 */
-	public GlobalSaveAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		/* Set the id */
-		setId(
-			getWorkbenchActionConstant() != null
-				? getWorkbenchActionConstant()
-				: SAVE);
-
-		/* Set the label */
-		setText(CommonUIActionMessages.GlobalSaveAction_label);
-
-		/* Set the image */
-		setImageDescriptor(SAVE_IMAGE);
-		setHoverImageDescriptor(SAVE_IMAGE);
-		setDisabledImageDescriptor(DISABLED_SAVE_IMAGE);
-
-		/* Set the context sensitive help */
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-	 */
-	public String getActionId() {
-		return GlobalActionId.SAVE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java
deleted file mode 100644
index 4a7794f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.actions.global;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds;
-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages;
-
-/**
- * Global SelectAll Action
- * 
- * @author vramaswa
- */
-public final class GlobalSelectAllAction extends GlobalAction {
- 
-    /**
-     * Action definition id of the select all action.
-     */
-    private static final String SELECT_ALL = "org.eclipse.gmf.runtime.common.ui.actions.global.selectAll"; //$NON-NLS-1$
-
-	/**
-	 * @param workbenchPage
-	 */
-	public GlobalSelectAllAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-    /**
-     * Constructor for GlobalSelectAllAction.
-     * @param workbenchPart
-     */
-    public GlobalSelectAllAction(IWorkbenchPart workbenchPart) {
-        super(workbenchPart);
-    }
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-        /* Set the id */
-        setId(
-            getWorkbenchActionConstant() != null
-                ? getWorkbenchActionConstant()
-                : SELECT_ALL);
-
-        /* Set the label */
-        setText(CommonUIActionMessages.SelectAllAction_label);
-
-        /* Set the context sensitive help */
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP);
-		
-		super.init();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.action.internal.global.GlobalAction#getActionId()
-     */
-    public String getActionId() {
-        return GlobalActionId.SELECT_ALL;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/global/GlobalActionHandlerData.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/global/GlobalActionHandlerData.java
deleted file mode 100644
index fa02c8c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/global/GlobalActionHandlerData.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.internal.global;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-
-/**
- * A tuple that contains the <code>IGlobalActionHandler</code> and its
- * associated <code>IGlobalActionContext</code>
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalActionHandlerData {
-
-    /**
-     * Attribute for the handler
-     */
-    final private IGlobalActionHandler handler;
-
-    /**
-     * Attribute for the context
-     */
-    final private IGlobalActionContext context;
-
-    /**
-     * Constructor for GlobalActionHandlerData.
-     * 
-     * @param handler attribute for the context
-     * @param context attribute for the handler
-     */
-    public GlobalActionHandlerData(
-        IGlobalActionHandler handler,
-        IGlobalActionContext context) {
-        super();
-
-        assert null != handler;
-        assert null != context;
-
-        this.handler = handler;
-        this.context = context;
-    }
-
-    /**
-     * Returns the handler.
-     * @return IGlobalActionHandler
-     */
-    public IGlobalActionHandler getHandler() {
-        return handler;
-    }
-
-    /**
-     * Returns the context.
-     * @return IGlobalActionContext
-     */
-    public IGlobalActionContext getContext() {
-        return context;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionMessages.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionMessages.java
deleted file mode 100644
index 61b8d9a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionMessages.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.common.ui.action.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CommonUIActionMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUIActionMessages";//$NON-NLS-1$
-
-	private CommonUIActionMessages() {
-		// Do not instantiate
-	}
-
-	public static String GlobalCloseAction_label;
-	public static String CopyAction_label;
-	public static String GlobalCutAction_label;
-	public static String GlobalDeleteAction_label;
-	public static String GlobalRedoAction_label;
-	public static String GlobalUndoAction_label;
-	public static String GlobalRedoAction_formattedLabel;
-	public static String GlobalUndoAction_formattedLabel;
-	public static String GlobalFindAction_label;
-	public static String GlobalMoveAction_label;
-	public static String GlobalOpenAction_label;
-	public static String GlobalPasteAction_label;
-	public static String GlobalPrintAction_label;
-	public static String GlobalPropertiesAction_label;
-	public static String GlobalRefreshAction_label;
-	public static String GlobalRevertAction_label;
-	public static String GlobalRenameAction_label;
-	public static String GlobalSaveAction_label;
-	public static String SelectAllAction_label;
-	public static String RevertGlobalActionHandler_messageBox_title;
-	public static String RevertGlobalActionHandler_messageBox_message;
-	public static String RevertGlobalActionHandler_messageBox_prompt;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonUIActionMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionMessages.properties b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionMessages.properties
deleted file mode 100644
index ef9f0fd..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionMessages.properties
+++ /dev/null

@@ -1,43 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Global Action Labels - Translation Instruction: section to be translated
-# ==============================================================================
-GlobalCloseAction_label=&Close
-CopyAction_label=Copy
-GlobalCutAction_label=Cut
-GlobalDeleteAction_label=&Delete
-GlobalRedoAction_label=&Redo
-GlobalUndoAction_label=&Undo
-GlobalRedoAction_formattedLabel=&Redo {0}
-GlobalUndoAction_formattedLabel=&Undo {0}
-GlobalFindAction_label=Find/Repla&ce...
-GlobalMoveAction_label=Mo&ve...
-GlobalOpenAction_label=&Open
-GlobalPasteAction_label=Paste
-GlobalPrintAction_label=&Print...
-GlobalPropertiesAction_label=P&roperties
-GlobalRefreshAction_label=Refresh
-GlobalRevertAction_label=Rever&t
-GlobalRenameAction_label=Rena&me...
-GlobalSaveAction_label=&Save
-SelectAllAction_label=Select All
-
-# The string for the prompt dialog shown when reverting to the last saved version of a
-# saveable workbench part
-# ================================ BEGIN ==================================================
-RevertGlobalActionHandler_messageBox_title=Revert
-RevertGlobalActionHandler_messageBox_message=Unsaved changes will be lost.
-RevertGlobalActionHandler_messageBox_prompt=Are you sure that you want to revert to the last saved version?
-# ==================================== END =================================================

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionPluginImages.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionPluginImages.java
deleted file mode 100644
index 6ce1723..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionPluginImages.java
+++ /dev/null

@@ -1,34 +0,0 @@
-package org.eclipse.gmf.runtime.common.ui.action.internal.l10n;
-
-/**
- * Bundle of all images used by the org.eclipse.gmf.runtime.common.ui.action plugin.
- */
-public class CommonUIActionPluginImages {
-
-	// Prefixes
-	private static final String PREFIX_FULL_ETOOL16 = "icons/full/etool16/"; //$NON-NLS-1$
-	private static final String PREFIX_FULL_DTOOL16 = "icons/full/dtool16/"; //$NON-NLS-1$
-
-	// Note: The following images will eventually become available in org.eclipse.ui.ISharedImages
-	// See Bugzilla 115551
-	
-	// Images for print action
-	public static final String IMG_PRINT_EDIT_ETOOL16 = PREFIX_FULL_ETOOL16 + "print_edit.gif"; //$NON-NLS-1$
-	public static final String IMG_PRINT_EDIT_DTOOL16 = PREFIX_FULL_DTOOL16 + "print_edit.gif"; //$NON-NLS-1$
-	
-	// Images for move action
-	public static final String IMG_MOVE_EDIT_ETOOL16 = PREFIX_FULL_ETOOL16 + "move_edit.gif"; //$NON-NLS-1$
-	public static final String IMG_MOVE_EDIT_DTOOL16 = PREFIX_FULL_DTOOL16 + "move_edit.gif"; //$NON-NLS-1$
-
-	// Images for rename action
-	public static final String IMG_RENAME_EDIT_ETOOL16 = PREFIX_FULL_ETOOL16 + "rename_edit.gif"; //$NON-NLS-1$
-	public static final String IMG_RENAME_EDIT_DTOOL16 = PREFIX_FULL_DTOOL16 + "rename_edit.gif"; //$NON-NLS-1$
-	
-	// Images for save action
-	public static final String IMG_SAVE_EDIT_ETOOL16 = PREFIX_FULL_ETOOL16 + "save_edit.gif"; //$NON-NLS-1$
-	public static final String IMG_SAVE_EDIT_DTOOL16 = PREFIX_FULL_DTOOL16 + "save_edit.gif"; //$NON-NLS-1$
-	
-	// Images for refresh action
-	public static final String IMG_REFRESH_NAV_ETOOL16 = PREFIX_FULL_ETOOL16 + "refresh_nav.gif"; //$NON-NLS-1$
-	public static final String IMG_REFRESH_NAV_DTOOL16 = PREFIX_FULL_DTOOL16 + "refresh_nav.gif"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/package.html b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/package.html
deleted file mode 100644
index 0213980..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/package.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes to manage the string, image, font and cursor resources for 
-the org.eclipse.gmf.runtime.common.ui.action plugin.</p>
-
-<p>Messages and labels on GUI components that need to be localized (adapted 
-for a specific region or language) should be placed in the <code>messages.properties</code>
-file in this package.</p>
-
-<p>Classes in the org.eclipse.gmf.runtime.common.ui.action plugin should use the 
-{@link org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager} class to 
-access to the I18N resources that is needs.</p>
-
-
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.action.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/package.html b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/package.html
deleted file mode 100644
index 0678d50..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/package.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes to manage the org.eclipse.gmf.runtime.common.ui.action plugin,
-including debug options and status codes for logging and tracing.</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.action.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/util/SelectionUtil.java b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/util/SelectionUtil.java
deleted file mode 100644
index d732437..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/util/SelectionUtil.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.action.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.util.IInlineTextEditorPart;
-
-/**
- * This class provides selection utility methods.
- * 
- * @author dmisic
- */
-public class SelectionUtil {
-
-	/**
-	 * This class should not be instantiated since it provides static utility
-	 * methods.
-	 */
-	private SelectionUtil() {
-		super();
-	}
-
-	/**
-	 * Attempts to select and reveal the specified object in all parts within
-	 * the supplied workbench window's active page. Checks all parts in the
-	 * active page to see if they implement <code>ISetSelectionTarget</code>,
-	 * either directly or as an adapter. If so, tells the part to select and
-	 * reveal the specified resource.
-	 * 
-	 * @param obj
-	 *            The object to be selected and revealed
-	 * @param window
-	 *            The workbench window to select and reveal the resource
-	 * 
-	 * @see ISetSelectionTarget
-	 */
-	public static void selectAndReveal(Object obj, IWorkbenchWindow window) {
-
-		// validate the input
-		if (window == null || obj == null)
-			return;
-		IWorkbenchPage page = window.getActivePage();
-		if (page == null)
-			return;
-
-		// get all the view and editor parts
-		List parts = new ArrayList();
-		IWorkbenchPartReference refs[] = page.getViewReferences();
-		for (int i = 0; i < refs.length; i++) {
-			IWorkbenchPart part = refs[i].getPart(false);
-			if (part != null)
-				parts.add(part);
-		}
-		refs = page.getEditorReferences();
-		for (int i = 0; i < refs.length; i++) {
-			IWorkbenchPart part = refs[i].getPart(false);
-			if (part != null)
-				parts.add(part);
-		}
-
-		final ISelection selection = new StructuredSelection(obj);
-		Iterator it = parts.iterator();
-		while (it.hasNext()) {
-			IWorkbenchPart part = (IWorkbenchPart) it.next();
-
-			// get the part's ISetSelectionTarget implementation
-			ISetSelectionTarget target = null;
-			if (part instanceof ISetSelectionTarget)
-				target = (ISetSelectionTarget) part;
-			else
-				target = (ISetSelectionTarget) part
-					.getAdapter(ISetSelectionTarget.class);
-
-			if (target != null) {
-				// select and reveal resource
-				final ISetSelectionTarget finalTarget = target;
-				window.getShell().getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						finalTarget.selectReveal(selection);
-					}
-				});
-			}
-		}
-	}
-	
-	/**
-	 * Tries to get an IInlineTextEditorPart from the part parameter.
-	 * It checks to see if the part implements the IInlineTextEditorPart
-	 * interface, and if not, it will try to use the IAdaptable mechanism 
-	 * to ask for an IInlineTextEditorPart
-	 *  
-	 * @param part the part to extract IInlineTextEditorPart from
-	 * @return IInlineTextEditorPart if possible or null
-	 */
-	private static IInlineTextEditorPart getInlineTextEditorPart(
-			IWorkbenchPart part) {
-		if (part instanceof IInlineTextEditorPart) {
-			return (IInlineTextEditorPart) part;
-		} else {
-			return (IInlineTextEditorPart) ((IAdaptable) part)
-				.getAdapter(IInlineTextEditorPart.class);
-		}
-	}
-
-	/**
-	 * Select, reveal and start inline editing on the new element, if
-	 * appropriate.
-	 * 
-	 * @param part
-	 *            the workbench part in which to start the inline editing
-	 * @param newElement
-	 *            the new element
-	 */
-	public static void startInlineEdit(final IWorkbenchPart part,
-			final Object newElement) {
-		//Run the select and reveal and inline-editor bits asynchronously
-		// to ensure that the content provider has had a chance to receive
-		// the event notification that a new element was added to the model.
-		// Otherwise, the element will not be found in the select/reveal and
-		// the inline editor will not be able to start on the new element.		
-		part.getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-			public void run() {
-				IInlineTextEditorPart inlineTextEditorPart = getInlineTextEditorPart(part);
-				if (inlineTextEditorPart != null) {
-					inlineTextEditorPart.startInlineEdit(newElement);
-				} else {
-					//original impl.
-					if (part instanceof ISetSelectionTarget) {
-						((ISetSelectionTarget) part)
-							.selectReveal(new StructuredSelection(newElement));
-					}
-					if (part instanceof IInlineTextEditorPart) {
-						((IInlineTextEditorPart) part).startInlineEdit();
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * Select, reveal and start renaming the new element, if appropriate.
-	 * 
-	 * @param part
-	 *            the workbench part in which to start the global rename action
-	 * @param newElement
-	 *            the new element
-	 */
-	public static void startRename(final IWorkbenchPart part,
-			final Object newElement) {
-		// Run the select and rename asynchronously
-		// to ensure that the content provider has had a chance to receive
-		// the event notification that a new element was added to the model.
-		// Otherwise, the element will not be found in the select/reveal.
-		part.getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-			public void run() {
-				IInlineTextEditorPart inlineTextEditorPart = getInlineTextEditorPart(part);
-				if (inlineTextEditorPart != null) {
-					inlineTextEditorPart.startInlineEdit(newElement,
-						new Runnable() {
-
-							public void run() {
-								GlobalAction renameAction = GlobalActionManager
-									.getInstance().getGlobalAction(part,
-										GlobalActionId.RENAME);
-								if ((renameAction != null)
-									&& (renameAction.isRunnable())) {
-									renameAction.run();
-								}
-							}
-						});
-				} else {
-					//original impl.
-					if (part instanceof ISetSelectionTarget) {
-						((ISetSelectionTarget) part)
-							.selectReveal(new StructuredSelection(newElement));
-					}
-					GlobalAction renameAction = GlobalActionManager
-						.getInstance().getGlobalAction(part,
-							GlobalActionId.RENAME);
-					if ((renameAction != null) && (renameAction.isRunnable())) {
-						renameAction.run();
-					}
-				}
-			}
-		});
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/util/package.html b/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/util/package.html
deleted file mode 100644
index c15225f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/util/package.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes that help in using the modeling platform actions.</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/.classpath b/org.eclipse.gmf.runtime.common.ui.printing.win32/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.ui.printing.win32/.cvsignore b/org.eclipse.gmf.runtime.common.ui.printing.win32/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/.project b/org.eclipse.gmf.runtime.common.ui.printing.win32/.project
deleted file mode 100644
index 28538fa..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.printing.win32</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.common.ui.printing.win32/.template b/org.eclipse.gmf.runtime.common.ui.printing.win32/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.aps
deleted file mode 100644
index 094c698..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.bat b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.bat
deleted file mode 100644
index 93d1912..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.bat
+++ /dev/null

@@ -1,4 +0,0 @@
-set PATH=C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin;%PATH%

-call VCVARS32.BAT

-echo "Building Print Component"

-msdev DiagramPrint.dsw /MAKE ALL /REBUILD


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.clw b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.clw
deleted file mode 100644
index 6cd698f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.clw
+++ /dev/null

@@ -1,110 +0,0 @@
-; CLW file contains information for the MFC ClassWizard

-

-[General Info]

-Version=1

-ClassCount=1

-Class1=CDiagramPrintApp

-LastClass=CDiagramPrintApp

-NewFileInclude2=#include "DiagramPrint.h"

-ResourceCount=3

-NewFileInclude1=#include "stdafx.h"

-Resource1=1538

-Resource2=1539

-Resource3=1546

-

-[CLS:CDiagramPrintApp]

-Type=0

-HeaderFile=DiagramPrint.h

-ImplementationFile=DiagramPrint.cpp

-Filter=N

-LastObject=CDiagramPrintApp

-

-[DLG:1538]

-Type=1

-Class=?

-ControlCount=28

-Control1=1075,button,1342308359

-Control2=1093,static,1342308352

-Control3=1139,combobox,1344471299

-Control4=1025,button,1342373888

-Control5=1095,static,1342308480

-Control6=1099,static,1342308492

-Control7=1094,static,1342308480

-Control8=1098,static,1342308492

-Control9=1097,static,1342308480

-Control10=1101,static,1342308492

-Control11=1096,static,1342308480

-Control12=1100,static,1342308492

-Control13=1040,button,1342373891

-Control14=1072,button,1342308359

-Control15=1056,button,1342373897

-Control16=1058,button,1342177289

-Control17=1057,button,1342177289

-Control18=1089,static,1342308354

-Control19=1152,edit,1350770688

-Control20=1090,static,1342308354

-Control21=1153,edit,1350770688

-Control22=1073,button,1342308359

-Control23=1092,static,1342308352

-Control24=1154,edit,1350770688

-Control25=1086,static,1342308867

-Control26=1041,button,1342373891

-Control27=IDOK,button,1342373889

-Control28=IDCANCEL,button,1342242816

-

-[DLG:1539]

-Type=1

-Class=?

-ControlCount=23

-Control1=1075,button,1342308359

-Control2=1093,static,1342308352

-Control3=1136,combobox,1344471299

-Control4=1025,button,1342373888

-Control5=1095,static,1342308480

-Control6=1099,static,1342308492

-Control7=1094,static,1342308480

-Control8=1098,static,1342308492

-Control9=1097,static,1342308480

-Control10=1101,static,1342308492

-Control11=1096,static,1342308480

-Control12=1100,static,1342308492

-Control13=1073,button,1342308359

-Control14=1089,static,1342308352

-Control15=1137,combobox,1344471299

-Control16=1090,static,1342308352

-Control17=1138,combobox,1344471299

-Control18=1072,button,1342308359

-Control19=1084,static,1342308355

-Control20=1056,button,1342373897

-Control21=1057,button,1342177289

-Control22=IDOK,button,1342373889

-Control23=IDCANCEL,button,1342242816

-

-[DLG:1546]

-Type=1

-Class=?

-ControlCount=23

-Control1=1080,static,1342308358

-Control2=1081,static,1342308357

-Control3=1082,static,1342308357

-Control4=1073,button,1342308359

-Control5=1089,static,1342308352

-Control6=1137,combobox,1344471299

-Control7=1090,static,1342308352

-Control8=1138,combobox,1344471299

-Control9=1072,button,1342308359

-Control10=1056,button,1342373897

-Control11=1057,button,1342177289

-Control12=1075,button,1342308359

-Control13=1102,static,1342308352

-Control14=1155,edit,1350762496

-Control15=1103,static,1342308352

-Control16=1157,edit,1350762496

-Control17=1104,static,1342308352

-Control18=1156,edit,1350762496

-Control19=1105,static,1342308352

-Control20=1158,edit,1350762496

-Control21=IDOK,button,1342373889

-Control22=IDCANCEL,button,1342242816

-Control23=1026,button,1342242816

-


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.cpp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.cpp
deleted file mode 100644
index 9a619c9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.cpp
+++ /dev/null

@@ -1,644 +0,0 @@
-//*****************************************************************************
-//
-//	File:		DiagramPrint.cpp
-//
-//	Purpose:	Defines the initialization routines for the DLL.
-//				In DiagramPrint.rc, you may have to change the icon line to				
-//				ICON            "",1086,156,290,70,25,WS_GROUP
-//
-//	Author:		Wayne Diu, wdiu
-//
-//				
-// Copyright (c) 2002 - 2005 IBM Corporation and others.
-// 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:
-//    IBM Corporation - initial API and implementation 
-//
-//******************************************************************************
-
-#include "stdafx.h"
-#include "DiagramPrint.h"
-#include "WinPrintHelper.h"
-#include <Afxtempl.h>
-
-#define IDD_MODELER_PRINT_DIALOG 1538
-#define IDD_MODELER_PRINT_DIALOG_RTL 1547
-#define IDC_COLLATE 1041
-#define IDC_COPIES 1154
-#define IDC_PRINT_RANGE_ALL 1056
-#define IDC_PRINT_RANGE_PAGES 1058
-#define IDC_PRINT_RANGE_PAGES_START 1152
-#define IDC_PRINT_RANGE_PAGES_END 1153
-#define IDPROPERTIES 1025
-//#include "Windows.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-//
-//	Note!
-//
-//		If this DLL is dynamically linked against the MFC
-//		DLLs, any functions exported from this DLL which
-//		call into MFC must have the AFX_MANAGE_STATE macro
-//		added at the very beginning of the function.
-//
-//		For example:
-//
-//		extern "C" BOOL PASCAL EXPORT ExportedFunction()
-//		{
-//			AFX_MANAGE_STATE(AfxGetStaticModuleState());
-//			// normal function body here
-//		}
-//
-//		It is very important that this macro appear in each
-//		function, prior to any calls into MFC.  This means that
-//		it must appear as the first statement within the 
-//		function, even before any object variable declarations
-//		as their constructors may generate calls into the MFC
-//		DLL.
-//
-//		Please see MFC Technical Notes 33 and 58 for additional
-//		details.
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CDiagramPrintApp
-
-BEGIN_MESSAGE_MAP(CDiagramPrintApp, CWinApp)
-	//{{AFX_MSG_MAP(CDiagramPrintApp)
-		// NOTE - the ClassWizard will add and remove mapping macros here.
-		//    DO NOT EDIT what you see in these blocks of generated code!
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CDiagramPrintApp construction
-
-CDiagramPrintApp::CDiagramPrintApp()
-{
-	// TODO: add construction code here,
-	// Place all significant initialization in InitInstance
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only CDiagramPrintApp object
-CDiagramPrintApp theApp;
-PRINTDLG pd;
-
-//struct for stored values
-class DiagramListItem {
-public :
-	CString string;
-	bool selected;
-};
-
-//constants
-const int WS_EX_LAYOUTRTL	= 0x00400000;
-const int LAYOUT_RTL		= 0x00000001;
-
-
-//stored values
-CList<DiagramListItem, DiagramListItem> diagramListItems;
-UINT uiPercent = 100, uiPagesM = 1, uiPagesN = 1, uiCopies = 1, uiPagesFrom = 1, uiPagesTo = 0;
-bool bPrintRangeAll = false, bPrintRangePages = false;
-bool bDiagramPrintRangeAll = false, bDiagramPrintRangeCurrent = false, bDiagramPrintRangeSelection = false;
-bool bCollate = false;
-bool bLandscape = false;
-int  paperSizeIndex = 0; //see PageSetupPageType for page types
-short paperWidth = 0, paperLength = 0; //for user defined paper size
-
-//true when the dialog has been initialized.
-bool bInitialized = false;
-
-//controls
-CListBox *pDiagrams = NULL;
-
-//controls as windows
-HWND hAll = NULL, hCurrent = NULL, hSelection = NULL, hDiagrams = NULL, hPages = NULL, hPagesM = NULL, hPagesN = NULL, hPercent = NULL, hPercentVal = NULL;
-HWND hPRAll = NULL, hPRPages = NULL, hPRPagesStart = NULL, hPRPagesEnd = NULL;
-HWND hwndOwner = NULL;
-
-//Helper for converting jstring to wchar_t
-wchar_t * convert(JNIEnv * env, jstring s) {
-	//get the string and its length into original and len
-	const jchar * original = env->GetStringChars(s, 0);
-	const jsize len = env->GetStringLength(s);
-
-	//allocate extra one for the null
-	wchar_t * converted = new wchar_t[len+1];
-
-	//copy from original into converted
-	memcpy(converted, original, sizeof(wchar_t)*len);
-	env->ReleaseStringChars(s, original);
-
-	//null terminate it
-	converted[len] = 0;
-
-	return converted;
-}
-
-
-//Enable the print range
-//Set enable to true to enable the print range, false to disable it.
-void enablePrintRange(boolean enable = true) {
-	EnableWindow(hPRAll, enable);
-	EnableWindow(hPRPages, enable);
-	EnableWindow(hPRPagesStart, enable);
-	EnableWindow(hPRPagesEnd, enable);
-}
-
-//Enable the print range if only one diagram is selected
-void enableDiagramPrintRangeSelectionIfOnlyOneDiagramIsSelected() {
-	if (IsWindowEnabled(hSelection)) {
-		if (pDiagrams->GetSelCount() == 1) {
-			enablePrintRange();
-			return;
-		}
-	}
-	enablePrintRange(false);
-}
-
-//The print hook for the Windows print dialog template.
-//Contains methods to check for messages when the user clicks
-//on controls including the OK button.
-UINT APIENTRY PrintHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) {
-	if (uiMsg == WM_INITDIALOG) {
-		//save all, current, selection as hwnds
-		hAll = GetDlgItem(hdlg, IDC_ALL_DIAGRAMS);
-		ASSERT(hAll);
-		hCurrent = GetDlgItem(hdlg, IDC_CURRENT_DIAGRAM);
-		ASSERT(hCurrent);
-		hSelection = GetDlgItem(hdlg, IDC_SELECTED_DIAGRAMS);
-		ASSERT(hSelection);
-		hPercent = GetDlgItem(hdlg, IDC_SCALE_PERCENT);
-		ASSERT(hPercent);
-		hPages = GetDlgItem(hdlg, IDC_SCALE_FIT);
-		ASSERT(hPages);
-		hPercentVal = GetDlgItem(hdlg, IDC_PERCENT);
-		ASSERT(hPercentVal);
-		hPagesM = GetDlgItem(hdlg, IDC_PAGESM);
-		ASSERT(hPagesM);
-		hPagesN = GetDlgItem(hdlg, IDC_PAGESN);
-		ASSERT(hPagesN);
-
-		hPRAll = GetDlgItem(hdlg, IDC_PRINT_RANGE_ALL);
-		ASSERT(hPRAll);
-		hPRPages = GetDlgItem(hdlg, IDC_PRINT_RANGE_PAGES);
-		ASSERT(hPRPages);
-		hPRPagesStart = GetDlgItem(hdlg, IDC_PRINT_RANGE_PAGES_START);
-		ASSERT(hPRPagesStart);
-		hPRPagesEnd = GetDlgItem(hdlg, IDC_PRINT_RANGE_PAGES_END);
-		ASSERT(hPRPagesEnd);
-
-		//diagrams print range group
-
-		//select current diagram
-		CheckDlgButton(hdlg, IDC_CURRENT_DIAGRAM, true);
-
-		//diagrams listbox
-		CWnd *wnd = CWnd::FromHandle(hdlg);
-		pDiagrams = (CListBox*) wnd->GetDlgItem(IDC_DIAGRAMS);
-		ASSERT(pDiagrams);
-		hDiagrams = GetDlgItem(hdlg, IDC_DIAGRAMS);
-		ASSERT(hDiagrams);
-
-		//clear first, but should have nothing
-		for (int i = 0; i < pDiagrams->GetCount(); i++) {
-			pDiagrams->DeleteString(i);
-		}
-
-		//go through CList of diagram CStrings and add it
-		
-		// Make sure to handle width settings or there won't be a horizontal scorllbar
-		CClientDC dc(pDiagrams);
-		CFont* font = pDiagrams->GetFont();
-		dc.SelectObject(font);
-		CSize sz;
-		int width = 0;
-		for (i = 0; i < diagramListItems.GetCount(); i++) {
-			pDiagrams->AddString(diagramListItems.GetAt(diagramListItems.FindIndex(i)).string);
-     
-			sz = dc.GetTextExtent(diagramListItems.GetAt(diagramListItems.FindIndex(i)).string, _tcslen(diagramListItems.GetAt(diagramListItems.FindIndex(i)).string));
-			sz.cx += 3 * ::GetSystemMetrics(SM_CXBORDER);
-			if(sz.cx > width) { 
-				// Extend 
-				width = sz.cx;
-				pDiagrams->SetHorizontalExtent(width);
-			} 
-		}
-
-		//disable listbox since all is selected first
-		EnableWindow(hDiagrams, false);
-
-		//enable print range group since current diagram is selected
-		enablePrintRange(true);
-
-		//scaling group
-
-		//set perecent to 100
-		SetDlgItemInt(hdlg, IDC_PERCENT, uiPercent, false);
-
-		//set fit to pages to 1
-		SetDlgItemInt(hdlg, IDC_PAGESM, uiPagesM, false);
-		SetDlgItemInt(hdlg, IDC_PAGESN, uiPagesN, false);
-
-		//select the uiPercent radio button
-		CheckDlgButton(hdlg, IDC_SCALE_PERCENT, true);
-
-		//disable pages since uiPercent is selected first
-		EnableWindow(hPagesM, false);
-		EnableWindow(hPagesN, false);
-
-		//Even though something may fail, I will set initialized to true
-		//because I will have asserted.  If I only set initialized to true
-		//when all ASSERTs are OK, then I may prevent other code from running
-		//at all which is worse than running with some errors.
-		bInitialized = true;
-
-    }
-	else if (uiMsg == WM_COMMAND) { //user did something
-		if (HIWORD(wParam) == BN_CLICKED) {
-			ASSERT(bInitialized);
-			//you shouldn't need reinterpret_cast, but I am making it explicit
-			if ((reinterpret_cast<HWND>(lParam)) == GetDlgItem(hdlg, IDOK)) {
-				//OK pressed here.  I can save the values that I cannot retrieve from
-				//the PRINTDLG structured that's filled in for me.
-				//These are custom vals.
-
-				//save Print Range values
-				bDiagramPrintRangeAll = IsDlgButtonChecked(hdlg, IDC_ALL_DIAGRAMS);
-				bDiagramPrintRangeCurrent = IsDlgButtonChecked(hdlg, IDC_CURRENT_DIAGRAM);
-				bDiagramPrintRangeSelection = IsDlgButtonChecked(hdlg, IDC_SELECTED_DIAGRAMS);
-
-				//save the Scaling values
-				if (IsDlgButtonChecked(hdlg, IDC_SCALE_PERCENT)) {
-					uiPercent = GetDlgItemInt(hdlg, IDC_PERCENT, false, false);
-					if (uiPercent == 0) { //failure or 0
-						uiPercent = 100;
-					}
-					uiPagesM = -1;
-					uiPagesN = -1;
-				}
-				else { //IDC_SCALE_FIT
-					uiPercent = -1;
-					uiPagesM = GetDlgItemInt(hdlg, IDC_PAGESM, false, false);
-					if (uiPagesM == 0) { //failure or 0
-						uiPagesM = 1;
-					}
-					uiPagesN = GetDlgItemInt(hdlg, IDC_PAGESN, false, false);
-					if (uiPagesN == 0) { //failure or 0
-						uiPagesN = 1;
-					}
-				}
-
-				//save the bCollate value here
-				//because PD_COLLATE does not always work
-				bCollate = IsDlgButtonChecked(hdlg, IDC_COLLATE);
-
-				//save the uiCopies value here
-				//because nCopies does not always work
-				uiCopies = GetDlgItemInt(hdlg, IDC_COPIES, false, false);
-
-				//save the selected elements
-				CWnd *wnd = CWnd::FromHandle(hdlg);
-				CListBox *pDiagramz = (CListBox*) wnd->GetDlgItem(IDC_DIAGRAMS);
-
-				for (int i = 0; i < diagramListItems.GetCount(); i++) {
-					diagramListItems.GetAt(diagramListItems.FindIndex(i)).selected = pDiagramz->GetSel(i);
-				}
-			}
-			else if ((reinterpret_cast<HWND>(lParam)) == hSelection) { //selection radio
-				EnableWindow(hDiagrams, true);
-				//check if print range should be enabled or disabled by checking
-				//list of selections and making sure only one is selected
-				enableDiagramPrintRangeSelectionIfOnlyOneDiagramIsSelected();
-			}
-			else if ((reinterpret_cast<HWND>(lParam)) == hCurrent) { //selection radio
-				EnableWindow(hDiagrams, false);
-				enablePrintRange();
-			}
-			else if ((reinterpret_cast<HWND>(lParam)) == hAll) { //selection radio
-				EnableWindow(hDiagrams, false);
-				enablePrintRange(false);
-			}
-			else if ((reinterpret_cast<HWND>(lParam)) == hPercent) { //selection radio
-				EnableWindow(hPagesM, false);
-				EnableWindow(hPagesN, false);
-				EnableWindow(hPercentVal, true);
-			}
-			else if ((reinterpret_cast<HWND>(lParam)) == hPages) { //selection radio
-				EnableWindow(hPagesM, true);
-				EnableWindow(hPagesN, true);
-				EnableWindow(hPercentVal, false);
-			}
-		}
-
-		//selection changed message from diagrams listbox
-		else if (LOWORD (wParam) == IDC_DIAGRAMS && HIWORD (wParam)== LBN_SELCHANGE ) {
-			ASSERT(bInitialized);
-			enableDiagramPrintRangeSelectionIfOnlyOneDiagramIsSelected();
-		}
-	}
-	else if (uiMsg == WM_SHOWWINDOW) {
-		//apply the settings only when the window shows, as the user 
-		//may wish to specify different settings in the properties dialog
-
-		DEVMODE* pDevMode; 
-
-		pDevMode = (DEVMODE*)::GlobalLock(pd.hDevMode); 
-		pDevMode->dmFields |= DM_ORIENTATION; 
-		if (bLandscape)
-			pDevMode->dmOrientation = DMORIENT_LANDSCAPE;
-		else
-			pDevMode->dmOrientation = DMORIENT_PORTRAIT;
-
-		switch (paperSizeIndex) {
-		case 0:
-			pDevMode->dmPaperSize = DMPAPER_LETTER;
-			break;
-		case 1:
-			pDevMode->dmPaperSize = DMPAPER_LEGAL;
-			break;
-		case 2:
-			pDevMode->dmPaperSize = DMPAPER_EXECUTIVE;
-			break;
-		case 3:
-			pDevMode->dmPaperSize = DMPAPER_TABLOID;
-			break;
-		case 4:
-			pDevMode->dmPaperSize = DMPAPER_A3;
-			break;
-		case 5:
-			pDevMode->dmPaperSize = DMPAPER_A4;
-			break;
-		case 6:
-			pDevMode->dmPaperSize = DMPAPER_B4;
-			break;
-		case 7:
-			pDevMode->dmPaperSize = DMPAPER_B5;
-			break;
-		case 8: //user defined
-			pDevMode->dmPaperWidth = paperWidth;
-			pDevMode->dmPaperLength= paperLength;
-			break;
-		default:
-			pDevMode->dmPaperSize = DMPAPER_LETTER;
-		}
-			
-		::GlobalUnlock(pd.hDevMode);
-	}
-
-	return 0L;
-}
-
-//Initialize scale fit to with M, N
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_initScaleFitTo
-(JNIEnv *, jclass, jint m, jint n) {
-	uiPagesM = m;
-	uiPagesN = n;
-}
-
-//Initialize scale percent to with percent
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_initScalePercent
-(JNIEnv *, jclass, jint p) {
-	uiPercent = p;
-}
-
-//Add a diagram string.  Call reset before you insert the first one
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_addDiagramString
-(JNIEnv * env, jclass, jstring diagramName) {
-	//convert
-	wchar_t *lpBuff = convert(env, diagramName);
-
-	//add to a list of strings
-	DiagramListItem item;
-	item.string = CString(lpBuff);
-	item.selected = false;
-	diagramListItems.AddTail(item);
-	delete [] lpBuff;
-}
-
-//Get the scale to fit M as integer.
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getScaleFitToM
-(JNIEnv *, jclass) {
-	return uiPagesM;
-}
-
-//Get the scale to fit N as integer.
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getScaleFitToN
-(JNIEnv *, jclass) {
-	return uiPagesN;
-}
-
-//Get the scale to percent as integer.
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getScalePercent
-(JNIEnv *, jclass){
-	return uiPercent;
-}
-
-//Returns true if the diagram is selected, false if it wasn't
-//Pass in the index starting from 0 of the diagram you want to check is selected.
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_isDiagramSelected
-(JNIEnv *, jclass, jint index) {
-	//check to see if the index in that list is selected
-	//throw exception if out of range, and this is the desired behavior
-	return diagramListItems.GetAt(diagramListItems.FindIndex(index)).selected;
-}
-
-//Returns if the Diagram Print Range radio button is All.
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getDiagramPrintRangeAll
-(JNIEnv *, jclass) {
-	return bDiagramPrintRangeAll;
-}
-
-//Returns if the Diagram Print Range radio button is Current.
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getDiagramPrintRangeCurrent
-(JNIEnv *, jclass) {
-	return bDiagramPrintRangeCurrent;
-}
-
-//Returns if the Diagram Print Range radio button is Selection
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getDiagramPrintRangeSelection
-(JNIEnv *, jclass) {
-	return bDiagramPrintRangeSelection;
-}
-
-//Returns if the default Print Range radio button is All
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPrintRangeAll
-(JNIEnv *, jclass) {
-	return bPrintRangeAll;
-}
-
-//Returns if the default Print Range radio button is Pages
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPrintRangePages
-(JNIEnv *, jclass) {
-	return bPrintRangePages;
-}
-
-//Returns true if the collate checkbox is checked, false if it isn't
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getCollate
-(JNIEnv *, jclass) {
-	return bCollate;
-}
-
-//Resets the dialog.  Call this before adding strings to initialize the dialog.
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_resetDialog
-(JNIEnv *, jclass) {
-	while (!diagramListItems.IsEmpty()) 
-		diagramListItems.RemoveTail();
-}
-
-//Returns the start page to print from if you chose Pages in the default print range.
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPagesFrom
-(JNIEnv *, jclass) {
-	return uiPagesFrom;
-}
-
-//Returns the end page to print to if you chose Pages in the default print range.
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPagesTo
-(JNIEnv *, jclass) {
-	return uiPagesTo;
-}
-
-//Returns the number of copies to print.
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getNumberOfCopies
-(JNIEnv *, jclass) {
-	return uiCopies;
-}
-
-//Sets the owner's hWnd by the window class string and the title string so that it's modal
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_setHwndOwner
-(JNIEnv * env, jclass, jstring windowClassString, jstring titleString) {
-	wchar_t * windowClassWide = convert(env, windowClassString);
-	wchar_t * titleWide = convert(env, titleString);
-
-	//ok to be null, then it will have no owner and therefore not modal
-	hwndOwner = FindWindow(windowClassWide, titleWide);
-
-	if (hwndOwner == NULL) {
-		//risk of getting the wrong window if multiple windows have the same title
-		hwndOwner = FindWindow(NULL, titleWide);
-	}
-
-	delete [] windowClassWide;
-	delete [] titleWide;
-}
-
-//Sets the orientation of the page
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_setOrientation
-(JNIEnv * env, jclass, jboolean isLandscape) {
-	bLandscape = isLandscape;
-}
-
-//Sets the paper size (e.g. A4, Letter, Legal, etc). Refer to org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupPageType
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_setPaperSize
-(JNIEnv * env, jclass, jint index, jdouble width, jdouble length) {
-	paperSizeIndex = index;
-
-	//width and length are in mm...but we need values in tenths of mm for DEVMODE...
-	paperWidth  = (short)(width  * 10);
-	paperLength = (short)(length * 10);
-}
-
-
-
-//Open the print dialog.
-//Returns true if OK pressed, false if cancelled
-//If OK is pressed and true is returned, you can use the get methods to
-//get the values of the dialog.
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_open
-(JNIEnv * env, jclass, jobject printerData) {
-
-	// Initialize PRINTDLG
-	ZeroMemory(&pd, sizeof(pd));
-	pd.lStructSize = sizeof(pd);
-	pd.hwndOwner   = hwndOwner;
-	pd.hDevMode    = NULL;     //free later
-	pd.hDevNames   = NULL;     //free later
-	pd.Flags       = PD_ENABLEPRINTTEMPLATE | PD_ENABLEPRINTHOOK | PD_HIDEPRINTTOFILE | PD_COLLATE; 
-
-	//make sure the print dialog is RTL-enabled if the calling workbench is also RTL...
-	int ownerStyle = GetWindowLong(hwndOwner,GWL_EXSTYLE);
-
-	if ((ownerStyle & WS_EX_LAYOUTRTL) == WS_EX_LAYOUTRTL)
-		pd.lpPrintTemplateName = MAKEINTRESOURCE(IDD_MODELER_PRINT_DIALOG_RTL);
-	else
-		pd.lpPrintTemplateName = MAKEINTRESOURCE(IDD_MODELER_PRINT_DIALOG);
-
-	pd.hInstance = theApp.m_hInstance; //AfxGetInstanceHandle();
-	pd.lpfnPrintHook = PrintHookProc;
-	pd.nCopies     = 1;
-	pd.nFromPage   = 0xFFFF; 
-	pd.nToPage     = 0xFFFF; 
-	pd.nMinPage    = 1; 
-	pd.nMaxPage    = 0xFFFF; 
-
-	
-
-	if (PrintDlg(&pd)==TRUE) { //OK pressed
-
-		//I can get values that are not custom from the PRINTDLG structure
-		//I got the other values when OK was pressed from the print hook
-
-		//the bCollate flag does not always work
-		//bCollate = (pd.Flags & PD_COLLATE);
-
-		//the uiCopies does not always work
-		//uiCopies = pd.nCopies;
-
-		//save print range
-		bPrintRangeAll = !((pd.Flags & PD_PAGENUMS) || (pd.Flags & PD_SELECTION));
-		if (pd.Flags & PD_PAGENUMS) {
-			bPrintRangePages = true;
-			uiPagesFrom = pd.nFromPage;
-			uiPagesTo = pd.nToPage;
-		}
-		else {
-			bPrintRangePages = false;
-			uiPagesFrom = -1;
-			uiPagesTo = -1;
-		}
-
-		//set otherData from hDevMode
-		jclass objectClass = env->GetObjectClass(printerData); 
-		jfieldID id = env->GetFieldID(objectClass, "otherData", "[B");
-		jbyteArray byteArray = env->NewByteArray((jsize) GlobalSize(pd.hDevMode));
-		jbyte* byteArrayElements = env->GetByteArrayElements(byteArray, 0);
-		DEVMODE * pDM = (DEVMODE *)GlobalLock(pd.hDevMode);
-
-		MoveMemory(byteArrayElements, pDM, GlobalSize(pd.hDevMode));
-		GlobalUnlock(pd.hDevMode);
-
-		//byte copy done, save into java field
-		env->SetObjectField(printerData, id, byteArray);
-		env->ReleaseByteArrayElements(byteArray, byteArrayElements, 0);
-
-		//set info from devNames
-		DEVNAMES* pDN = (DEVNAMES*) GlobalLock(pd.hDevNames);
-		env->SetObjectField(printerData, env->GetFieldID(objectClass, "driver", "Ljava/lang/String;"), env->NewString((LPWSTR)pDN + pDN->wDriverOffset,wcslen(((LPWSTR)pDN + pDN->wDriverOffset))));
-		env->SetObjectField(printerData, env->GetFieldID(objectClass, "name", "Ljava/lang/String;"), env->NewString((LPWSTR)pDN + pDN->wDeviceOffset, wcslen(((LPWSTR)pDN + pDN->wDeviceOffset))));
-		GlobalUnlock(pd.hDevNames);
-
-		
-		//free the hDevMode and hDevNames
-		GlobalFree(pd.hDevMode);
-		GlobalFree(pd.hDevNames);
-
-		return true;
-	}
-
-	//free the hDevMode and hDevNames
-	GlobalFree(pd.hDevMode);
-	GlobalFree(pd.hDevNames);
-	hwndOwner = NULL;
-
-	return false;
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.def b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.def
deleted file mode 100644
index a316a45..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.def
+++ /dev/null

@@ -1,7 +0,0 @@
-; DiagramPrint.def : Declares the module parameters for the DLL.

-

-LIBRARY      "DiagramPrint"

-DESCRIPTION  'DiagramPrint Windows Dynamic Link Library'

-

-EXPORTS

-    ; Explicit exports can go here


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.dsp
deleted file mode 100644
index 32c7b10..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.dsp
+++ /dev/null

@@ -1,145 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint.mak" CFG="DiagramPrint - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint - Win32 Release"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:".\I10n\os\win32\x86\en\DiagramPrint.dll"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "DiagramPrint - Win32 Debug"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint - Win32 Release"
-# Name "DiagramPrint - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\res\DiagramPrint.rc2
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.dsw b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.dsw
deleted file mode 100644
index 979c502..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.dsw
+++ /dev/null

@@ -1,181 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "DiagramPrint"=.\DiagramPrint.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint

-    .

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_de"=.\DiagramPrint_de\DiagramPrint_de.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_de

-    .\DiagramPrint_de

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_es"=.\DiagramPrint_es\DiagramPrint_es.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_es

-    .\DiagramPrint_es

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_fr"=.\DiagramPrint_fr\DiagramPrint_fr.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_fr

-    .\DiagramPrint_fr

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_it"=.\DiagramPrint_it\DiagramPrint_it.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_it

-    .\DiagramPrint_it

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_ja"=.\DiagramPrint_ja\DiagramPrint_ja.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_ja

-    .\DiagramPrint_ja

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_ko"=.\DiagramPrint_ko\DiagramPrint_ko.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_ko

-    .\DiagramPrint_ko

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_pt_BR"=.\DiagramPrint_pt_BR\DiagramPrint_pt_BR.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_pt_BR

-    .\DiagramPrint_pt_BR

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_zh_CN"=.\DiagramPrint_zh_CN\DiagramPrint_zh_CN.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_zh_CN

-    .\DiagramPrint_zh_CN

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DiagramPrint_zh_TW"=.\DiagramPrint_zh_TW\DiagramPrint_zh_TW.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint_zh_TW

-    .\DiagramPrint_zh_TW

-    end source code control

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-    begin source code control

-    DiagramPrint

-    .

-    end source code control

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.h
deleted file mode 100644
index 00f3184..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.h
+++ /dev/null

@@ -1,63 +0,0 @@
-//*****************************************************************************

-//

-//	File:		DiagramPrint.h

-//

-//	Purpose:	main header file for the DiagramPrint DLL

-//

-//	Author:		Vishy Ramaswamy

-//

-//				

-// Copyright (c) 2002 - 2005 IBM Corporation and others.

-// 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:

-//    IBM Corporation - initial API and implementation 

-//

-//******************************************************************************

-

-

-#if !defined(AFX_DiagramPrint_H__B4FE3EB9_4E9B_497B_AD5D_E096E963F147__INCLUDED_)

-#define AFX_DiagramPrint_H__B4FE3EB9_4E9B_497B_AD5D_E096E963F147__INCLUDED_

-

-#if _MSC_VER > 1000

-#pragma once

-#endif // _MSC_VER > 1000

-

-#ifndef __AFXWIN_H__

-	#error include 'stdafx.h' before including this file for PCH

-#endif

-

-#include "resource.h"		// main symbols

-

-/////////////////////////////////////////////////////////////////////////////

-// CDiagramPrintApp

-// See DiagramPrint.cpp for the implementation of this class

-//

-

-class CDiagramPrintApp : public CWinApp

-{

-public:

-	CDiagramPrintApp();

-

-// Overrides

-	// ClassWizard generated virtual function overrides

-	//{{AFX_VIRTUAL(CDiagramPrintApp)

-	//}}AFX_VIRTUAL

-

-	//{{AFX_MSG(CDiagramPrintApp)

-		// NOTE - the ClassWizard will add and remove member functions here.

-		//    DO NOT EDIT what you see in these blocks of generated code !

-	//}}AFX_MSG

-	DECLARE_MESSAGE_MAP()

-};

-

-

-/////////////////////////////////////////////////////////////////////////////

-

-//{{AFX_INSERT_LOCATION}}

-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

-

-#endif // !defined(AFX_DiagramPrint_H__B4FE3EB9_4E9B_497B_AD5D_E096E963F147__INCLUDED_)


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.mak b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.mak
deleted file mode 100644
index 243be0f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.mak
+++ /dev/null

@@ -1,239 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on DiagramPrint.dsp

-!IF "$(CFG)" == ""

-CFG=DiagramPrint - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to DiagramPrint - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "DiagramPrint - Win32 Release" && "$(CFG)" != "DiagramPrint - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "DiagramPrint.mak" CFG="DiagramPrint - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "DiagramPrint - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "DiagramPrint - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-!IF  "$(CFG)" == "DiagramPrint - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-# Begin Custom Macros

-OutDir=.\Release

-# End Custom Macros

-

-ALL : "$(OUTDIR)\DiagramPrint.dll"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\DiagramPrint.obj"

-	-@erase "$(INTDIR)\DiagramPrint.pch"

-	-@erase "$(INTDIR)\DiagramPrint.res"

-	-@erase "$(INTDIR)\StdAfx.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(OUTDIR)\DiagramPrint.dll"

-	-@erase "$(OUTDIR)\DiagramPrint.exp"

-	-@erase "$(OUTDIR)\DiagramPrint.lib"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /Fp"$(INTDIR)\DiagramPrint.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-MTL=midl.exe

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-RSC=rc.exe

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\DiagramPrint.res" /d "NDEBUG" /d "_AFXDLL" 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\DiagramPrint.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\DiagramPrint.pdb" /machine:I386 /def:".\DiagramPrint.def" /out:"$(OUTDIR)\DiagramPrint.dll" /implib:"$(OUTDIR)\DiagramPrint.lib" 

-DEF_FILE= \

-	".\DiagramPrint.def"

-LINK32_OBJS= \

-	"$(INTDIR)\DiagramPrint.obj" \

-	"$(INTDIR)\StdAfx.obj" \

-	"$(INTDIR)\DiagramPrint.res"

-

-"$(OUTDIR)\DiagramPrint.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "DiagramPrint - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "$(OUTDIR)\DiagramPrint.dll"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\DiagramPrint.obj"

-	-@erase "$(INTDIR)\DiagramPrint.pch"

-	-@erase "$(INTDIR)\DiagramPrint.res"

-	-@erase "$(INTDIR)\StdAfx.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\DiagramPrint.dll"

-	-@erase "$(OUTDIR)\DiagramPrint.exp"

-	-@erase "$(OUTDIR)\DiagramPrint.ilk"

-	-@erase "$(OUTDIR)\DiagramPrint.lib"

-	-@erase "$(OUTDIR)\DiagramPrint.pdb"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /Fp"$(INTDIR)\DiagramPrint.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-MTL=midl.exe

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-RSC=rc.exe

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\DiagramPrint.res" /d "_DEBUG" /d "_AFXDLL" 

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\DiagramPrint.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\DiagramPrint.pdb" /debug /machine:I386 /def:".\DiagramPrint.def" /out:"$(OUTDIR)\DiagramPrint.dll" /implib:"$(OUTDIR)\DiagramPrint.lib" /pdbtype:sept 

-DEF_FILE= \

-	".\DiagramPrint.def"

-LINK32_OBJS= \

-	"$(INTDIR)\DiagramPrint.obj" \

-	"$(INTDIR)\StdAfx.obj" \

-	"$(INTDIR)\DiagramPrint.res"

-

-"$(OUTDIR)\DiagramPrint.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("DiagramPrint.dep")

-!INCLUDE "DiagramPrint.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "DiagramPrint.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "DiagramPrint - Win32 Release" || "$(CFG)" == "DiagramPrint - Win32 Debug"

-SOURCE=.\DiagramPrint.cpp

-

-"$(INTDIR)\DiagramPrint.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\DiagramPrint.pch"

-

-

-SOURCE=.\DiagramPrint.rc

-

-"$(INTDIR)\DiagramPrint.res" : $(SOURCE) "$(INTDIR)"

-	$(RSC) $(RSC_PROJ) $(SOURCE)

-

-

-SOURCE=.\StdAfx.cpp

-

-!IF  "$(CFG)" == "DiagramPrint - Win32 Release"

-

-CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /Fp"$(INTDIR)\DiagramPrint.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\DiagramPrint.pch" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ELSEIF  "$(CFG)" == "DiagramPrint - Win32 Debug"

-

-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /Fp"$(INTDIR)\DiagramPrint.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\DiagramPrint.pch" : $(SOURCE) "$(INTDIR)"

-	$(CPP) @<<

-  $(CPP_SWITCHES) $(SOURCE)

-<<

-

-

-!ENDIF 

-

-

-!ENDIF 

-


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.ncb b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.ncb
deleted file mode 100644
index ad23f89..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.ncb
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.opt b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.opt
deleted file mode 100644
index 5f66d96..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.opt
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.rc
deleted file mode 100644
index 0c4ae8e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.rc
+++ /dev/null

@@ -1,419 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Licensed Materials -- Property of IBM - (C) Copyright IBM Corporation, 2003,2003 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "® IBM is a registered trademark of International Business Machines Corporation.  Windows(TM) is a trademark of Microsoft Corporation.\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "DiagramPrint Dynamic Link Library\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Print"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Properties...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Where:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comment:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Print to fi&le",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Diagram print range",1072,8,93,272,106,WS_GROUP
-    CONTROL         "C&urrent diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "All &diagrams from open models",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "S&elected diagrams:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,253,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Scaling",IDC_STATIC,8,202,272,51
-    CONTROL         "Ad&just to % of normal size:",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "F&it to:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,34,12
-    LTEXT           "Ad&just to % of normal size:",1102,30,219,88,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "pages &wide:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "pages &tall:",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Print range",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&All",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&from:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&to:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copies",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Number of &copies:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "C&ollate",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,232,328,48,14
-    ICON            "",1086,156,290,70,25,WS_GROUP
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Print Setup"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Properties",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Where:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comment:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Paper",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Si&ze:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Source:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientation",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "P&ortrait",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "L&andscape",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Page Setup"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "Paper",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Si&ze:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Source:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientation",1072,8,156,64,56,WS_GROUP
-    CONTROL         "P&ortrait",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "L&andscape",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Margins",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Left:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Right:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Top:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Bottom:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Printer...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Print"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Properties",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Where:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comment:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Print to fi&le",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Print range",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&All",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Selection",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,
-                    12
-    RTEXT           "&from:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&to:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copies",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Number of &copies:",1092,168,108,68,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "C&ollate",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,232,164,48,14
-END
-
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "Print"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Properties...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Where:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comment:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Print to fi&le",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Diagram print range",1072,8,93,272,106,WS_GROUP
-    CONTROL         "C&urrent diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "All &diagrams from open models",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "S&elected diagrams:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,253,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Scaling",IDC_STATIC,8,202,272,51
-    CONTROL         "Ad&just to % of normal size:",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "F&it to:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,34,12
-    LTEXT           "Ad&just to % of normal size:",1102,30,219,88,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "pages &wide:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "pages &tall:",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Print range",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&All",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&from:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&to:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copies",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Number of &copies:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "C&ollate",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,232,328,48,14
-    ICON            "",1086,156,290,70,25,WS_GROUP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.aps
deleted file mode 100644
index 34d593f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.rc
deleted file mode 100644
index ab8d801..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.rc
+++ /dev/null

@@ -1,415 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Licensed Materials -- Property of IBM - (C) Copyright IBM Corporation, 2003,2003 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBM is a registered trademark of International Business Machines Corporation.  Windows(TM) is a trademark of Microsoft Corporation.\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "DiagramPrint Dynamic Link Library\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Drucken"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drucker",1075,7,4,279,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,20,36,8
-    COMBOBOX        1139,57,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschaften",1025,225,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,36,229,10
-    LTEXT           "Typ:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,48,228,10
-    LTEXT           "Standort:",1097,16,60,29,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,60,230,10
-    LTEXT           "Kommentar:",1096,16,72,37,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,70,156,10
-    CONTROL         "Ausgabe in &Datei",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,217,71,67,12
-    GROUPBOX        "Diagrammdruckbereich",1072,9,95,144,109,WS_GROUP
-    CONTROL         "A&lle Diagramme",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,62,12
-    CONTROL         "Ak&tuelles Diagramm",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,75,12
-    CONTROL         "Ausge&wählte Diagramme",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,91,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Skalierung",IDC_STATIC,160,95,127,109
-    LTEXT           "In Prozent",1104,168,111,32,8
-    CONTROL         "Prozent",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,39,9
-    CONTROL         "Anpassen auf",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    169,170,57,9
-    EDITTEXT        IDC_PERCENT,213,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,201,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,224,183,8,8
-    EDITTEXT        IDC_PAGESN,235,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "Seiten",1102,258,184,20,8
-    GROUPBOX        "Druckbereich",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Alles",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,28,12
-    CONTROL         "Se&iten",1058,"Button",BS_AUTORADIOBUTTON,16,245,33,12
-    RTEXT           "&von:",1089,53,247,14,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&bis:",1090,100,247,11,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopien",1073,159,211,128,64,WS_GROUP
-    LTEXT           "Anzahl der &Kopien:",1092,167,227,59,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,159,244,70,25,WS_GROUP
-    CONTROL         "Zu&ordnen",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,239,249,44,12
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,232,286,48,14
-    LTEXT           "Nach Seiten",1105,168,154,39,8
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Druckereinrichtung"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drucker",1075,8,5,272,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,20,21,8
-    COMBOBOX        1136,57,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschaften",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,8,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,36,220,10
-    LTEXT           "Typ:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,48,220,10
-    LTEXT           "Standort:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,60,220,10
-    LTEXT           "Kommentar:",1096,15,72,37,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,72,219,10
-    GROUPBOX        "Papier",1073,8,92,164,56,WS_GROUP
-    LTEXT           "G&röße:",1089,16,108,21,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Quelle:",1090,16,128,22,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Ausrichtung",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "H&ochformat",1056,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,224,106,50,12
-    CONTROL         "Q&uerformat",1057,"Button",BS_AUTORADIOBUTTON,224,126,
-                    48,12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Seitenaufbau"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "Papier",1073,8,96,224,56,WS_GROUP
-    LTEXT           "&Größe:",1089,16,112,21,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Quelle:",1090,16,132,22,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Ausrichtung",1072,8,156,64,56,WS_GROUP
-    CONTROL         "H&ochformat",1056,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,16,170,50,12
-    CONTROL         "Q&uerformat",1057,"Button",BS_AUTORADIOBUTTON,16,190,48,
-                    12
-    GROUPBOX        "Randeinstellungen",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Links:",1102,88,172,19,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Rechts:",1103,164,172,25,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "O&ben:",1104,88,192,19,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "U&nten:",1105,164,192,21,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Drucker...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 296, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Drucken"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drucker",1075,8,4,281,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,20,36,8
-    COMBOBOX        1139,57,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschaften",1025,218,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,36,228,10
-    LTEXT           "Typ:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,48,227,10
-    LTEXT           "Standort:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,60,228,10
-    LTEXT           "Kommentar:",1096,16,72,39,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,72,155,10
-    CONTROL         "Ausgabe in &Datei",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,217,70,67,12
-    GROUPBOX        "Druckbereich",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Alles",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,28,12
-    CONTROL         "Se&iten",1058,"Button",BS_AUTORADIOBUTTON,16,122,33,12
-    CONTROL         "Au&swahl",1057,"Button",BS_AUTORADIOBUTTON,16,138,40,12
-    RTEXT           "&von:",1089,52,124,14,8
-    EDITTEXT        1152,70,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&bis:",1090,103,124,12,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopien",1073,160,92,129,64,WS_GROUP
-    LTEXT           "Anzahl der &Kopien:",1092,168,108,59,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "Zu&ordnen",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,44,12
-    DEFPUSHBUTTON   "OK",IDOK,189,164,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,241,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "Drucken"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drucker",1075,7,4,279,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,20,36,8
-    COMBOBOX        1139,57,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschaften",1025,225,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,36,229,10
-    LTEXT           "Typ:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,48,228,10
-    LTEXT           "Standort:",1097,16,60,29,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,60,230,10
-    LTEXT           "Kommentar:",1096,16,72,37,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,70,156,10
-    CONTROL         "Ausgabe in &Datei",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,217,71,67,12
-    GROUPBOX        "Diagrammdruckbereich",1072,9,95,144,109,WS_GROUP
-    CONTROL         "A&lle Diagramme",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,62,12
-    CONTROL         "Ak&tuelles Diagramm",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,75,12
-    CONTROL         "Ausge&wählte Diagramme",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,91,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Skalierung",IDC_STATIC,160,95,127,109
-    LTEXT           "In Prozent",1104,168,111,32,8
-    CONTROL         "Prozent",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,39,9
-    CONTROL         "Anpassen auf",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    169,170,57,9
-    EDITTEXT        IDC_PERCENT,213,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,201,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,224,183,8,8
-    EDITTEXT        IDC_PAGESN,235,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "Seiten",1102,258,184,20,8
-    GROUPBOX        "Druckbereich",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Alles",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,28,12
-    CONTROL         "Se&iten",1058,"Button",BS_AUTORADIOBUTTON,16,245,33,12
-    RTEXT           "&von:",1089,53,247,14,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&bis:",1090,100,247,11,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopien",1073,159,211,128,64,WS_GROUP
-    LTEXT           "Anzahl der &Kopien:",1092,167,227,59,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,159,244,70,25,WS_GROUP
-    CONTROL         "Zu&ordnen",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,239,249,44,12
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,232,286,48,14
-    LTEXT           "Nach Seiten",1105,168,154,39,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint_de.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint_de.dsp
deleted file mode 100644
index 1981d4b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint_de.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_de" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_de - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_de.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_de.mak" CFG="DiagramPrint_de - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_de - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_de - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_de"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_de - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_DE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x407 /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\de\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_de - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_DE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../." /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_de - Win32 Release"
-# Name "DiagramPrint_de - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by DiagramPrint.rc
-//
-#define IDC_SCALE_PERCENT               1000
-#define IDC_SCALE_FIT                   1001
-#define IDC_DIAGRAMS                    1003
-#define IDC_ALL_DIAGRAMS                1010
-#define IDC_CURRENT_DIAGRAM             1011
-#define IDC_SELECTED_DIAGRAMS           1012
-#define IDC_PAGESM                      1155
-#define IDC_PERCENT                     1156
-#define IDC_PAGESN                      1157
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint.aps
deleted file mode 100644
index ad13bde..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint.rc
deleted file mode 100644
index 8f72092..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint.rc
+++ /dev/null

@@ -1,418 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Materiales bajo licencia -- Propiedad de IBM - (C) Copyright IBM Corporation, 2003,2003 - Derechos restringidos a los usuarios del Gobierno de EE.UU.: uso, duplicación o divulgación restringida por el contrato de planificación de GSA ADP con IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBM es una marca comercial registrada de International Business Machines Corporation.  Windows(TM) es una marca registrada de Microsoft Corporation.\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Biblioteca de enlace dinámico DiagramPrint\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impresora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Estado:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Lugar:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentario:",1096,16,72,39,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,58,72,137,10
-    CONTROL         "Imprimir a ar&chivo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,208,70,68,12
-    GROUPBOX        "Rango de impresión del diagrama",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "Todos &los diagramas",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,83,12
-    CONTROL         "Diagrama a&ctual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "&Diagramas seleccionados",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,97,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Ajuste",IDC_STATIC,160,95,119,109
-    LTEXT           "Por porcentaje",1104,168,111,52,8
-    CONTROL         "por ciento",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,43,9
-    CONTROL         "Ajustar a",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    171,169,61,9
-    EDITTEXT        IDC_PERCENT,220,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,190,180,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,212,182,8,8
-    EDITTEXT        IDC_PAGESN,220,180,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "páginas",1102,241,181,21,8
-    GROUPBOX        "Rango de impresión",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Todo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,245,48,12
-    RTEXT           "&desde:",1089,28,259,24,8
-    EDITTEXT        1152,54,257,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&hasta:",1090,82,259,22,8
-    EDITTEXT        1153,106,257,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copias",1073,159,211,120,64,WS_GROUP
-    LTEXT           "Número de &copias:",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "C&lasificar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,232,249,43,12
-    DEFPUSHBUTTON   "Bien",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,286,48,14
-    LTEXT           "Por páginas",1105,168,154,50,8
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Configurar impresión"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impresora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Estado:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Lugar:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentario:",1096,16,72,40,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,72,220,10
-    GROUPBOX        "Papel",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Ta&maño:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Origen:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientación",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,20,20,WS_GROUP
-    CONTROL         "&Vertical",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "&Horizontal",1057,"Button",BS_AUTORADIOBUTTON,224,126,
-                    52,12
-    DEFPUSHBUTTON   "Bien",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Configuración de página"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "Papel",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Ta&maño:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Origen:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientación",1072,8,156,64,56,WS_GROUP
-    CONTROL         "&Vertical",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "&Horizontal",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Márgenes",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Izquierdo:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Derecho:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Superior:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "In&ferior:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "Bien",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Impresora...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impresora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Estado:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Lugar:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentario:",1096,16,72,40,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,72,143,10
-    CONTROL         "Imprimir a ar&chivo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,205,70,71,12
-    GROUPBOX        "Rango de impresión",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Todo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,122,38,12
-    CONTROL         "&Selección",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,
-                    12
-    RTEXT           "&desde:",1089,54,124,23,8
-    EDITTEXT        1152,77,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&hasta:",1090,104,124,19,8
-    EDITTEXT        1153,124,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copias",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Número de &copias:",1092,168,108,68,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,20,20,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "C&lasificar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,232,130,44,12
-    DEFPUSHBUTTON   "Bien",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "Imprimir"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impresora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Estado:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Lugar:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentario:",1096,16,72,39,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,58,72,137,10
-    CONTROL         "Imprimir a ar&chivo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,208,70,68,12
-    GROUPBOX        "Rango de impresión del diagrama",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "Todos &los diagramas",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,83,12
-    CONTROL         "Diagrama a&ctual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "&Diagramas seleccionados",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,97,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Ajuste",IDC_STATIC,160,95,119,109
-    LTEXT           "Por porcentaje",1104,168,111,52,8
-    CONTROL         "por ciento",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,43,9
-    CONTROL         "Ajustar a",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    171,169,61,9
-    EDITTEXT        IDC_PERCENT,220,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,190,180,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,212,182,8,8
-    EDITTEXT        IDC_PAGESN,220,180,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "páginas",1102,241,181,21,8
-    GROUPBOX        "Rango de impresión",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Todo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,245,48,12
-    RTEXT           "&desde:",1089,28,259,24,8
-    EDITTEXT        1152,54,257,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&hasta:",1090,82,259,22,8
-    EDITTEXT        1153,106,257,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copias",1073,159,211,120,64,WS_GROUP
-    LTEXT           "Número de &copias:",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "C&lasificar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,232,249,43,12
-    DEFPUSHBUTTON   "Bien",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,286,48,14
-    LTEXT           "Por páginas",1105,168,154,50,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint_es.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint_es.dsp
deleted file mode 100644
index e45b78e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint_es.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_es" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_es - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_es.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_es.mak" CFG="DiagramPrint_es - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_es - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_es - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_es"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_es - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_ES_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0xc0a /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\es\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_es - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_ES_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../" /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_es - Win32 Release"
-# Name "DiagramPrint_es - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/resource.h
deleted file mode 100644
index 7de167e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by DiagramPrint.rc

-//

-#define IDC_SCALE_PERCENT               1000

-#define IDC_SCALE_FIT                   1001

-#define IDC_DIAGRAMS                    1003

-#define IDC_ALL_DIAGRAMS                1010

-#define IDC_CURRENT_DIAGRAM             1011

-#define IDC_SELECTED_DIAGRAMS           1012

-#define IDC_PAGESM                      1155

-#define IDC_PERCENT                     1156

-#define IDC_PAGESN                      1157

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NO_MFC                     1

-#define _APS_NEXT_RESOURCE_VALUE        101

-#define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1005

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint.aps
deleted file mode 100644
index b723b01..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint.rc
deleted file mode 100644
index b1054d0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint.rc
+++ /dev/null

@@ -1,417 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Licensed Materials -- Property of IBM - (C) Copyright IBM Corporation, 2003,2003 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBM is a registered trademark of International Business Machines Corporation.  Windows(TM) is a trademark of Microsoft Corporation.\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Bibliothèque DLL DiagramPrint\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimer"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Imprimante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nom :",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiétés",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Statut :",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type :",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Où :",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commentaire :",1096,16,72,45,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,65,72,122,10
-    CONTROL         "Imprimer dans le fi&chier",1040,"Button",
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,191,70,85,12
-    GROUPBOX        "Fourchette d'impression de diagramme",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "T&ous les diagrammes",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,83,12
-    CONTROL         "Diagramme &en cours",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,87,12
-    CONTROL         "&Diagrammes sélectionnés",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,98,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Échelonnement",IDC_STATIC,160,95,119,109
-    LTEXT           "Par pourcentage",1104,168,111,67,8
-    CONTROL         "pourcentage",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,55,9
-    CONTROL         "Insérer dans",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    171,169,83,9
-    EDITTEXT        IDC_PERCENT,232,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,183,182,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,205,184,8,8
-    EDITTEXT        IDC_PAGESN,213,182,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "pages",1102,234,183,21,8
-    GROUPBOX        "Fourchette d'impression",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Tous",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,245,36,12
-    RTEXT           "&de :",1089,48,247,20,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&à :",1090,96,247,16,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copies",1073,159,211,120,64,WS_GROUP
-    LTEXT           "Nombre de &copies :",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "R&assembler",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,225,249,50,19
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,232,286,48,14
-    LTEXT           "Par pages",1105,168,154,30,8
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Configuration impression"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Imprimante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nom :",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propriétés",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Statut :",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type :",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Où :",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commentaire :",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papier",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Tai&lle:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Source :",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientation",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "P&ortrait",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "Pa&ysage",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Configuration de page"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "Papier",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Tai&lle:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Source :",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientation",1072,8,156,64,56,WS_GROUP
-    CONTROL         "P&ortrait",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "Pa&ysage",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "Marges",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Gauche :",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Droite :",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Haut :",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Bas :",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Imprimante...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimer"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Imprimante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nom :",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propriétés",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Statut :",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type :",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Où :",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commentaire :",1096,16,72,45,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,63,72,122,10
-    CONTROL         "Imprimer dans le fi&chier",1040,"Button",
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,190,70,86,12
-    GROUPBOX        "Fourchette d'impression",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Tous",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Sélection",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,
-                    12
-    RTEXT           "&de :",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&à :",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copies",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Nombre de &copies :",1092,168,108,68,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,20,20,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "R&assembler",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,225,130,51,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "Imprimer"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Imprimante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nom :",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiétés",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Statut :",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type :",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Où :",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commentaire :",1096,16,72,45,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,65,72,122,10
-    CONTROL         "Imprimer dans le fi&chier",1040,"Button",
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,191,70,85,12
-    GROUPBOX        "Fourchette d'impression de diagramme",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "T&ous les diagrammes",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,83,12
-    CONTROL         "Diagramme &en cours",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,87,12
-    CONTROL         "&Diagrammes sélectionnés",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,98,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Échelonnement",IDC_STATIC,160,95,119,109
-    LTEXT           "Par pourcentage",1104,168,111,67,8
-    CONTROL         "pourcentage",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,55,9
-    CONTROL         "Insérer dans",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    171,169,83,9
-    EDITTEXT        IDC_PERCENT,232,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,183,182,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,205,184,8,8
-    EDITTEXT        IDC_PAGESN,213,182,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "pages",1102,234,183,21,8
-    GROUPBOX        "Fourchette d'impression",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Tous",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,245,36,12
-    RTEXT           "&de :",1089,48,247,20,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&à :",1090,96,247,16,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copies",1073,159,211,120,64,WS_GROUP
-    LTEXT           "Nombre de &copies :",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "R&assembler",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,225,249,50,19
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,232,286,48,14
-    LTEXT           "Par pages",1105,168,154,30,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint_fr.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint_fr.dsp
deleted file mode 100644
index ffc4755..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint_fr.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_fr" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_fr - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_fr.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_fr.mak" CFG="DiagramPrint_fr - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_fr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_fr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_fr"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_fr - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_FR_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x40c /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\fr\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_fr - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_FR_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../" /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_fr - Win32 Release"
-# Name "DiagramPrint_fr - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/resource.h
deleted file mode 100644
index 7de167e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by DiagramPrint.rc

-//

-#define IDC_SCALE_PERCENT               1000

-#define IDC_SCALE_FIT                   1001

-#define IDC_DIAGRAMS                    1003

-#define IDC_ALL_DIAGRAMS                1010

-#define IDC_CURRENT_DIAGRAM             1011

-#define IDC_SELECTED_DIAGRAMS           1012

-#define IDC_PAGESM                      1155

-#define IDC_PERCENT                     1156

-#define IDC_PAGESN                      1157

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NO_MFC                     1

-#define _APS_NEXT_RESOURCE_VALUE        101

-#define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1005

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint.aps
deleted file mode 100644
index 3ed8155..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint.rc
deleted file mode 100644
index b54ffbe..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint.rc
+++ /dev/null

@@ -1,418 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Materiali su licenza -- Proprietà della IBM - (C) Copyright IBM Corporation, 2003,2003 - Limitazioni per gli utenti appartenenti al governo degli Stati Uniti d'America - L'uso, la duplicazione o la divulgazione sono limitati dal supplemento GSA ADP al contratto con l'IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBM è un marchio della International Business Machines Corporation.  Windows(TM) è un marchio della Microsoft Corporation.\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "DiagramPrint Dynamic Link Library\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Stampa"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Stampante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Proprietà",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stato:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Posizione:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commenti:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Stampa su fi&le",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Intervallo di stampa diagramma",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "Tu&tti i diagrammi",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,64,12
-    CONTROL         "&Diagramma corrente",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "Diagram&mi selezionati",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,87,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Scala",IDC_STATIC,160,95,119,109
-    LTEXT           "Per percentuale",1104,168,111,54,8
-    CONTROL         "percentuale",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,51,9
-    CONTROL         "Adatta a",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,171,
-                    169,77,9
-    EDITTEXT        IDC_PERCENT,226,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,182,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,204,183,8,8
-    EDITTEXT        IDC_PAGESN,212,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "pagine",1102,233,182,21,8
-    GROUPBOX        "Intervallo di stampa",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Tutto",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pa&gine",1058,"Button",BS_AUTORADIOBUTTON,16,245,36,12
-    RTEXT           "&da:",1089,48,247,20,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,96,247,16,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copie",1073,159,211,120,64,WS_GROUP
-    LTEXT           "Numero di &copie:",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "Ri&lega",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,239,249,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Annulla",IDCANCEL,232,286,48,14
-    LTEXT           "Per pagine",1105,168,154,52,8
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Impostazioni di stampa"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Stampante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Proprietà",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stato:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Posizione:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commenti:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Carta",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Dimen&sione:",1089,16,108,42,8
-    COMBOBOX        1137,60,106,104,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Origine:",1090,16,128,36,8
-    COMBOBOX        1138,60,126,104,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientamento",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,20,20,WS_GROUP
-    CONTROL         "Ve&rticale",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "Or&izzontale",1057,"Button",BS_AUTORADIOBUTTON,224,126,
-                    52,12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Annulla",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Impostazione pagina"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "Carta",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Dimen&sione:",1089,16,112,43,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Origine:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientamento",1072,8,156,64,56,WS_GROUP
-    CONTROL         "Ve&rticale",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "Or&izzontale",1057,"Button",BS_AUTORADIOBUTTON,16,190,
-                    52,12
-    GROUPBOX        "Margini",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Sinistro:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Destro:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Superiore:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Inferiore:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Annulla",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Stampante...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Stampa"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Stampante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Proprietà",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stato:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Posizione:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commenti:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Stampa su fi&le",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Intervallo di stampa",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Tutto",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Pa&gine",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Selezione",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,
-                    12
-    RTEXT           "&da:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copie",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Numero di &copie:",1092,168,108,68,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "Ri&lega",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Annulla",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "Stampa"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Stampante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Proprietà",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stato:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Posizione:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commenti:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Stampa su fi&le",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Intervallo di stampa diagramma",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "Tu&tti i diagrammi",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,64,12
-    CONTROL         "&Diagramma corrente",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "Diagram&mi selezionati",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,87,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Scala",IDC_STATIC,160,95,119,109
-    LTEXT           "Per percentuale",1104,168,111,54,8
-    CONTROL         "percentuale",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,51,9
-    CONTROL         "Adatta a",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,171,
-                    169,77,9
-    EDITTEXT        IDC_PERCENT,226,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,182,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,204,183,8,8
-    EDITTEXT        IDC_PAGESN,212,181,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "pagine",1102,233,182,21,8
-    GROUPBOX        "Intervallo di stampa",1074,8,211,144,64,WS_GROUP
-    CONTROL         "&Tutto",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pa&gine",1058,"Button",BS_AUTORADIOBUTTON,16,245,36,12
-    RTEXT           "&da:",1089,48,247,20,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,96,247,16,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copie",1073,159,211,120,64,WS_GROUP
-    LTEXT           "Numero di &copie:",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "Ri&lega",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,239,249,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Annulla",IDCANCEL,232,286,48,14
-    LTEXT           "Per pagine",1105,168,154,52,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint_it.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint_it.dsp
deleted file mode 100644
index bd18a70..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint_it.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_it" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_it - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_it.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_it.mak" CFG="DiagramPrint_it - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_it - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_it - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_it"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_it - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_IT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x410 /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\it\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_it - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_IT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../." /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_it - Win32 Release"
-# Name "DiagramPrint_it - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/resource.h
deleted file mode 100644
index 7de167e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by DiagramPrint.rc

-//

-#define IDC_SCALE_PERCENT               1000

-#define IDC_SCALE_FIT                   1001

-#define IDC_DIAGRAMS                    1003

-#define IDC_ALL_DIAGRAMS                1010

-#define IDC_CURRENT_DIAGRAM             1011

-#define IDC_SELECTED_DIAGRAMS           1012

-#define IDC_PAGESM                      1155

-#define IDC_PERCENT                     1156

-#define IDC_PAGESN                      1157

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NO_MFC                     1

-#define _APS_NEXT_RESOURCE_VALUE        101

-#define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1005

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint.aps
deleted file mode 100644
index 354b64c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint.rc
deleted file mode 100644
index 3f23ca3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint.rc
+++ /dev/null

@@ -1,417 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Japanese resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "CZX¿ -- IBM ÌL  - (C) Copyright IBM Corporation, 2003,2003 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBM Í IBM Corporation  Ìo^¤WÅ·BWindows(TM) Í Microsoft Corporation Ì¤WÅ·B\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "DiagramPrint Dynamic Link Library\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "óü"
-FONT 9, "MS UI Gothic"
-BEGIN
-    LTEXT           "¼O (&N):",1093,16,20,34,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "vpeB[ (&P)",1025,208,17,67,14,WS_GROUP
-    LTEXT           "Xe[^X:",1095,16,36,44,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,36,214,10
-    LTEXT           "^Cv:",1094,16,48,44,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,48,214,10
-    LTEXT           "ê:",1097,16,60,44,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,60,214,10
-    LTEXT           "Rg:",1096,16,72,44,10,SS_NOPREFIX
-    CONTROL         "t@CÉoÍ (&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,209,71,67,12
-    GROUPBOX        "_CAOóüÍÍ",1072,8,95,144,109,WS_GROUP
-    CONTROL         "·×ÄÌ_CAO (&L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,117,12
-    CONTROL         "»ÝÌ_CAO (&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,117,12
-    CONTROL         "Iðµ½_CAO (&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,117,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "XP[O",IDC_STATIC,160,95,119,109
-    LTEXT           "wèµ½p[ZgÅóü",1104,168,111,102,8
-    CONTROL         "p[Zg",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,38,9
-    CONTROL         "tBbeBO·é",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON,171,169,100,9
-    EDITTEXT        IDC_PERCENT,212,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,195,179,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,217,180,6,8
-    EDITTEXT        IDC_PAGESN,226,179,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "y[W",1102,249,180,27,8
-    GROUPBOX        "óüÍÍ",1074,8,211,144,64,WS_GROUP
-    CONTROL         "·×Ä (&A)",1056,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,16,229,64,12
-    CONTROL         "y[W (&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,64,
-                    12
-    RTEXT           "Jn:",1089,38,259,21,8
-    EDITTEXT        1152,61,258,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "I¹:",1090,90,259,22,8
-    EDITTEXT        1153,114,258,26,12,ES_NUMBER | WS_GROUP
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,72,142,10
-    GROUPBOX        "v^[",1075,8,4,272,84,WS_GROUP
-    GROUPBOX        "óü",1073,159,211,120,64,WS_GROUP
-    LTEXT           " (&C):",1092,167,227,62,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,161,244,70,25,WS_GROUP
-    CONTROL         "PÊ(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,233,249,45,14
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "LZ",IDCANCEL,232,286,48,14
-    LTEXT           "y[WÉí¹Äóü",1105,168,154,104,8
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "óüÝè"
-FONT 9, "MS UI Gothic"
-BEGIN
-    GROUPBOX        "v^[",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¼O (&N):",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "vpeB[ (&P)",1025,207,17,68,14,WS_GROUP
-    LTEXT           "Xe[^X:",1095,16,36,44,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,36,213,10
-    LTEXT           "^Cv:",1094,16,48,44,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,48,213,10
-    LTEXT           "ê:",1097,16,60,44,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,60,213,10
-    LTEXT           "Rg:",1096,16,72,44,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,72,213,10
-    GROUPBOX        "p",1073,8,92,164,56,WS_GROUP
-    LTEXT           "TCY (&Z):",1089,10,108,40,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "\[X (&S):",1090,10,128,41,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "ûü",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "c (&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "¡ (&A)",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "LZ",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "y[WÝè"
-FONT 9, "MS UI Gothic"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "p",1073,8,96,224,56,WS_GROUP
-    LTEXT           "TCY (&Z):",1089,16,112,45,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "\[X (&S):",1090,16,132,45,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "ûü",1072,8,156,64,56,WS_GROUP
-    CONTROL         "c (&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "¡ (&A)",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "]",1075,80,156,152,56,WS_GROUP
-    LTEXT           "¶ (&L):",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "E (&R):",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "ã (&T):",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "º (&B):",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,65,220,48,14,WS_GROUP
-    PUSHBUTTON      "LZ",IDCANCEL,117,220,48,14
-    PUSHBUTTON      "v^[ (&P)...",1026,169,220,66,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "óü"
-FONT 9, "MS UI Gothic"
-BEGIN
-    GROUPBOX        "v^[",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¼O (&N):",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "vpeB[ (&P)",1025,209,17,65,14,WS_GROUP
-    LTEXT           "Xe[^X:",1095,16,36,43,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,61,36,214,10
-    LTEXT           "^Cv:",1094,16,48,43,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,61,48,214,10
-    LTEXT           "ê:",1097,16,60,43,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,61,60,214,10
-    LTEXT           "Rg:",1096,16,72,43,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,61,72,144,10
-    CONTROL         "t@CÉoÍ (&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,209,70,67,12
-    GROUPBOX        "óüÍÍ",1072,8,92,144,64,WS_GROUP
-    CONTROL         "·×Ä (&A)",1056,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,16,103,64,10
-    CONTROL         "y[W (&G)",1058,"Button",BS_AUTORADIOBUTTON,16,115,64,
-                    10
-    CONTROL         "Ið (&S)",1057,"Button",BS_AUTORADIOBUTTON,16,142,64,
-                    11
-    RTEXT           "Jn:",1089,49,130,20,8
-    EDITTEXT        1152,71,127,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "I¹:",1090,99,130,19,8
-    EDITTEXT        1153,120,127,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "óü",1073,160,92,120,64,WS_GROUP
-    LTEXT           " (&C):",1092,168,108,68,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,123,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "PÊ",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,241,130,34,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "LZ",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "óü"
-FONT 9, "MS UI Gothic"
-BEGIN
-    LTEXT           "¼O (&N):",1093,16,20,34,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "vpeB[ (&P)",1025,208,17,67,14,WS_GROUP
-    LTEXT           "Xe[^X:",1095,16,36,44,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,36,214,10
-    LTEXT           "^Cv:",1094,16,48,44,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,48,214,10
-    LTEXT           "ê:",1097,16,60,44,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,60,214,10
-    LTEXT           "Rg:",1096,16,72,44,10,SS_NOPREFIX
-    CONTROL         "t@CÉoÍ (&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,209,71,67,12
-    GROUPBOX        "_CAOóüÍÍ",1072,8,95,144,109,WS_GROUP
-    CONTROL         "·×ÄÌ_CAO (&L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,117,12
-    CONTROL         "»ÝÌ_CAO (&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,117,12
-    CONTROL         "Iðµ½_CAO (&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,117,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "XP[O",IDC_STATIC,160,95,119,109
-    LTEXT           "wèµ½p[ZgÅóü",1104,168,111,102,8
-    CONTROL         "p[Zg",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,172,126,38,9
-    CONTROL         "tBbeBO·é",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON,171,169,100,9
-    EDITTEXT        IDC_PERCENT,212,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,195,179,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,217,180,6,8
-    EDITTEXT        IDC_PAGESN,226,179,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "y[W",1102,249,180,27,8
-    GROUPBOX        "óüÍÍ",1074,8,211,144,64,WS_GROUP
-    CONTROL         "·×Ä (&A)",1056,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,16,229,64,12
-    CONTROL         "y[W (&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,64,
-                    12
-    RTEXT           "Jn:",1089,38,259,21,8
-    EDITTEXT        1152,61,258,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "I¹:",1090,90,259,22,8
-    EDITTEXT        1153,114,258,26,12,ES_NUMBER | WS_GROUP
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,62,72,142,10
-    GROUPBOX        "v^[",1075,8,4,272,84,WS_GROUP
-    GROUPBOX        "óü",1073,159,211,120,64,WS_GROUP
-    LTEXT           " (&C):",1092,167,227,62,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,161,244,70,25,WS_GROUP
-    CONTROL         "PÊ(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,233,249,45,14
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "LZ",IDCANCEL,232,286,48,14
-    LTEXT           "y[WÉí¹Äóü",1105,168,154,104,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Japanese resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint_ja.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint_ja.dsp
deleted file mode 100644
index 7352b04..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint_ja.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_ja" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_ja - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_ja.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_ja.mak" CFG="DiagramPrint_ja - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_ja - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_ja - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_ja"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_ja - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_JA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x411 /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\ja\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_ja - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_JA_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../." /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_ja - Win32 Release"
-# Name "DiagramPrint_ja - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by DiagramPrint.rc
-//
-#define IDC_SCALE_PERCENT               1000
-#define IDC_SCALE_FIT                   1001
-#define IDC_DIAGRAMS                    1003
-#define IDC_ALL_DIAGRAMS                1010
-#define IDC_CURRENT_DIAGRAM             1011
-#define IDC_SELECTED_DIAGRAMS           1012
-#define IDC_PAGESM                      1155
-#define IDC_PERCENT                     1156
-#define IDC_PAGESN                      1157
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint.aps
deleted file mode 100644
index f0162c6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint.rc
deleted file mode 100644
index e1e3013..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint.rc
+++ /dev/null

@@ -1,417 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Korean resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)
-#ifdef _WIN32
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-#pragma code_page(949)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Licensed Materials -- Property of IBM - (C) Copyright IBM Corporation, 2003,2003 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBMÀº International Business Machines CorporationÀÇ µî·Ï»óÇ¥ÀÔ´Ï´Ù. Windows(TM)´Â Microsoft CorporationÀÇ »óÇ¥ÀÔ´Ï´Ù.\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "DiagramPrint µ¿Àû ¸µÅ© ¶óÀÌºê·¯¸®\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 333, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ÀÎ¼â"
-FONT 9, "±¼¸²"
-BEGIN
-    GROUPBOX        "ÇÁ¸°ÅÍ",1075,8,4,295,84,WS_GROUP
-    LTEXT           "ÀÌ¸§(&N):",1093,12,20,36,8
-    COMBOBOX        1139,54,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Æ¯¼º(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "»óÅÂ:",1095,12,32,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,243,10
-    LTEXT           "À¯Çü:",1094,11,46,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,243,10
-    LTEXT           "À§Ä¡:",1097,11,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,243,10
-    LTEXT           "¼³¸í:",1096,11,74,36,9,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,74,152,10
-    CONTROL         "ÆÄÀÏ·Î ÀÎ¼â(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,230,72,64,12
-    GROUPBOX        "´ÙÀÌ¾î±×·¥ ÀÎ¼â ¹üÀ§",1072,8,95,144,109,WS_GROUP
-    CONTROL         "¸ðµç ´ÙÀÌ¾î±×·¥(L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,108,72,12
-    CONTROL         "ÇöÀç ´ÙÀÌ¾î±×·¥(&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "¼±ÅÃµÈ ´ÙÀÌ¾î±×·¥(&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,87,12
-    LISTBOX         IDC_DIAGRAMS,25,156,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "¹èÀ²",IDC_STATIC,160,95,143,109
-    LTEXT           "ÆÛ¼¾Æ®º°",1104,164,111,35,8
-    CONTROL         "ÆÛ¼¾Æ®",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,43,9
-    CONTROL         "¸ÂÃã ´ë»ó",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    163,169,42,11
-    EDITTEXT        IDC_PERCENT,218,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,210,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,235,170,9,8
-    EDITTEXT        IDC_PAGESN,250,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "ÆäÀÌÁö",1102,276,169,21,8
-    GROUPBOX        "ÀÎ¼â ¹üÀ§",1074,8,211,170,64,WS_GROUP
-    CONTROL         "¸ðµÎ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "ÆäÀÌÁö(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,43,
-                    12
-    RTEXT           "½ÃÀÛ(&F):",1089,64,247,26,8
-    EDITTEXT        1152,94,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "³¡(&T):",1090,124,247,21,8
-    EDITTEXT        1153,150,245,24,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "ÀÎ¼â ¸Å¼ö",1073,190,211,126,64,WS_GROUP
-    LTEXT           "ÀÎ¼â ¸Å¼ö(&U):",1092,199,227,42,8
-    EDITTEXT        1154,277,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,197,245,70,25,WS_GROUP
-    CONTROL         "´ëÁ¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,275,249,36,12
-    DEFPUSHBUTTON   "È®ÀÎ",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,232,286,48,14
-    LTEXT           "ÆäÀÌÁöº°",1105,165,154,30,10
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ÀÎ¼â ¼³Á¤"
-FONT 9, "±¼¸²"
-BEGIN
-    GROUPBOX        "ÇÁ¸°ÅÍ",1075,8,4,272,84,WS_GROUP
-    LTEXT           "ÀÌ¸§(&N):",1093,11,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Æ¯¼º(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "»óÅÂ:",1095,11,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "À¯Çü:",1094,11,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "À§Ä¡:",1097,11,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "¼³¸í:",1096,12,73,36,9,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "¿ëÁö",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Å©±â(&Z):",1089,12,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "¼Ò½º(&S):",1090,12,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "¹æÇâ",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "¼¼·Î(&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "°¡·Î(&A)",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "È®ÀÎ",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ÆäÀÌÁö ¼³Á¤"
-FONT 9, "±¼¸²"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "¿ëÁö",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Å©±â(&Z):",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "¼Ò½º(&S):",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "¹æÇâ",1072,8,156,64,56,WS_GROUP
-    CONTROL         "¼¼·Î(&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "°¡·Î(&A)",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "¿©¹é",1075,80,156,152,56,WS_GROUP
-    LTEXT           "¿ÞÂÊ(&L):",1102,88,172,32,8
-    EDITTEXT        1155,125,170,28,12,WS_GROUP
-    LTEXT           "¿À¸¥ÂÊ(&R):",1103,162,172,34,8
-    EDITTEXT        1157,201,170,28,12,WS_GROUP
-    LTEXT           "¸Ç À§(&T):",1104,88,192,29,8
-    EDITTEXT        1156,125,190,28,12,WS_GROUP
-    LTEXT           "¸Ç ¾Æ·¡(&B):",1105,161,192,36,8
-    EDITTEXT        1158,201,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "È®ÀÎ",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "ÇÁ¸°ÅÍ(&P)...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 321, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ÀÎ¼â"
-FONT 9, "±¼¸²"
-BEGIN
-    GROUPBOX        "ÇÁ¸°ÅÍ",1075,8,4,278,84,WS_GROUP
-    LTEXT           "ÀÌ¸§(&N):",1093,11,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Æ¯¼º(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "»óÅÂ:",1095,10,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "À¯Çü:",1094,11,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "À§Ä¡:",1097,11,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "¼³¸í:",1096,11,73,36,9,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "ÆÄÀÏ·Î ÀÎ¼â(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,72,64,12
-    GROUPBOX        "ÀÎ¼â ¹üÀ§",1072,9,93,171,64,WS_GROUP
-    CONTROL         "¸ðµÎ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "ÆäÀÌÁö(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,122,43,
-                    12
-    CONTROL         "¼±ÅÃ(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "½ÃÀÛ(&F):",1089,64,124,27,8
-    EDITTEXT        1152,96,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "³¡(&T):",1090,126,124,22,8
-    EDITTEXT        1153,153,122,23,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "ÀÎ¼â ¸Å¼ö",1073,187,92,127,64,WS_GROUP
-    LTEXT           "ÀÎ¼â ¸Å¼ö(&C):",1092,194,108,68,8
-    EDITTEXT        1154,277,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,193,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "´ëÁ¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,273,130,36,12
-    DEFPUSHBUTTON   "È®ÀÎ",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 333, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "ÀÎ¼â"
-FONT 9, "±¼¸²"
-BEGIN
-    GROUPBOX        "ÇÁ¸°ÅÍ",1075,8,4,295,84,WS_GROUP
-    LTEXT           "ÀÌ¸§(&N):",1093,12,20,36,8
-    COMBOBOX        1139,54,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Æ¯¼º(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "»óÅÂ:",1095,12,32,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,243,10
-    LTEXT           "À¯Çü:",1094,11,46,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,243,10
-    LTEXT           "À§Ä¡:",1097,11,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,243,10
-    LTEXT           "¼³¸í:",1096,11,74,36,9,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,74,152,10
-    CONTROL         "ÆÄÀÏ·Î ÀÎ¼â(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,230,72,64,12
-    GROUPBOX        "´ÙÀÌ¾î±×·¥ ÀÎ¼â ¹üÀ§",1072,8,95,144,109,WS_GROUP
-    CONTROL         "¸ðµç ´ÙÀÌ¾î±×·¥(L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,108,72,12
-    CONTROL         "ÇöÀç ´ÙÀÌ¾î±×·¥(&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "¼±ÅÃµÈ ´ÙÀÌ¾î±×·¥(&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,87,12
-    LISTBOX         IDC_DIAGRAMS,25,156,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "¹èÀ²",IDC_STATIC,160,95,143,109
-    LTEXT           "ÆÛ¼¾Æ®º°",1104,164,111,35,8
-    CONTROL         "ÆÛ¼¾Æ®",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,43,9
-    CONTROL         "¸ÂÃã ´ë»ó",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    163,169,42,11
-    EDITTEXT        IDC_PERCENT,218,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,210,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,235,170,9,8
-    EDITTEXT        IDC_PAGESN,250,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "ÆäÀÌÁö",1102,276,169,21,8
-    GROUPBOX        "ÀÎ¼â ¹üÀ§",1074,8,211,170,64,WS_GROUP
-    CONTROL         "¸ðµÎ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "ÆäÀÌÁö(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,43,
-                    12
-    RTEXT           "½ÃÀÛ(&F):",1089,64,247,26,8
-    EDITTEXT        1152,94,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "³¡(&T):",1090,124,247,21,8
-    EDITTEXT        1153,150,245,24,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "ÀÎ¼â ¸Å¼ö",1073,190,211,126,64,WS_GROUP
-    LTEXT           "ÀÎ¼â ¸Å¼ö(&U):",1092,199,227,42,8
-    EDITTEXT        1154,277,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,197,245,70,25,WS_GROUP
-    CONTROL         "´ëÁ¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,275,249,36,12
-    DEFPUSHBUTTON   "È®ÀÎ",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,232,286,48,14
-    LTEXT           "ÆäÀÌÁöº°",1105,165,154,30,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Korean resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint_ko.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint_ko.dsp
deleted file mode 100644
index 51bd4d6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint_ko.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_ko" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_ko - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_ko.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_ko.mak" CFG="DiagramPrint_ko - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_ko - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_ko - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_ko"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_ko - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_KO_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x412 /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\ko\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_ko - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_KO_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../." /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_ko - Win32 Release"
-# Name "DiagramPrint_ko - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by DiagramPrint.rc
-//
-#define IDC_SCALE_PERCENT               1000
-#define IDC_SCALE_FIT                   1001
-#define IDC_DIAGRAMS                    1003
-#define IDC_ALL_DIAGRAMS                1010
-#define IDC_CURRENT_DIAGRAM             1011
-#define IDC_SELECTED_DIAGRAMS           1012
-#define IDC_PAGESM                      1155
-#define IDC_PERCENT                     1156
-#define IDC_PAGESN                      1157
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint.aps
deleted file mode 100644
index baf8d8a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint.rc
deleted file mode 100644
index b11a8fe..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint.rc
+++ /dev/null

@@ -1,417 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Materiais Licenciados -- Propriedade da IBM - (C) Copyright IBM Corporation, 2003,2003 - Uso, duplicação ou publicação restrita pelo GSA ADP Schedule Contract com a IBM Corp.\0"
-            VALUE "LegalTrademarks", "A (c) IBM é uma marca registrada da International Business Machines Corporation.  Windows(TM) é uma marca registrada da Microsoft Corporation.\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Biblioteca de Link Dinâmico DiagramPrint\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,27,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propriedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Em que:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentário:",1096,16,72,37,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,73,133,10
-    CONTROL         "Imprimir para o a&rquivo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,192,71,83,12
-    GROUPBOX        "Intervalo de impressão do diagrama",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "T&odos os Diagramas",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,79,12
-    CONTROL         "Diagrama &Atual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "&Diagramas Selecionados",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,93,12
-    LISTBOX         IDC_DIAGRAMS,15,153,116,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Escalando",IDC_STATIC,160,95,119,109
-    LTEXT           "Por porcentagem",1104,168,111,58,8
-    CONTROL         "porcentagem",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,165,126,55,9
-    CONTROL         "Ajustar a",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    167,169,41,9
-    EDITTEXT        IDC_PERCENT,224,124,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,209,167,13,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,224,170,4,8
-    EDITTEXT        IDC_PAGESN,229,167,14,12,ES_NUMBER | WS_GROUP
-    LTEXT           "páginas",1102,245,170,27,8
-    GROUPBOX        "Intervalo de impressão",1074,7,212,144,64,WS_GROUP
-    CONTROL         "&Todas",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,245,38,12
-    RTEXT           "&de:",1089,57,247,12,9
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&para:",1090,97,246,17,8
-    EDITTEXT        1153,117,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,159,211,120,66,WS_GROUP
-    LTEXT           "Número de &cópias:",1092,167,227,59,8
-    EDITTEXT        1154,231,224,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "C&ombinar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,233,245,42,12
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,286,48,14
-    LTEXT           "Por páginas",1105,168,154,47,8
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir Configuração"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propriedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Em que:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentário:",1096,15,72,37,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,55,72,220,10
-    GROUPBOX        "Papel",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Ta&manho:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Origem:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientação",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "R&etrato",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "P&aisagem",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Configuração da Página"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "Papel",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Ta&manho:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Origem:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientação",1072,8,156,64,56,WS_GROUP
-    CONTROL         "R&etrato",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "P&aisagem",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Margens",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Esquerda:",1102,88,172,32,8
-    EDITTEXT        1155,122,170,28,12,WS_GROUP
-    LTEXT           "&Direita:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Superior:",1104,88,192,32,8
-    EDITTEXT        1156,122,190,28,12,WS_GROUP
-    LTEXT           "&Inferior:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Impressora...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propriedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Em que:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentário:",1096,16,72,37,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,72,133,10
-    CONTROL         "Imprimir para o a&rquivo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,192,70,83,12
-    GROUPBOX        "Intervalo de impressão",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Todas",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,122,38,12
-    CONTROL         "&Seleção",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&de:",1089,57,124,12,8
-    EDITTEXT        1152,73,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&para:",1090,102,124,17,8
-    EDITTEXT        1153,122,122,25,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,156,92,124,64,WS_GROUP
-    LTEXT           "Número de &cópias:",1092,168,108,65,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,163,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "C&omb.",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,243,130,33,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "Imprimir"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,20,27,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propriedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Em que:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentário:",1096,16,72,37,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,73,133,10
-    CONTROL         "Imprimir para o a&rquivo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,192,71,83,12
-    GROUPBOX        "Intervalo de impressão do diagrama",1072,8,95,144,109,
-                    WS_GROUP
-    CONTROL         "T&odos os Diagramas",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,79,12
-    CONTROL         "Diagrama &Atual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "&Diagramas Selecionados",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,93,12
-    LISTBOX         IDC_DIAGRAMS,15,153,116,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Escalando",IDC_STATIC,160,95,119,109
-    LTEXT           "Por porcentagem",1104,168,111,58,8
-    CONTROL         "porcentagem",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,165,126,55,9
-    CONTROL         "Ajustar a",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,
-                    167,169,41,9
-    EDITTEXT        IDC_PERCENT,224,124,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,209,167,13,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,224,170,4,8
-    EDITTEXT        IDC_PAGESN,229,167,14,12,ES_NUMBER | WS_GROUP
-    LTEXT           "páginas",1102,245,170,27,8
-    GROUPBOX        "Intervalo de impressão",1074,7,212,144,64,WS_GROUP
-    CONTROL         "&Todas",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,245,38,12
-    RTEXT           "&de:",1089,57,247,12,9
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&para:",1090,97,246,17,8
-    EDITTEXT        1153,117,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,159,211,120,66,WS_GROUP
-    LTEXT           "Número de &cópias:",1092,167,227,59,8
-    EDITTEXT        1154,231,224,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "C&ombinar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,233,245,42,12
-    DEFPUSHBUTTON   "OK",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,286,48,14
-    LTEXT           "Por páginas",1105,168,154,47,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint_pt_BR.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint_pt_BR.dsp
deleted file mode 100644
index e4813ed..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint_pt_BR.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_pt_BR" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_pt_BR - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_pt_BR.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_pt_BR.mak" CFG="DiagramPrint_pt_BR - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_pt_BR - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_pt_BR - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_pt_BR"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_pt_BR - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_PT_BR_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x416 /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\pt_BR\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_pt_BR - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_PT_BR_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../." /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_pt_BR - Win32 Release"
-# Name "DiagramPrint_pt_BR - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/resource.h
deleted file mode 100644
index 7de167e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by DiagramPrint.rc

-//

-#define IDC_SCALE_PERCENT               1000

-#define IDC_SCALE_FIT                   1001

-#define IDC_DIAGRAMS                    1003

-#define IDC_ALL_DIAGRAMS                1010

-#define IDC_CURRENT_DIAGRAM             1011

-#define IDC_SELECTED_DIAGRAMS           1012

-#define IDC_PAGESM                      1155

-#define IDC_PERCENT                     1156

-#define IDC_PAGESN                      1157

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NO_MFC                     1

-#define _APS_NEXT_RESOURCE_VALUE        101

-#define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1005

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint.aps
deleted file mode 100644
index aff80f4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint.rc
deleted file mode 100644
index f930f87..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint.rc
+++ /dev/null

@@ -1,414 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Chinese (P.R.C.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 4, 2\r\n"
-    "#pragma code_page(936)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Licensed Materials -- Property of IBM - (C) Copyright IBM Corporation, 2003,2003 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBM ÊÇ International Business Machines Corporation µÄ×¢²áÉÌ±ê¡£Windows(TM) ÊÇ Microsoft Corporation µÄÉÌ±ê¡£\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "DiagramPrint ¶¯Ì¬Á´½Ó¿â\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "´òÓ¡"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,272,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "ÊôÐÔ(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "×´Ì¬£º",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "ÀàÐÍ£º",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Î»ÖÃ£º",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "×¢ÊÍ£º",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "´òÓ¡µ½ÎÄ¼þ(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,208,71,69,12
-    GROUPBOX        "Í¼´òÓ¡·¶Î§",1072,8,95,144,109,WS_GROUP
-    CONTROL         "ËùÓÐÍ¼(&L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,64,12
-    CONTROL         "µ±Ç°Í¼(&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "Ñ¡ÖÐµÄÍ¼(&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,99,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Ëõ·Å",IDC_STATIC,160,95,119,109
-    LTEXT           "°´°Ù·Ö±È",1104,168,111,35,8
-    CONTROL         "°Ù·Ö±È",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,36,9
-    CONTROL         "ÊÊÓ¡",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,171,169,
-                    30,9
-    EDITTEXT        IDC_PERCENT,209,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,204,168,20,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESN,234,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "ҳ",1102,257,169,8,8
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Ò³Âë(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,43,12
-    RTEXT           "´Ó(&F)£º",1089,65,246,31,8
-    EDITTEXT        1152,106,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,67,263,29,8
-    EDITTEXT        1153,105,260,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "´òÓ¡·¶Î§",1074,8,211,144,64,WS_GROUP
-    LTEXT           "°´Ò³Êý",1105,168,154,30,8
-    LTEXT           "x",IDC_STATIC,226,170,8,8
-    GROUPBOX        "·ÝÊý",1073,159,211,120,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,163,244,70,25,WS_GROUP
-    CONTROL         "Öð·Ý(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,236,242,41,27
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,232,286,48,14
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "´òÓ¡ÉèÖÃ"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,272,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "ÊôÐÔ(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "×´Ì¬£º",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "ÀàÐÍ£º",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Î»ÖÃ£º",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "×¢ÊÍ£º",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Ö½ÕÅ",1073,8,92,164,56,WS_GROUP
-    LTEXT           "³ß´ç(&Z)£º",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "À´Ô´(&S)£º",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "·½Ïò",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "×ÝÏò(&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "ºáÏò(&A)",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Ò³ÃæÉèÖÃ"
-FONT 9, "ËÎÌå"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "Ö½ÕÅ",1073,8,96,224,56,WS_GROUP
-    LTEXT           "³ß´ç(&Z)£º",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "À´Ô´(&S)£º",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "·½Ïò",1072,8,156,64,56,WS_GROUP
-    CONTROL         "×ÝÏò(&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "ºáÏò(&A)",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "Ò³±ß¾à",1075,80,156,152,56,WS_GROUP
-    LTEXT           "×ó(&L)£º",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "ÓÒ(&R)£º",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "ÉÏ(&T)£º",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "ÏÂ(&B)£º",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "È·¶¨",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,132,220,37,14
-    PUSHBUTTON      "´òÓ¡»ú(&P)...",1026,175,220,58,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "´òÓ¡"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,277,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "ÊôÐÔ(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "×´Ì¬£º",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "ÀàÐÍ£º",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Î»ÖÃ£º",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "×¢ÊÍ£º",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "´òÓ¡µ½ÎÄ¼þ(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,68,12
-    GROUPBOX        "´òÓ¡·¶Î§",1072,10,92,144,64,WS_GROUP
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Ò³Âë(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,121,50,12
-    CONTROL         "Ñ¡Ôñ(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "´Ó(&F)£º",1089,84,124,31,8
-    EDITTEXT        1152,119,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,83,139,32,8
-    EDITTEXT        1153,120,137,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "·ÝÊý",1073,160,92,125,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",1092,168,108,68,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,159,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "Öð·Ý(O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,237,130,42,12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "´òÓ¡"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,272,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "ÊôÐÔ(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "×´Ì¬£º",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "ÀàÐÍ£º",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Î»ÖÃ£º",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "×¢ÊÍ£º",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "´òÓ¡µ½ÎÄ¼þ(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,208,71,69,12
-    GROUPBOX        "Í¼´òÓ¡·¶Î§",1072,8,95,144,109,WS_GROUP
-    CONTROL         "ËùÓÐÍ¼(&L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,64,12
-    CONTROL         "µ±Ç°Í¼(&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "Ñ¡ÖÐµÄÍ¼(&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,99,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Ëõ·Å",IDC_STATIC,160,95,119,109
-    LTEXT           "°´°Ù·Ö±È",1104,168,111,35,8
-    CONTROL         "°Ù·Ö±È",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,36,9
-    CONTROL         "ÊÊÓ¡",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,171,169,
-                    30,9
-    EDITTEXT        IDC_PERCENT,209,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,204,168,20,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESN,234,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "ҳ",1102,257,169,8,8
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "Ò³Âë(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,43,12
-    RTEXT           "´Ó(&F)£º",1089,65,246,31,8
-    EDITTEXT        1152,106,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,67,263,29,8
-    EDITTEXT        1153,105,260,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "´òÓ¡·¶Î§",1074,8,211,144,64,WS_GROUP
-    LTEXT           "°´Ò³Êý",1105,168,154,30,8
-    LTEXT           "x",IDC_STATIC,226,170,8,8
-    GROUPBOX        "·ÝÊý",1073,159,211,120,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,163,244,70,25,WS_GROUP
-    CONTROL         "Öð·Ý(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,236,242,41,27
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,232,286,48,14
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Chinese (P.R.C.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 4, 2
-#pragma code_page(936)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint_zh_CN.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint_zh_CN.dsp
deleted file mode 100644
index bde99e8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint_zh_CN.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_zh_CN" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_zh_CN - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_zh_CN.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_zh_CN.mak" CFG="DiagramPrint_zh_CN - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_zh_CN - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_zh_CN - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_zh_CN"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_zh_CN - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_ZH_CN_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x804 /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\zh_CN\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_zh_CN - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_ZH_CN_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../." /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_zh_CN - Win32 Release"
-# Name "DiagramPrint_zh_CN - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by DiagramPrint.rc
-//
-#define IDC_SCALE_PERCENT               1000
-#define IDC_SCALE_FIT                   1001
-#define IDC_DIAGRAMS                    1003
-#define IDC_ALL_DIAGRAMS                1010
-#define IDC_CURRENT_DIAGRAM             1011
-#define IDC_SELECTED_DIAGRAMS           1012
-#define IDC_PAGESM                      1155
-#define IDC_PERCENT                     1156
-#define IDC_PAGESN                      1157
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint.aps
deleted file mode 100644
index 5002807..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint.aps
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint.rc
deleted file mode 100644
index c43c45f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint.rc
+++ /dev/null

@@ -1,415 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Chinese (Taiwan) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT)
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-#pragma code_page(950)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 4, 1\r\n"
-    "#pragma code_page(950)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\DiagramPrint.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "DiagramPrint DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "DiagramPrint\0"
-            VALUE "LegalCopyright", "Licensed Materials -- Property of IBM - (C) Copyright IBM Corporation, 2003,2003 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(c) IBM ¬O International Business Machines Corporation ªºµù¥U°Ó¼Ð¡AWindows(TM) ¬O Microsoft Corporation ªº°Ó¼Ð¡C\0"
-            VALUE "OriginalFilename", "DiagramPrint.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "DiagramPrint °ÊºAÃìµ²µ{¦¡®w\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "¦C¦L"
-FONT 9, "·s²Ó©úÅé"
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "¤º®e(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "ª¬ºA¡G",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "µù¸Ñ¡G",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "¦C¦L¦ÜÀÉ®×(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "¹Ï«¬¦C¦L½d³ò",1072,8,95,144,109,WS_GROUP
-    CONTROL         "©Ò¦³¹Ï«¬(&L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,64,12
-    CONTROL         "²{¦æ¹Ï«¬(&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "©Ò¿ïªº¹Ï«¬(&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,87,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "½Õ¾ã",IDC_STATIC,160,95,119,109
-    LTEXT           "¨Ì¦Ê¤À¤ñ",1104,168,111,35,8
-    CONTROL         "¦Ê¤À¤ñ",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,33,9
-    CONTROL         "²Å¦X",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,171,169,
-                    30,9
-    EDITTEXT        IDC_PERCENT,208,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,204,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,226,170,8,8
-    EDITTEXT        IDC_PAGESN,234,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "¶¼Æ",1102,255,169,21,8
-    GROUPBOX        "¦C¦L½d³ò",1074,8,211,144,64,WS_GROUP
-    CONTROL         "¥þ³¡(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "¶¼Æ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,36,12
-    RTEXT           "±q(&F)¡G",1089,48,247,20,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,96,247,16,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,159,211,120,64,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "¤À¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,239,249,36,12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,232,286,48,14
-    LTEXT           "¨Ì¶¼Æ",1105,168,154,30,8
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "¦C¦L³]©w"
-FONT 9, "·s²Ó©úÅé"
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "¤º®e(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "ª¬ºA¡G",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "µù¸Ñ¡G",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "¯È±i",1073,8,92,164,56,WS_GROUP
-    LTEXT           "¤j¤p(&Z)¡G",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "¨Ó·½(&S)¡G",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "¤è¦V",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "ª½¦L(&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "¾î¦L(&A)",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,232,156,48,14
-END
-
-1546 DIALOG DISCARDABLE  32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "¶±³]©w"
-FONT 9, "·s²Ó©úÅé"
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,160,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,84,88,80,4
-    GROUPBOX        "¯È±i",1073,8,96,224,56,WS_GROUP
-    LTEXT           "¤j¤p(&Z)¡G",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "¨Ó·½(&S)¡G",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "¤è¦V",1072,8,156,64,56,WS_GROUP
-    CONTROL         "ª½¦L(&O)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "¾î¦L(&A)",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "Ãä¶Z",1075,80,156,152,56,WS_GROUP
-    LTEXT           "¥ª(&L)¡G",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "¥k(&R)¡G",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "¤W(&T)¡G",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "¤U(&B)¡G",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "½T©w",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "¦Lªí¾÷(&P)...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "¦C¦L"
-FONT 9, "·s²Ó©úÅé"
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "¤º®e(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "ª¬ºA¡G",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "µù¸Ñ¡G",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "¦C¦L¦ÜÀÉ®×(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "¦C¦L½d³ò",1072,8,92,144,64,WS_GROUP
-    CONTROL         "¥þ³¡(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "¶¼Æ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "¿ï¨ú½d³ò(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,138,
-                    64,12
-    RTEXT           "±q(&F)¡G",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,160,92,120,64,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,168,108,68,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "¤À¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,232,164,48,14
-END
-
-#define WS_EX_LAYOUTRTL			0x00400000
-
-
-1547 DIALOGEX 32, 32, 290, 312
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RTLREADING | WS_EX_LAYOUTRTL
-CAPTION "¦C¦L"
-FONT 9, "·s²Ó©úÅé"
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "¤º®e(&P)",1025,212,17,60,14,WS_GROUP
-    LTEXT           "ª¬ºA¡G",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "µù¸Ñ¡G",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "¦C¦L¦ÜÀÉ®×(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "¹Ï«¬¦C¦L½d³ò",1072,8,95,144,109,WS_GROUP
-    CONTROL         "©Ò¦³¹Ï«¬(&L)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,110,64,12
-    CONTROL         "²{¦æ¹Ï«¬(&C)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON,16,124,76,12
-    CONTROL         "©Ò¿ïªº¹Ï«¬(&D)",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,139,87,12
-    LISTBOX         IDC_DIAGRAMS,25,153,118,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "½Õ¾ã",IDC_STATIC,160,95,119,109
-    LTEXT           "¨Ì¦Ê¤À¤ñ",1104,168,111,35,8
-    CONTROL         "¦Ê¤À¤ñ",IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,172,126,33,9
-    CONTROL         "²Å¦X",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON,171,169,
-                    30,9
-    EDITTEXT        IDC_PERCENT,208,125,32,12,ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_PAGESM,204,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "x",IDC_STATIC,226,170,8,8
-    EDITTEXT        IDC_PAGESN,234,168,20,12,ES_NUMBER | WS_GROUP
-    LTEXT           "¶¼Æ",1102,255,169,21,8
-    GROUPBOX        "¦C¦L½d³ò",1074,8,211,144,64,WS_GROUP
-    CONTROL         "¥þ³¡(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,229,64,12
-    CONTROL         "¶¼Æ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,245,36,12
-    RTEXT           "±q(&F)¡G",1089,48,247,20,8
-    EDITTEXT        1152,70,245,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,96,247,16,8
-    EDITTEXT        1153,114,245,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,159,211,120,64,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,167,227,68,8
-    EDITTEXT        1154,239,225,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,160,244,70,25,WS_GROUP
-    CONTROL         "¤À¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,239,249,36,12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,286,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,232,286,48,14
-    LTEXT           "¨Ì¶¼Æ",1105,168,154,30,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 287
-        BOTTOMMARGIN, 300
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Chinese (Taiwan) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT)
-#ifdef _WIN32
-LANGUAGE 4, 1
-#pragma code_page(950)
-#endif //_WIN32
-#include "res\DiagramPrint.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint_zh_TW.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint_zh_TW.dsp
deleted file mode 100644
index 5500d83..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint_zh_TW.dsp
+++ /dev/null

@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_zh_TW" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=DiagramPrint_zh_TW - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_zh_TW.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "DiagramPrint_zh_TW.mak" CFG="DiagramPrint_zh_TW - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_zh_TW - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_zh_TW - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_zh_TW"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_zh_TW - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_ZH_TW_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x404 /i "../." /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"..\I10n\os\win32\x86\zh_TW\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_zh_TW - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DIAGRAMPRINT_ZH_TW_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../." /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/DiagramPrint.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "DiagramPrint_zh_TW - Win32 Release"
-# Name "DiagramPrint_zh_TW - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\DiagramPrint.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\DiagramPrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\WinPrintHelper.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by DiagramPrint.rc
-//
-#define IDC_SCALE_PERCENT               1000
-#define IDC_SCALE_FIT                   1001
-#define IDC_DIAGRAMS                    1003
-#define IDC_ALL_DIAGRAMS                1010
-#define IDC_CURRENT_DIAGRAM             1011
-#define IDC_SELECTED_DIAGRAMS           1012
-#define IDC_PAGESM                      1155
-#define IDC_PERCENT                     1156
-#define IDC_PAGESN                      1157
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/StdAfx.cpp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/StdAfx.cpp
deleted file mode 100644
index e266bd7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/StdAfx.cpp
+++ /dev/null

@@ -1,26 +0,0 @@
-//*****************************************************************************

-//

-//	File:		stdafx.cpp

-//

-//	Purpose:	source file that includes just the standard includes

-//				DiagramPrint.pch will be the pre-compiled header

-//				stdafx.obj will contain the pre-compiled type information

-//

-//	Author:		

-//

-//				

-// Copyright (c) 2002 - 2005 IBM Corporation and others.

-// 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:

-//    IBM Corporation - initial API and implementation 

-//

-//******************************************************************************

-

-#include "stdafx.h"

-

-

-


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/StdAfx.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/StdAfx.h
deleted file mode 100644
index 8d60429..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/StdAfx.h
+++ /dev/null

@@ -1,59 +0,0 @@
-//*****************************************************************************

-//

-//	File:		stdafx.h

-//

-//	Purpose:	include file for standard system include files,

-//				or project specific include files that are used frequently, but

-//				are changed infrequently

-//

-//	Author:		

-//

-//				

-// Copyright (c) 2002 - 2005 IBM Corporation and others.

-// 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:

-//    IBM Corporation - initial API and implementation 

-//

-//******************************************************************************

-

-#if !defined(AFX_STDAFX_H__C3741CBF_7429_4D9A_9018_1795B3295C9F__INCLUDED_)

-#define AFX_STDAFX_H__C3741CBF_7429_4D9A_9018_1795B3295C9F__INCLUDED_

-

-#if _MSC_VER > 1000

-#pragma once

-#endif // _MSC_VER > 1000

-

-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers

-

-#include <afxwin.h>         // MFC core and standard components

-#include <afxext.h>         // MFC extensions

-

-#ifndef _AFX_NO_OLE_SUPPORT

-#include <afxole.h>         // MFC OLE classes

-#include <afxodlgs.h>       // MFC OLE dialog classes

-#include <afxdisp.h>        // MFC Automation classes

-#endif // _AFX_NO_OLE_SUPPORT

-

-

-#ifndef _AFX_NO_DB_SUPPORT

-#include <afxdb.h>			// MFC ODBC database classes

-#endif // _AFX_NO_DB_SUPPORT

-

-#ifndef _AFX_NO_DAO_SUPPORT

-#include <afxdao.h>			// MFC DAO database classes

-#endif // _AFX_NO_DAO_SUPPORT

-

-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls

-#ifndef _AFX_NO_AFXCMN_SUPPORT

-#include <afxcmn.h>			// MFC support for Windows Common Controls

-#endif // _AFX_NO_AFXCMN_SUPPORT

-

-

-//{{AFX_INSERT_LOCATION}}

-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

-

-#endif // !defined(AFX_STDAFX_H__C3741CBF_7429_4D9A_9018_1795B3295C9F__INCLUDED_)


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/WinPrintHelper.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/WinPrintHelper.h
deleted file mode 100644
index 97d1c79..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/WinPrintHelper.h
+++ /dev/null

@@ -1,204 +0,0 @@
-//*****************************************************************************
-//
-//	File:		WinPrintHelper.h
-//
-//	Purpose:	Header file used by DiagramPrint.cpp, which will compile to
-//				a DLL.
-//
-//	Author:		Wayne Diu, wdiu
-//
-//				
-// Copyright (c) 2002 - 2005 IBM Corporation and others.
-// 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:
-//    IBM Corporation - initial API and implementation 
-//
-//******************************************************************************
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class WinPrintHelper */
-
-#ifndef _Included_WinPrintHelper
-#define _Included_WinPrintHelper
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     WinPrintHelper
- * Method:    initScaleFitTo
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_initScaleFitTo
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     WinPrintHelper
- * Method:    initScalePercent
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_initScalePercent
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     WinPrintHelper
- * Method:    addDiagramString
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_addDiagramString
-  (JNIEnv *, jclass, jstring);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getScaleFitToM
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getScaleFitToM
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getScaleFitToN
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getScaleFitToN
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getScalePercent
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getScalePercent
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    isDiagramSelected
- * Signature: (I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_isDiagramSelected
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getPrintRangeAll
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPrintRangeAll
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getPrintRangePages
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPrintRangePages
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getDiagramPrintRangeAll
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getDiagramPrintRangeAll
-(JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getDiagramPrintRangeCurrent
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getDiagramPrintRangeCurrent
-(JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getDiagramPrintRangeSelection
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getDiagramPrintRangeSelection
-(JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getNumberOfCopies
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getNumberOfCopies
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    open
- * Signature: (LWinPrintHelper$PrintDlgData;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_open
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getCollate
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getCollate
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    resetDialog
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_resetDialog
-(JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getPagesFrom
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPagesFrom
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    getPagesTo
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_getPagesTo
-  (JNIEnv *, jclass);
-
-/*
- * Class:     WinPrintHelper
- * Method:    setHwndOwner
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_setHwndOwner
-(JNIEnv * env, jclass, jstring, jstring);
-
-/*
- * Class:     WinPrintHelper
- * Method:    setOrientation
- * Signature: (Z)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_setOrientation
-(JNIEnv * env, jclass, jboolean isLandscape);
-
-/*
- * Class:     WinPrintHelper
- * Method:    setPaperSize
- * Signature: (IDD)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_gmf_runtime_common_ui_printing_PrintHelper_setPaperSize
-(JNIEnv * env, jclass, jint index, jdouble width, jdouble length);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/res/DiagramPrint.rc2 b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/res/DiagramPrint.rc2
deleted file mode 100644
index 14f3ebc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/res/DiagramPrint.rc2
+++ /dev/null

@@ -1,13 +0,0 @@
-//

-// DiagramPrint.RC2 - resources Microsoft Visual C++ does not edit directly

-//

-

-#ifdef APSTUDIO_INVOKED

-	#error this file is not editable by Microsoft Visual C++

-#endif //APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-// Add manually edited resources here...

-

-/////////////////////////////////////////////////////////////////////////////


diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/resource.h
+++ /dev/null

@@ -1,25 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by DiagramPrint.rc
-//
-#define IDC_SCALE_PERCENT               1000
-#define IDC_SCALE_FIT                   1001
-#define IDC_DIAGRAMS                    1003
-#define IDC_ALL_DIAGRAMS                1010
-#define IDC_CURRENT_DIAGRAM             1011
-#define IDC_SELECTED_DIAGRAMS           1012
-#define IDC_PAGESM                      1155
-#define IDC_PERCENT                     1156
-#define IDC_PAGESN                      1157
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_de.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_de.dll
deleted file mode 100644
index 8386d4d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_de.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_en.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_en.dll
deleted file mode 100644
index 86a33a6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_en.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_es.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_es.dll
deleted file mode 100644
index 2439ce6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_es.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_fr.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_fr.dll
deleted file mode 100644
index 67be17c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_fr.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_it.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_it.dll
deleted file mode 100644
index 5d21f17..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_it.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ja.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ja.dll
deleted file mode 100644
index 30ca913..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ja.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ko.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ko.dll
deleted file mode 100644
index 08fd58d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ko.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pt_BR.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pt_BR.dll
deleted file mode 100644
index 5418d2a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pt_BR.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_CN.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_CN.dll
deleted file mode 100644
index b6d9064..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_CN.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_TW.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_TW.dll
deleted file mode 100644
index f527247..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_TW.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.printing.win32/META-INF/MANIFEST.MF
deleted file mode 100644
index 39a35f4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.printing.win32
-Bundle-Name: %Fragment.name
-Bundle-Vendor: %Fragment.providerName
-Bundle-Version: 1.0.2.qualifier
-Bundle-Localization: printingWin32Fragment
-Fragment-Host: org.eclipse.gmf.runtime.common.ui.printing
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)"
-Provide-Package: org.eclipse.gmf.runtime.common.ui.printing

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/about.html b/org.eclipse.gmf.runtime.common.ui.printing.win32/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/build.properties b/org.eclipse.gmf.runtime.common.ui.printing.win32/build.properties
deleted file mode 100644
index 63593ff..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/build.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = fragment.xml,\
-               printingWin32Fragment.properties,\
-               META-INF/,\
-               .,\
-               about.html,\
-               DiagramPrint_zh_TW.dll,\
-               DiagramPrint_zh_CN.dll,\
-               DiagramPrint_pt_BR.dll,\
-               DiagramPrint_ko.dll,\
-               DiagramPrint_ja.dll,\
-               DiagramPrint_it.dll,\
-               DiagramPrint_fr.dll,\
-               DiagramPrint_es.dll,\
-               DiagramPrint_en.dll,\
-               DiagramPrint_de.dll
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/fragment.xml b/org.eclipse.gmf.runtime.common.ui.printing.win32/fragment.xml
deleted file mode 100644
index f50a8d5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/fragment.xml
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<fragment>
-
-</fragment>

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/printingWin32Fragment.properties b/org.eclipse.gmf.runtime.common.ui.printing.win32/printingWin32Fragment.properties
deleted file mode 100644
index 624baa0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/printingWin32Fragment.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Fragment.name = GMF Printing for Win32
-Fragment.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java b/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java
deleted file mode 100644
index de4e863..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java
+++ /dev/null

@@ -1,525 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.printing;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.printing.internal.CommonPrintingDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.printing.internal.CommonPrintingStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.printing.internal.PrintingPlugin;
-
-/**
- * The PrintHelper implements the IPrintHelper interface for the platform
- * specfic print code.
- * 
- * This is for Win32.
- * 
- * @author wdiu, Wayne Diu
- */
-public class PrintHelper
-    implements IPrintHelper {
-
-    /**
-     * Dynamic link library name without the extension
-     */
-    private static final String DLL_NAME = "DiagramPrint"; //$NON-NLS-1$
-
-    /**
-     * Country and language separator
-     */
-    private static final String SEPARATOR = StringStatics.UNDER_SCORE;
-
-    // to avoid throwing exceptions because of trying to load dlls for
-    // unsupported locales, maintain an array of supported countries and
-    // languages
-
-    // in the array below, if there are multiple entries for the same
-    // language, put the country specific one first
-
-    /**
-     * Supported languages strings. Default locale is SUPPORTED[0].
-     */
-    private static final String SUPPORTED[] = {
-        "en", "de", "es", "fr", "it", "ja", "ko", "pt_BR", "zh_CN", "zh_TW"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-
-    /**
-     * Default locale, English language
-     */
-    private static final String DEFAULT_LOCALE = SUPPORTED[0];
-
-    /*
-     * Load the dll
-     */
-    static {
-
-        // Although a far nicer way to do this dll loading is by using
-        // Bundle-NativeCode in manifest.mf, we are not doing it that way
-        // because of Bugzilla
-        // https://bugs.eclipse.org/bugs/show_bug.cgi?id=153902
-
-        // When the Bugzilla has been fixed, this static block can be replaced
-        // with one line of code
-        // System.loadLibrary("DiagramPrint");
-
-        String localizedVersion = DEFAULT_LOCALE;
-
-        List supported = new ArrayList();
-        supported.addAll(Arrays.asList(SUPPORTED));
-
-        String language = Locale.getDefault().getLanguage().toLowerCase();
-        if (supported.contains(language)) {
-            localizedVersion = language;
-        } else {
-            String country = Locale.getDefault().getCountry().toUpperCase();
-            if (country != null) {
-                String locale = language + SEPARATOR + country;
-                if (supported.contains(locale)) {
-                    localizedVersion = locale;
-                }
-            }
-        }
-
-        try {
-            System.loadLibrary(DLL_NAME + SEPARATOR + localizedVersion);
-        } catch (UnsatisfiedLinkError ule) {
-            Log.error(PrintingPlugin.getDefault(),
-                CommonPrintingStatusCodes.RESOURCE_FAILURE,
-                "Failed to load DiagramPrint dll for " //$NON-NLS-1$
-                    + localizedVersion);
-            Trace.catching(PrintingPlugin.getDefault(),
-                CommonPrintingDebugOptions.EXCEPTIONS_CATCHING,
-                PrintHelper.class, "Link", ule); //$NON-NLS-1$
-            Trace.throwing(PrintingPlugin.getDefault(),
-                CommonPrintingDebugOptions.EXCEPTIONS_THROWING,
-                PrintHelper.class, "Link", ule); //$NON-NLS-1$*/
-            throw ule;
-        }
-    }
-
-    /*
-     * Static methods from dll
-     */
-
-    /*
-     * Set methods
-     */
-
-    /**
-     * Init print dialog box's scale fit to.
-     * 
-     * @param m
-     * @param n
-     */
-    public static native void initScaleFitTo(int m, int n);
-
-    /**
-     * Init print dialog box's scale percent.
-     * 
-     * @param percent
-     */
-    public static native void initScalePercent(int percent);
-
-    /**
-     * Resets the dialog. Call this before addDiagramString if you've already
-     * added strings.
-     */
-    public static native void resetDialog();
-
-    /**
-     * Add a string to the diagrams list of the dialog box.
-     * 
-     * @param string
-     */
-    public static native void addDiagramString(String string);
-
-    /**
-     * Set the owner hwnd so that the displyed print dialog is modal.
-     * 
-     * @param windowClass
-     *            String with class
-     * @param title
-     *            String with shell title
-     */
-    public static native void setHwndOwner(String windowClass, String title);
-
-    /**
-     * Allows to set the orientation (portrait/landscape) in the print dialog.
-     * 
-     * @param isLandscape
-     *            true if orientation should be landscape, false otherwise.
-     */
-    public static native void setOrientation(boolean isLandscape);
-
-    /**
-     * Allows to set the paper size in the print dialog.
-     * 
-     * @param index
-     *            index of type of paper size,
-     * @see org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupPageType
-     *      for the type of paper sizes available and their indices.
-     * @param width
-     *            specifies the custom width of the paper. Leave as 0 if paper
-     *            size index is user-defined.
-     * @param height
-     *            specifies the custom width of the paper. Leave as 0 if paper
-     *            size index is user-defined.
-     */
-    public static native void setPaperSize(int index, double width,
-            double height);
-
-    /*
-     * Get methods
-     */
-
-    /**
-     * If not > 0 then user has clicked percent scaling
-     * 
-     * @return scale to m int
-     */
-    public static native int getScaleFitToM();
-
-    /**
-     * If not > 0 then user has clicked percent scaling
-     * 
-     * @return scale to n int
-     */
-    public static native int getScaleFitToN();
-
-    /**
-     * If not > 0 then user has clicked fit to m x n scaling
-     * 
-     * @return scale percent int
-     */
-    public static native int getScalePercent();
-
-    /**
-     * Returns true if the diagram at the index was selected
-     * 
-     * @param index
-     *            the index of the diagrams you passed in
-     * @return true if selected, false if not selected
-     */
-    public static native boolean isDiagramSelected(int index);
-
-    // one of the three is unnecssary, but it makes more sense
-    /**
-     * Returns if diagram print range all was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public static native boolean getDiagramPrintRangeAll();
-
-    /**
-     * Returns if diagram print range current was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public static native boolean getDiagramPrintRangeCurrent();
-
-    /**
-     * Returns if diagram print range selection was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public static native boolean getDiagramPrintRangeSelection();
-
-    // one of the three is unnecssary, but it makes more sense
-    /**
-     * Returns if print range all was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public static native boolean getPrintRangeAll();
-
-    /**
-     * Returns if print range pages was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public static native boolean getPrintRangePages();
-
-    /**
-     * Returns if collate was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public static native boolean getCollate();
-
-    /**
-     * Returns the pages from int value, check if (getPrintRangesPages()) first.
-     * 
-     * @return int of the pages from box
-     */
-    public static native int getPagesFrom();
-
-    /**
-     * Returns the pages from int value, check if (getPrintRangesPages()) first.
-     * 
-     * @return int of the pages to box
-     */
-    public static native int getPagesTo();
-
-    /**
-     * Returns the number of copies the user wants to print. This is nCopies
-     * from PRINTDLG
-     * 
-     * @return int with the number of copies
-     */
-    public static native int getNumberOfCopies();
-
-    /*
-     * Don't do getDevMode() and gethDevNames() for hDevMode and hDevNames from
-     * PRINTDLG because they are filled by passing in PrinterData to open..
-     */
-
-    /**
-     * Opens the dialog box.
-     * 
-     * @param pd
-     * @return <code>true</code> if dialog box opened succesfully,
-     *         <code>false</code> otherwise
-     */
-    public static native boolean open(PrinterData pd);
-
-    /**
-     * Open the print dialog box with the diagram list.
-     * 
-     * XXX: internal access SWT_Window0 is a hardcoded internal access string
-     * 
-     * @param diagramList
-     */
-    public PrinterData openPrintDlg(List diagramList) {
-
-        // set owner to make it modal
-        String title = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-            .getShell().getText();
-
-        assert null != title : "title cannot be null"; //$NON-NLS-1$
-
-        // XXX: internal access
-        // SWT_Window0 is a hardcoded internal access string of the class
-        // name and it could change. However, setHwndOwner will try to
-        // obtain the window even if it can't find that matching class by
-        // using the window's title.
-        setHwndOwner("SWT_Window0", title); //$NON-NLS-1$
-
-        // initialize dialog
-        resetDialog();
-        initScaleFitTo(1, 1);
-        initScalePercent(100);
-
-        if (diagramList != null) {
-            for (int c = 0; c < diagramList.size(); c++) {
-                assert (diagramList.get(c) instanceof String);
-                addDiagramString((String) diagramList.get(c));
-            }
-        }
-
-        // prevent default initialization from empty constructor
-        PrinterData printerData = new PrinterData(StringStatics.BLANK,
-            StringStatics.BLANK);
-        if (open(printerData)) {
-            // save the printerData
-            if (getPrintRangePages()) {
-                printerData.scope = PrinterData.PAGE_RANGE;
-                printerData.startPage = getPagesFrom();
-                printerData.endPage = getPagesTo();
-            } else /* if (getPrintRangeAll()) */{
-                printerData.scope = PrinterData.ALL_PAGES;
-            }
-            printerData.printToFile = false;
-            // not supported by dialog, no need to set printerData.fileName
-
-            printerData.copyCount = getNumberOfCopies();
-            printerData.collate = getCollate();
-
-        } else {
-            return null;
-        }
-
-        return printerData;
-
-    }
-
-    /**
-     * Make an instance of PrintHelper
-     */
-    public PrintHelper() {
-        /* empty constructor */
-    }
-
-    /*
-     * The get methods to hide the static methods
-     */
-
-    /**
-     * If not > 0 then user has clicked percent scaling
-     * 
-     * @return scale to m int
-     */
-    public int getDlgScaleFitToM() {
-        return getScaleFitToM();
-    }
-
-    /**
-     * If not > 0 then user has clicked percent scaling
-     * 
-     * @return scale to n int
-     */
-    public int getDlgScaleFitToN() {
-        return getScaleFitToN();
-    }
-
-    /**
-     * If not > 0 then user has clicked fit to m x n scaling
-     * 
-     * @return scale percent int
-     */
-    public int getDlgScalePercent() {
-        return getScalePercent();
-    }
-
-    /**
-     * Returns true if the diagram at the index was selected
-     * 
-     * @param index
-     *            the index of the diagrams you passed in
-     * @return true if selected, false if not selected
-     */
-    public boolean isDlgDiagramSelected(int index) {
-        return isDiagramSelected(index);
-    }
-
-    // one of the three is unnecssary, but it makes more sense
-    /**
-     * Returns if diagram print range all was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public boolean getDlgDiagramPrintRangeAll() {
-        return getDiagramPrintRangeAll();
-    }
-
-    /**
-     * Returns if diagram print range current was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public boolean getDlgDiagramPrintRangeCurrent() {
-        return getDiagramPrintRangeCurrent();
-    }
-
-    /**
-     * Returns if diagram print range selection was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public boolean getDlgDiagramPrintRangeSelection() {
-        return getDiagramPrintRangeSelection();
-    }
-
-    // one of the three is unnecssary, but it makes more sense
-    /**
-     * Returns if print range all was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public boolean getDlgPrintRangeAll() {
-        return getPrintRangeAll();
-    }
-
-    /**
-     * Returns if print range pages was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public boolean getDlgPrintRangePages() {
-        return getPrintRangePages();
-    }
-
-    /**
-     * Returns if collate was selected
-     * 
-     * @return true if selected, false if not selected
-     */
-    public boolean getDlgCollate() {
-        return getCollate();
-    }
-
-    /**
-     * Returns the pages from int value, check if (getDlgPrintRangesPages())
-     * first.
-     * 
-     * @return int of the pages from box
-     */
-    public int getDlgPagesFrom() {
-        return getPagesFrom();
-    }
-
-    /**
-     * Returns the pages from int value, check if (getDlgPrintRangesPages())
-     * first.
-     * 
-     * @return int of the pages to box
-     */
-    public int getDlgPagesTo() {
-        return getPagesTo();
-    }
-
-    /**
-     * Returns the number of copies the user wants to print. This is nCopies
-     * from PRINTDLG
-     * 
-     * @return int with the number of copies
-     */
-    public int getDlgNumberOfCopies() {
-        return getNumberOfCopies();
-    }
-
-    /**
-     * Allows to set the orientation (portrait/landscape) in the print dialog.
-     * 
-     * @param isLandscape
-     *            true if orientation should be landscape, false otherwise.
-     */
-    public void setDlgOrientation(boolean bLandscape) {
-        setOrientation(bLandscape);
-    }
-
-    /**
-     * Allows to set the paper size in the print dialog.
-     * 
-     * @param index
-     *            index of type of paper size,
-     * @see org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupPageType
-     *      for the type of paper sizes available and their indices.
-     * @param width
-     *            specifies the custom width of the paper. Leave as 0 if paper
-     *            size index is user-defined.
-     * @param height
-     *            specifies the custom width of the paper. Leave as 0 if paper
-     *            size index is user-defined.
-     */
-    public void setDlgPaperSize(int index, double width, double height) {
-        setPaperSize(index, width, height);
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/package.html b/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/package.html
deleted file mode 100644
index 87cd845..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy %level1
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/.classpath b/org.eclipse.gmf.runtime.common.ui.printing/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.ui.printing/.cvsignore b/org.eclipse.gmf.runtime.common.ui.printing/.cvsignore
deleted file mode 100644
index edfb53f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-doc
-org

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/.options b/org.eclipse.gmf.runtime.common.ui.printing/.options
deleted file mode 100644
index 665993b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.options
+++ /dev/null

@@ -1,19 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.common.ui.printing plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.common.ui.printing plug-in
-org.eclipse.gmf.runtime.common.ui.printing/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting=false
-
-# Trace information related to action administration
-org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin=false
-# Trace when actions are run
-org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run=false

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/.project b/org.eclipse.gmf.runtime.common.ui.printing/.project
deleted file mode 100644
index b2132ba..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.printing</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.common.ui.printing/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.printing/META-INF/MANIFEST.MF
deleted file mode 100644
index 533694b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.printing
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.printing.internal.PrintingPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.printing,
- org.eclipse.gmf.runtime.common.ui.printing.internal;x-internal:=true
-Require-Bundle: org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/about.html b/org.eclipse.gmf.runtime.common.ui.printing/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/build.properties b/org.eclipse.gmf.runtime.common.ui.printing/build.properties
deleted file mode 100644
index 86a4e94..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               .options,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/plugin.properties b/org.eclipse.gmf.runtime.common.ui.printing/plugin.properties
deleted file mode 100644
index 817a450..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Printing
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/IPrintHelper.java b/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/IPrintHelper.java
deleted file mode 100644
index 6eed17e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/IPrintHelper.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.printing;
-
-import java.util.List;
-
-import org.eclipse.swt.printing.PrinterData;
-
-/**
- * The IPrintHelper is an interface for the platform specfic print fragments.
- * The print fragments may have these methods declared in the interface as
- * native methods, then implement this interface as wrappers around the
- * native methods.
- * 
- * @author wdiu, Wayne Diu
- */
-public interface IPrintHelper {
-	/**
-	 * The location where I expect the print helper to be implemented.
-	 * This should be in a fragment, e.g. org.eclipse.gmf.runtime.common.ui.printing.operatingsystem
-	 */
-	public static final String PRINT_HELPER_CLASS_NAME = "org.eclipse.gmf.runtime.common.ui.printing.PrintHelper"; //$NON-NLS-1$
-
-	/**
-	 * Opens the print dialog with the diagram list which could be null
-	 * 
-	 * @param diagramList the List of Diagram objects.  diagramList can
-	 * be null.
-	 * @return <code>PrinterData</code>
-	 */
-	PrinterData openPrintDlg(List diagramList);
-
-	/**
-	 * If not > 0 then user has clicked percent scaling
-	 * 
-	 * @return scale to m int
-	 */
-	int getDlgScaleFitToM();
-
-	/**
-	 * If not > 0 then user has clicked percent scaling
-	 * 
-	 * @return scale to n int
-	 */
-	int getDlgScaleFitToN();
-
-	/**
-	 * If not > 0 then user has clicked fit to m x n scaling
-	 * 
-	 * @return scale percent int
-	 */
-	int getDlgScalePercent();
-
-	/**
-	 * Returns true if the diagram at the index was selected
-	 * 
-	 * @param index the index of the diagrams you passed in
-	 * @return true if selected, false if not selected
-	 */
-	boolean isDlgDiagramSelected(int index);
-
-	//one of the three is unnecssary, but it makes more sense
-	/**
-	 * Returns if diagram print range all was selected
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	boolean getDlgDiagramPrintRangeAll();
-
-	/**
-	 * Returns if diagram print range current was selected
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	boolean getDlgDiagramPrintRangeCurrent();
-
-	/**
-	 * Returns if diagram print range selection was selected
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	boolean getDlgDiagramPrintRangeSelection();
-
-	/**
-	 * Returns if print range all was selected
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	boolean getDlgPrintRangeAll();
-
-	/**
-	 * Returns if print range pages was selected
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	boolean getDlgPrintRangePages();
-
-	/**
-	 * Returns if collate was selected
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	boolean getDlgCollate();
-
-	/**
-	 * Returns the pages from int value, check if (getDlgPrintRangesPages())
-	 * first.
-	 * 
-	 * @return int of the pages from box
-	 */
-	int getDlgPagesFrom();
-
-	/**
-	 * Returns the pages from int value, check if (getDlgPrintRangesPages())
-	 * first.
-	 * 
-	 * @return int of the pages to box
-	 */
-	int getDlgPagesTo();
-
-	/**
-	 * Returns the number of copies the user wants to print.
-	 * This is nCopies from PRINTDLG
-	 * 
-	 * @return int with the number of copies
-	 */
-	int getDlgNumberOfCopies();
-    
-    /**
-     * Allows to set the orientation (portrait/landscape) in the print dialog.
-     * @param isLandscape   true if orientation should be landscape, false otherwise.
-     */
-    void setDlgOrientation(boolean bLandscape);
-
-    /**
-     * Allows to set the paper size in the print dialog.
-     * @param index         index of type of paper size, @see org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupPageType
-     *                      for the type of paper sizes available and their indices. 
-     * @param width         specifies the custom width of the paper. Leave as 0 if
-     *                      paper size index is user-defined.
-     * @param height        specifies the custom width of the paper. Leave as 0 if
-     *                      paper size index is user-defined.
-     */
-    void setDlgPaperSize(int index, double width, double length);
-    
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/CommonPrintingDebugOptions.java b/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/CommonPrintingDebugOptions.java
deleted file mode 100644
index 477ccfe..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/CommonPrintingDebugOptions.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.printing.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author wdiu, mainly copied from khussey's CommonCoreDebugOptions
- *
- */
-public final class CommonPrintingDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonPrintingDebugOptions() {
-		/* private constructor */
-	}
-
-	/** Debug option. */
-	public static final String DEBUG = PrintingPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	/** Debug option to trace exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	
-	/** Debug option to trace exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	/** Debug option to trace method entering. */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	
-	/** Debug option to trace method exiting. */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/CommonPrintingStatusCodes.java b/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/CommonPrintingStatusCodes.java
deleted file mode 100644
index 52928f3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/CommonPrintingStatusCodes.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.printing.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author wdiu, mainly copied from khussey's CommonCoreStatusCodes
- *
- */
-public final class CommonPrintingStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonPrintingStatusCodes() {
-		/* private constructor */
-	}
-
-	/**
-	 * Status code indicating that everything is OK.
-	 */
-	public static final int OK = 0;
-
-	/**
-	 * Status code indicating that an error occurred with a resource.
-	 * This could be the printing DLL.
-	 */
-	public static final int RESOURCE_FAILURE = 1;
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/PrintingPlugin.java b/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/PrintingPlugin.java
deleted file mode 100644
index ea8ee79..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/internal/PrintingPlugin.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.printing.internal;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author wdiu Wayne Diu
- */
-public class PrintingPlugin
-	extends Plugin {
-
-	/**
-	 * The shared instance.
-	 */
-	private static PrintingPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public PrintingPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return PrintPreviewPlugin
-	 */
-	public static PrintingPlugin getDefault() {
-		return plugin;
-	}
-
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/package.html b/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/package.html
deleted file mode 100644
index 87cd845..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy %level1
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.classpath b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.cvsignore b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.project b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.project
deleted file mode 100644
index 488d477..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.services.dnd.ide</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/META-INF/MANIFEST.MF
deleted file mode 100644
index 1c4095b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.services.dnd.ide; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.services.dnd.ide.internal.CommonUIServicesDNDIDEPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core,
- org.eclipse.gmf.runtime.common.ui.services.dnd.ide.drag,
- org.eclipse.gmf.runtime.common.ui.services.dnd.ide.drop,
- org.eclipse.gmf.runtime.common.ui.services.dnd.ide.internal;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.dnd.ide.internal.core;x-internal:=true
-Require-Bundle: org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services.dnd;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/about.html b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/build.properties b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/build.properties
deleted file mode 100644
index 3b5754f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/plugin.properties b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/plugin.properties
deleted file mode 100644
index 449637b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/plugin.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Common UI Services - Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = GMF Common UI DND IDE Services
-Plugin.providerName = Eclipse.org
-
-
-# ===============================================================================
-# Extension Points - Translation Instruction : section to be translated
-# ===============================================================================
-ext.transferAdapterProviders = GMF Common Transfer Adapters
-ext.dragDropListenerProviders = GMF Common Drag Drop Listener Providers

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/plugin.xml b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/plugin.xml
deleted file mode 100644
index 83da923..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/plugin.xml
+++ /dev/null

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<plugin>
-
-     <extension
-         id="transferAdapterProviders"
-         name="%ext.transferAdapterProviders"
-         point="org.eclipse.gmf.runtime.common.ui.services.dnd.transferAdapterProviders">
-      <TransferAdapterProvider
-            class="org.eclipse.gmf.runtime.common.ui.services.dnd.ide.internal.core.IDETransferAdapterProvider"
-            id="commonIDETransferAdapterProvider">
-         <Priority
-               name="Low">
-         </Priority>
-         <AdapterType
-               operation="drag">
-            <TransferId
-                  id="navigatorSelectionTransfer">
-            </TransferId>
-            <TransferId
-                  id="resourceTransfer">
-            </TransferId>
-            <TransferId
-                  id="markerTransfer">
-            </TransferId>
-         </AdapterType>
-         <AdapterType
-               operation="drop">
-            <TransferId
-                  id="navigatorSelectionTransfer">
-            </TransferId>
-            <TransferId
-                  id="resourceTransfer">
-            </TransferId>
-            <TransferId
-                  id="markerTransfer">
-            </TransferId>
-         </AdapterType>
-      </TransferAdapterProvider>
-   </extension>
-
-</plugin>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/core/IDETransferId.java b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/core/IDETransferId.java
deleted file mode 100644
index df7cc16..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/core/IDETransferId.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core;
-
-/**
- * Interface containing constants for transfer ids used within drag and drop
- * operations
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDETransferId {
-
-	/**
-	 * Constant for resuorce transfer agent
-	 */
-	public static final String RESOURCE_TRANSFER = "resourceTransfer"; //$NON-NLS-1$;
-
-	/**
-	 * Constant for marker transfer agent
-	 */
-	public static final String MARKER_TRANSFER = "markerTransfer"; //$NON-NLS-1$;
-
-	/**
-	 * Constant for resource navigator selection transfer agent
-	 */
-	public static final String NAV_SELECTION_TRANSFER = "navigatorSelectionTransfer"; //$NON-NLS-1$;
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/core/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/core/package.html
deleted file mode 100644
index b89cf07..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/core/package.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides support for drag and drop with IDE dependencies.</P>
-
-<P>Transfer adapter provider for items with IDE dependencies, which are defined
-in {@link org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core.IDETransferId
-IDETransferId}.</P>
-
-
-<h2>Package Specification</h2>
-
-<P>For more information on transferring data using Eclipse drag and drop, please
-see {@link org.eclipse.swt.dnd.Transfer org.eclipse.swt.dnd.Transfer} and {@link
-org.eclipse.swt.dnd.TransferData org.eclipse.swt.dnd.TransferData}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drag/ResourceDragSourceListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drag/ResourceDragSourceListener.java
deleted file mode 100644
index e25a353..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drag/ResourceDragSourceListener.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.ide.drag;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.views.navigator.NavigatorDragAdapter;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core.IDETransferId;
-
-/**
- * Concrete class that implements the IDragSourceListener. This class handles
- * dragging files and folder elements.
- * 
- * @author ldamus
- */
-public class ResourceDragSourceListener
-	extends NavigatorDragAdapter
-	implements IDragSourceListener {
-
-	/**
-	 * Constructs a new drag listener.
-	 * 
-	 * @param provider
-	 *            the selection provider
-	 */
-	public ResourceDragSourceListener(ISelectionProvider provider) {
-		super(provider);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener#isDraggable(org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceContext)
-	 */
-	public boolean isDraggable(IDragSourceContext context) {
-		ISelection selection = context.getSelection();
-		if (!(selection instanceof IStructuredSelection)) {
-			return false;
-		}
-
-		for (Iterator i = ((IStructuredSelection) selection).iterator(); i
-			.hasNext();) {
-			Object next = i.next();
-			if (!(next instanceof IFile || next instanceof IFolder)) {
-				if (next instanceof IAdaptable) {
-					IResource resource = (IResource) ((IAdaptable) next)
-						.getAdapter(IResource.class);
-					if (resource != null
-						&& (resource.getType() == IResource.FILE || resource
-							.getType() == IResource.FOLDER)) {
-						return true;
-					}
-				}
-				return false;
-			}
-		}
-		if (selection.isEmpty()) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener#getSupportingTransferIds()
-	 */
-	public String[] getSupportingTransferIds() {
-		return new String[] {IDETransferId.NAV_SELECTION_TRANSFER};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drag/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drag/package.html
deleted file mode 100644
index 2d31be6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drag/package.html
+++ /dev/null

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides support for dragging with IDE dependencies.</P>
-
-<P>Drag source listener used by the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core.ResourceDragDropListenerProvider
-ResourceDragDropListenerProvider}.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information on transferring data using Eclipse drag and drop, please
-see {@link org.eclipse.swt.dnd.Transfer org.eclipse.swt.dnd.Transfer} and {@link
-org.eclipse.swt.dnd.TransferData org.eclipse.swt.dnd.TransferData}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drop/ResourceDropTargetListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drop/ResourceDropTargetListener.java
deleted file mode 100644
index 6e39d03..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drop/ResourceDropTargetListener.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.ide.drop;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.views.navigator.NavigatorDropAdapter;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferId;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core.IDETransferId;
-
-/**
- * Concrete class that implements the IDropTargetListener. This class handles
- * dropping resource elements.
- * 
- * @author ldamus
- */
-public class ResourceDropTargetListener
-	extends NavigatorDropAdapter
-	implements IDropTargetListener {
-
-	/**
-	 * Constructs a new drop listener for the given viewer.
-	 * 
-	 * @param viewer
-	 *            the viewer
-	 */
-	public ResourceDropTargetListener(StructuredViewer viewer) {
-		super(viewer);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.IDropTargetListener#getExecutableContext(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public ICommand getExecutableContext(DropTargetEvent event) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.IDropTargetListener#canSupport(org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.IDropTargetContext,
-	 *      org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.IDropTargetEvent,
-	 *      org.eclipse.gmf.runtime.common.ui.internal.dnd.ITransferAgent)
-	 */
-	public boolean canSupport(IDropTargetContext context,
-			IDropTargetEvent currentEvent, ITransferAgent currentAgent) {
-
-		Object target = context.getCurrentTarget();
-		return (target instanceof IResource)
-			|| ((target instanceof IAdaptable) && ((IAdaptable) target)
-				.getAdapter(IResource.class) != null);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.IDropTargetListener#setFeedback(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void setFeedback(DropTargetEvent event) {
-
-		if (FileTransfer.getInstance().isSupportedType(event.currentDataType))
-			// if dropping a file, make a copy gesture instead of move
-			if ((event.operations & DND.DROP_COPY) != 0) {
-				event.detail = DND.DROP_COPY;
-			} else {
-				event.detail = DND.DROP_NONE;
-			}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.IDropTargetListener#getSupportingTransferIds()
-	 */
-	public String[] getSupportingTransferIds() {
-		return new String[] {IDETransferId.NAV_SELECTION_TRANSFER,
-			TransferId.FILE_TRANSFER};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dropAccept(DropTargetEvent event) {
-		Object target = getCurrentTarget();
-		if (!(target instanceof IResource)) {
-			if (target instanceof IAdaptable) {
-				target = ((IAdaptable) target).getAdapter(IResource.class);
-			}
-		}
-		if (!validateDrop(target, event.detail, event.currentDataType)) {
-			event.detail = DND.DROP_NONE;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.navigator.NavigatorDropAdapter#validateDrop(java.lang.Object,
-	 *      int, org.eclipse.swt.dnd.TransferData)
-	 */
-	public boolean validateDrop(Object target, int dragOperation,
-			TransferData transferType) {
-		// adapt the target to IResource if necessary
-		Object adaptedTarget = target;
-		if (!(adaptedTarget instanceof IResource)) {
-			if (adaptedTarget instanceof IAdaptable) {
-				adaptedTarget = ((IAdaptable) target)
-					.getAdapter(IResource.class);
-			}
-		}
-
-		if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType)) {
-			// validate that the source is IResource, otherwise superclass's
-			// call fails
-			ISelection selection = LocalSelectionTransfer.getTransfer()
-				.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				List selectionList = ((IStructuredSelection) selection)
-					.toList();
-				Iterator i = selectionList.iterator();
-				while (i.hasNext()) {
-					if (!(i.next() instanceof IResource)) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return super.validateDrop(adaptedTarget, dragOperation, transferType);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#getCurrentTarget()
-	 */
-	protected Object getCurrentTarget() {
-		Object target = super.getCurrentTarget();
-		if (!(target instanceof IResource)) {
-			if (target instanceof IAdaptable) {
-				target = ((IAdaptable) target).getAdapter(IResource.class);
-			}
-		}
-		return target;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drop/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drop/package.html
deleted file mode 100644
index 6505bfd..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/drop/package.html
+++ /dev/null

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides support for dropping with IDE dependencies.</P>
-
-<P>Drop target listener used by the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core.ResourceDragDropListenerProvider
-ResourceDragDropListenerProvider}.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information on transferring data using Eclipse drag and drop, please
-see {@link org.eclipse.swt.dnd.Transfer org.eclipse.swt.dnd.Transfer} and {@link
-org.eclipse.swt.dnd.TransferData org.eclipse.swt.dnd.TransferData}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/CommonUIServicesDNDIDEPlugin.java b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/CommonUIServicesDNDIDEPlugin.java
deleted file mode 100644
index 4b4cb07..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/CommonUIServicesDNDIDEPlugin.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.ide.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The common UI Services DND IDE plug-in.
- * 
- * @author wdiu, Wayne Diu
- */
-public class CommonUIServicesDNDIDEPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * This plug-in's shared instance.
-	 */
-	private static CommonUIServicesDNDIDEPlugin INSTANCE;
-
-	/**
-	 * Creates a new plug-in runtime object.
-	 */
-	public CommonUIServicesDNDIDEPlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static CommonUIServicesDNDIDEPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/core/IDETransferAdapterProvider.java b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/core/IDETransferAdapterProvider.java
deleted file mode 100644
index 1543de3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/core/IDETransferAdapterProvider.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.ide.internal.core;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.part.MarkerTransfer;
-import org.eclipse.ui.part.ResourceTransfer;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.AbstractTransferAdapterProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAgent;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.SelectionDragAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.TransferDragSourceAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.SelectionDropAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.TransferDropTargetAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.ide.core.IDETransferId;
-
-/**
- * Concrete implementation for common transfer adapters
- * 
- * @author Wayne Diu, wdiu, based on
- * org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterProvider
- */
-public final class IDETransferAdapterProvider
-	extends AbstractTransferAdapterProvider {
-
-	/**
-	 * Attribute for the table of transfer ids and their drag adapters
-	 */
-	private Hashtable transferDragSourceTable = new Hashtable();
-
-	/**
-	 * Attribute for the table of transfer ids and their drop adapters
-	 */
-	private Hashtable transferDropTargetTable = new Hashtable();
-
-	/**
-	 * Constructor for TransferAdapterProvider.
-	 */
-	public IDETransferAdapterProvider() {
-		super();
-
-		/*
-		 * Initialize the table of transfer Ids and their drag adapters for
-		 * pre-defined ids
-		 */
-		getTransferDragSourceTable().put(
-			new Integer(IDETransferId.RESOURCE_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				IDETransferId.RESOURCE_TRANSFER, ResourceTransfer.getInstance(),
-				false)));
-
-		getTransferDragSourceTable().put(
-			new Integer(IDETransferId.MARKER_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(
-				new TransferAgent(IDETransferId.MARKER_TRANSFER, MarkerTransfer
-					.getInstance(), false)));
-		getTransferDragSourceTable().put(
-			new Integer(IDETransferId.NAV_SELECTION_TRANSFER.hashCode()),
-			new SelectionDragAdapter(new TransferAgent(
-				IDETransferId.NAV_SELECTION_TRANSFER, LocalSelectionTransfer
-					.getTransfer(), true) {
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent#getSelection(org.eclipse.swt.dnd.TransferData)
-				 */
-				public ISelection getSelection(TransferData transferData) {
-					return LocalSelectionTransfer.getTransfer().getSelection();
-				}
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent#setSelection(org.eclipse.jface.viewers.ISelection)
-				 */
-				public void setSelection(ISelection selection) {
-					LocalSelectionTransfer.getTransfer()
-						.setSelection(selection);
-				}
-			}));
-		/*
-		 * Initialize the table of transfer Ids and their drop adapters for
-		 * pre-defined ids
-		 */
-		getTransferDropTargetTable().put(
-			new Integer(IDETransferId.RESOURCE_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				IDETransferId.RESOURCE_TRANSFER, ResourceTransfer.getInstance(),
-				false)));
-
-		getTransferDropTargetTable().put(
-			new Integer(IDETransferId.MARKER_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(
-				new TransferAgent(IDETransferId.MARKER_TRANSFER, MarkerTransfer
-					.getInstance(), false)));
-
-		getTransferDropTargetTable().put(
-			new Integer(IDETransferId.NAV_SELECTION_TRANSFER.hashCode()),
-			new SelectionDropAdapter(new TransferAgent(
-				IDETransferId.NAV_SELECTION_TRANSFER, LocalSelectionTransfer
-					.getTransfer(), true) {
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent#getSelection(org.eclipse.swt.dnd.TransferData)
-				 */
-				public ISelection getSelection(TransferData transferData) {
-					return LocalSelectionTransfer.getTransfer().getSelection();
-				}
-			}));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDragSourceAdapter(java.lang.String)
-	 */
-	public ITransferDragSourceListener getTransferDragSourceAdapter(
-			String transferId) {
-		assert null != transferId : "transferId cannot be null";; //$NON-NLS-1$
-
-		ITransferDragSourceListener listener = null;
-		listener = (ITransferDragSourceListener) getTransferDragSourceTable()
-			.get(new Integer(transferId.hashCode()));
-		return listener;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDropTargetAdapter(java.lang.String)
-	 */
-	public ITransferDropTargetListener getTransferDropTargetAdapter(
-			String transferId) {
-		assert null != transferId : "transferId cannot be null"; //$NON-NLS-1$
-
-		ITransferDropTargetListener listener = null;
-		listener = (ITransferDropTargetListener) getTransferDropTargetTable()
-			.get(new Integer(transferId.hashCode()));
-		return listener;
-	}
-
-	/**
-	 * Return table of transfer drag source adapters
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getTransferDragSourceTable() {
-		return transferDragSourceTable;
-	}
-
-	/**
-	 * Return table of transfer drop target adapters
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getTransferDropTargetTable() {
-		return transferDropTargetTable;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/package.html
deleted file mode 100644
index 4faa831..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/src/org/eclipse/gmf/runtime/common/ui/services/dnd/ide/internal/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages - drag and drop.
-
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.dnd.ide.*
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/.classpath b/org.eclipse.gmf.runtime.common.ui.services.dnd/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.ui.services.dnd/.cvsignore b/org.eclipse.gmf.runtime.common.ui.services.dnd/.cvsignore
deleted file mode 100644
index edfb53f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-doc
-org

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/.options b/org.eclipse.gmf.runtime.common.ui.services.dnd/.options
deleted file mode 100644
index 25d22f0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.options
+++ /dev/null

@@ -1,14 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.common.ui.services.dnd plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.common.ui.services.dnd plug-in
-org.eclipse.gmf.runtime.common.ui.services.dnd/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/throwing=false
-
-# Trace drag and drop
-org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing=false
-# Trace information related to service configuration
-org.eclipse.gmf.runtime.common.ui.services.dnd/debug/services/config=false

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/.project b/org.eclipse.gmf.runtime.common.ui.services.dnd/.project
deleted file mode 100644
index f404b11..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.services.dnd</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.common.ui.services.dnd/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.services.dnd/META-INF/MANIFEST.MF
deleted file mode 100644
index 038ca99..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.services.dnd; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.services.dnd.core,
- org.eclipse.gmf.runtime.common.ui.services.dnd.drag,
- org.eclipse.gmf.runtime.common.ui.services.dnd.drop,
- org.eclipse.gmf.runtime.common.ui.services.dnd.internal;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.dnd.internal.l10n;x-internal:=true
-Require-Bundle: org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/about.html b/org.eclipse.gmf.runtime.common.ui.services.dnd/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/build.properties b/org.eclipse.gmf.runtime.common.ui.services.dnd/build.properties
deleted file mode 100644
index 260070f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               .options,\
-               META-INF/,\
-               .,\
-               schema/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/plugin.properties b/org.eclipse.gmf.runtime.common.ui.services.dnd/plugin.properties
deleted file mode 100644
index 8d140b6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/plugin.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Common UI Services - Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = GMF Common UI DND Services
-Plugin.providerName = Eclipse.org
-
-
-# ===============================================================================
-# Extension Points - Translation Instruction : section to be translated
-# ===============================================================================
-extPoint.transferAdapterProviders =  GMF Transfer Adapter Providers
-extPoint.dragDropListenerProviders = GMF Drag And Drop Listener Providers
-ext.transferAdapterProviders = GMF Common Transfer Adapters

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/plugin.xml b/org.eclipse.gmf.runtime.common.ui.services.dnd/plugin.xml
deleted file mode 100644
index e6cf011..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/plugin.xml
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-
-<plugin>
-
-     <extension-point id="dragDropListenerProviders" name="%extPoint.dragDropListenerProviders" schema="schema/dragDropListenerProviders.exsd"/>
-   <extension-point id="transferAdapterProviders" name="%extPoint.transferAdapterProviders" schema="schema/transferAdapterProviders.exsd"/>
-
-   <extension
-         id="transferAdapterProviders"
-         name="%ext.transferAdapterProviders"
-         point="org.eclipse.gmf.runtime.common.ui.services.dnd.transferAdapterProviders">
-      <TransferAdapterProvider
-            class="org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.TransferAdapterProvider"
-            id="commonTransferAdapterProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <AdapterType
-               operation="drag">
-            <TransferId
-                  id="customDataTransfer">
-            </TransferId>
-            <TransferId
-                  id="selectionTransfer">
-            </TransferId>
-            <TransferId
-                  id="fileTransfer">
-            </TransferId>
-            <TransferId
-                  id="pluginTransfer">
-            </TransferId>
-            <TransferId
-                  id="textTransfer">
-            </TransferId>
-            <TransferId
-                  id="richTextTransfer">
-            </TransferId>
-         </AdapterType>
-         <AdapterType
-               operation="drop">
-            <TransferId
-                  id="navigatorSelectionTransfer">
-            </TransferId>
-            <TransferId
-                  id="customDataTransfer">
-            </TransferId>
-            <TransferId
-                  id="selectionTransfer">
-            </TransferId>
-            <TransferId
-                  id="resourceTransfer">
-            </TransferId>
-            <TransferId
-                  id="fileTransfer">
-            </TransferId>
-            <TransferId
-                  id="pluginTransfer">
-            </TransferId>
-            <TransferId
-                  id="markerTransfer">
-            </TransferId>
-            <TransferId
-                  id="textTransfer">
-            </TransferId>
-            <TransferId
-                  id="richTextTransfer">
-            </TransferId>
-         </AdapterType>
-      </TransferAdapterProvider>
-   </extension>
-
-
-</plugin>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/schema/dragDropListenerProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services.dnd/schema/dragDropListenerProviders.exsd
deleted file mode 100644
index 6e296ae..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/schema/dragDropListenerProviders.exsd
+++ /dev/null

@@ -1,256 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services.dnd">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services.dnd" id="dragDropListenerProviders" name="Drag and Drop Listeners Extension Points"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to register drag source and drop target listeners
-    against element types within view parts.This extension point facilitates
-    the configuration of providers for the drag/drop listener service (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.core.DragDropListenerService&lt;/tt&gt;).
-    The providers register listeners for drag and drop operations on specific element
-    types within view parts.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="DragDropListenerProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point, i.e. &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.dragDropListenerProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. dragDropListenerProviders.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.dragDropListenerProviders.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="DragDropListenerProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="ViewId" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the provider, e.g. my_dragDropListenerProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider class. Providers implement service functionality (operations).
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.dnd.core.AbstractDragDropListenerProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The name of the provider priority, i.e. Lowest, Low, Medium, High, or Highest.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ViewId">
-      <complexType>
-         <sequence>
-            <element ref="ElementType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The target view part id, e.g. &lt;tt&gt;org.eclipse.test.project.ui.views.MyView&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ElementType">
-      <complexType>
-         <sequence>
-            <element ref="OperationType" minOccurs="1" maxOccurs="2"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The element type within the view part, e.g. &lt;tt&gt;org.eclipse.test.project.ui.internal.providers.MyElement&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="OperationType">
-      <complexType>
-         <sequence>
-            <element ref="TransferId" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="operation" use="required">
-            <annotation>
-               <documentation>
-                  The operation type being registered for within the view part, e.g. &lt;tt&gt;drag or drop&lt;/tt&gt;
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="drag">
-                  </enumeration>
-                  <enumeration value="drop">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="TransferId">
-      <complexType>
-         <attribute name="transferId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id for the transfer agent
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of the drag and drop listener provider extension:
-&lt;p&gt;
-&lt;pre&gt;
-&lt;extension 
-      id=&quot;dragDropListenerProviders&quot; 
-      name=&quot;%ext.dragDropListenerProviders&quot; 
-      point=&quot;org.eclipse.gmf.runtime.common.ui.services.dnd.dragDropListenerProviders&quot;&gt; 
-      &lt;DragDropListenerProvider 
-         class=&quot;org.eclipse.test.project.ui.internal.providers.dnd.DragDropListenerProvider&quot; 
-         id=&quot;myExplorerDragDropListenerProvider&quot;&gt; 
-         &lt;Priority 
-            name=&quot;Lowest&quot;&gt; 
-         &lt;/Priority&gt; 
-         &lt;ViewId 
-            id=&quot;org.eclipse.test.project.ui.views.MyExplorer&quot;&gt; 
-           &lt;ElementType 
-              class=&quot;org.eclipse.test.project.ui.internal.providers.myexplorer.MyElement&quot;&gt; 
-             &lt;OperationType 
-                operation=&quot;drag&quot;&gt; 
-               &lt;TransferId 
-                  transferId=&quot;selection&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;customData&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;file&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;text&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;richText&quot;&gt; 
-               &lt;/TransferId&gt; 
-             &lt;/OperationType&gt; 
-             &lt;OperationType 
-                operation=&quot;drop&quot;&gt; 
-               &lt;TransferId 
-                  transferId=&quot;selection&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;customData&quot;&gt; 
-               &lt;/TransferId&gt; 
-             &lt;/OperationType&gt; 
-           &lt;/ElementType&gt; 
-         &lt;/ViewId&gt; 
-      &lt;/DragDropListenerProvider&gt; 
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the &lt;tt&gt;class&lt;/tt&gt; attribute must represent a subclass of
-         &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.AbstractProvider&lt;/tt&gt; that implements
-         &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragDropListenerProvider&lt;/tt&gt;, e.g. a subclass
-         of &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.core.AbstractDragDropListenerProvider&lt;/tt&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2003, 2005  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/schema/transferAdapterProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services.dnd/schema/transferAdapterProviders.exsd
deleted file mode 100644
index 69d98d2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/schema/transferAdapterProviders.exsd
+++ /dev/null

@@ -1,224 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services.dnd">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services.dnd" id="transferAdapterProviders" name="Transfer Adapter Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to register transfer adapters for drag and drop operations. This extension point facilitates
-    the configuration of providers for the transfer adapter service (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterService&lt;/tt&gt;).
-    The providers register adapters for drag and drop operations on specific transfer ids.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="TransferAdapterProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point, i.e. &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.transferAdapterProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. transferAdapterProviders.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.transferAdapterProviders.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="TransferAdapterProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="AdapterType" minOccurs="1" maxOccurs="2"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the provider, e.g. my_transferAdapterProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider class. Providers implement service functionality (operations).
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.dnd.core.AbstractTransferAdapterProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The name of the provider priority, i.e. Lowest, Low, Medium, High, or Highest.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="AdapterType">
-      <complexType>
-         <sequence>
-            <element ref="TransferId" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="operation" use="required">
-            <annotation>
-               <documentation>
-                  The adapter type being registered, e.g. &lt;tt&gt;drag or drop&lt;/tt&gt;
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="drag">
-                  </enumeration>
-                  <enumeration value="drop">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="TransferId">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The unique transfer id for the transfer agent, e.g. &lt;tt&gt;customDataTransfer&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of the transfer adapter provider extension:
-&lt;p&gt;
-&lt;pre&gt;
-&lt;extension 
-      id=&quot;dragDropListenerProviders&quot; 
-      name=&quot;%ext.dragDropListenerProviders&quot; 
-      point=&quot;org.eclipse.gmf.runtime.common.ui.services.dnd.dragDropListenerProviders&quot;&gt; 
-      &lt;DragDropListenerProvider 
-         class=&quot;org.eclipse.test.project.ui.internal.providers.dnd.MyExplorerDragDropListenerProvider&quot; 
-         id=&quot;myexplorerDragDropListenerProvider&quot;&gt; 
-         &lt;Priority 
-            name=&quot;Lowest&quot;&gt; 
-         &lt;/Priority&gt; 
-         &lt;ViewId 
-            id=&quot;org.eclipse.test.modeler.ui.views.MyExplorer&quot;&gt; 
-           &lt;ElementType 
-              class=&quot;org.eclipse.test.project.ui.internal.providers.explorer.MyElement&quot;&gt; 
-             &lt;OperationType 
-                operation=&quot;drag&quot;&gt; 
-               &lt;TransferId 
-                  transferId=&quot;selection&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;customData&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;file&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;text&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;richText&quot;&gt; 
-               &lt;/TransferId&gt; 
-             &lt;/OperationType&gt; 
-             &lt;OperationType 
-                operation=&quot;drop&quot;&gt; 
-               &lt;TransferId 
-                  transferId=&quot;selection&quot;&gt; 
-               &lt;/TransferId&gt; 
-               &lt;TransferId 
-                  transferId=&quot;customData&quot;&gt; 
-               &lt;/TransferId&gt; 
-             &lt;/OperationType&gt; 
-           &lt;/ElementType&gt; 
-         &lt;/ViewId&gt; 
-      &lt;/DragDropListenerProvider&gt; 
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the &lt;tt&gt;class&lt;/tt&gt; attribute must represent a subclass of
-         &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.AbstractProvider&lt;/tt&gt; that implements
-         &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider&lt;/tt&gt;, e.g. a subclass
-         of &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.dnd.core.AbstractTransferAdapterProvider&lt;/tt&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2003, 2005  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/AbstractDragDropListenerProvider.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/AbstractDragDropListenerProvider.java
deleted file mode 100644
index d7ea125..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/AbstractDragDropListenerProvider.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.ListenerOperation;
-
-/**
- * The abstract parent of all concrete drag and drop listener providers. A
- * concrete provider needs to override the <code>getDragSourceListener()</code>
- * and <code>getDropTargetListener</code> methods. The <code>provides</code>
- * method has a default implementation. The <code>provides()</code> method is
- * already handled by the proxy for the provider (
- * <code>DragDropListenerService.ProviderDescriptor</code>). The proxy
- * contains all the information necessary for the <code>provides()</code>
- * method.
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class AbstractDragDropListenerProvider
-	extends AbstractProvider
-	implements IDragDropListenerProvider {
-
-	/**
-	 * Constructor for AbstractDragDropListenerProvider.
-	 */
-	public AbstractDragDropListenerProvider() {
-		super();
-	}
-
-	/**
-	 * Returns <code>true</code> if the provider can handle the
-	 * <code>ListenerOperation</code> operation
-	 * 
-	 * @param operation
-	 *            An operation
-	 * 
-	 * @return Returns <code>true</code> if the provider can handle the
-	 *         <code>ListenerOperation</code> operation. Otherwise returns
-	 *         <code>false</code>
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public final boolean provides(IOperation operation) {
-
-		if (operation instanceof ListenerOperation) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragDropListenerProvider#getDragSourceListeners(org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragListenerContext)
-	 */
-	public IDragSourceListener[] getDragSourceListeners(
-			IDragListenerContext context) {
-		return new IDragSourceListener[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragDropListenerProvider#getDropTargetListeners(org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDropListenerContext)
-	 */
-	public IDropTargetListener[] getDropTargetListeners(
-			IDropListenerContext context) {
-		return new IDropTargetListener[0];
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/AbstractTransferAdapterProvider.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/AbstractTransferAdapterProvider.java
deleted file mode 100644
index 11df573..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/AbstractTransferAdapterProvider.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.GetTransferAdapterOperation;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.ITransferAdapterProvider;
-
-/**
- * The abstract parent of all concrete transfer adapter providers. A concrete
- * provider needs to override the <code>getTransferDragSourceAdapter()</code>
- * and <code>getTransferDropTargetAdapter</code> methods. The
- * <code>provides</code> method has a default implementation. The
- * <code>provides()</code> method is already handled by the proxy for the
- * provider (<code>TransferAdapterService.ProviderDescriptor</code>). The
- * proxy contains all the information necessary for the <code>provides()</code>
- * method.
- * 
- * @author Vishy Ramaswamy
- */
-public class AbstractTransferAdapterProvider
-	extends AbstractProvider
-	implements ITransferAdapterProvider {
-
-	/**
-	 * Constructor for AbstractTransferAdapterProvider.
-	 */
-	public AbstractTransferAdapterProvider() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDragSourceAdapter(java.lang.String)
-	 */
-	public ITransferDragSourceListener getTransferDragSourceAdapter(
-			String transferId) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDropTargetAdapter(java.lang.String)
-	 */
-	public ITransferDropTargetListener getTransferDropTargetAdapter(
-			String transferId) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public final boolean provides(IOperation operation) {
-		if (operation instanceof GetTransferAdapterOperation) {
-			return true;
-		}
-
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/DragDropListenerService.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/DragDropListenerService.java
deleted file mode 100644
index 24aad17..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/DragDropListenerService.java
+++ /dev/null

@@ -1,517 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.GetDragListenerOperation;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.GetDropListenerOperation;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.ListenerOperation;
-
-/**
- * A service that provides the <code>IDragSourceListener</code> and
- * <code>IDropTargetListener</code>. This service gets the all the providers
- * that provide listeners for the specified context.
- * 
- * @author Vishy Ramaswamy
- */
-public class DragDropListenerService
-	extends Service
-	implements IDragDropListenerProvider {
-
-	/**
-	 * A descriptor for <code>IDragDropListenerProvider</code> defined by a
-	 * configuration element.
-	 * 
-	 * @author Vishy Ramaswamy
-	 */
-	protected static class ProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/**
-		 * Attribute for maintaining the provider information
-		 */
-		private Hashtable partInfo = null;
-
-		/**
-		 * Constructs a <code>IDragDropListenerProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element
-		 *            The configuration element describing the provider.
-		 * @param aPartInfo
-		 *            A <code>Hashtable</code> with the provider information
-		 */
-		protected ProviderDescriptor(IConfigurationElement element,
-				Hashtable aPartInfo) {
-			super(element);
-
-			assert null != aPartInfo : "aPartInfo cannot be null"; //$NON-NLS-1$
-			
-			this.partInfo = aPartInfo;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		public boolean provides(IOperation operation) {
-			/* Check the operations */
-			if (!(operation instanceof GetDragListenerOperation)
-				&& !(operation instanceof GetDropListenerOperation)) {
-				return false;
-			}
-
-			/* Get all the context information */
-			Class elementType = null;
-			String partId = null;
-			String operationType = null;
-			String transferId = null;
-			boolean isCompatible = false;
-
-			if (operation instanceof GetDragListenerOperation) {
-				elementType = ((IDragListenerContext) ((GetDragListenerOperation) operation)
-					.getContext()).getSelectedElementType();
-				partId = ((IDragListenerContext) ((GetDragListenerOperation) operation)
-					.getContext()).getActivePart().getSite().getId();
-				operationType = ((GetDragListenerOperation) operation)
-					.getContext().getOperationType();
-				transferId = ((IDragListenerContext) ((GetDragListenerOperation) operation)
-					.getContext()).getTransferId();
-				isCompatible = ((IDragListenerContext) ((GetDragListenerOperation) operation)
-					.getContext()).isCompatible();
-			}
-
-			if (operation instanceof GetDropListenerOperation) {
-				elementType = ((IDropListenerContext) ((GetDropListenerOperation) operation)
-					.getContext()).getTargetElementType();
-				partId = ((IDropListenerContext) ((GetDropListenerOperation) operation)
-					.getContext()).getActivePart().getSite().getId();
-				operationType = ((GetDropListenerOperation) operation)
-					.getContext().getOperationType();
-				transferId = ((IDropListenerContext) ((GetDropListenerOperation) operation)
-					.getContext()).getTransferId();
-				isCompatible = ((IDropListenerContext) ((GetDropListenerOperation) operation)
-					.getContext()).isCompatible();
-			}
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DNDS:provides::Element Type is " + elementType.getName()); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DNDS:provides::Part Id is " + partId); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DNDS:provides::Operation Type is " + operationType); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DNDS:provides::Transfer id is " + transferId); //$NON-NLS-1$				
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DNDS:provides::Compatible is " + isCompatible); //$NON-NLS-1$				
-			}
-
-			/* Check if the part is handled */
-			Hashtable elementTypeTable = (Hashtable) getPartInfo().get(partId);
-			if (elementTypeTable == null) {
-				return false;
-			}
-
-			/* Check if the operation type is handled */
-			Hashtable operationTypeTable = (Hashtable) elementTypeTable
-				.get(isCompatible ? getCompatibleType(elementTypeTable,
-					elementType).getName()
-					: elementType.getName());
-			if (operationTypeTable == null) {
-				return false;
-			}
-
-			/* Get the transfer id list */
-			List transferIdList = (List) operationTypeTable.get(operationType);
-			if (transferIdList == null) {
-				return false;
-			}
-
-			/* Check if the requested transfer is available */
-			return (transferId.equals(IListenerContext.ALL_TRANSFERS)) ? true
-				: transferIdList.contains(transferId);
-		}
-
-		/**
-		 * Returns the <code>Hashtable</code> containing the provider
-		 * information
-		 * 
-		 * @return Return the <code>partInfo</code> instance variable
-		 */
-		private Hashtable getPartInfo() {
-			return partInfo;
-		}
-
-		/**
-		 * Returns the element type from the element type table that is
-		 * assignable from the specified element type
-		 * 
-		 * @param elementTypeTable
-		 *            The table of element types
-		 * @param elementType
-		 *            The specified element type
-		 * @return Return the compatible type
-		 */
-		private Class getCompatibleType(Hashtable elementTypeTable,
-				Class elementType) {
-			/*
-			 * Enumerate through the element types and check if if the class or
-			 * interface is either the same as, or is a superclass or
-			 * superinterface of, the class or interface represented by the
-			 * specified element type
-			 */
-			Class newClass = null;
-			String className = null;
-			Enumeration enumeration = elementTypeTable.keys();
-			while (enumeration.hasMoreElements()) {
-				className = (String) enumeration.nextElement();
-
-				try {
-					newClass = Class.forName(className, false, elementType
-						.getClassLoader());
-				} catch (ClassNotFoundException e) {
-					// This is an expected exception. Do not log - only trace.
-					Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-						CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-						getClass(), "getCompatibleType", e); //$NON-NLS-1$
-				}
-
-				if (newClass != null && newClass.isAssignableFrom(elementType)) {
-					return newClass;
-				}
-			}
-
-			return elementType;
-		}
-	}
-
-	/**
-	 * The DragDropListenerService constructor
-	 */
-	private final static DragDropListenerService instance = new DragDropListenerService();
-
-	static {
-		instance.configureProviders(CommonUIServicesDNDPlugin.getPluginId(), "dragDropListenerProviders"); //$NON-NLS-1$
-	}
-	 
-	/**
-	 * The DragDropListenerService constructor
-	 */
-	protected DragDropListenerService() {
-		super(false);
-	}
-
-	/**
-	 * Gets the instance of DragDropListenerService
-	 * 
-	 * @return Returns the <code>instance</code> variable
-	 */
-	public static DragDropListenerService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Executes the <code>ListenerOperation</code> operation using the FORWARD
-	 * strategy
-	 * 
-	 * @param operation
-	 *            The operation
-	 * 
-	 * @return Returns a <code>Object</code>
-	 */
-	private Object execute(ListenerOperation operation) {
-		List results = execute(ExecutionStrategy.FORWARD, operation);
-
-		if (operation instanceof GetDragListenerOperation) {
-			return results.isEmpty() ? null
-				: combineArraysInList(results, new IDragSourceListener[0]);
-		} else if (operation instanceof GetDropListenerOperation) {
-			return results.isEmpty() ? null
-				: combineArraysInList(results, new IDropTargetListener[0]);
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.internal.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	protected Service.ProviderDescriptor newProviderDescriptor(
-			IConfigurationElement element) {
-		return new ProviderDescriptor(element,
-			getDragDropListenerProviderInfo(element));
-	}
-
-	/**
-	 * Captures all the <code>IDragDropListenerProvider</code> information.
-	 * 
-	 * @param element
-	 *            The configuration element associated with the provider
-	 * 
-	 * @return Returns a <code>Hashtable</code>
-	 */
-	private Hashtable getDragDropListenerProviderInfo(
-			IConfigurationElement element) {
-		/* Get the view id children */
-		Hashtable providerInfo = new Hashtable();
-		try {
-			IConfigurationElement[] viewChildren = element
-				.getChildren("ViewId"); //$NON-NLS-1$
-			for (int i = 0; i < viewChildren.length; i++) {
-				/* Get the view element */
-				IConfigurationElement viewConfig = viewChildren[i];
-
-				/* Get the view id attribute */
-				String id = viewConfig.getAttribute("id"); //$NON-NLS-1$
-				if (id == null) {
-					handleInvalidElement(viewConfig);
-					continue;
-				}
-
-				/* Add a placeholder in the table */
-				providerInfo.put(id, new Hashtable());
-
-				/* Get all the element types */
-				IConfigurationElement[] elementTypeChildren = viewConfig
-					.getChildren();
-				for (int j = 0; j < elementTypeChildren.length; j++) {
-					IConfigurationElement elementTypeConfig = elementTypeChildren[j];
-
-					/* Get the class attribute */
-					String elementTypeClass = elementTypeConfig
-						.getAttribute("class"); //$NON-NLS-1$
-					if (elementTypeClass == null) {
-						handleInvalidElement(elementTypeConfig);
-						continue;
-					}
-					/* Add a placeholder for the element type */
-					Hashtable table = (Hashtable) providerInfo.get(id);
-					table.put(elementTypeClass, new Hashtable());
-
-					/* Get the operation type children */
-					IConfigurationElement[] operationTypeChildren = elementTypeConfig
-						.getChildren();
-					for (int k = 0; k < operationTypeChildren.length; k++) {
-						IConfigurationElement operationTypeConfig = operationTypeChildren[k];
-
-						/* Get the operation type attributes */
-						String operationType = operationTypeConfig
-							.getAttribute("operation"); //$NON-NLS-1$
-						if (operationType == null) {
-							handleInvalidElement(operationTypeConfig);
-							continue;
-						}
-						/* Get the transfer type children */
-						Vector listOftransferId = new Vector();
-						IConfigurationElement[] transferTypeChildren = operationTypeConfig
-							.getChildren();
-						for (int l = 0; l < transferTypeChildren.length; l++) {
-							IConfigurationElement transferIdConfig = transferTypeChildren[l];
-
-							/* Get the transfer id attributes */
-							String transferId = transferIdConfig
-								.getAttribute("transferId"); //$NON-NLS-1$
-							if (transferId == null) {
-								handleInvalidElement(transferIdConfig);
-								continue;
-							}
-							/* Add to the list */
-							listOftransferId.addElement(transferId);
-
-						}
-
-						/* Add a placeholder for the operation type */
-						table = (Hashtable) ((Hashtable) providerInfo.get(id))
-							.get(elementTypeClass);
-						table.put(operationType, listOftransferId);
-					}
-				}
-			}
-		} catch (Exception e) {
-			Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-				getClass(), "getDragDropListenerProviderInfo", e); //$NON-NLS-1$
-			Log.error(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDStatusCodes.SERVICE_FAILURE, MessageFormat
-					.format(INVALID_ELEMENT_MESSAGE_PATTERN,
-						new Object[] {element.getName()}), e);
-		}
-
-		return providerInfo;
-	}
-
-	/**
-	 * Traces and logs a message to indicate that the XML element is invalid.
-	 * 
-	 * @param element
-	 *            the invalid XML element
-	 */
-	private void handleInvalidElement(IConfigurationElement element) {
-
-		String message = MessageFormat.format(INVALID_ELEMENT_MESSAGE_PATTERN,
-			new Object[] {element.getDeclaringExtension().toString()
-				+ StringStatics.COLON + element.getName()});
-
-		Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-			CommonUIServicesDNDDebugOptions.SERVICES_CONFIG, message);
-		Log.error(CommonUIServicesDNDPlugin.getDefault(),
-			CommonUIServicesDNDStatusCodes.SERVICE_FAILURE, message);
-	}
-
-	/**
-	 * Utility to get all the registered transfer ids against a part id for an
-	 * operation type
-	 * 
-	 * @param partId
-	 *            the part id
-	 * @param operationType
-	 *            the type of operation (drag or drop)
-	 * @return array of transfer ids
-	 */
-	public String[] getAllTransferIds(String partId, String operationType) {
-		assert null != partId : "partId cannot be null"; //$NON-NLS-1$
-		assert null != operationType : "operationType cannot be null"; //$NON-NLS-1$
-
-		/* Get all the providers */
-		List list = getAllProviders();
-
-		/* Iterate through all the providers */
-		ArrayList transferIds = new ArrayList();
-		Iterator it = list.iterator();
-		while (it.hasNext()) {
-			/* Get the next descriptor */
-			ProviderDescriptor descriptor = (ProviderDescriptor) it.next();
-
-			/* Check if the part is handled */
-			Hashtable elementTypeTable = (Hashtable) descriptor.getPartInfo()
-				.get(partId);
-			if (elementTypeTable == null) {
-				continue;
-			}
-
-			/* Go through all the element types */
-			Enumeration e = elementTypeTable.elements();
-			while (e.hasMoreElements()) {
-				/* Get the operation type table */
-				Hashtable operationTypeTable = (Hashtable) e.nextElement();
-
-				/* Check if the operation is handled */
-				if (operationTypeTable.containsKey(operationType)) {
-					/* Get the transfer id list */
-					List transferIdList = (List) operationTypeTable
-						.get(operationType);
-
-					/* Get the transfer id */
-					Iterator transfer = transferIdList.iterator();
-					while (transfer.hasNext()) {
-						/*
-						 * Get the id and add it to the list if it does not
-						 * exist
-						 */
-						String transferId = (String) transfer.next();
-						if (!transferIds.contains(transferId)) {
-							transferIds.add(transferId);
-						}
-					}
-				}
-			}
-		}
-
-		/* Return the list of ids */
-		return !transferIds.isEmpty() ? (String[]) transferIds
-			.toArray(new String[transferIds.size()])
-			: null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragDropListenerProvider#getDragSourceListeners(org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragListenerContext)
-	 */
-	public IDragSourceListener[] getDragSourceListeners(
-			IDragListenerContext context) {
-		assert null != context : "context cannot be null"; //$NON-NLS-1$
-
-		return (IDragSourceListener[]) execute(new GetDragListenerOperation(
-			context));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragDropListenerProvider#getDropTargetListeners(org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDropListenerContext)
-	 */
-	public IDropTargetListener[] getDropTargetListeners(
-			IDropListenerContext context) {
-		assert null != context : "context cannot be null"; //$NON-NLS-1$
-
-		return (IDropTargetListener[]) execute(new GetDropListenerOperation(
-			context));
-	}
-
-	/**
-	 * Combines the arrays in the passed list into one array.
-	 * 
-	 * @param list
-	 *            The List of arrays to combine together
-	 * @param resultingArrayType
-	 *            the Object[] used to define the type of the combined array
-	 * 
-	 * @return Object[] the combined array of the proper type
-	 */
-	private final Object[] combineArraysInList(List list,
-			Object[] resultingArrayType) {
-		List listEntry = null;
-		Iterator it = list.iterator();
-		ArrayList results = new ArrayList();
-		while (it.hasNext()) {
-			Object[] array = (Object[]) it.next();
-			if (array != null && array.length > 0) {
-				listEntry = Arrays.asList(array);
-				results.addAll(listEntry);
-			}
-		}
-
-		return results.toArray(resultingArrayType);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDragDropListenerProvider.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDragDropListenerProvider.java
deleted file mode 100644
index 9f5c648..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDragDropListenerProvider.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener;
-
-/**
- * Interface that needs to be implemented by the client who provides
- * <code>IDragSourceListener</code> and <code>IDropTargetListener</code>
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDragDropListenerProvider
-	extends IProvider {
-
-	/**
-	 * Returns an array of <code>IDragSourceListener</code> for the given
-	 * <code>IDragDropListenerContext</code>
-	 * 
-	 * @param context
-	 *            The context for the provider
-	 * @return Returns an array of <code>IDragSourceListener</code>
-	 */
-	public IDragSourceListener[] getDragSourceListeners(
-			IDragListenerContext context);
-
-	/**
-	 * Returns an array of <code>IDropTargetListener</code> for the given
-	 * <code>IDragDropListenerContext</code>
-	 * 
-	 * @param context
-	 *            The context for the provider
-	 * @return Returns an array of <code>IDropTargetListener</code>
-	 */
-	public IDropTargetListener[] getDropTargetListeners(
-			IDropListenerContext context);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDragListenerContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDragListenerContext.java
deleted file mode 100644
index c6df56d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDragListenerContext.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-
-/**
- * Interface for accessing the attributes used to determine the
- * <code>IDragSourceListener</code>
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDragListenerContext
-	extends IListenerContext {
-
-	/**
-	 * Returns a boolean to indicate whether a direct match is required for the
-	 * element type or not. For a compatible type the element type supported by
-	 * the provider should be assignable from this context's element type.
-	 * 
-	 * @return true if compatible is requested, false otherwise (for a direct
-	 *         match)
-	 */
-	public boolean isCompatible();
-
-	/**
-	 * Returns the active <code>IWorkbenchPart</code>
-	 * 
-	 * @return Returns the active <code>IWorkbenchPart</code>
-	 */
-	public IWorkbenchPart getActivePart();
-
-	/**
-	 * Returns an element type associated with the current selection in the
-	 * active <code>IWorkbenchPart</code>
-	 * 
-	 * @return Returns a <code>Class</code>
-	 */
-	public Class getSelectedElementType();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDropListenerContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDropListenerContext.java
deleted file mode 100644
index 023a3f1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IDropListenerContext.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-
-/**
- * Interface for accessing the attributes used to determine the
- * <code>IDropTargetListener</code>.
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDropListenerContext
-	extends IListenerContext {
-
-	/**
-	 * Returns a boolean to indicate whether a direct match is required for the
-	 * element type or not. For a compatible type the element type supported by
-	 * the provider should be assignable from this context's element type.
-	 * 
-	 * @return true if compatible is requested, false otherwise (for a direct
-	 *         match)
-	 */
-	public boolean isCompatible();
-
-	/**
-	 * Returns the active <code>IWorkbenchPart</code>
-	 * 
-	 * @return Returns the active <code>IWorkbenchPart</code>
-	 */
-	public IWorkbenchPart getActivePart();
-
-	/**
-	 * Returns an element type associated with the current target selected on
-	 * the drop target viewer
-	 * 
-	 * @return Returns a <code>Class</code>
-	 */
-	public Class getTargetElementType();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IListenerContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IListenerContext.java
deleted file mode 100644
index 6fe2770..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/IListenerContext.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-/**
- * Interface for accessing the attributes used to determine the drag and drop
- * transfer adapters and listeners
- * 
- * @author Vishy Ramaswamy
- */
-public interface IListenerContext {
-
-	/**
-	 * Constant for requesting all supporting transfer ids
-	 */
-	public static final String ALL_TRANSFERS = "ALL_TRANSFERS"; //$NON-NLS-1$
-
-	/**
-	 * Constant for drag operation type
-	 */
-	public static final String DRAG = "drag"; //$NON-NLS-1$
-
-	/**
-	 * Constant for drop operation type
-	 */
-	public static final String DROP = "drop"; //$NON-NLS-1$
-
-	/**
-	 * Returns the operation type
-	 * 
-	 * @return Returns the operation type
-	 */
-	public String getOperationType();
-
-	/**
-	 * Returns the transfer id requested
-	 * 
-	 * @return the transfer id
-	 */
-	public String getTransferId();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/ITransferAgent.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/ITransferAgent.java
deleted file mode 100644
index 3d8f52f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/ITransferAgent.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-
-/**
- * Interface to be implemented by providers of new transfer agents for drag and
- * drop operations
- * 
- * @author Vishy Ramaswamy
- */
-public interface ITransferAgent {
-
-	/**
-	 * Returns the unique id for this transfer agent
-	 * 
-	 * @return String the transfer id
-	 */
-	public String getTransferId();
-
-	/**
-	 * Returns the transfer agent
-	 * 
-	 * @return Transfer the transfer
-	 */
-	public Transfer getTransfer();
-
-	/**
-	 * Returns a boolean indicating whether the transfer agent is selection
-	 * transfer
-	 * 
-	 * @return boolean true or false
-	 */
-	public boolean isSelectionType();
-
-	/**
-	 * Set the selection if the transfer is a selection transfer
-	 * 
-	 * @param selection
-	 *            The selection to be set
-	 */
-	public void setSelection(ISelection selection);
-
-	/**
-	 * Return the selection if the transfer is a selection transfer
-	 * 
-	 * @param transferData
-	 *            the platform specific representation of the data to be
-	 *            converted
-	 * @return ISelection the selection
-	 */
-	public ISelection getSelection(TransferData transferData);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/SelectionTransfer.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/SelectionTransfer.java
deleted file mode 100644
index a53808b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/SelectionTransfer.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.TransferData;
-
-/**
- * This class can be used to transfer a <code>ISelection</code> between two
- * parts in a workbench in a drag and drop operation. This class does not
- * marshall the data.
- * 
- * @author Vishy Ramaswamy
- */
-public final class SelectionTransfer
-	extends ByteArrayTransfer {
-
-	/**
-	 * Create a UUID for the type name to make sure that each instance of an
-	 * Eclipse application uses a different "type" of
-	 * <code>SelectionTransfer</code>
-	 */
-	private static final String TYPE_NAME = "Element Selection Format" + (new Long(System.currentTimeMillis())).toString(); //$NON-NLS-1$
-
-	/**
-	 * Attribute for the type id
-	 */
-	private static final int TYPE_ID = registerType(TYPE_NAME);
-
-	/**
-	 * Create the singleton.
-	 */
-	private static SelectionTransfer instance = new SelectionTransfer();
-
-	/**
-	 * Return the singleton.
-	 * 
-	 * @return the singleton instance of the SelectionTransfer class
-	 */
-	public static SelectionTransfer getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Create a <code>SelectionTransfer</code>.
-	 */
-	private SelectionTransfer() {
-		super();
-	}
-
-	/**
-	 * Attribute that holds on to the selection.
-	 */
-	private ISelection selection = null;
-
-	/**
-	 * Converts the <code>TYPE_NAME</code> into a <code>byte[]</code>
-	 * 
-	 * @see org.eclipse.swt.dnd.Transfer#javaToNative(java.lang.Object,
-	 *      org.eclipse.swt.dnd.TransferData)
-	 */
-	public void javaToNative(Object object, TransferData transferData) {
-		byte[] check = TYPE_NAME.getBytes();
-		super.javaToNative(check, transferData);
-	}
-
-	/**
-	 * Retrieves the <code>byte[]</code> associated with
-	 * <code>TYPE_NAME</code>. Verifies it is the same as the
-	 * <code>TYPE_NAME</code> and then returns the <code>selection</code>.
-	 * 
-	 * @return <code>Object</code>
-	 * @see org.eclipse.swt.dnd.Transfer#nativeToJava(org.eclipse.swt.dnd.TransferData)
-	 */
-	public Object nativeToJava(TransferData transferData) {
-		Object result = super.nativeToJava(transferData);
-		if (isInvalidNativeType(result)) {
-			return null;
-		}
-
-		return getSelection();
-	}
-
-	/**
-	 * Check if the tranfer type is valid
-	 * 
-	 * @param result
-	 *            with the transfer type to check
-	 * @return true if the type is valid, false if it isn't
-	 */
-	private boolean isInvalidNativeType(Object result) {
-		return !(result instanceof byte[])
-			|| !TYPE_NAME.equals(new String((byte[]) result));
-	}
-
-	/**
-	 * Returns the type ids supported by this agent
-	 * 
-	 * @return <code>int[]</code>
-	 * @see org.eclipse.swt.dnd.Transfer#getTypeIds()
-	 */
-	protected int[] getTypeIds() {
-		return new int[] {TYPE_ID};
-	}
-
-	/**
-	 * Returns the type names supported by this agent
-	 * 
-	 * @return <code>String[]</code>
-	 * @see org.eclipse.swt.dnd.Transfer#getTypeNames()
-	 */
-	protected String[] getTypeNames() {
-		return new String[] {TYPE_NAME};
-	}
-
-	/**
-	 * Returns the selection.
-	 * 
-	 * @return <code>selection</code>
-	 */
-	public ISelection getSelection() {
-		return selection;
-	}
-
-	/**
-	 * Sets the selection.
-	 * 
-	 * @param aSelection
-	 *            The selection to set
-	 */
-	public void setSelection(ISelection aSelection) {
-		this.selection = aSelection;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferAdapterService.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferAdapterService.java
deleted file mode 100644
index c81ccf0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferAdapterService.java
+++ /dev/null

@@ -1,263 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.GetTransferAdapterOperation;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.ITransferAdapterProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.ListenerOperation;
-
-/**
- * A service that provides transfer adapters for a given transfer id.
- * 
- * @author Vishy Ramaswamy
- */
-public class TransferAdapterService
-	extends Service
-	implements ITransferAdapterProvider {
-
-	/**
-	 * A descriptor for <code>ITransferAdapterProvider</code> defined by a
-	 * configuration element.
-	 * 
-	 * @author Vishy Ramaswamy
-	 */
-	protected static class ProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/**
-		 * Attribute for maintaining the provider information
-		 */
-		private Hashtable adapterInfo = null;
-
-		/**
-		 * Constructs a <code>ITransferAdapterProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element
-		 *            The configuration element describing the provider.
-		 * @param anAdapterInfo
-		 *            A <code>Hashtable</code> with the provider information
-		 */
-		protected ProviderDescriptor(IConfigurationElement element,
-				Hashtable anAdapterInfo) {
-			super(element);
-
-			assert null != anAdapterInfo : "anAdapterInfo cannot be null"; //$NON-NLS-1$
-			this.adapterInfo = anAdapterInfo;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		public boolean provides(IOperation operation) {
-			/* Check the operation */
-			if (!(operation instanceof GetTransferAdapterOperation)) {
-				return false;
-			}
-
-			/* Get all the context information */
-			String operationType = ((GetTransferAdapterOperation) operation)
-				.getContext().getOperationType();
-			String transferId = ((GetTransferAdapterOperation) operation)
-				.getContext().getTransferId();
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"TAS:provides::Operation Type is " + operationType); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"TAS:provides::Transfer id is " + transferId); //$NON-NLS-1$				
-			}
-
-			/* Check if an id exists */
-			List transferIdList = (List) getAdapterInfo().get(
-				new Integer(operationType.hashCode()));
-			if (transferIdList == null) {
-				return false;
-			}
-
-			return transferIdList.contains(new Integer(transferId.hashCode()));
-		}
-
-		/**
-		 * Returns the <code>Hashtable</code> containing the provider
-		 * information
-		 * 
-		 * @return Return the <code>adapterInfo</code> instance variable
-		 */
-		private Hashtable getAdapterInfo() {
-			return adapterInfo;
-		}
-	}
-
-	/**
-	 * Attribute for the singleton
-	 */
-	private final static TransferAdapterService instance = new TransferAdapterService();
-
-	static {
-		instance.configureProviders(CommonUIServicesDNDPlugin.getPluginId(), "transferAdapterProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the singleton.
-	 * 
-	 * @return singleton instance of the TransferAdapterService class
-	 */
-	public static TransferAdapterService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Constructor for TransferAdapterService.
-	 */
-	protected TransferAdapterService() {
-		super(false);
-	}
-
-	/**
-	 * Executes the <code>ListenerOperation</code> operation using the FIRST
-	 * strategy
-	 * 
-	 * @param operation
-	 *            The operation
-	 * @return Returns a <code>Object</code>
-	 */
-	private Object execute(ListenerOperation operation) {
-		List results = execute(ExecutionStrategy.FIRST, operation);
-		return results.isEmpty() ? null
-			: results.get(0);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.internal.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	protected Service.ProviderDescriptor newProviderDescriptor(
-			IConfigurationElement element) {
-		return new ProviderDescriptor(element,
-			getTransferAdapterProviderInfo(element));
-	}
-
-	/**
-	 * Captures all the <code>ITransferAdapterProvider</code> information.
-	 * 
-	 * @param element
-	 *            The configuration element associated with the provider
-	 * @return Returns a <code>Hashtable</code>
-	 */
-	private Hashtable getTransferAdapterProviderInfo(
-			IConfigurationElement element) {
-		/* Get the transfer id children */
-		Hashtable providerInfo = new Hashtable();
-		IConfigurationElement[] adapterTypeChildren = element
-			.getChildren("AdapterType"); //$NON-NLS-1$
-		for (int i = 0; i < adapterTypeChildren.length; i++) {
-			IConfigurationElement adapterTypeConfig = adapterTypeChildren[i];
-
-			/* Get the operation type attributes */
-			String operationType = adapterTypeConfig.getAttribute("operation"); //$NON-NLS-1$
-
-			Vector listOftransferIds = new Vector();
-			IConfigurationElement[] transferChildren = adapterTypeConfig
-				.getChildren();
-			for (int j = 0; j < transferChildren.length; j++) {
-				/* Get the transfer id element */
-				IConfigurationElement transferConfig = transferChildren[j];
-
-				/* Get the transfer id attribute */
-				String id = transferConfig.getAttribute("id"); //$NON-NLS-1$
-
-				/* Get the transfer ids */
-
-				/* Add to the list */
-				listOftransferIds.addElement(new Integer(id.hashCode()));
-			}
-
-			/* Add a placeholder in the table */
-			providerInfo.put(new Integer(operationType.hashCode()),
-				listOftransferIds);
-		}
-
-		return providerInfo;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDragSourceAdapter(java.lang.String)
-	 */
-	public ITransferDragSourceListener getTransferDragSourceAdapter(
-			String transferId) {
-		assert null != transferId : "transferId cannot be null"; //$NON-NLS-1$
-
-		/* Create a placeholder */
-		final String id = transferId;
-
-		/* Return the adapter */
-		return (ITransferDragSourceListener) execute(new GetTransferAdapterOperation(
-			new IListenerContext() {
-
-				public String getOperationType() {
-					return IListenerContext.DRAG;
-				}
-
-				public String getTransferId() {
-					return id;
-				}
-			}));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDropTargetAdapter(java.lang.String)
-	 */
-	public ITransferDropTargetListener getTransferDropTargetAdapter(
-			String transferId) {
-		assert null != transferId : "transferId cannot be null"; //$NON-NLS-1$
-
-		/* Create a placeholder */
-		final String id = transferId;
-
-		/* Return the adapter */
-		return (ITransferDropTargetListener) execute(new GetTransferAdapterOperation(
-			new IListenerContext() {
-
-				public String getOperationType() {
-					return IListenerContext.DROP;
-				}
-
-				public String getTransferId() {
-					return id;
-				}
-			}));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferAgent.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferAgent.java
deleted file mode 100644
index f26be5b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferAgent.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-
-/**
- * Utility class that contains the transfer id and the associated transfer
- * 
- * @author Vishy Ramasamy
- */
-public class TransferAgent
-	implements ITransferAgent {
-
-	/**
-	 * Attribute for the transfer id
-	 */
-	private final String transferId;
-
-	/**
-	 * Attribute for the transfer
-	 */
-	private final Transfer transfer;
-
-	/**
-	 * Attribute to check if selection type
-	 */
-	private final boolean isSelectionType;
-
-	/**
-	 * Constructor for the transfer agent
-	 * 
-	 * @param aTransferId
-	 *            the unique transfer ID for this transfer agent
-	 * @param aTransfer
-	 *            instance of a Transfer class that corresponds to the type of
-	 *            data to be transferred
-	 * @param anIsSelectionType
-	 *            true if transfer data a selection type transfer, false if
-	 *            transfer data is not a selection type transfer
-	 */
-	public TransferAgent(String aTransferId, Transfer aTransfer,
-			boolean anIsSelectionType) {
-		assert null != aTransferId : "aTransferId cannot be null"; //$NON-NLS-1$
-		assert null != aTransfer : "aTransfer cannot be null"; //$NON-NLS-1$
-
-		this.transferId = aTransferId;
-		this.transfer = aTransfer;
-		this.isSelectionType = anIsSelectionType;
-	}
-
-	/**
-	 * Return the transfer id
-	 * 
-	 * @return transferId
-	 */
-	public String getTransferId() {
-		return transferId;
-	}
-
-	/**
-	 * Return the transfer
-	 * 
-	 * @return transfer
-	 */
-	public Transfer getTransfer() {
-		return transfer;
-	}
-
-	/**
-	 * Set the selection if the transfer is a selection transfer
-	 * 
-	 * @param selection
-	 *            The selection to be set
-	 */
-	public void setSelection(ISelection selection) {
-		/* method not implemented */
-	}
-
-	/**
-	 * Return the selection if the transfer is a selection transfer
-	 * 
-	 * @param transferData
-	 *            the platform specific representation of the data to be
-	 *            converted
-	 * @return ISelection the selection
-	 */
-	public ISelection getSelection(TransferData transferData) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent#isSelectionType()
-	 */
-	public boolean isSelectionType() {
-		return isSelectionType;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferId.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferId.java
deleted file mode 100644
index 8158871..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferId.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.core;
-
-/**
- * Interface containing constants for transfer ids used within drag and drop
- * operations
- * 
- * @author Vishy Ramaswamy
- */
-public interface TransferId {
-
-	/**
-	 * Constant for custom data transfer agent
-	 */
-	public static final String CUSTOM_DATA_TRANSFER = "customDataTransfer"; //$NON-NLS-1$
-
-	/**
-	 * Constant for file transfer agent
-	 */
-	public static final String FILE_TRANSFER = "fileTransfer"; //$NON-NLS-1$;
-
-	/**
-	 * Constant for plugin transfer agent
-	 */
-	public static final String PLUGIN_TRANSFER = "pluginTransfer"; //$NON-NLS-1$;
-
-	/**
-	 * Constant for selection transfer agent
-	 */
-	public static final String SELECTION_TRANSFER = "selectionTransfer"; //$NON-NLS-1$;
-
-	/**
-	 * Constant for text transfer agent
-	 */
-	public static final String TEXT_TRANSFER = "textTransfer"; //$NON-NLS-1$;
-
-	/**
-	 * Constant for rich text transfer agent
-	 */
-	public static final String RTF_TRANSFER = "richTextTransfer"; //$NON-NLS-1$;
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/package.html
deleted file mode 100644
index 435aa84..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/package.html
+++ /dev/null

@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides core support for drag and drop. The two main services in this package for drag
-and drop are {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.DragDropListenerService
-DragDropListenerService} and {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterService
-TransferAdapterService}.</P>
-
-<h2>DragDropListenerService and TransferAdapterService</h2>
-<P>The {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.DragDropListenerService
-DragDropListenerService} contains methods to get the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener
-IDragSourceListener} and
-{@link org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener
-IDropTargetListener}, which are interfaces implemented by drag and drop
-providers.  It also contains a method to get Transfer ID strings, which can then
-be passed on to the TransferAdapterService to return {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener}
-ITransferDragSourceListener or {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener}
-ITransferDropTargetListener, which are interfaces to be implemented by drag and
-drop adapters for different transfer types.
-
-
-<h2>Package Specification</h2>
-
-<P>For more information on transferring data using Eclipse drag and drop, please
-see {@link org.eclipse.swt.dnd.Transfer org.eclipse.swt.dnd.Transfer} and {@link
-org.eclipse.swt.dnd.TransferData org.eclipse.swt.dnd.TransferData}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/AbstractDragSourceListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/AbstractDragSourceListener.java
deleted file mode 100644
index 305c78d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/AbstractDragSourceListener.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.dnd.DragSourceEvent;
-
-/**
- * Abstract parent of all the drag source listeners
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class AbstractDragSourceListener
-	implements IDragSourceListener {
-
-	/**
-	 * Attribute for the drag source context.
-	 */
-	private IDragSourceContext context = null;
-
-	/**
-	 * Attribute for the supporting transfer ids.
-	 */
-	private final String[] transferIds;
-
-	/**
-	 * Constructor for AbstractDragSourceListener.
-	 * 
-	 * @param transferIdArray
-	 *            The transfer agent ids
-	 */
-	public AbstractDragSourceListener(String[] transferIdArray) {
-		super();
-
-		assert null != transferIdArray : "transferIdArray cannot be null"; //$NON-NLS-1$
-		assert transferIdArray.length > 0 : "transferIdArray cannot be empty"; //$NON-NLS-1$
-
-		this.transferIds = transferIdArray;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener#isDraggable(org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceContext)
-	 */
-	public final boolean isDraggable(IDragSourceContext cntxt) {
-		/* Set the context */
-		this.context = cntxt;
-
-		/* Check if draggable */
-		return isDraggable();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener#getSupportingTransferIds()
-	 */
-	public final String[] getSupportingTransferIds() {
-		return transferIds;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public final void dragStart(DragSourceEvent event) {
-		event.doit = true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragSetData(DragSourceEvent event) {
-		/* method not implemented */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragFinished(DragSourceEvent event) {
-		/* method not implemented */
-	}
-
-	/**
-	 * Returns the context.
-	 * 
-	 * @return IDragSourceContext
-	 */
-	protected final IDragSourceContext getContext() {
-		return context;
-	}
-
-	/**
-	 * Checks if the selection contained in the context is draggable. Derived
-	 * classes can get context using the <code>getContext()</code> method.
-	 * 
-	 * @return true if draggable, false otherwise
-	 */
-	protected abstract boolean isDraggable();
-
-	/**
-	 * Combines the arrays in the passed list into one array.
-	 * 
-	 * @param list
-	 *            The List of arrays to combine together
-	 * @param resultingArrayType
-	 *            the Object[] used to define the type of the combined array
-	 * 
-	 * @return Object[] the combined array of the proper type
-	 */
-	protected final Object[] combineArraysInList(List list,
-			Object[] resultingArrayType) {
-		List listEntry = null;
-		Iterator it = list.iterator();
-		ArrayList results = new ArrayList();
-		while (it.hasNext()) {
-			listEntry = Arrays.asList((Object[]) it.next());
-			results.addAll(listEntry);
-		}
-
-		return results.toArray(resultingArrayType);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/DelegatingDragSourceAdapter.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/DelegatingDragSourceAdapter.java
deleted file mode 100644
index 14a5761..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/DelegatingDragSourceAdapter.java
+++ /dev/null

@@ -1,557 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.DragSource;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.DragDropListenerService;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterService;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.DragListenerContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.l10n.CommonUIServicesDNDMessages;
-
-/**
- * This class delegates all the drag source events to the transfer drag source
- * adapters. The transfer adapters delegate to the registered listeners
- * 
- * @author Vishy Ramaswamy
- */
-public final class DelegatingDragSourceAdapter
-	implements DragSourceListener {
-
-	/**
-	 * Attribute for the all transfer drag source adapters mapped to their
-	 * transfer id.
-	 */
-	private final Hashtable allAdapters;
-
-	/**
-	 * Attribute for the current transfer drag source adapters.
-	 */
-	private ITransferDragSourceListener[] currentAdapters = null;
-
-	/**
-	 * Attribute for the chosen transfer drag source adapter.
-	 */
-	private ITransferDragSourceListener chosenAdapter = null;
-
-	/**
-	 * Attribute for the drag source context.
-	 */
-	private final DragSourceContext context;
-
-	/**
-	 * Constructor for DelegatingDragSourceAdapter.
-	 * 
-	 * @param aContext
-	 *            the drag source context
-	 */
-	public DelegatingDragSourceAdapter(DragSourceContext aContext) {
-		super();
-
-		assert null != aContext : "aContext cannot be null"; //$NON-NLS-1$
-		this.context = aContext;
-
-		/* Set the adapters */
-		allAdapters = getAllTransferAdapters();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragStart(DragSourceEvent event) {
-		try {
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND, "dragStart entered"); //$NON-NLS-1$
-			}
-
-			/* Save the provided event information */
-			boolean saveDoit = event.doit;
-			Object saveData = event.data;
-
-			/* Clear the previous collection of adapters */
-			setCurrentAdapters(null);
-
-			/* Clear the previous chosen adapter */
-			setChosenAdapter(null);
-
-			/* Set the adapters */
-			setCurrentAdapters(getAdapters(getListeners()));
-
-			/* Iterate through the adapters */
-			boolean doIt = false;
-			ArrayList listOfActiveAdapters = new ArrayList();
-			ArrayList listOfActiveTransferAgents = new ArrayList();
-			if (getCurrentAdapters() != null && getCurrentAdapters().length > 0) {
-				for (int i = 0; i < getCurrentAdapters().length; i++) {
-					/* Set the do it flag */
-					event.doit = saveDoit;
-
-					/* Invoke the drag start */
-					getCurrentAdapters()[i].dragStart(event);
-
-					/* If ok to drag add the transfer to the list */
-					if (event.doit) {
-						listOfActiveAdapters.add(getCurrentAdapters()[i]);
-						listOfActiveTransferAgents.add(getCurrentAdapters()[i]
-							.getTransferAgent().getTransfer());
-					}
-
-					/* Ok to drag if anyone is ready to handle */
-					doIt = doIt || event.doit;
-				}
-
-				/* Set the transfers and the updated adapters */
-				if (doIt) {
-					/* Set the transfers */
-					((DragSource) event.widget)
-						.setTransfer((Transfer[]) listOfActiveTransferAgents
-							.toArray(new Transfer[listOfActiveTransferAgents
-								.size()]));
-
-					/* Set the adapters */
-					setCurrentAdapters((org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener[]) listOfActiveAdapters
-						.toArray(new ITransferDragSourceListener[listOfActiveAdapters
-							.size()]));
-				}
-
-				if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND)) {
-					String result = doIt ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
-					Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-						CommonUIServicesDNDDebugOptions.DND,
-						"DragStart::Event do it flag is " + result); //$NON-NLS-1$
-
-					/* Write the transfer adapters */
-					for (int i = 0; i < getCurrentAdapters().length; i++) {
-						Trace
-							.trace(
-								CommonUIServicesDNDPlugin.getDefault(),
-								CommonUIServicesDNDDebugOptions.DND,
-								"DragStart::Transfer Adapter is " + getCurrentAdapters()[i].getClass().getName()); //$NON-NLS-1$
-					}
-				}
-
-				/* Set the event information */
-				event.data = saveData;
-				event.doit = doIt;
-			} else {
-				/* Delegate to the drag source */
-				getContext().dragStart(event);
-			}
-		} catch (Throwable e) {
-			event.doit = false;
-			handle(e, false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragSetData(DragSourceEvent event) {
-		try {
-			/* Get the corresponding chosen adapter */
-			setChosenAdapter(getAdapter(event.dataType));
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter Chosen"; //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragSetData::Chosen Adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().dragSetData(event);
-			} else {
-				/* Delegate to the drag source */
-				getContext().dragSetData(event);
-			}
-		} catch (Throwable e) {
-			event.data = null;
-			handle(e, false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragFinished(DragSourceEvent event) {
-		try {
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter Chosen"; //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragFinished::Chosen Adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-
-			/* Get the corresponding chosen adapter */
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().dragFinished(event);
-			} else {
-				setChosenAdapter(getAdapter(event.dataType));
-				if (getChosenAdapter() != null) {
-					getChosenAdapter().dragFinished(event);
-				} else {
-					/* Delegate to the drag source */
-					getContext().dragFinished(event);
-				}
-			}
-		} catch (Throwable e) {
-			handle(e, false);
-		} finally {
-			setChosenAdapter(null);
-			setCurrentAdapters(null);
-		}
-	}
-
-	/**
-	 * Returns the current adapters.
-	 * 
-	 * @return ITransferDragSourceListener[]
-	 */
-	private ITransferDragSourceListener[] getCurrentAdapters() {
-		return currentAdapters;
-	}
-
-	/**
-	 * Returns the drag source context.
-	 * 
-	 * @return DragSourceContext
-	 */
-	private DragSourceContext getContext() {
-		return context;
-	}
-
-	/**
-	 * Returns the set of registered listeners. The listeners are acquired
-	 * through the <code>DragDropListenerService</code>.
-	 * 
-	 * @return IDragSourceListener[] an array of listeners
-	 */
-	private IDragSourceListener[] getListeners() {
-		/* Get the structured selection */
-		ISelection selection = getContext().getSelection();
-
-		/* Check the selection */
-		if (selection == null || selection.isEmpty()
-			|| !(selection instanceof IStructuredSelection)) {
-			return null;
-		}
-
-		/* Get the selection as an object array */
-		Object[] array = ((IStructuredSelection) selection).toArray();
-
-		/* Create a unique list of element types */
-		ArrayList listOfElementTypes = new ArrayList();
-		for (int i = 0; i < array.length; i++) {
-			if (!listOfElementTypes.contains(array[i].getClass())) {
-				listOfElementTypes.add(array[i].getClass());
-			}
-		}
-
-		/* Get the drag source listeners */
-		ArrayList listOfListeners = new ArrayList();
-		Iterator iterator = listOfElementTypes.iterator();
-		while (iterator.hasNext()) {
-			/* Get the element type */
-			Class clazz = (Class) iterator.next();
-
-			/* Create a drag listener context */
-			DragListenerContext aContext = new DragListenerContext(getContext()
-				.getActivePart(), clazz, IListenerContext.ALL_TRANSFERS, false);
-
-			/* Get the drag source listeners */
-			IDragSourceListener[] listeners = DragDropListenerService
-				.getInstance().getDragSourceListeners(aContext);
-
-			/* Get a compatible one if no listener is found for a direct match */
-			if (listeners == null || listeners.length == 0) {
-				/* Create a drag listener context */
-				aContext = new DragListenerContext(
-					getContext().getActivePart(), clazz,
-					IListenerContext.ALL_TRANSFERS, true);
-
-				/* Get the drag source listener */
-				listeners = DragDropListenerService.getInstance()
-					.getDragSourceListeners(aContext);
-			}
-
-			/* Add to the list */
-			if (listeners != null && listeners.length != 0) {
-				for (int i = 0; i < listeners.length; i++) {
-					if (!listOfListeners.contains(listeners[i])) {
-						listOfListeners.add(listeners[i]);
-					}
-				}
-			}
-		}
-
-		/* Combine all the listeners into one array */
-		return !listOfListeners.isEmpty() ? (IDragSourceListener[]) listOfListeners
-			.toArray(new IDragSourceListener[listOfListeners.size()])
-			: null;
-	}
-
-	/**
-	 * Returns the set of transfer drag source adapters. The adapters are
-	 * created based on the transfers supported by the listeners
-	 * 
-	 * @param listeners
-	 *            The registered list of <code>IDragSourceListener</code>
-	 * @return ITransferDragSourceListener[] an array of transfer adapters
-	 */
-	private ITransferDragSourceListener[] getAdapters(
-			IDragSourceListener[] listeners) {
-		/* Return if no listeners or no selection */
-		if (listeners == null || listeners.length == 0) {
-			return null;
-		}
-
-		/* Create placeholder for active listeners */
-		Hashtable listOfUniqueTransferIds = new Hashtable();
-
-		/* Check if the listeners can handle the drag */
-		for (int i = 0; i < listeners.length; i++) {
-			/* Check if the selection is draggable */
-			if (!listeners[i].isDraggable(getContext())) {
-				continue;
-			}
-
-			/* Get the transfer ids */
-			String[] transferIds = listeners[i].getSupportingTransferIds();
-			if (transferIds == null || transferIds.length == 0) {
-				continue;
-			}
-
-			/* Iterate through the ids */
-			for (int y = 0; y < transferIds.length; y++) {
-				/* Placeholder for listeners */
-				ArrayList listOfListeners = null;
-
-				if (!listOfUniqueTransferIds.containsKey(transferIds[y])) {
-					/* Create a new list */
-					listOfListeners = new ArrayList();
-				} else {
-					/* Get the list of listeners and add to it */
-					listOfListeners = (ArrayList) listOfUniqueTransferIds
-						.get(transferIds[y]);
-				}
-
-				/* Update the list */
-				if (listOfListeners != null) {
-					listOfListeners.add(listeners[i]);
-					listOfUniqueTransferIds
-						.put(transferIds[y], listOfListeners);
-				}
-			}
-		}
-
-		/* Return if no active transfer agents */
-		if (listOfUniqueTransferIds.isEmpty()) {
-			return null;
-		}
-
-		/* Get the adapters */
-		ArrayList listOfAdapters = new ArrayList();
-		Enumeration enumeration = listOfUniqueTransferIds.keys();
-		while (enumeration.hasMoreElements()) {
-			/* Get the next id */
-			String transferId = (String) enumeration.nextElement();
-
-			/* Get the listeners */
-			ArrayList supportingListeners = (ArrayList) listOfUniqueTransferIds
-				.get(transferId);
-
-			/* Get the adapter */
-			ITransferDragSourceListener adapter = (ITransferDragSourceListener) getAllAdapters()
-				.get(new Integer(transferId.hashCode()));
-			if (adapter != null) {
-				/* Initialize the adapter */
-				adapter.init(
-					(IDragSourceListener[]) supportingListeners
-						.toArray(new IDragSourceListener[supportingListeners
-							.size()]), getContext());
-
-				/* Add to the list */
-				listOfAdapters.add(adapter);
-			}
-		}
-
-		/* Return the list of adapters */
-		return !listOfAdapters.isEmpty() ? (ITransferDragSourceListener[]) listOfAdapters
-			.toArray(new ITransferDragSourceListener[listOfAdapters.size()])
-			: null;
-	}
-
-	/**
-	 * Sets the current adapters.
-	 * 
-	 * @param currentAdapterArray
-	 *            The adapters to set
-	 */
-	private void setCurrentAdapters(
-			ITransferDragSourceListener[] currentAdapterArray) {
-		this.currentAdapters = currentAdapterArray;
-	}
-
-	/**
-	 * Returns the chosen adapter
-	 * 
-	 * @param type
-	 *            The transfer data type
-	 * @return The transfer drag source adapter chosen
-	 */
-	private ITransferDragSourceListener getAdapter(TransferData type) {
-		if (type != null) {
-			for (int i = 0; i < getCurrentAdapters().length; i++) {
-				if (getCurrentAdapters()[i].getTransferAgent().getTransfer()
-					.isSupportedType(type)) {
-					return getCurrentAdapters()[i];
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the chosenAdapter.
-	 * 
-	 * @return ITransferDragSourceListener
-	 */
-	private ITransferDragSourceListener getChosenAdapter() {
-		return chosenAdapter;
-	}
-
-	/**
-	 * Sets the chosenAdapter.
-	 * 
-	 * @param aChosenAdapter
-	 *            The chosenAdapter to set
-	 */
-	private void setChosenAdapter(ITransferDragSourceListener aChosenAdapter) {
-		this.chosenAdapter = aChosenAdapter;
-	}
-
-	/**
-	 * Returns the set of transfer drag source adapters. The adapters are
-	 * created based on the provided transfer ids determined from the drag and
-	 * drop service.
-	 * 
-	 * @return Hashtable a table of transfer adapters
-	 */
-	private Hashtable getAllTransferAdapters() {
-		/* Create placeholder for possible adapters */
-		Hashtable listOfSupportedAdapters = new Hashtable();
-
-		/* Get the ids from the drag and drop service */
-		String[] transferIds = DragDropListenerService.getInstance()
-			.getAllTransferIds(getContext().getActivePart().getSite().getId(),
-				IListenerContext.DRAG);
-
-		/* Iterate through the ids */
-		if (transferIds == null || transferIds.length == 0) {
-			return null;
-		}
-
-		/* Create the adapters */
-		for (int i = 0; i < transferIds.length; i++) {
-			ITransferDragSourceListener adapter = TransferAdapterService
-				.getInstance().getTransferDragSourceAdapter(transferIds[i]);
-
-			if (adapter != null) {
-				listOfSupportedAdapters.put(new Integer(transferIds[i]
-					.hashCode()), adapter);
-			}
-		}
-
-		/* Return the adapters */
-		return listOfSupportedAdapters;
-	}
-
-	/**
-	 * Handles the specified exception.
-	 * 
-	 * @param exception
-	 *            The exception to be handled.
-	 * @param displayDialog
-	 *            boolean to indicate whether to display dialog
-	 */
-	private void handle(Throwable exception, boolean displayDialog) {
-		if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-			CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING)) {
-			Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-				getClass(), "handle", exception); //$NON-NLS-1$
-		}
-
-		IStatus status = new Status(IStatus.ERROR, CommonUIServicesDNDPlugin
-			.getPluginId(), CommonUIServicesDNDStatusCodes.DRAG_ACTION_FAILURE,
-			CommonUIServicesDNDMessages.DelegatingDragSourceAdapter__ERROR__errorMessage, exception);
-
-		Log.log(CommonUIServicesDNDPlugin.getDefault(), status);
-
-		if (displayDialog) {
-
-			status = new Status(IStatus.ERROR, CommonUIServicesDNDPlugin
-				.getPluginId(),
-				CommonUIServicesDNDStatusCodes.DRAG_ACTION_FAILURE, 
-				CommonUIServicesDNDMessages.DelegatingDragSourceAdapter__ERROR__errorMessage,
-				exception);
-
-			ErrorDialog.openError(getContext().getActivePart().getSite()
-				.getShell(), null, null, status);
-		}
-	}
-
-	/**
-	 * Returns the adapters.
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getAllAdapters() {
-		return allAdapters;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/DragSourceContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/DragSourceContext.java
deleted file mode 100644
index 52b876e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/DragSourceContext.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Concrete implementation of <code>IDragSourceContext</code>
- * 
- * @author Vishy Ramaswamy
- */
-public class DragSourceContext
-	implements IDragSourceContext {
-
-	/**
-	 * Attribute for the active part.
-	 */
-	private final IWorkbenchPart activePart;
-
-	/**
-	 * Constructor for DragSourceContext.
-	 * 
-	 * @param anActivePart
-	 *            active IWorkbenchPart
-	 */
-	public DragSourceContext(IWorkbenchPart anActivePart) {
-		super();
-
-		assert null != anActivePart : "anActivePart cannot be null"; //$NON-NLS-1$
-		this.activePart = anActivePart;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceContext#getSelection()
-	 */
-	public ISelection getSelection() {
-		return getActivePart().getSite().getSelectionProvider().getSelection();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceContext#getActivePart()
-	 */
-	public final IWorkbenchPart getActivePart() {
-		return activePart;
-	}
-
-	/**
-	 * Sets the data of the given DragSourceEvent
-	 * 
-	 * @param event
-	 *            the DragSourceEvent to have its data set
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	protected void dragSetData(DragSourceEvent event) {
-		event.data = null;
-	}
-
-	/**
-	 * Drag operation started.
-	 * 
-	 * @param event
-	 *            the DragSouceEvent to be updated
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	protected void dragStart(DragSourceEvent event) {
-		event.doit = false;
-	}
-
-	/**
-	 * Drag operation finished.
-	 * 
-	 * @param event
-	 *            the DragSouceEvent to be updated
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	protected void dragFinished(DragSourceEvent event) {
-		/* method not implemented */
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/IDragSourceContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/IDragSourceContext.java
deleted file mode 100644
index 47423f7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/IDragSourceContext.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Interface that contains the context information relevant to the drag source.
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDragSourceContext {
-
-	/**
-	 * Returns the selection of the drag source viewer
-	 * 
-	 * @return The selection of the drag source viewer
-	 */
-	public ISelection getSelection();
-
-	/**
-	 * Returns the active <code>IWorkbenchPart</code> associated with the drag
-	 * source viewer.
-	 * 
-	 * @return The active <code>IWorkbenchPart</code>
-	 */
-	public IWorkbenchPart getActivePart();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/IDragSourceListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/IDragSourceListener.java
deleted file mode 100644
index ed73ab8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/IDragSourceListener.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import org.eclipse.swt.dnd.DragSourceListener;
-
-/**
- * Interface to be implemented by providers to handle drag source events
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDragSourceListener
-	extends DragSourceListener {
-
-	/**
-	 * Determines if the selection in the context is draggable. This method is
-	 * invoked when the drag starts
-	 * 
-	 * @param context
-	 *            The context associated with the drag source
-	 * @return true if the drag allowed and false otherwise.
-	 */
-	public boolean isDraggable(IDragSourceContext context);
-
-	/**
-	 * Returns the supporting transfer agent ids.
-	 * 
-	 * @return return the supporting transfer agent ids
-	 */
-	public String[] getSupportingTransferIds();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/ITransferDragSourceListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/ITransferDragSourceListener.java
deleted file mode 100644
index 88b7bad..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/ITransferDragSourceListener.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import org.eclipse.swt.dnd.DragSourceListener;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-
-/**
- * Interface to be implemented by providers of transfer agents that are used by
- * the drag source within drag/drop operations.
- * 
- * @author Vishy Ramaswamy
- */
-public interface ITransferDragSourceListener
-	extends DragSourceListener {
-
-	/**
-	 * Returns the transfer agent associated with this transfer listener.
-	 * 
-	 * @return ITransferAgent associated with this transfer listener
-	 */
-	public ITransferAgent getTransferAgent();
-
-	/**
-	 * Initializes this transfer drag source listener with the drag source
-	 * listeners, registered against this transfer agent, and the drag source
-	 * context
-	 * 
-	 * @param listeners
-	 *            the drag source listeners
-	 * @param context
-	 *            the drag source context
-	 */
-	public void init(IDragSourceListener[] listeners, IDragSourceContext context);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/SelectionDragAdapter.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/SelectionDragAdapter.java
deleted file mode 100644
index 2cca92d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/SelectionDragAdapter.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import org.eclipse.swt.dnd.DragSourceEvent;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-
-/**
- * Concrete implementation of the transfer drag source adapter for the selection
- * transfer type.
- * 
- * @author Vishy Ramaswamy
- */
-public class SelectionDragAdapter
-	extends TransferDragSourceAdapter {
-
-	/**
-	 * Constructor for SelectionDragAdapter.
-	 * 
-	 * @param transferAgent
-	 *            ITransferAgent to use
-	 */
-	public SelectionDragAdapter(ITransferAgent transferAgent) {
-		super(transferAgent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragStart(DragSourceEvent event) {
-		/* Set the selection */
-		getTransferAgent().setSelection(getContext().getSelection());
-
-		/* Invoke the super */
-		super.dragStart(event);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragSetData(DragSourceEvent event) {
-		/*
-		 * For consistency, set the data to the selection even though the
-		 * selection is provided by the transfer to the drop target adapter
-		 */
-		event.data = getTransferAgent().getSelection(event.dataType);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragFinished(DragSourceEvent event) {
-		/* Set the selection back to null */
-		getTransferAgent().setSelection(null);
-
-		/* Invoke the super */
-		super.dragSetData(event);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/TransferDragSourceAdapter.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/TransferDragSourceAdapter.java
deleted file mode 100644
index 3184a56..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/TransferDragSourceAdapter.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drag;
-
-import org.eclipse.swt.dnd.DragSourceEvent;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-
-/**
- * Parent of all the transfer drag source adapters. Every transfer type drag
- * source adapter should override the methods in the
- * <code>DragSourceListener</code> interface.
- * 
- * @author Vishy Ramaswamy
- */
-public class TransferDragSourceAdapter
-	implements ITransferDragSourceListener {
-
-	/**
-	 * Attribute for the drag source listeners.
-	 */
-	private IDragSourceListener[] listeners;
-
-	/**
-	 * Attribute for the transfer agent.
-	 */
-	private final ITransferAgent transferAgent;
-
-	/**
-	 * Attribute for the drag source context.
-	 */
-	private IDragSourceContext context;
-
-	/**
-	 * Constructor for TransferDragSourceAdapter.
-	 * 
-	 * @param aTransferAgent
-	 *            ITransferAgent that this class is an adpater for
-	 */
-	public TransferDragSourceAdapter(ITransferAgent aTransferAgent) {
-		super();
-
-		assert null != aTransferAgent : "aTransferAgent cannot be null"; //$NON-NLS-1$
-		this.transferAgent = aTransferAgent;
-	}
-
-	/**
-	 * Returns the listeners.
-	 * 
-	 * @return IDragSourceListener[]
-	 */
-	protected final IDragSourceListener[] getListeners() {
-		return listeners;
-	}
-
-	/**
-	 * Returns the context.
-	 * 
-	 * @return IDragSourceContext
-	 */
-	protected final IDragSourceContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragFinished(DragSourceEvent event) {
-		/* Set the event to all the listeners */
-		for (int i = 0; i < getListeners().length; i++) {
-			getListeners()[i].dragFinished(event);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragSetData(DragSourceEvent event) {
-		/* Set the event to all the listeners */
-		for (int i = 0; i < getListeners().length; i++) {
-			getListeners()[i].dragSetData(event);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
-	 */
-	public void dragStart(DragSourceEvent event) {
-		/* Set the event to all the listeners */
-		for (int i = 0; i < getListeners().length; i++) {
-			getListeners()[i].dragStart(event);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener#init(org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener[],
-	 *      org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceContext)
-	 */
-	public final void init(IDragSourceListener[] dragSourceListeners,
-			IDragSourceContext dragSourceContext) {
-		assert null != dragSourceListeners : "list of dragSourceListeners cannot be null"; //$NON-NLS-1$
-		assert null != dragSourceContext : "dragSourceContext cannot be null"; //$NON-NLS-1$
-
-		this.listeners = dragSourceListeners;
-		this.context = dragSourceContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener#getTransferAgent()
-	 */
-	public final ITransferAgent getTransferAgent() {
-		return transferAgent;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/package.html
deleted file mode 100644
index 67fc502..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drag/package.html
+++ /dev/null

@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides core support for the drag component of drag and drop.  The two main types of
-classes in this package are those that pertain to the drag source, and those
-that pertain to adapting the transfer agent for the item to be dragged for use
-with the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterProvider
-TransferAdapterProvider}.  See the schema documentation for
-transferAdapterProviders for more information.</P>
-
-<h2>The Drag Source</h2>
-<P>The {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.AbstractDragSourceListener
-AbstractDragSourceListener}, which extends the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener
-IDragSourceListener} for listening to drags, determines if the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.DragSourceContext
-DragSourceContext} is draggable.  Drag providers should subclass the
-{@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.AbstractDragSourceListener
-AbstractDragSourceListener} and handle the {@link
-org.eclipse.swt.dnd.DragSourceEvent DragSourceEvent}.</P>
-
-<h2>The Drag Adapter</h2>
-<P>The {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.TransferDragSourceAdapter
-TransferDragSourceAdapter} implements the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener
-ITransferDragSourceListener} interface.  It adapts the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent
-ITransferAgent} for use with the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterProvider
-TransferAdapterProvider} and notifies its {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener
-IDragSourceListener} array with {@link org.eclipse.swt.dnd.DragSourceEvent
-DragSourceEvent} notifications.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information on transferring data using Eclipse drag and drop, please
-see {@link org.eclipse.swt.dnd.Transfer org.eclipse.swt.dnd.Transfer} and {@link
-org.eclipse.swt.dnd.TransferData org.eclipse.swt.dnd.TransferData}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/AbstractDropTargetListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/AbstractDropTargetListener.java
deleted file mode 100644
index 645144a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/AbstractDropTargetListener.java
+++ /dev/null

@@ -1,505 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPartSite;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDStatusCodes;
-
-/**
- * Abstract parent of all the drop target listeners
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class AbstractDropTargetListener
-	implements IDropTargetListener {
-
-	/**
-	 * Attribute for the drop target context.
-	 */
-	private IDropTargetContext context = null;
-
-	/**
-	 * Attribute for the current transfer agent.
-	 */
-	private ITransferAgent currentAgent = null;
-
-	/**
-	 * Attribute for the current event.
-	 */
-	private IDropTargetEvent currentEvent = null;
-
-	/**
-	 * Attribute for the supporting transfer ids.
-	 */
-	private final List transferIds = new Vector();
-
-	/**
-	 * Enumerated type for work indicator type
-	 */
-	public static class WorkIndicatorType
-		extends EnumeratedType {
-
-		private static final long serialVersionUID = 1L;
-
-		private static int nextOrdinal = 0;
-
-		/** None work indicator type. */
-		public static final WorkIndicatorType NONE = new WorkIndicatorType(
-			"None"); //$NON-NLS-1$
-
-		/** Busy work indicator type. */
-		public static final WorkIndicatorType BUSY = new WorkIndicatorType(
-			"Busy"); //$NON-NLS-1$
-
-		/** Progress monitor indicator type. */
-		public static final WorkIndicatorType PROGRESS_MONITOR = new WorkIndicatorType(
-			"Progress Monitor"); //$NON-NLS-1$
-
-		/** Cancelable progress monitor indicator type. */
-		public static final WorkIndicatorType CANCELABLE_PROGRESS_MONITOR = new WorkIndicatorType(
-			"Cancelable Progress Monitor"); //$NON-NLS-1$
-
-		/**
-		 * The list of values for this enumerated type.
-		 */
-		private static final WorkIndicatorType[] VALUES = {NONE, BUSY,
-			PROGRESS_MONITOR, CANCELABLE_PROGRESS_MONITOR};
-
-		/**
-		 * Constructor for WorkIndicatorType.
-		 * 
-		 * @param name
-		 *            The name for the WorkIndicatorType
-		 * @param ordinal
-		 *            The ordinal for theWorkIndicatorType
-		 */
-		protected WorkIndicatorType(String name, int ordinal) {
-			super(name, ordinal);
-		}
-
-		/**
-		 * Constructor for WorkIndicatorType.
-		 * 
-		 * @param name
-		 *            The name for the WorkIndicatorType
-		 */
-		private WorkIndicatorType(String name) {
-			this(name, nextOrdinal++);
-		}
-
-		/**
-		 * Retrieves the list of constants for this enumerated type.
-		 * 
-		 * @return The list of constants for this enumerated type.
-		 */
-		protected List getValues() {
-			return Collections.unmodifiableList(Arrays.asList(VALUES));
-		}
-	}
-
-	/**
-	 * Constructor for AbstractDropTargetListener.
-	 * 
-	 * @param transferIdArray
-	 *            The transfer agent ids
-	 */
-	public AbstractDropTargetListener(String[] transferIdArray) {
-		super();
-
-		assert null!=transferIdArray : "transferIdArray cannot be null"; //$NON-NLS-1$
-		assert transferIdArray.length > 0 : "transferIdArray cannot be empty"; //$NON-NLS-1$
-
-		this.transferIds.addAll(Arrays.asList(transferIdArray));
-	}
-
-	/**
-	 * Default Constructor for AbstractDropTargetListener.
-	 *  
-	 */
-	public AbstractDropTargetListener() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener#getSupportingTransferIds()
-	 */
-	public final String[] getSupportingTransferIds() {
-		return (String[]) transferIds.toArray(new String[transferIds.size()]);
-	}
-
-	/**
-	 * Add transfer id to the list of transferIds.
-	 * 
-	 * @param transferId
-	 *            String id to add
-	 */
-	public final void addSupportingTransferId(String transferId) {
-		assert null != transferId : "transferId cannot be null"; //$NON-NLS-1$
-		
-		if (!transferIds.contains(transferId)) {
-			transferIds.add(transferId);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragEnter(DropTargetEvent event) {
-		/* method not implemented */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragLeave(DropTargetEvent event) {
-		/* method not implemented */
-		currentAgent = null;
-		currentEvent = null;
-		context = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOperationChanged(DropTargetEvent event) {
-		/* method not implemented */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOver(DropTargetEvent event) {
-		/* method not implemented */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public final void drop(DropTargetEvent event) {
-		/* Check the target and data */
-		// Fix for RATLC00528158 - Linux: Cannot DnD Tables or Database from
-		// Data Definition View to Class Diagram
-		// Removed check "event.data == null"
-		if (getContext().getCurrentTarget() == null) {
-			event.detail = DND.DROP_NONE;
-			return;
-		}
-
-		/* Get the command */
-		final ICommand command = getExecutableContext(event);
-
-		/* Get the command manager */
-		final IOperationHistory manager = (IOperationHistory) getContext()
-			.getActivePart().getAdapter(IOperationHistory.class);
-
-		/* Check the manager and command */
-		if (manager == null || command == null) {
-			event.detail = DND.DROP_NONE;
-			return;
-		}
-
-		WorkIndicatorType type = getWorkIndicatorType();
-
-		if (type == WorkIndicatorType.PROGRESS_MONITOR) {
-			runCommandInProgressMonitorDialog(command, false);
-
-		} else if (type == WorkIndicatorType.CANCELABLE_PROGRESS_MONITOR) {
-			runCommandInProgressMonitorDialog(command, true);
-
-		} else if (type == WorkIndicatorType.BUSY) {
-            /* display hour glass cursor */
-            BusyIndicator.showWhile(null, new Runnable() {
-
-                public void run() {
-                    try {
-                        manager.execute(command, new NullProgressMonitor(),
-                            null);
-                    } catch (ExecutionException e) {
-                        Trace
-                            .catching(
-                                CommonUIServicesDNDPlugin.getDefault(),
-                                CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-                                getClass(), "drop", e); //$NON-NLS-1$
-                        Log.error(CommonUIServicesDNDPlugin.getDefault(),
-                            CommonUIServicesDNDStatusCodes.SERVICE_FAILURE,
-                            "drop", e); //$NON-NLS-1$
-                    }
-
-                }
-            });
-        } else {
-            try {
-                manager.execute(command, new NullProgressMonitor(), null);
-            } catch (ExecutionException e) {
-                Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-                    CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-                    getClass(), "drop", e); //$NON-NLS-1$
-                Log.error(CommonUIServicesDNDPlugin.getDefault(),
-                    CommonUIServicesDNDStatusCodes.SERVICE_FAILURE, "drop", e); //$NON-NLS-1$
-            }
-        }
-
-		/* Set the event detail */
-		event.detail = (command.getCommandResult().getStatus().isOK()) ? event.detail
-			: DND.DROP_NONE;
-
-		currentAgent = null;
-		currentEvent = null;
-		context = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dropAccept(DropTargetEvent event) {
-		/* method not implemented */
-	}
-
-	/**
-	 * Returns the context.
-	 * 
-	 * @return IDropTargetContext
-	 */
-	protected final IDropTargetContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener#getExecutableContext(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public ICommand getExecutableContext(DropTargetEvent event) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener#setFeedback(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void setFeedback(DropTargetEvent event) {
-		event.feedback |= DND.FEEDBACK_EXPAND | DND.FEEDBACK_SCROLL;
-		switch (getContext().getRelativeLocation()) {
-			case IDropTargetContext.LOCATION_BEFORE:
-				event.feedback |= DND.FEEDBACK_INSERT_BEFORE;
-				break;
-			case IDropTargetContext.LOCATION_AFTER:
-				event.feedback |= DND.FEEDBACK_INSERT_AFTER;
-				break;
-			case IDropTargetContext.LOCATION_ON:
-			default:
-				event.feedback |= DND.FEEDBACK_SELECT;
-				break;
-		}
-	}
-
-	/**
-	 * Returns whether the listener can support handling drop operations on the
-	 * current target context and the current event.
-	 * 
-	 * @return true or false
-	 */
-	public abstract boolean canSupport();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener#canSupport(org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext,
-	 *      org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent,
-	 *      org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent)
-	 */
-	public final boolean canSupport(IDropTargetContext cntxt,
-			IDropTargetEvent currEvent, ITransferAgent currAgent) {
-		/* Set the context */
-		this.context = cntxt;
-		/* Set the event */
-		this.currentEvent = currEvent;
-		/* Set the agent */
-		this.currentAgent = currAgent;
-
-		return canSupport();
-	}
-
-	/**
-	 * Returns the current event.
-	 * 
-	 * @return IDropTargetEvent
-	 */
-	protected final IDropTargetEvent getCurrentEvent() {
-		return currentEvent;
-	}
-
-	/**
-	 * Returns the current transfer agent.
-	 * 
-	 * @return ITransferAgent
-	 */
-	protected final ITransferAgent getCurrentAgent() {
-		return currentAgent;
-	}
-
-	/**
-	 * Returns the current shell.
-	 * 
-	 * @return Shell
-	 */
-	protected final Shell getShell() {
-		IWorkbenchPartSite site = getContext().getActivePart().getSite();
-
-		return site != null ? site.getShell()
-			: null;
-	}
-
-	/**
-	 * Gets type of work indicator (progress monitor, hourglass, or none).
-	 * 
-	 * @return type of work indicator
-	 */
-	protected WorkIndicatorType getWorkIndicatorType() {
-		return WorkIndicatorType.BUSY;
-	}
-
-	/**
-	 * Runs <code>command</code> in the context of a progress monitor dialog.
-	 * The command runs in the same thread as the dialog. The cancel button on
-	 * the dialog is enabled if <code>cancelable</code> is <code>true</code>.
-	 * 
-	 * @param command
-	 *            the command to run
-	 * @param cancelable
-	 *            <code>true</code> if the progress monitor should have an
-	 *            enabled cancel button, <code>false</code> otherwise.
-	 * 
-	 * @exception RuntimeException
-	 *                if any exception or error occurs while running the action
-	 */
-	private void runCommandInProgressMonitorDialog(final ICommand command,
-			boolean cancelable) {
-
-		/* Get the operation history */
-		final IOperationHistory manager = (IOperationHistory) getContext()
-			.getActivePart().getAdapter(IOperationHistory.class);
-
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) {
-                try {
-                    manager.execute(command, monitor, null);
-                    
-                } catch (ExecutionException e) {
-                    Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-                        CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-                        getClass(), "drop", e); //$NON-NLS-1$
-                    Log.error(CommonUIServicesDNDPlugin.getDefault(),
-                        CommonUIServicesDNDStatusCodes.SERVICE_FAILURE, "drop", e); //$NON-NLS-1$
-                    
-                    RuntimeException re = new RuntimeException(e);
-
-                    Trace.throwing(CommonUIServicesDNDPlugin.getDefault(),
-                        CommonUIServicesDNDDebugOptions.EXCEPTIONS_THROWING,
-                        getClass(), "runCommandInProgressMonitorDialog", re); //$NON-NLS-1$
-                    throw re;
-                }
-
-			}
-		};
-		runInProgressMonitorDialog(runnable, cancelable);
-	}
-
-	/**
-	 * Runs <code>runnable</code> in a progress monitor dialog. The runnable
-	 * runs in the same thread as the dialog. The cancel button on the dialog is
-	 * enabled if <code>cancelable</code> is <code>true</code>.
-	 * 
-	 * @param runnable
-	 *            the runnable to run in the context of the progress dialog
-	 * @param cancelable
-	 *            <code>true</code> if the progress monitor should have an
-	 *            enabled cancel button, <code>false</code> otherwise.
-	 * 
-	 * @exception RuntimeException
-	 *                if any exception or error occurs while running the
-	 *                runnable
-	 */
-	private void runInProgressMonitorDialog(IRunnableWithProgress runnable,
-			boolean cancelable) {
-
-		try {
-			if (System.getProperty("RUN_PROGRESS_IN_UI_HACK") != null) { //$NON-NLS-1$
-				new ProgressMonitorDialog(null).run(false, cancelable, runnable);
-			} else {
-				new ProgressMonitorDialog(null).run(true, cancelable, runnable);
-			}
-
-		} catch (InvocationTargetException ite) {
-			Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-				getClass(), "runInProgressMonitorDialog", ite); //$NON-NLS-1$
-			Log.error(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDStatusCodes.SERVICE_FAILURE,
-				"runInProgressMonitorDialog", ite); //$NON-NLS-1$
-
-			RuntimeException cre = new RuntimeException(ite
-				.getTargetException());
-
-			Trace.throwing(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.EXCEPTIONS_THROWING,
-				getClass(), "runInProgressMonitorDialog", cre); //$NON-NLS-1$
-			throw cre;
-
-		} catch (InterruptedException ie) {
-			Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-				getClass(), "runInProgressMonitorDialog", ie); //$NON-NLS-1$
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DelegatingDropTargetAdapter.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DelegatingDropTargetAdapter.java
deleted file mode 100644
index 8a15efc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DelegatingDropTargetAdapter.java
+++ /dev/null

@@ -1,621 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.DragDropListenerService;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterService;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.l10n.CommonUIServicesDNDMessages;
-
-/**
- * This class delegates all the drop target events to the transfer drop target
- * adapter. The transfer adapter delegates to the registered listeners
- * 
- * @author Vishy Ramaswamy
- */
-public class DelegatingDropTargetAdapter
-	implements DropTargetListener {
-
-	/**
-	 * Attribute for the error message
-	 */
-	//private static final String ERROR_MSG = ResourceManager
-	//	.getI18NString("DelegatingDropTargetAdapter.errorMessage"); //$NON-NLS-1$
-
-	/**
-	 * Attribute for the error message for logging
-	 */
-	//private static final String ERROR_MSG_LOG = ResourceManager
-	//	.getI18NString("DelegatingDropTargetAdapter._ERROR_.errorMessage"); //$NON-NLS-1$
-
-	/**
-	 * Attribute for the transfer drop target adapters.
-	 */
-	private ITransferDropTargetListener[] adapters = null;
-
-	/**
-	 * Attribute for the current transfer drop target adapter.
-	 */
-	private ITransferDropTargetListener chosenAdapter = null;
-
-	/**
-	 * Attribute for the drop target context.
-	 */
-	private final DropTargetContext context;
-
-	/**
-	 * Attribute for the original drop event type.
-	 */
-	private int origDropType = DND.DROP_NONE;
-
-	/**
-	 * Attribute for the current drop event type.
-	 */
-	private int currentDropType = DND.DROP_NONE;
-
-	/**
-	 * Constructor for DelegatingDropTargetAdapter.
-	 * 
-	 * @param aContext
-	 *            context information for the drop target
-	 */
-	public DelegatingDropTargetAdapter(DropTargetContext aContext) {
-		super();
-
-		assert null != aContext : "context information for the drop target cannot be null"; //$NON-NLS-1$
-		this.context = aContext;
-
-		/* Set the adapters */
-		adapters = getAllTransferAdapters();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragEnter(DropTargetEvent event) {
-		try {
-			/* Set the original drop type */
-			setOrigDropType(event.detail);
-
-			/* Set the current target and location */
-			getContext().setCurrentTargetAndLocation(event);
-
-			/*
-			 * Re-Initialize the Transfer Adapters with dynamically with the
-			 * correct context
-			 */
-			initAdapters();
-
-			/* Set the chosen adapter */
-			setChosenAdapter(event);
-
-			/* Check if a chosen adapter exists */
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().dragEnter(event);
-			} else {
-				/* Delegate to the drop target */
-				getContext().dragEnter(event);
-			}
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter"; //$NON-NLS-1$ 
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragEnter::Event detail is " + event.detail); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragEnter::Chosen adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-		} catch (Throwable e) {
-			event.detail = DND.DROP_NONE;
-			handle(e, false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragLeave(DropTargetEvent event) {
-		try {
-			/* Check if a chosen adapter exists */
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().dragLeave(event);
-			} else {
-				/* Delegate to the drop target */
-				getContext().dragLeave(event);
-			}
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter"; //$NON-NLS-1$ 
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragLeave::Event detail is " + event.detail); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragLeave::Chosen adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-		} catch (Throwable e) {
-			handle(e, false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOperationChanged(DropTargetEvent event) {
-		try {
-			/* Set the original drop type */
-			setOrigDropType(event.detail);
-
-			/* Set the current target and location */
-			getContext().setCurrentTargetAndLocation(event);
-
-			/* Set the chosen adapter */
-			setChosenAdapter(event);
-
-			/* Check if a chosen adapter exists */
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().dragOperationChanged(event);
-			} else {
-				/* Delegate to the drop target */
-				getContext().dragOperationChanged(event);
-			}
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter"; //$NON-NLS-1$ 
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragOperationChanged::Event detail is " + event.detail); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragOperationChanged::Chosen adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-		} catch (Throwable e) {
-			event.detail = DND.DROP_NONE;
-			handle(e, false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOver(DropTargetEvent event) {
-		try {
-			/* Set the current target and location */
-			getContext().setCurrentTargetAndLocation(event);
-
-			/* Set the event detail as the original drop type */
-			event.detail = getOrigDropType();
-
-			/* Set the chosen adapter */
-			setChosenAdapter(event);
-
-			/* Check if a chosen adapter exists */
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().dragOver(event);
-
-				/* Check the event detail */
-				if (event.detail != DND.DROP_NONE) {
-					setCurrentDropType(event.detail);
-				}
-			} else {
-				/* Delegate to the drop target */
-				getContext().dragOver(event);
-			}
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter"; //$NON-NLS-1$ 
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragOver::Event detail is " + event.detail); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DragOver::Chosen adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-		} catch (Throwable e) {
-			event.detail = DND.DROP_NONE;
-			handle(e, false);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void drop(DropTargetEvent event) {
-		try {
-			/*
-			 * Save the event detail just in case the event has to be delegated
-			 * to the drop target
-			 */
-			int oldDetail = event.detail;
-
-			/* Set the current target and location */
-			getContext().setCurrentTargetAndLocation(event);
-
-			/* Set the event detail as the current drop type */
-			event.detail = getCurrentDropType();
-
-			/* Set the chosen adapter */
-			setChosenAdapter(event);
-
-			/* Check if a chosen adapter exists */
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().drop(event);
-			} else {
-				event.detail = oldDetail;
-
-				/* Delegate to the drop target */
-				getContext().drop(event);
-			}
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter"; //$NON-NLS-1$ 
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"Drop::Event detail is " + event.detail); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"Drop::Chosen adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-		} catch (Throwable e) {
-			event.detail = DND.DROP_NONE;
-			handle(e, true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dropAccept(DropTargetEvent event) {
-		try {
-			/*
-			 * Save the event detail just in case the event has to be delegated
-			 * to the drop target
-			 */
-			int oldDetail = event.detail;
-
-			/* Set the current target and location */
-			getContext().setCurrentTargetAndLocation(event);
-
-			/* Set the event detail as the original drop type */
-			event.detail = getCurrentDropType();
-
-			/* Set the chosen adapter */
-			setChosenAdapter(event);
-
-			/* Check if a chosen adapter exists */
-			if (getChosenAdapter() != null) {
-				getChosenAdapter().dropAccept(event);
-
-				/* Check the event detail */
-				if (event.detail != getCurrentDropType()) {
-					setCurrentDropType(event.detail);
-				}
-			} else {
-				event.detail = oldDetail;
-
-				/* Delegate to the drop target */
-				getContext().dropAccept(event);
-			}
-
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				String adapterChosen = getChosenAdapter() != null ? getChosenAdapter()
-					.getClass().getName()
-					: "No Adapter"; //$NON-NLS-1$ 
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DropAccept::Event detail is " + event.detail); //$NON-NLS-1$
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"DropAccept::Chosen adapter is " + adapterChosen); //$NON-NLS-1$
-			}
-		} catch (Throwable e) {
-			event.detail = DND.DROP_NONE;
-			handle(e, false);
-		}
-	}
-
-	/**
-	 * Returns the adapters.
-	 * 
-	 * @return ITransferDropTargetListener[]
-	 */
-	private ITransferDropTargetListener[] getAdapters() {
-		return adapters;
-	}
-
-	/**
-	 * Returns the drop target context.
-	 * 
-	 * @return DropTargetContext
-	 */
-	private DropTargetContext getContext() {
-		return context;
-	}
-
-	/**
-	 * Returns the set of registered transfer agents. This is determined from
-	 * the drop target service.
-	 * 
-	 * @return Transfer[] an array of transfer agents
-	 */
-	public Transfer[] getAllTransferAgents() {
-		/* Return null if no registered agents */
-		if (getAdapters() == null || getAdapters().length == 0) {
-			return null;
-		}
-
-		/* Get the transfers */
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < getAdapters().length; i++) {
-			list.add(getAdapters()[i].getTransferAgent().getTransfer());
-		}
-
-		return (Transfer[]) list.toArray(new Transfer[list.size()]);
-	}
-
-	/**
-	 * Returns the set of transfer drop target adapters. The adapters are
-	 * created based on the provided transfer ids determined from the drag and
-	 * drop service.
-	 * 
-	 * @return ITransferDropTargetListener[] an array of transfer adapters
-	 */
-	private ITransferDropTargetListener[] getAllTransferAdapters() {
-		/* Create placeholder for possible adapters */
-		ArrayList listOfSupportedAdapters = new ArrayList();
-
-		/* Get the ids from the drag and drop service */
-		String[] transferIds = DragDropListenerService.getInstance()
-			.getAllTransferIds(getContext().getActivePart().getSite().getId(),
-				IListenerContext.DROP);
-
-		/* Iterate through the ids */
-		if (transferIds == null || transferIds.length == 0) {
-			return null;
-		}
-
-		/* Create the adapters */
-		for (int i = 0; i < transferIds.length; i++) {
-			ITransferDropTargetListener adapter = TransferAdapterService
-				.getInstance().getTransferDropTargetAdapter(transferIds[i]);
-
-			if (adapter != null) {
-				listOfSupportedAdapters.add(adapter);
-			}
-		}
-
-		/* Return the adapters */
-		return !listOfSupportedAdapters.isEmpty() ? (ITransferDropTargetListener[]) listOfSupportedAdapters
-			.toArray(new ITransferDropTargetListener[listOfSupportedAdapters
-				.size()])
-			: null;
-	}
-
-	/**
-	 * Set the chosen adapter.
-	 * 
-	 * @param event
-	 *            the event
-	 */
-	private void setChosenAdapter(DropTargetEvent event) {
-		/* Set the chosen adapter to null */
-		chosenAdapter = null;
-
-		/* Get the data types */
-		TransferData[] dataTypes = event.dataTypes;
-		if (dataTypes == null || dataTypes.length == 0) {
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				Trace
-					.trace(CommonUIServicesDNDPlugin.getDefault(),
-						CommonUIServicesDNDDebugOptions.DND,
-						"setChosenAdapter::No transfer types available in the event"); //$NON-NLS-1$
-			}
-
-			return;
-		}
-
-		/* Check if there are any adapters */
-		if (getAdapters() == null) {
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				Trace
-					.trace(CommonUIServicesDNDPlugin.getDefault(),
-						CommonUIServicesDNDDebugOptions.DND,
-						"setChosenAdapter::No adapters registered with this target"); //$NON-NLS-1$
-			}
-			return;
-		}
-
-		/* Check if the target is null */
-		if (getContext().getCurrentTarget() == null) {
-			if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND)) {
-				Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-					CommonUIServicesDNDDebugOptions.DND,
-					"setChosenAdapter::Current target is null"); //$NON-NLS-1$
-			}
-
-			return;
-		}
-
-		/*
-		 * Preferably use the selection transfer for in-process drag and drop
-		 * operations. Iterate through the adapters
-		 */
-		for (int i = 0; i < getAdapters().length; i++) {
-			if (getAdapters()[i].getTransferAgent().isSelectionType()) {
-				/* Check if the adapter can handle */
-				if (getAdapters()[i].canSupport(event)) {
-					/* Set the adapter */
-					chosenAdapter = getAdapters()[i];
-					return;
-				}
-			}
-		}
-
-		/* Iterate through the rest of the adapters */
-		for (int i = 0; i < getAdapters().length; i++) {
-			if (!getAdapters()[i].getTransferAgent().isSelectionType()) {
-				/* Check if the adapter can handle */
-				if (getAdapters()[i].canSupport(event)) {
-					/* Set the adapter */
-					chosenAdapter = getAdapters()[i];
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the chosenAdapter.
-	 * 
-	 * @return ITransferDropTargetListener
-	 */
-	private ITransferDropTargetListener getChosenAdapter() {
-		return chosenAdapter;
-	}
-
-	/**
-	 * Handles the specified exception.
-	 * 
-	 * @param exception
-	 *            The exception to be handled.
-	 * @param displayDialog
-	 *            boolean to indicate whether to display dialog
-	 */
-	private void handle(Throwable exception, boolean displayDialog) {
-		if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-			CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING)) {
-			Trace.catching(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.EXCEPTIONS_CATCHING,
-				getClass(), "handle", exception); //$NON-NLS-1$
-		}
-
-		IStatus status = new Status(IStatus.ERROR, CommonUIServicesDNDPlugin
-			.getPluginId(), CommonUIServicesDNDStatusCodes.DROP_ACTION_FAILURE,
-			CommonUIServicesDNDMessages.DelegatingDropTargetAdapter__ERROR__errorMessage, exception);
-
-		Log.log(CommonUIServicesDNDPlugin.getDefault(), status);
-
-		if (displayDialog) {
-
-			status = new Status(IStatus.ERROR, CommonUIServicesDNDPlugin
-				.getPluginId(),
-				CommonUIServicesDNDStatusCodes.DROP_ACTION_FAILURE, 
-				CommonUIServicesDNDMessages.DelegatingDropTargetAdapter_errorMessage,
-				exception);
-
-			ErrorDialog.openError(getContext().getActivePart().getSite()
-				.getShell(), null, null, status);
-		}
-	}
-
-	/**
-	 * Return the original drop type
-	 * 
-	 * @return int the drop type
-	 */
-	private int getOrigDropType() {
-		return origDropType;
-	}
-
-	/**
-	 * Set the original drop type
-	 * 
-	 * @param anOrigDropType
-	 *            the drop type
-	 */
-	private void setOrigDropType(int anOrigDropType) {
-		this.origDropType = anOrigDropType;
-	}
-
-	/**
-	 * Return the current drop type
-	 * 
-	 * @return int the drop type
-	 */
-	private int getCurrentDropType() {
-		return currentDropType;
-	}
-
-	/**
-	 * Set the current drop type
-	 * 
-	 * @param aCurrentDropType
-	 *            the drop type
-	 */
-	private void setCurrentDropType(int aCurrentDropType) {
-		this.currentDropType = aCurrentDropType;
-	}
-
-	/**
-	 * Inititializes the transfer adapters' context
-	 */
-	private void initAdapters() {
-		/* Iterate through the adapters */
-
-		if (getAdapters() != null)
-			for (int i = 0; i < getAdapters().length; i++) {
-
-				/* Initialize the adapter */
-				getAdapters()[i].init(getContext());
-
-			}
-
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DropTargetContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DropTargetContext.java
deleted file mode 100644
index d0df7cf..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DropTargetContext.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Concrete implementation of <code>IDropTargetContext</code>
- * 
- * @author Vishy Ramaswamy
- */
-public class DropTargetContext
-	implements IDropTargetContext {
-
-	/**
-	 * The threshold used to determine if the mouse is before or after a target
-	 * item.
-	 */
-	protected static final int LOCATION_EPSILON = 5;
-
-	/**
-	 * Attribute for the active part.
-	 */
-	private final IWorkbenchPart activePart;
-
-	/**
-	 * Attribute for the target.
-	 */
-	protected Object target = null;
-
-	/**
-	 * Attribute for the drop target viewer control.
-	 */
-	private final Control viewerControl;
-
-	/**
-	 * Attribute for the current location.
-	 */
-	protected Point location = null;
-
-	/**
-	 * Attribute for the relative location.
-	 */
-	protected int relativeLocation = IDropTargetContext.LOCATION_NONE;
-
-	/**
-	 * Constructor for DropTargetContext.
-	 * 
-	 * @param anActivePart
-	 *            the active IWorkbenchPart
-	 * @param aViewerControl
-	 *            Control of the drop target
-	 */
-	public DropTargetContext(IWorkbenchPart anActivePart, Control aViewerControl) {
-		super();
-
-		assert null != anActivePart : "anActivePart cannot be null"; //$NON-NLS-1$
-		assert null != aViewerControl : "aViewerControl cannot be null"; //$NON-NLS-1$
-
-		this.activePart = anActivePart;
-		this.viewerControl = aViewerControl;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext#getActivePart()
-	 */
-	public final IWorkbenchPart getActivePart() {
-		return activePart;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext#getCurrentTarget()
-	 */
-	public final Object getCurrentTarget() {
-		return target;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext#getCurrentLocation()
-	 */
-	public final Point getCurrentLocation() {
-		return location;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext#getViewerControl()
-	 */
-	public final Control getViewerControl() {
-		return viewerControl;
-	}
-
-	/**
-	 * Sets the target item of the given drop event as the current target. Also
-	 * sets the current coordinates of the current location of the mouse.
-	 * 
-	 * @param event
-	 *            the event
-	 */
-	protected void setCurrentTargetAndLocation(DropTargetEvent event) {
-		/* Set the target */
-		target = event.item == null ? null
-			: event.item.getData();
-
-		/* Set the location coordinates */
-		location = getViewerControl().toControl(new Point(event.x, event.y));
-
-		/* Set the relative location */
-		if (!(event.item instanceof Item)) {
-			relativeLocation = IDropTargetContext.LOCATION_NONE;
-		} else {
-			/* Get the item */
-			Item item = (Item) event.item;
-
-			/* Get the bounds */
-			Rectangle bounds = null;
-			if (item instanceof TreeItem) {
-				bounds = ((TreeItem) item).getBounds();
-			} else if (item instanceof TableItem) {
-				bounds = ((TableItem) item).getBounds(0);
-			}
-
-			/* Set the relative location */
-			if (bounds == null) {
-				relativeLocation = IDropTargetContext.LOCATION_NONE;
-			} else if ((location.y - bounds.y) < LOCATION_EPSILON) {
-				relativeLocation = IDropTargetContext.LOCATION_BEFORE;
-			} else if ((bounds.y + bounds.height - location.y) < LOCATION_EPSILON) {
-				relativeLocation = IDropTargetContext.LOCATION_AFTER;
-			} else {
-				relativeLocation = IDropTargetContext.LOCATION_ON;
-			}
-		}
-	}
-
-	/**
-	 * Set details of the event upon entering the drop target
-	 * 
-	 * @param event
-	 *            DropTargetEvent to have its detail field reset
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	protected void dragEnter(DropTargetEvent event) {
-		event.detail = DND.DROP_NONE;
-	}
-
-	/**
-	 * Called when the drag operation has changed
-	 * 
-	 * @param event
-	 *            DropTargetEvent to update
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	protected void dragOperationChanged(DropTargetEvent event) {
-		event.detail = DND.DROP_NONE;
-	}
-
-	/**
-	 * Called when over the drop target
-	 * 
-	 * @param event
-	 *            DropTargetEvent to update
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	protected void dragOver(DropTargetEvent event) {
-		event.detail = DND.DROP_NONE;
-	}
-
-	/**
-	 * Called upon a drop
-	 * 
-	 * @param event
-	 *            DropTargetEvent to update
-	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	protected void drop(DropTargetEvent event) {
-		event.detail = DND.DROP_NONE;
-	}
-
-	/**
-	 * Called immediately before a drop
-	 * 
-	 * @param event
-	 *            DropTargetEvent to have its detail field reset
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	protected void dropAccept(DropTargetEvent event) {
-		event.detail = DND.DROP_NONE;
-	}
-
-	/**
-	 * Called when leaving the drop target or cancelling
-	 * 
-	 * @param event
-	 *            DropTargetEvent to update
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	protected void dragLeave(DropTargetEvent event) {
-		/* method not implemented */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext#getRelativeLocation()
-	 */
-	public final int getRelativeLocation() {
-		return relativeLocation;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DropTargetEvent.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DropTargetEvent.java
deleted file mode 100644
index 1ce4146..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/DropTargetEvent.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.swt.dnd.TransferData;
-
-/**
- * Concrete implementation of <code>IDropTargetEvent</code>
- * 
- * @author Vishy Ramaswamy
- */
-public final class DropTargetEvent
-	implements IDropTargetEvent {
-
-	/**
-	 * Attribute for the drop target event.
-	 */
-	private org.eclipse.swt.dnd.DropTargetEvent event = null;
-
-	/**
-	 * Constructor for DropTargetEvent.
-	 */
-	protected DropTargetEvent() {
-		/* method not implemented */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent#getCurrentDataType()
-	 */
-	public TransferData getCurrentDataType() {
-		return event.currentDataType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent#getCurrentOperation()
-	 */
-	public int getCurrentOperation() {
-		return event.detail;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent#getDataTypes()
-	 */
-	public TransferData[] getDataTypes() {
-		return event.dataTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent#getOperations()
-	 */
-	public int getOperations() {
-		return event.operations;
-	}
-
-	/**
-	 * Set the event
-	 * 
-	 * @param anEvent
-	 *            the event
-	 */
-	protected void setEvent(org.eclipse.swt.dnd.DropTargetEvent anEvent) {
-		assert null != anEvent : "anEvent cannot be null"; //$NON-NLS-1$
-		this.event = anEvent;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetContext.java
deleted file mode 100644
index d173a78..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetContext.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Interface that contains the context information relevant to the drop target.
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDropTargetContext {
-
-	/**
-	 * Constant describing the position of the cursor relative to the target
-	 * object. This means the mouse is positioned slightly before the target.
-	 * 
-	 * @see #getRelativeLocation
-	 */
-	public static final int LOCATION_BEFORE = 1;
-
-	/**
-	 * Constant describing the position of the cursor relative to the target
-	 * object. This means the mouse is positioned slightly after the target.
-	 * 
-	 * @see #getRelativeLocation
-	 */
-	public static final int LOCATION_AFTER = 2;
-
-	/**
-	 * Constant describing the position of the cursor relative to the target
-	 * object. This means the mouse is positioned directly on the target.
-	 * 
-	 * @see #getRelativeLocation
-	 */
-	public static final int LOCATION_ON = 3;
-
-	/**
-	 * Constant describing the position of the cursor relative to the target
-	 * object. This means the mouse is not positioned over or near any valid
-	 * target.
-	 * 
-	 * @see #getRelativeLocation
-	 */
-	public static final int LOCATION_NONE = 4;
-
-	/**
-	 * Returns the control associated with the drop target viewer.
-	 * 
-	 * @return Control
-	 */
-	public Control getViewerControl();
-
-	/**
-	 * Returns the active <code>IWorkbenchPart</code> associated with the drop
-	 * target viewer.
-	 * 
-	 * @return Returns the active <code>IWorkbenchPart</code>
-	 */
-	public IWorkbenchPart getActivePart();
-
-	/**
-	 * Returns the current target on the drop target viewer
-	 * 
-	 * @return Returns the current target on the drop target viewer
-	 */
-	public Object getCurrentTarget();
-
-	/**
-	 * Returns the coordinates of the current location of the mouse.
-	 * 
-	 * @return Point the location
-	 */
-	public Point getCurrentLocation();
-
-	/**
-	 * Constant describing the position of the cursor relative to the target
-	 * object
-	 * 
-	 * @return int the location
-	 */
-	public int getRelativeLocation();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetEvent.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetEvent.java
deleted file mode 100644
index 4f9ea37..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetEvent.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.swt.dnd.TransferData;
-
-/**
- * Interface that contains the information relevant to the drop target event.
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDropTargetEvent {
-
-	/**
-	 * The operation being performed.
-	 * 
-	 * @see org.eclipse.swt.dnd.DND#DROP_NONE
-	 * @see org.eclipse.swt.dnd.DND#DROP_MOVE
-	 * @see org.eclipse.swt.dnd.DND#DROP_COPY
-	 * @see org.eclipse.swt.dnd.DND#DROP_LINK
-	 * @return int constant of operation being performed
-	 */
-	public int getCurrentOperation();
-
-	/**
-	 * A bitwise OR'ing of the operations that the DragSource can support (e.g.
-	 * DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK). The detail value must be
-	 * a member of this list or DND.DROP_NONE.
-	 * 
-	 * @see org.eclipse.swt.dnd.DND#DROP_NONE
-	 * @see org.eclipse.swt.dnd.DND#DROP_MOVE
-	 * @see org.eclipse.swt.dnd.DND#DROP_COPY
-	 * @see org.eclipse.swt.dnd.DND#DROP_LINK
-	 * @return int of bitwise or of supported operations
-	 */
-	public int getOperations();
-
-	/**
-	 * A list of the types of data that the DragSource is capable of providing.
-	 * The currentDataType must be a member of this list.
-	 * 
-	 * @return TransferData[] array of the types of data that the DragSource is
-	 *         capable of providing.
-	 */
-	public TransferData[] getDataTypes();
-
-	/**
-	 * The type of data that will be dropped.
-	 * 
-	 * @return TransferData representation of the data that will be dropped
-	 */
-	public TransferData getCurrentDataType();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetListener.java
deleted file mode 100644
index 1f1f9a9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/IDropTargetListener.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-
-/**
- * Interface to be implemented by providers to handle drop target events
- * 
- * @author Vishy Ramaswamy
- */
-public interface IDropTargetListener
-	extends DropTargetListener {
-
-	/**
-	 * Returns a command for dropping the event data on the drop target. The
-	 * event passed in corresponds to the drop event. The listener can get the
-	 * current target from the context.
-	 * 
-	 * @param event
-	 *            the event associated with the drop event
-	 * @return Returns a command for dropping the event data on the drop target.
-	 */
-	public ICommand getExecutableContext(DropTargetEvent event);
-
-	/**
-	 * Returns a boolean indicating whether the listener can support drop
-	 * operations on the current target. The target context, current event and
-	 * current transfer agent information is passed to the listener. This method
-	 * is invoked whenever the target changes.
-	 * 
-	 * @param context
-	 *            The drop action context
-	 * @param currentEvent
-	 *            The current drop event
-	 * @param currentAgent
-	 *            the current transfer agent
-	 * @return Returns true or false
-	 */
-	public boolean canSupport(IDropTargetContext context,
-			IDropTargetEvent currentEvent, ITransferAgent currentAgent);
-
-	/**
-	 * Provides the listener an opportunity to set the feedback when hovering
-	 * over a target. The listener can decide whether drag under effect is
-	 * enabled for the current target.
-	 * 
-	 * @param event
-	 *            The drop target event
-	 */
-	public void setFeedback(DropTargetEvent event);
-
-	/**
-	 * Returns the supporting transfer agent ids.
-	 * 
-	 * @return return the supporting transfer agent ids
-	 */
-	public String[] getSupportingTransferIds();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/ITransferDropTargetListener.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/ITransferDropTargetListener.java
deleted file mode 100644
index fc770af..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/ITransferDropTargetListener.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-
-/**
- * Interface to be implemented by providers of transfer agents that are used by
- * the drop target within drag/drop operations.
- * 
- * @author Vishy Ramaswamy
- */
-public interface ITransferDropTargetListener
-	extends DropTargetListener {
-
-	/**
-	 * Returns the transfer agent associated with this transfer listener.
-	 * 
-	 * @return ITransferAgent associated with this transfer listener
-	 */
-	public ITransferAgent getTransferAgent();
-
-	/**
-	 * Initializes this transfer drop target listener with the drop target
-	 * context that provides the target and location information during the
-	 * drag/drop operation.
-	 * 
-	 * @param context
-	 *            the drop target context
-	 */
-	public void init(IDropTargetContext context);
-
-	/**
-	 * Returns whether the drop operation for the current drop event is
-	 * supported by this listener. This listener will have access to the
-	 * <code>IDropActionContext</code> and the current drop target listener
-	 * when this method is invoked.
-	 * 
-	 * @param event
-	 *            The drop target event
-	 * @return true if can support, false otherwise
-	 */
-	public boolean canSupport(DropTargetEvent event);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/SelectionDropAdapter.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/SelectionDropAdapter.java
deleted file mode 100644
index e018fc0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/SelectionDropAdapter.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.DropTargetEvent;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-
-/**
- * Concrete implementation of the transfer drop target adapter for the selection
- * transfer type.
- * 
- * @author Vishy Ramaswamy
- */
-public class SelectionDropAdapter
-	extends TransferDropTargetAdapter {
-
-	/**
-	 * Constructor for SelectionDropAdapter.
-	 * 
-	 * @param transferAgent
-	 *            ITransferAgent to use
-	 */
-	public SelectionDropAdapter(ITransferAgent transferAgent) {
-		super(transferAgent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener#canSupport(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public boolean canSupport(DropTargetEvent event) {
-		/* Check if the transfer data is supported */
-		if (canSupportTransferData(event)) {
-			/* Get the selection */
-			ISelection selection = getTransferAgent().getSelection(
-				event.currentDataType);
-			return selection != null && !selection.isEmpty()
-				&& isSupportingListenerAvailable();
-		}
-
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/TransferDropTargetAdapter.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/TransferDropTargetAdapter.java
deleted file mode 100644
index bfa111a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/TransferDropTargetAdapter.java
+++ /dev/null

@@ -1,318 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.drop;
-
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.DragDropListenerService;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core.DropListenerContext;
-
-/**
- * Parent of all the transfer drop target adapters. Every transfer type drop
- * target adapter should override the methods in the
- * <code>DropTargetListener</code> interface.
- * 
- * @author Vishy Ramaswamy
- */
-public class TransferDropTargetAdapter
-	implements ITransferDropTargetListener {
-
-	/**
-	 * Attribute for the drop target listener.
-	 */
-	private IDropTargetListener listener;
-
-	/**
-	 * Attribute for the transfer agent.
-	 */
-	private final ITransferAgent transferAgent;
-
-	/**
-	 * Attribute for the drop target context.
-	 */
-	private IDropTargetContext context;
-
-	/**
-	 * Attribute for the current event
-	 */
-	private final org.eclipse.gmf.runtime.common.ui.services.dnd.drop.DropTargetEvent currentEvent;
-
-	/**
-	 * Constructor for TransferDropTargetAdapter.
-	 * 
-	 * @param aTransferAgent
-	 *            The transfer agent
-	 */
-	public TransferDropTargetAdapter(ITransferAgent aTransferAgent) {
-		super();
-
-		assert null != aTransferAgent : "aTransferAgent cannot be null"; //$NON-NLS-1$
-		
-		this.listener = null;
-		this.transferAgent = aTransferAgent;
-		this.context = null;
-		this.currentEvent = new org.eclipse.gmf.runtime.common.ui.services.dnd.drop.DropTargetEvent();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragEnter(DropTargetEvent event) {
-		if (listener != null) {
-			/* Send the event to the selected listener */
-			listener.setFeedback(event);
-
-			/* Send the event to the selected listener */
-			listener.dragEnter(event);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragLeave(DropTargetEvent event) {
-		/* Send the event to the selected listener */
-		if (listener != null) {
-			listener.dragLeave(event);
-		}
-		listener = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOperationChanged(DropTargetEvent event) {
-		/* Send the event to the selected listener */
-		if (listener != null) {
-			listener.dragOperationChanged(event);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOver(DropTargetEvent event) {
-		/* Send the event to the selected listener */
-		if (listener != null) {
-			/* Send the event to the selected listener */
-			listener.setFeedback(event);
-
-			/* Send the event to the selected listener */
-			listener.dragOver(event);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public final void drop(DropTargetEvent event) {
-		/* Send the event to the selected listener */
-		if (listener != null) {
-			/* Send the event to the selected listener */
-			listener.drop(event);
-		}
-		listener = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dropAccept(DropTargetEvent event) {
-		/* Set the event to the selected listener */
-		if (listener != null) {
-			listener.dropAccept(event);
-		}
-	}
-
-	/**
-	 * Returns the listener.
-	 * 
-	 * @return IDropTargetListener
-	 */
-	protected final IDropTargetListener getListener() {
-		return listener;
-	}
-
-	/**
-	 * Returns the context.
-	 * 
-	 * @return IDropTargetContext
-	 */
-	protected final IDropTargetContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener#init(org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext)
-	 */
-	public final void init(IDropTargetContext initialContext) {
-		assert null != initialContext : "initialContext cannot be null"; //$NON-NLS-1$
-		
-		this.context = initialContext;
-	}
-
-	/**
-	 * Returns the transfer agent.
-	 * 
-	 * @return ITransferAgent
-	 */
-	public final ITransferAgent getTransferAgent() {
-		return transferAgent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener#canSupport(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public boolean canSupport(DropTargetEvent event) {
-		if (Trace.shouldTrace(CommonUIServicesDNDPlugin.getDefault(),
-			CommonUIServicesDNDDebugOptions.DND)) {
-			Trace.trace(CommonUIServicesDNDPlugin.getDefault(),
-				CommonUIServicesDNDDebugOptions.DND,
-				"canSupport::Adapter is " + getClass().getName()); //$NON-NLS-1$
-		}
-
-		/*
-		 * Check if one of the transfer data can be supported by this transfer
-		 * and if a supporting listener is available
-		 */
-		return canSupportTransferData(event) && isSupportingListenerAvailable();
-	}
-
-	/**
-	 * Check if a supporting listener is available.It also updates the current
-	 * listener cache.
-	 * 
-	 * @return boolean true or false
-	 */
-	protected final boolean isSupportingListenerAvailable() {
-		/* Get the listeners if any for the adapter's transfer type */
-		IDropTargetListener[] listeners = getListeners(false);
-
-		/* Get a compatible one if no listener is found for a direct match */
-		if (listeners == null || listeners.length == 0) {
-			listeners = getListeners(true);
-		}
-
-		/* Choose the current listener */
-		if (listeners != null) {
-			CommonUIServicesDNDPlugin plugin = CommonUIServicesDNDPlugin
-				.getDefault();
-			boolean shouldTrace = Trace.shouldTrace(plugin,
-				CommonUIServicesDNDDebugOptions.DND);
-
-			for (int i = 0; i < listeners.length; ++i) {
-				try {
-					/* Update the listener */
-					listener = listeners[i];
-					if (listener.canSupport(context, currentEvent,
-						transferAgent)) {
-						if (shouldTrace) {
-							Trace
-								.trace(
-									plugin,
-									CommonUIServicesDNDDebugOptions.DND,
-									"isSupportingListenerAvailable::Chosen listener is " + listener.getClass().getName()); //$NON-NLS-1$
-						}
-
-						return true;
-					}
-				} catch (RuntimeException e) {
-					if (shouldTrace) {
-						Trace.catching(plugin,
-							CommonUIServicesDNDDebugOptions.DND, getClass(),
-							"isSupportingListenerAvailable", e); //$NON-NLS-1$
-					}
-					Log
-						.warning(
-							plugin,
-							CommonUIServicesDNDStatusCodes.IGNORED_EXCEPTION_WARNING,
-							"Drop Listener " + listeners[i].getClass().getName(), e); //$NON-NLS-1$
-				}
-			}
-		}
-
-		/* Set the listener back to null */
-		listener = null;
-
-		return false;
-	}
-
-	/**
-	 * Checks if the transfer agent can support one of the transfer datas passed
-	 * into the event. It also updates the internal current event cache and sets
-	 * the current data type on the current event.
-	 * 
-	 * @param event
-	 *            the drop target event
-	 * @return boolean true or false
-	 */
-	protected final boolean canSupportTransferData(DropTargetEvent event) {
-		/* Update the current event */
-		currentEvent.setEvent(event);
-
-		Transfer transfer = transferAgent.getTransfer();
-
-		for (int i = 0; i < event.dataTypes.length; ++i) {
-			TransferData dataType = event.dataTypes[i];
-
-			if (transfer.isSupportedType(dataType)) {
-				/* Set the current data type */
-				event.currentDataType = dataType;
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the drop target listeners for the current context.
-	 * 
-	 * @param isCompatible
-	 *            should compatible listeners be considered
-	 * @return IDropTargetListener[] the drop target listeners
-	 */
-	private final IDropTargetListener[] getListeners(boolean isCompatible) {
-		/* Get the drop target listeners */
-		IDropTargetListener[] listeners = DragDropListenerService.getInstance()
-			.getDropTargetListeners(
-				new DropListenerContext(context.getActivePart(), context
-					.getCurrentTarget().getClass(), transferAgent
-					.getTransferId(), isCompatible));
-
-		return listeners;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/package.html
deleted file mode 100644
index d3e2635..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/drop/package.html
+++ /dev/null

@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides core support for the drop component of drag and drop.  The two main types of
-classes in this package are those that pertain to the drop target, and those
-that pertain to adapting the transfer agent for the item to be dropped for use
-with the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterProvider
-TransferAdapterProvider}.  See the schema documentation for
-transferAdapterProviders for more information.</P>
-
-<h2>The Drop Target</h2>
-<P>The {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.AbstractDropTargetListener
-AbstractDropTargetListener}, which extends the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener
-IDropTargetListener} for listening to drops, determines if the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.DropTargetContext
-DropTargetContext} can support drops.  Drop providers should subclass the
-{@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.AbstractDropTargetListener
-AbstractDropTargetListener} and handle the SWT {@link
-org.eclipse.swt.dnd.DropTargetEvent DropTargetEvent} or the GMF
-{@link org.eclipse.gmf.runtime.common.ui.services.dnd.drop.DropTargetEvent
-DropTargetEvent}.</P>
-
-<h2>The Drop Adapter</h2>
-<P>The {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.TransferDropTargetAdapter
-TransferDropTargetAdapter} implements the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener
-ITransferDropTargetListener} interface.  It adapts the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent
-ITransferAgent} for use with the {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterProvider
-TransferAdapterProvider} and notifies its {@link
-org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener
-IDropTargetListener} array with {@link org.eclipse.swt.dnd.DropTargetEvent
-DropTargetEvent} notifications.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information on transferring data using Eclipse drag and drop, please
-see {@link org.eclipse.swt.dnd.Transfer org.eclipse.swt.dnd.Transfer} and {@link
-org.eclipse.swt.dnd.TransferData org.eclipse.swt.dnd.TransferData}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDDebugOptions.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDDebugOptions.java
deleted file mode 100644
index 73f0655..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDDebugOptions.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *  
- */
-public final class CommonUIServicesDNDDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private CommonUIServicesDNDDebugOptions() {
-		/* private constructor */
-	}
-
-	/**
-	 * General debug string
-	 */
-	public static final String DEBUG = CommonUIServicesDNDPlugin.getPluginId()
-		+ "/debug"; //$NON-NLS-1$
-
-	/**
-	 * Debug option for exceptions being caught
-	 */
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	/**
-	 * Debug option for exceptions being thrown
-	 */
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	/**
-	 * Debug option for dnd
-	 */
-	public static final String DND = DEBUG + "/dnd/tracing"; //$NON-NLS-1$	
-
-	/**
-	 * Service configuration errors, such as invalid xml element in xml config
-	 * file.
-	 */
-	public static final String SERVICES_CONFIG = DEBUG + "/services/config"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDPlugin.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDPlugin.java
deleted file mode 100644
index fdb5094..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDPlugin.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The common UI plug-in.
- * 
- * @author wdiu, Wayne Diu
- * 
- */
-public class CommonUIServicesDNDPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * This plug-in's shared instance.
-	 */
-	private static CommonUIServicesDNDPlugin INSTANCE;
-
-	/**
-	 * Creates a new plug-in runtime object.
-	 */
-	public CommonUIServicesDNDPlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static CommonUIServicesDNDPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDStatusCodes.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDStatusCodes.java
deleted file mode 100644
index 46206e0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/CommonUIServicesDNDStatusCodes.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *  
- */
-public final class CommonUIServicesDNDStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private CommonUIServicesDNDStatusCodes() {
-		/* private constructor */
-	}
-
-	/**
-	 * Status code indicating that everything is OK.
-	 */
-	public static final int OK = 0;
-
-	/**
-	 * Status code indicating that an error occurred with a service.
-	 */
-	public static final int SERVICE_FAILURE = 1;
-
-	/**
-	 * Status code indicating that an error occurred with the drag action.
-	 */
-	public static final int DRAG_ACTION_FAILURE = 2;
-
-	/**
-	 * Status code indicating that an error occurred with the drop action.
-	 */
-	public static final int DROP_ACTION_FAILURE = 3;
-
-	/**
-	 * Status code warning that an exception was ignored
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 4;
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/DragListenerContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/DragListenerContext.java
deleted file mode 100644
index 268fbbc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/DragListenerContext.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragListenerContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext;
-
-/**
- * This class implements <code>IDragListenerContext</code> interface.
- * 
- * @author Vishy Ramaswamy
- */
-public final class DragListenerContext
-	implements IDragListenerContext {
-
-	/**
-	 * Attribute for the <code>IWorkbenchPart</code>
-	 */
-	final private IWorkbenchPart activePart;
-
-	/**
-	 * Attribute for the element type
-	 */
-	final private Class selectedElementType;
-
-	/**
-	 * Attribute for the transfer id
-	 */
-	final private String transferId;
-
-	/**
-	 * Attribute for compatability flag
-	 */
-	final private boolean isCompatible;
-
-	/**
-	 * Create a DragListenerContext.
-	 * 
-	 * @param anActivePart
-	 *            active IWorkbenchPart
-	 * @param aSelectedElementType
-	 *            Class of element to drag
-	 * @param aTransferId
-	 *            String with the id of the context
-	 * @param anIsCompatible
-	 *            true if exact element type match required, false if compatible
-	 *            matches are allowed
-	 */
-	public DragListenerContext(IWorkbenchPart anActivePart,
-			Class aSelectedElementType, String aTransferId,
-			boolean anIsCompatible) {
-		super();
-
-		assert null != anActivePart : "anActivePart cannot be null"; //$NON-NLS-1$
-		assert null != aSelectedElementType : "aSelectedElementType cannot be null"; //$NON-NLS-1$
-		assert null != aTransferId : "aTransferId cannot be null"; //$NON-NLS-1$
-
-		this.activePart = anActivePart;
-		this.selectedElementType = aSelectedElementType;
-		this.transferId = aTransferId;
-		this.isCompatible = anIsCompatible;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragListenerContext#getSelectedElementType()
-	 */
-	public Class getSelectedElementType() {
-		return selectedElementType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext#getTransferId()
-	 */
-	public String getTransferId() {
-		return transferId;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragListenerContext#isCompatible()
-	 */
-	public boolean isCompatible() {
-		return isCompatible;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragListenerContext#getActivePart()
-	 */
-	public IWorkbenchPart getActivePart() {
-		return activePart;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext#getOperationType()
-	 */
-	public String getOperationType() {
-		return IListenerContext.DRAG;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/DropListenerContext.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/DropListenerContext.java
deleted file mode 100644
index 6afb6a7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/DropListenerContext.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDropListenerContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext;
-
-/**
- * This class implements <code>IDropListenerContext</code> interface.
- * 
- * @author Vishy Ramaswamy
- */
-public final class DropListenerContext
-	implements IDropListenerContext {
-
-	/**
-	 * Attribute for the <code>IWorkbenchPart</code>
-	 */
-	final private IWorkbenchPart activePart;
-
-	/**
-	 * Attribute for the element type
-	 */
-	final private Class targetElementType;
-
-	/**
-	 * Attribute for the transfer id
-	 */
-	final private String transferId;
-
-	/**
-	 * Attribute for compatability flag
-	 */
-	final private boolean isCompatible;
-
-	/**
-	 * Create a DragListenerContext.
-	 * 
-	 * @param anActivePart
-	 *            active workbench part
-	 * @param aTargetElementType
-	 *            Class of the element to drop on
-	 * @param aTransferId
-	 *            String with the id of the context
-	 * @param anIsCompatible
-	 *            true if exact element type match required, false if compatible
-	 *            matches are allowed
-	 */
-	public DropListenerContext(IWorkbenchPart anActivePart,
-			Class aTargetElementType, String aTransferId, boolean anIsCompatible) {
-		super();
-
-		assert null != anActivePart : "anActivePart cannot be null"; //$NON-NLS-1$
-		assert null != aTargetElementType  : "aTargetElementType cannot be null"; //$NON-NLS-1$
-		assert null != aTransferId : "aTransferId cannot be null"; //$NON-NLS-1$
-
-		this.activePart = anActivePart;
-		this.targetElementType = aTargetElementType;
-		this.transferId = aTransferId;
-		this.isCompatible = anIsCompatible;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext#getTransferId()
-	 */
-	public String getTransferId() {
-		return transferId;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDropListenerContext#isCompatible()
-	 */
-	public boolean isCompatible() {
-		return isCompatible;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDropListenerContext#getActivePart()
-	 */
-	public IWorkbenchPart getActivePart() {
-		return activePart;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDropListenerContext#getTargetElementType()
-	 */
-	public Class getTargetElementType() {
-		return targetElementType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext#getOperationType()
-	 */
-	public String getOperationType() {
-		return IListenerContext.DROP;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetDragListenerOperation.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetDragListenerOperation.java
deleted file mode 100644
index 56bcdd9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetDragListenerOperation.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragDropListenerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragListenerContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.IDragSourceListener;
-
-/**
- * An operation that gets the <code>IDragSourceListener</code> associated with
- * the <code>IDragListenerContext</code> from the
- * <code>IDragDropListenerProvider</code>
- * 
- * @author Vishy Ramaswamy
- */
-public final class GetDragListenerOperation
-	extends ListenerOperation {
-
-	/**
-	 * Constructor for GetDragListenerOperation.
-	 * 
-	 * @param context
-	 *            The drag listener context
-	 */
-	public GetDragListenerOperation(IDragListenerContext context) {
-		super(context);
-	}
-
-	/**
-	 * Executes this operation on the <code>IDragDropListenerProvider</code>
-	 * provider.
-	 * 
-	 * @param provider
-	 *            The provider on which to execute this operation.
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		if (provider instanceof IDragDropListenerProvider) {
-			/* Get the provider */
-			IDragDropListenerProvider prov = (IDragDropListenerProvider) provider;
-
-			/* Get the drag source listeners */
-			IDragSourceListener[] listeners = prov
-				.getDragSourceListeners((IDragListenerContext) getContext());
-
-			/* Return the handler */
-			return listeners;
-		}
-
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetDropListenerOperation.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetDropListenerOperation.java
deleted file mode 100644
index ad2b20e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetDropListenerOperation.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDragDropListenerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IDropListenerContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetListener;
-
-/**
- * An operation that gets the <code>IDropTargetListener</code> associated with
- * the <code>IDropListenerContext</code> from the
- * <code>IDragDropListenerProvider</code>
- * 
- * @author Vishy Ramaswamy
- */
-public final class GetDropListenerOperation
-	extends ListenerOperation {
-
-	/**
-	 * Constructor for GetDropListenerOperation.
-	 * 
-	 * @param context
-	 *            The drop listener context
-	 */
-	public GetDropListenerOperation(IDropListenerContext context) {
-		super(context);
-	}
-
-	/**
-	 * Executes this operation on the <code>IDragDropListenerProvider</code>
-	 * provider.
-	 * 
-	 * @param provider
-	 *            The provider on which to execute this operation.
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		if (provider instanceof IDragDropListenerProvider) {
-			/* Get the provider */
-			IDragDropListenerProvider prov = (IDragDropListenerProvider) provider;
-
-			/* Get the drop target listeners */
-			IDropTargetListener[] listeners = prov
-				.getDropTargetListeners((IDropListenerContext) getContext());
-
-			/* Return the handler */
-			return listeners;
-		}
-
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetTransferAdapterOperation.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetTransferAdapterOperation.java
deleted file mode 100644
index c469344..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/GetTransferAdapterOperation.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext;
-
-/**
- * An operation that gets the transfer adapter listener
- * 
- * @author Vishy Ramaswamy
- */
-public final class GetTransferAdapterOperation
-	extends ListenerOperation {
-
-	/**
-	 * Constructor for GetTransferAdapterOperation.
-	 * 
-	 * @param context
-	 *            The listener context
-	 */
-	public GetTransferAdapterOperation(IListenerContext context) {
-		super(context);
-	}
-
-	/**
-	 * Executes this operation on the <code>ITransferAdapterProvider</code>
-	 * provider.
-	 * 
-	 * @param provider
-	 *            The provider on which to execute this operation.
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		if (provider instanceof ITransferAdapterProvider
-			&& getContext().getOperationType() != null) {
-			/* Get the adapter */
-			if (getContext().getOperationType().equals(IListenerContext.DRAG)) {
-				return ((ITransferAdapterProvider) provider)
-					.getTransferDragSourceAdapter(getContext().getTransferId());
-			} else if (getContext().getOperationType().equals(
-				IListenerContext.DROP)) {
-				return ((ITransferAdapterProvider) provider)
-					.getTransferDropTargetAdapter(getContext().getTransferId());
-			}
-		}
-
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/ITransferAdapterProvider.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/ITransferAdapterProvider.java
deleted file mode 100644
index a46285f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/ITransferAdapterProvider.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener;
-
-/**
- * Interface that needs to be implemented by the client who provides transfer
- * adapters for transfer ids in drag and drop operations
- * 
- * @author Vishy Ramaswamy
- */
-public interface ITransferAdapterProvider
-	extends IProvider {
-
-	/**
-	 * Returns a <code>ITransferDragSourceListener</code> for the given
-	 * transfer id
-	 * 
-	 * @param transferId
-	 *            the transfer id
-	 * @return Returns a <code>ITransferDragSourceListener</code>
-	 */
-	public ITransferDragSourceListener getTransferDragSourceAdapter(
-			String transferId);
-
-	/**
-	 * Returns a <code>ITransferDropTargetListener</code> for the given
-	 * transfer id
-	 * 
-	 * @param transferId
-	 *            the transfer id
-	 * @return Returns a <code>ITransferDropTargetListener</code>
-	 */
-	public ITransferDropTargetListener getTransferDropTargetAdapter(
-			String transferId);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/ListenerOperation.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/ListenerOperation.java
deleted file mode 100644
index b306aa3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/ListenerOperation.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.IListenerContext;
-
-/**
- * The abstract parent of all drag and drop listener operations. This class
- * maintains a reference to the <code>IListenerContext</code>.
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class ListenerOperation
-	implements IOperation {
-
-	/**
-	 * Attribute for the <code>IListenerContext</code>.
-	 */
-	private final IListenerContext context;
-
-	/**
-	 * Create a ListenerOperation.
-	 * 
-	 * @param aContext
-	 *            the IListenerContext to keep a reference to
-	 */
-	public ListenerOperation(IListenerContext aContext) {
-		assert null != aContext : "aContext cannot be null"; //$NON-NLS-1$
-		this.context = aContext;
-	}
-
-	/**
-	 * Returns the context.
-	 * 
-	 * @return The <code>context</code> instance variable
-	 */
-	public final IListenerContext getContext() {
-		return context;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/TransferAdapterProvider.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/TransferAdapterProvider.java
deleted file mode 100644
index 4ccc78e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/core/TransferAdapterProvider.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.core;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.part.PluginTransfer;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.AbstractTransferAdapterProvider;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.SelectionTransfer;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAgent;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferId;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.ITransferDragSourceListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.SelectionDragAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drag.TransferDragSourceAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.ITransferDropTargetListener;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.SelectionDropAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.TransferDropTargetAdapter;
-import org.eclipse.gmf.runtime.common.ui.util.CustomDataTransfer;
-
-/**
- * Concrete implementation for common transfer adapters
- * 
- * @author Vishy Ramaswamy
- */
-public final class TransferAdapterProvider
-	extends AbstractTransferAdapterProvider {
-
-	/**
-	 * Attribute for the table of transfer ids and their drag adapters
-	 */
-	private Hashtable transferDragSourceTable = new Hashtable();
-
-	/**
-	 * Attribute for the table of transfer ids and their drop adapters
-	 */
-	private Hashtable transferDropTargetTable = new Hashtable();
-
-	/**
-	 * Constructor for TransferAdapterProvider.
-	 */
-	public TransferAdapterProvider() {
-		super();
-		
-		/*
-		 * Initialize the table of transfer Ids and their drag adapters for
-		 * pre-defined ids
-		 */
-		getTransferDragSourceTable().put(
-			new Integer(TransferId.CUSTOM_DATA_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				TransferId.CUSTOM_DATA_TRANSFER, CustomDataTransfer
-					.getInstance(), false)));
-		getTransferDragSourceTable().put(
-			new Integer(TransferId.FILE_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				TransferId.FILE_TRANSFER, FileTransfer.getInstance(), false)));
-		getTransferDragSourceTable().put(
-			new Integer(TransferId.PLUGIN_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(
-				new TransferAgent(TransferId.PLUGIN_TRANSFER, PluginTransfer
-					.getInstance(), false)));
-		getTransferDragSourceTable().put(
-			new Integer(TransferId.SELECTION_TRANSFER.hashCode()),
-			new SelectionDragAdapter(new TransferAgent(
-				TransferId.SELECTION_TRANSFER, SelectionTransfer.getInstance(),
-				true) {
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent#getSelection(org.eclipse.swt.dnd.TransferData)
-				 */
-				public ISelection getSelection(TransferData transferData) {
-					return SelectionTransfer.getInstance().getSelection();
-				}
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent#setSelection(org.eclipse.jface.viewers.ISelection)
-				 */
-				public void setSelection(ISelection selection) {
-					SelectionTransfer.getInstance().setSelection(selection);
-				}
-			}));
-		getTransferDragSourceTable().put(
-			new Integer(TransferId.TEXT_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				TransferId.TEXT_TRANSFER, TextTransfer.getInstance(), false)));
-		getTransferDragSourceTable().put(
-			new Integer(TransferId.RTF_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				TransferId.RTF_TRANSFER, RTFTransfer.getInstance(), false)));
-
-		/*
-		 * Initialize the table of transfer Ids and their drop adapters for
-		 * pre-defined ids
-		 */
-		getTransferDropTargetTable().put(
-			new Integer(TransferId.CUSTOM_DATA_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				TransferId.CUSTOM_DATA_TRANSFER, CustomDataTransfer
-					.getInstance(), false)));
-		getTransferDropTargetTable().put(
-			new Integer(TransferId.FILE_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				TransferId.FILE_TRANSFER, FileTransfer.getInstance(), false)));
-		getTransferDropTargetTable().put(
-			new Integer(TransferId.PLUGIN_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(
-				new TransferAgent(TransferId.PLUGIN_TRANSFER, PluginTransfer
-					.getInstance(), false)));
-		getTransferDropTargetTable().put(
-			new Integer(TransferId.SELECTION_TRANSFER.hashCode()),
-			new SelectionDropAdapter(new TransferAgent(
-				TransferId.SELECTION_TRANSFER, SelectionTransfer.getInstance(),
-				true) {
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent#getSelection(org.eclipse.swt.dnd.TransferData)
-				 */
-				public ISelection getSelection(TransferData transferData) {
-					return SelectionTransfer.getInstance().getSelection();
-				}
-			}));
-		getTransferDropTargetTable().put(
-			new Integer(TransferId.TEXT_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				TransferId.TEXT_TRANSFER, TextTransfer.getInstance(), false)));
-		getTransferDropTargetTable().put(
-			new Integer(TransferId.RTF_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				TransferId.RTF_TRANSFER, RTFTransfer.getInstance(), false)));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDragSourceAdapter(java.lang.String)
-	 */
-	public ITransferDragSourceListener getTransferDragSourceAdapter(
-			String transferId) {
-		assert null != transferId : "transferId cannot be null";; //$NON-NLS-1$
-		
-		ITransferDragSourceListener listener = null;
-		listener = (ITransferDragSourceListener) getTransferDragSourceTable()
-			.get(new Integer(transferId.hashCode()));
-		return listener;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAdapterProvider#getTransferDropTargetAdapter(java.lang.String)
-	 */
-	public ITransferDropTargetListener getTransferDropTargetAdapter(
-			String transferId) {
-		assert null != transferId : "transferId cannot be null"; //$NON-NLS-1$
-		
-		ITransferDropTargetListener listener = null;
-		listener = (ITransferDropTargetListener) getTransferDropTargetTable()
-			.get(new Integer(transferId.hashCode()));
-		return listener;
-	}
-
-	/**
-	 * Return table of transfer drag source adapters
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getTransferDragSourceTable() {
-		return transferDragSourceTable;
-	}
-
-	/**
-	 * Return table of transfer drop target adapters
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getTransferDropTargetTable() {
-		return transferDropTargetTable;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/CommonUIServicesDNDMessages.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/CommonUIServicesDNDMessages.java
deleted file mode 100644
index f679231..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/CommonUIServicesDNDMessages.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CommonUIServicesDNDMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.ui.services.dnd.internal.l10n.CommonUIServicesDNDMessages";//$NON-NLS-1$
-
-	private CommonUIServicesDNDMessages() {
-		// Do not instantiate
-	}
-
-	public static String DelegatingDragSourceAdapter_errorMessage;
-	public static String DelegatingDragSourceAdapter__ERROR__errorMessage;
-	public static String DelegatingDropTargetAdapter_errorMessage;
-	public static String DelegatingDropTargetAdapter__ERROR__errorMessage;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonUIServicesDNDMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/CommonUIServicesDNDMessages.properties b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/CommonUIServicesDNDMessages.properties
deleted file mode 100644
index 9a4dba1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/CommonUIServicesDNDMessages.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# error messages
-# ================================ BEGIN ==================================================
-DelegatingDragSourceAdapter_errorMessage=The drag operation was not successful
-DelegatingDragSourceAdapter__ERROR__errorMessage= IRJA0286E The drag operation was not successful
-
-DelegatingDropTargetAdapter_errorMessage=The drop operation was not successful
-DelegatingDropTargetAdapter__ERROR__errorMessage= IRJA0285E The drop operation was not successful
-
-# ==================================== END =================================================

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/ResourceManager.java b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/ResourceManager.java
deleted file mode 100644
index 172e6e1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/ResourceManager.java
+++ /dev/null

@@ -1,87 +0,0 @@
-///******************************************************************************
-// * Copyright (c) 2005 IBM Corporation and others.
-// * 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:
-// *    IBM Corporation - initial API and implementation 
-// ****************************************************************************/
-//
-//package org.eclipse.gmf.runtime.common.ui.services.dnd.internal.l10n;
-//
-//import org.eclipse.core.runtime.Plugin;
-//
-//import org.eclipse.gmf.runtime.common.core.l10n.AbstractResourceManager;
-//import org.eclipse.gmf.runtime.common.ui.l10n.AbstractUIResourceManager;
-//import org.eclipse.gmf.runtime.common.ui.services.dnd.internal.CommonUIServicesDNDPlugin;
-//
-///**
-// * A singleton resource manager object that manages string, image, font and
-// * cursor types of resources for this plug-in.
-// * 
-// * @author wdiu, based on common.ui's resource manager.
-// */
-//public final class ResourceManager
-//	extends AbstractUIResourceManager {
-//
-//	/**
-//	 * Singleton instance for the resource manager.
-//	 */
-//	private static AbstractResourceManager resourceManager = new ResourceManager();
-//
-//	/**
-//	 * Constructs a new resource manager.
-//	 */
-//	private ResourceManager() {
-//		super();
-//	}
-//
-//	/**
-//	 * Retrieves the singleton instance of this resource manager.
-//	 * 
-//	 * @return The singleton resource manager.
-//	 */
-//	//public static AbstractResourceManager getInstance() {
-//	//	return resourceManager;
-//	//}
-//
-//	/**
-//	 * Retrieves a localized string for the specified key.
-//	 * 
-//	 * @return A localized string value, or a key if the bundle does not contain
-//	 *         this entry.
-//	 * @param key
-//	 *            The resource bundle key.
-//	 */
-//	//public static String getI18NString(String key) {
-//	//	return getInstance().getString(key);
-//	//}
-//
-//	/**
-//	 * Initializes this resource manager's resources.
-//	 * 
-//	 * @see org.eclipse.gmf.runtime.common.core.l10n.AbstractResourceManager#initializeResources()
-//	 */
-//	protected void initializeResources() {
-//		//do nothing
-//	}
-//	
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.gmf.runtime.common.ui.l10n.AbstractUIResourceManager#initializeUIResources()
-//	 */
-//	protected void initializeUIResources() {
-//		initializeMessageResources();
-//	}	
-//
-//	/*
-//	 * (non-Javadoc)
-//	 * 
-//	 * @see org.eclipse.gmf.runtime.common.core.internal.l10n.AbstractResourceManager#getPlugin()
-//	 */
-//	protected Plugin getPlugin() {
-//		return CommonUIServicesDNDPlugin.getDefault();
-//	}
-//
-//}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/package.html
deleted file mode 100644
index a2a7f33..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/l10n/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages - drag and drop resource manager.
-
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.dnd.*
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/package.html b/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/package.html
deleted file mode 100644
index ea79c75..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/src/org/eclipse/gmf/runtime/common/ui/services/dnd/internal/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages - drag and drop.
-
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy %level0
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/.classpath b/org.eclipse.gmf.runtime.common.ui.services.properties/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.common.ui.services.properties/.cvsignore b/org.eclipse.gmf.runtime.common.ui.services.properties/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/.project b/org.eclipse.gmf.runtime.common.ui.services.properties/.project
deleted file mode 100644
index 19bb409..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.services.properties</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/org.eclipse.gmf.runtime.common.ui.services.properties/.template b/org.eclipse.gmf.runtime.common.ui.services.properties/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.services.properties/META-INF/MANIFEST.MF
deleted file mode 100644
index a979d9f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.services.properties; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.services.properties.internal.PSFCommonUIPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.services.properties,
- org.eclipse.gmf.runtime.common.ui.services.properties.descriptors,
- org.eclipse.gmf.runtime.common.ui.services.properties.extended,
- org.eclipse.gmf.runtime.common.ui.services.properties.internal;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.properties.internal.l10n;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/about.html b/org.eclipse.gmf.runtime.common.ui.services.properties/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/build.properties b/org.eclipse.gmf.runtime.common.ui.services.properties/build.properties
deleted file mode 100644
index 37bda7c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               schema/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/plugin.properties b/org.eclipse.gmf.runtime.common.ui.services.properties/plugin.properties
deleted file mode 100644
index 9bdf97f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Common UI Properties Service Framework
-Plugin.providerName = Eclipse.org
-
-

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/plugin.xml b/org.eclipse.gmf.runtime.common.ui.services.properties/plugin.xml
deleted file mode 100644
index 23470e3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/plugin.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<plugin>
-
-     <extension-point id="propertiesProviders" name="%extPoint.propertiesProviders" schema="schema/propertiesProviders.exsd"/>
-   <extension-point id="propertyModifiers" name="%extPoint.propertyModifiers" schema="schema/propertyModifiers.exsd"/>
-  
-
-</plugin>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/schema/propertiesProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services.properties/schema/propertiesProviders.exsd
deleted file mode 100644
index 12781df..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/schema/propertiesProviders.exsd
+++ /dev/null

@@ -1,158 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services.properties">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services.properties" id="propertiesProviders" name="Properties Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point facilitates the configuration of providers for the properties service (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.properties.PropertiesService&lt;/tt&gt;). Using this extension point, providers are registered to contribute properties to the Eclipse property sheet view part, given a workbench selection.
-&lt;P&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="PropertiesProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="PropertiesProvider">
-      <annotation>
-         <documentation>
-            A property provider element describes a client defined property provider object.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The &apos;class&apos; attribute must contain a fully qualified name of the property provider class. The property provider must implement org.eclipse.gmf.runtime.common.ui.services.properties.IPropertyProvider interface.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="verifyPluginLoaded" type="boolean">
-            <annotation>
-               <documentation>
-                  The &apos;verifyPluginLoaded&apos; attribute will be used while testing the applicability of the given provider. If set to true, the service will verify that provider&apos;s plugin is loaded, before running IPropertyProvider.provides() test. If the declaring plugin is not loaded the IPropertyProvider.provides() will not be called and provider will be considered not applicable. If the decalring pluging is loaded, the service will run IPropertyProvider.provides() to determine wither or not the provider is applicable. When the &apos;verifyPluginLoaded&apos; attribute is set to false - the verification will not be perfomed and IPropertyProvider.provides() will called regardless of the plugin being loaded.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            Priority element specifies the priority of the provider from HIGHEST to LOWEST. The providers will be allowed to contribute to the property source in order of their priorities - from HIGHEST to LOWEST. This will ensure the desired order of contribution and helps to exclude duplicate properties, already contributed by others. For example, a provider with LOWEST priority, when executed, can check if there are any properties already contributed by any other providers. If none - it may want to contribute, if some - may want to withraw from contribution.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  Enumeration with the following 5 values HIGHEST, HIGH, MEDIUM, LOW, LOWEST.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a provider extension:
- &lt;pre&gt;
- &lt;extension
-         id=&quot;myPropertiesProvider&quot;
-         name=&quot;My Properties Provider Name&quot;
-         point=&quot;org.eclipse.gmf.runtime.common.ui.services.properties.propertiesProviders&quot;&gt;
-      &lt;PropertiesProvider
-            verifyPluginLoaded=&quot;false&quot;
-            class=&quot;com.examples.MyPropertiesProvider&quot;&gt;
-         &lt;Priority
-               name=&quot;Medium&quot;&gt;
-         &lt;/Priority&gt;
-      &lt;/PropertiesProvider&gt;
-   &lt;/extension&gt;
- &lt;/pre&gt;   
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the &lt;tt&gt;class&lt;/tt&gt; attribute must represent a subclass of
-         &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.AbstractProvider&lt;/tt&gt; that implements
-         &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.properties.IPropertiesProvider&lt;/tt&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2003, 2004  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/schema/propertyModifiers.exsd b/org.eclipse.gmf.runtime.common.ui.services.properties/schema/propertyModifiers.exsd
deleted file mode 100644
index 5cd9977..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/schema/propertyModifiers.exsd
+++ /dev/null

@@ -1,171 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services.properties">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services.properties" id="propertyModifiers" name="Properties Modifiers Extention Point"/>
-      </appInfo>
-      <documentation>
-         This extension point facilitates the configuration of modifiers for the properties service (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.properties.PropertiesService&lt;/tt&gt;). Using this extension point, modifiers are registered to specific property providers, which contribute properties to the Eclipse property sheet view part. The role of a modifier is to write-protectect and/or set flags for properties provided by the provider, for which this modifier is for. The associated provider(s) is indicated by the Provider element. There can be one or more associated providers. If the modifier is to be attached to all property providers, it&apos;s Provider&apos;s element class should be set to &apos;*&apos;.
-&lt;P&gt;
-A policy may be specified to delay loading the modifier until it is applicable
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="PropertyModifier"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. &lt;tt&gt;propertyModifiers&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. &lt;tt&gt;%ext.propertyModifiers&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="PropertyModifier">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-            <element ref="Provider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Fully qualified string containing the provider class.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.properties.IPropertiesModifier"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  This element is used to specify the priority that this provider has relative to other property modifier providers.  All providers have the opportunity to make their contributions.  The provider with the lowest priority will be chosen as the first contributor, while the provider with the highest priority will be chosen as the last contributor.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Policy">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Fully qualified string containing the provider class.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Provider">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example propertyModifiers extension:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-      id=&quot;org.eclipse.test.project.ui.editors.providers.ReadOnlyDiagramPropertiesModifier&quot; 
-      name=&quot;%ext.readOnlyPropertiesModifier&quot; 
-      point=&quot;org.eclipse.gmf.runtime.common.ui.services.properties.propertyModifiers&quot;&gt;
-      &lt;PropertyModifier class=&quot;org.eclipse.test.project.ui.properties.providers.ReadOnlyDiagramPropertiesModifier&quot;&gt;
-         &lt;Priority name=&quot;Highest&quot;&gt;
-         &lt;/Priority&gt;
-            &lt;Provider class=&quot;*&quot;&gt;
-         &lt;/Provider&gt;                  
-      &lt;/PropertyModifier&gt;
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the &lt;tt&gt;class&lt;/tt&gt; attribute must represent a class
-         that implements &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.properties.IPropertiesModifier&lt;/tt&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2005  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/ApplyModifiersOperation.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/ApplyModifiersOperation.java
deleted file mode 100644
index 04afd39..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/ApplyModifiersOperation.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * Operation which is excuted in order to apply modifiers to a property source provided by a provider
- * 
- * @author nbalaba
- * @canBeSeenBy %partners 
- */
-public class ApplyModifiersOperation
-	implements IOperation {
-
-	/** A property source that will be put through the modifiers */
-	protected ICompositePropertySource propertySource;
-	
-	/**
-	 * Create a new operation object
-	 * 
-	 * @param propertySource - a property source that will be put through the modifiers
-	 */
-	public ApplyModifiersOperation(ICompositePropertySource propertySource) {
-		super();
-		this.propertySource = propertySource;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		assert null != provider : "provider cannot be null"; //$NON-NLS-1$
-
-		if (provider instanceof IPropertiesModifier)
-			((IPropertiesModifier) provider).apply(getPropertySource());
-
-		return getPropertySource();
-	}
-
-	/**
-	 * @return - Returns the propertySource.
-	 */
-	public ICompositePropertySource getPropertySource() {
-		return propertySource;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/GetPropertySourceOperation.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/GetPropertySourceOperation.java
deleted file mode 100644
index 5445150..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/GetPropertySourceOperation.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.common.ui.services.properties;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * An operation which will execute providers in order of priorities (from
- * HIGHEST to LOWEST), obtain a property source from each, and append each result
- * into a linked list of <code>ICompositePropertySource</code> property source
- * objects.
- */
-
-public class GetPropertySourceOperation implements IOperation {
-
-    private Object object;
-
-    private ICompositePropertySource propertySource;
-
-    /**
-     * Create a GetPropertySourceOperation instance
-     * 
-     * @param object -
-     *            target of the properties
-     */
-    public GetPropertySourceOperation(Object object) {
-
-        this.object = object;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-     */
-    public Object execute(IProvider provider) {
-        assert null!= provider : "provider cannot be null"; //$NON-NLS-1$
-
-        if (provider instanceof IPropertiesProvider) {
-            IPropertiesProvider propertieProvider = (IPropertiesProvider) provider;
-            ICompositePropertySource result = propertieProvider
-                    .getPropertySource(object);
-
-            if (result != null)
-                PropertiesService.getInstance().applyModifiers(
-                        propertieProvider, result);
-
-            if (propertySource == null) {
-                propertySource = result;
-                return propertySource;
-            }
-
-            if (result != null)
-                propertySource.addPropertySource(result);
-
-        }
-        return propertySource;
-    }
-
-    /**
-     * Returns the propertySource - a linked list of
-     * <code>ICompositePropertySource</code> property source objects.
-     * 
-     * @return ICompositePropertySource - the propertySource
-     */
-    public ICompositePropertySource getPropertySource() {
-        return propertySource;
-    }
-
-    /**
-     * Returns the object - target of the properties
-     * 
-     * @return Object - target of the properties
-     */
-    public Object getObject() {
-        return object;
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/ICompositePropertySource.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/ICompositePropertySource.java
deleted file mode 100644
index 95bf295..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/ICompositePropertySource.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties;
-
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * The composite property source is a linked list of composite property sources. 
- * This allows the property service to chain property sources contributed by the different 
- * providers
- */
-public interface ICompositePropertySource
-	extends IPropertySource {
-
-	/**
-	 * Add another composite property source to the linked list
-	 * 
-	 * @param source - a composite property source to be added to the linked list
-	 */
-	public void addPropertySource(ICompositePropertySource source);
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/IPropertiesModifier.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/IPropertiesModifier.java
deleted file mode 100644
index 04c0eb4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/IPropertiesModifier.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-
-/**
- * An interface to be implemented by the property modifier classes.
- * 
- * A property modifier is responsible for modifying properties, contributed by 
- * a property provider(s). A property modifier is attached to a property provider(s).
- * After the propety provider is done with property contribution, the modifier is
- * applied to the properties, in order to write-protect and/or set flags and/or override
- * display names.
- * 
- * If the modifier is to be applied to all providers - the XML declaration of the modifier
- * should specify the class of the provider as a '*'. 
- * 
- * @author nbalaba
- * @canBeSeenBy %partners 
- */
-public interface IPropertiesModifier extends IProvider {
-	
-	/**
-	 * Apply code <code>ICompositePropertySource</code>
-	 * 
-	 * @param propertySource <code>ICompositePropertySource</code> to be applied
-	 */
-	public void apply(ICompositePropertySource propertySource);
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/IPropertiesProvider.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/IPropertiesProvider.java
deleted file mode 100644
index 3ac71a8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/IPropertiesProvider.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * A <code>IPropertiesProvider</code> object. Each such provider contributes a
- * set of properties as <code>ICompositePropertySource</code> object for the
- * given target.
- * 
- * All contributions from such providers will be assembled by the properties
- * service into a property source object.
- */
-
-public interface IPropertiesProvider extends IProvider {
-
-    /**
-     * A call to contribute a set of properties as
-     * <code>ICompositePropertySource</code> object for the given target.
-     * 
-     * This contribution will be appended to the properties contributed by other providers.
-     * 
-     * @param object -
-     *            target of the properties
-     * @return - properties contributed by this provider
-     */
-    public ICompositePropertySource getPropertySource(Object object);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesService.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesService.java
deleted file mode 100644
index 5d5779b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesService.java
+++ /dev/null

@@ -1,336 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.ui.services.properties.internal.PSFCommonUIPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * The property service taks all property contributions from property source
- * providers and assembles these properties into a property source object.
- * 
- * @author Tauseef A. Israr
- * @canBeSeenBy %partners 
- */
-public class PropertiesService
-	extends Service
-	implements IPropertiesProvider {
-
-	/**
-	 * A descriptor for providers defined by a configuration element.
-	 * 
-	 * @author Natalia Balaba
-	 */
-	protected static class PropertiesProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		private static final String A_PLUGIN_LOADED = "verifyPluginLoaded"; //$NON-NLS-1$
-
-		/**
-		 * Create a instance of the <code>PropertiesProviderDescriptor</code>
-		 * given the properties provider configuration element.
-		 * 
-		 * @param element -
-		 *            a property provider configuration element
-		 */
-		protected PropertiesProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		public boolean provides(IOperation operation) {
-			String attr_value = getElement().getAttribute(A_PLUGIN_LOADED);
-			Boolean pluginLoadedVerify = Boolean.valueOf(attr_value);
-
-			// instead of the policy we
-			// use plugin loaded test
-			if (pluginLoadedVerify.booleanValue() && !isPluginLoaded())
-				return false;
-
-			// the provider does not care if the plugin is loaded - use its
-			// provides() test
-			IProvider theProvider = getProvider();
-			return null != theProvider && theProvider.provides(operation);
-
-		}
-
-		/*
-		 * Verify if the declaring pluging of the propety provider is loaded.
-		 * 
-		 * @return - true if the declaring pluging of the propety provider is
-		 * loaded, false otherwise
-		 */
-		private boolean isPluginLoaded() {
-			String pluginId = ((IExtension) getElement().getParent())
-				.getContributor().getName();
-			Bundle bundle = Platform.getBundle(pluginId);
-
-			return null != bundle
-				&& bundle.getState() == org.osgi.framework.Bundle.ACTIVE;
-
-		}
-	}
-
-	/**
-	 * The modifiers services are created per isntance of properties provider if
-	 * it has any modifiers associated with it. All instances of the
-	 * ModifiersService are kept in a private cache of the PropertiesService
-	 * singleton.
-	 * 
-	 * @author nbalaba
-	 */
-	static class ModifiersService
-		extends Service {
-
-		/**
-		 * Create an isntance of the ModifierService
-		 */
-		public ModifiersService() {
-			super();
-		}
-
-		/**
-		 * Apply modifiers to the property source
-		 * 
-		 * @param propertySource -
-		 *            a property source object which contains properties
-		 *            contributed by a single properties provider.
-		 * @return - a property source object after modifiers are applied to it
-		 */
-		public ICompositePropertySource applyModifiers(
-				ICompositePropertySource propertySource) {
-			ApplyModifiersOperation operation = new ApplyModifiersOperation(
-				propertySource);
-			this.execute(ExecutionStrategy.FORWARD, operation);
-			return operation.getPropertySource();
-
-		}
-
-	}
-
-	private static final String E_MODIFIER_PROVIDER = "Provider"; //$NON-NLS-1$
-
-	private static final String A_CLASS = "class"; //$NON-NLS-1$
-
-	private static final String STAR = "*"; //$NON-NLS-1$
-
-	/**
-	 * This attribute stores the instance of the Singleton class.
-	 */
-	private static PropertiesService uniqueInstance;
-
-	/*
-	 * a private cache of the modifier service objects. A ModifierService
-	 * instance will be created one per properties provider, given that there
-	 * are modifiers for that provider.
-	 */
-	private Map modifiersServices = new HashMap();
-
-	/*
-	 * A private cache of the modifier configuration elements per provider
-	 */
-	private Map modifiersMap = new HashMap();
-
-	/**
-	 * Extension point name for the properties providers extension point.
-	 */
-	private static final String PROPERTY_PROVIDERS_EXT_P_NAME = "propertiesProviders"; //$NON-NLS-1$
-
-	/**
-	 * Extension point name for the properties modifiers extension point.
-	 */
-	private static final String PROPERTY_MODIFIERS_EXT_P_NAME = "propertyModifiers"; //$NON-NLS-1$	
-
-	/**
-	 * This operation implements the logic for returning the same instance of
-	 * the Singleton pattern.
-	 * 
-	 * @return the singleton instance of <code>PropertiesService</code>
-	 */
-	public static PropertiesService getInstance() {
-
-		if (uniqueInstance == null) {
-			uniqueInstance = new PropertiesService();
-		}
-
-		return uniqueInstance;
-	}
-
-	/**
-	 * Constructor for PropertiesService.
-	 *  
-	 */
-	private PropertiesService() {
-		super();
-
-		String pluginId = PSFCommonUIPlugin.getPluginId();
-
-		configureProviders(pluginId, PROPERTY_PROVIDERS_EXT_P_NAME);
-
-		configureModifiers(Platform.getExtensionRegistry()
-									.getExtensionPoint(pluginId, PROPERTY_MODIFIERS_EXT_P_NAME)
-									.getConfigurationElements());
-	}
-
-	/**
-	 * Return a property source for the given object
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.IPropertiesProvider#getPropertySource(Object)
-	 */
-	public ICompositePropertySource getPropertySource(Object object) {
-
-		GetPropertySourceOperation operation = new GetPropertySourceOperation(
-			object);
-		this.execute(ExecutionStrategy.FORWARD, operation);
-		return operation.getPropertySource();
-	}
-
-	/**
-	 * Apply property source modifiers appropriate for the given provider
-	 * 
-	 * @param provider -
-	 *            a property provider which contributed the properties
-	 * @param propertySource -
-	 *            a property source object containing properties, contributed by
-	 *            the given provider
-	 */
-	public void applyModifiers(IPropertiesProvider provider,
-			ICompositePropertySource propertySource) {
-
-		ModifiersService modifiersService = getModifiersService(provider);
-		if (modifiersService != null)
-			modifiersService.applyModifiers(propertySource);
-
-	}
-
-	/**
-	 * Retrieve an instance of the ModifierService, appropriate for the given
-	 * provider.
-	 * 
-	 * @param provider an instance of <code>IPropertiesProvider</code>
-	 * @return an instance of the ModifierService, appropriate for the given
-	 * provider.
-	 */
-	protected ModifiersService getModifiersService(IPropertiesProvider provider) {
-		return (ModifiersService) modifiersServices.get(provider.getClass()
-			.getName());
-	}
-
-	/**
-	 * Configure all modifier elements.
-	 * 
-	 * @param elements -
-	 *            modifier configuration elements
-	 */
-	public final void configureModifiers(IConfigurationElement[] elements) {
-
-		List modifiersApplicableForAllProviders = new ArrayList();
-
-		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement element = elements[i];
-
-			IConfigurationElement[] associatedProviders = element
-				.getChildren(E_MODIFIER_PROVIDER);
-
-			for (int p = 0; p < associatedProviders.length; p++) {
-				IConfigurationElement associatedProvider = associatedProviders[p];
-				String providerId = associatedProvider.getAttribute(A_CLASS);
-
-				if (providerId.equals(STAR)) // the modifier specified that it
-					// is applicable to all (*)
-					// providers
-					modifiersApplicableForAllProviders.add(element);
-				else {
-					if (!modifiersMap.containsKey(providerId))
-						modifiersMap.put(providerId, new ArrayList());
-
-					((List) modifiersMap.get(providerId)).add(element);
-				}
-			}
-		}
-
-		for (Iterator e = modifiersMap.keySet().iterator(); e.hasNext();) {
-			String providerId = (String) e.next();
-			ArrayList modifierElements = (ArrayList) modifiersMap
-				.get(providerId);
-			modifierElements.addAll(modifiersApplicableForAllProviders); // add
-			// modifiers
-			// for all (*)
-			// providers
-			int modifiersForProvider = modifierElements.size();
-			if (modifiersForProvider > 0) {
-				IConfigurationElement[] elementsArray = new IConfigurationElement[modifiersForProvider];
-				System.arraycopy(modifierElements.toArray(), 0, elementsArray,
-					0, modifierElements.size());
-
-				initModifierServiceFor(providerId, elementsArray);
-
-			}
-		}
-
-	}
-
-	/*
-	 * Initialize a ModifierService for the property provider with the given Id.
-	 * This provider has modifiers attached to it, so it will need a Modifier
-	 * service.
-	 * 
-	 * @param providerId - an id (a full class name) of the properties provider
-	 * who needs ModifersService @param modifierElements - configuratoion
-	 * elements
-	 */
-	private void initModifierServiceFor(String providerId,
-			IConfigurationElement[] modifierElements) {
-		ModifiersService modifierService = new ModifiersService();
-
-		modifierService.configureProviders(modifierElements);
-		modifiersServices.put(providerId, modifierService);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.internal.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	protected ProviderDescriptor newProviderDescriptor(
-			IConfigurationElement element) {
-
-		String providerId = element.getAttribute(A_CLASS);
-		modifiersMap.put(providerId, new ArrayList()); // create modifiers entry
-		// for each property
-		// provider
-		// the entry may be empty - if there are no modifiers for the given
-		// provider
-
-		// return whatever super does
-		return new PropertiesProviderDescriptor(element);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesServiceAdapterFactory.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesServiceAdapterFactory.java
deleted file mode 100644
index 2f0019d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesServiceAdapterFactory.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.common.ui.services.properties;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-
-
-/**
- * Use to get the IPropertySource adapter for an object so that its properties
- * can be build by the properties service.
- * 
- * @author Tauseef A. Israr
- * @canBeSeenBy %partners 
- */
-public class PropertiesServiceAdapterFactory
-	implements IAdapterFactory, IPropertySourceProvider {
-
-	/**
-	 * PropertiesServiceAdapterFactory constructor
-	 */
-	public PropertiesServiceAdapterFactory() {
-
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(Object, Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-
-		assert null != adaptableObject;
-		assert null != adapterType;
-		if (adapterType.equals(IPropertySource.class))
-			return getPropertySource(adaptableObject);
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-
-		return new Class[] {IPropertySource.class};
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.IPropertySourceProvider#getPropertySource(java.lang.Object)
-	 */
-	public IPropertySource getPropertySource(Object object) {
-
-		if (object instanceof IPropertySource)
-			return (IPropertySource) object;
-
-		IPropertiesProvider service = PropertiesService.getInstance();
-		assert null != service;
-		return service.getPropertySource(object);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/CompositePropertySource.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/CompositePropertySource.java
deleted file mode 100644
index 250b675..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/CompositePropertySource.java
+++ /dev/null

@@ -1,235 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.descriptors;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource;
-
-/**
- * A concrete implementation of the <code>ICompositePropertySource</code>
- * interface. A composite property source - is a <code>IPropertySource</code>
- * object, which allows link <code>ICompositePropertySource</code> object into
- * a linked list structure. The underlaying linked list is transparent to a
- * client - from outside it is a <code>IPropertySource</code> object.
- */
-public class CompositePropertySource implements ICompositePropertySource {
-
-    // the source of the properties
-    private Object object = null;
-
-    // child source
-    private ICompositePropertySource enclosed = null;
-
-    // category of the source - each descriptor inherits that
-    private String category = null;
-
-    // a local cache of the local to this source object property descriptors vs
-    // their ids
-    private Map propertyDescriptors = new HashMap();
-
-    /**
-     * Create an instance of the <code>ICompositePropertySource</code> for the
-     * given object. This creates a single link object, ready to be appended to
-     * an existing linked list, or become a head of a new one.
-     * 
-     * @param object -
-     *            the target of the properties
-     */
-    public CompositePropertySource(Object object) {
-        super();
-        this.object = object;
-    }
-
-    /**
-     * Create an instance of the <code>ICompositePropertySource</code> for the
-     * given object. This creates a single link object, ready to be appended to
-     * an existing linked list, or become a head of a new one.
-     * 
-     * The descriptors in the scope of this link by default will be assigned the
-     * given category
-     * 
-     * @param object -
-     *            the target of the properties
-     * @param category -
-     *            the property category to be assigned to all descrtiptors in
-     *            the scope of this link
-     */
-    public CompositePropertySource(Object object, String category) {
-        this(object);
-        this.category = category;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource#addPropertySource(org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource)
-     */
-    public void addPropertySource(ICompositePropertySource source) {
-        assert this != source : "self is not allowed - this will result in stack overflows"; //$NON-NLS-1$
-
-        if (this.enclosed == null)
-            enclosed = source;
-
-        else
-            enclosed.addPropertySource(source);
-
-    }
-
-    /**
-     * Adds a new property descriptor to the property source. If there is
-     * a property with that id already, nothing will happen
-     * 
-     * @param descriptor -
-     *            a new property descriptor to add to the property source
-     */
-    public void addPropertyDescriptor(
-            ICompositeSourcePropertyDescriptor descriptor) {
-
-        if (!isPropertySet(descriptor.getId())) {
-            if (descriptor.getCategory() == null)
-                descriptor.setCategory(getCategory());
-
-            getLocalDescriptors().put(descriptor.getId(), descriptor);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue()
-     */
-    public Object getEditableValue() {
-        if (getObject() == null && enclosed != null)
-            return enclosed.getEditableValue();
-
-        return getObject();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()
-     */
-    public IPropertyDescriptor[] getPropertyDescriptors() {
-        List list = new ArrayList(getLocalDescriptors().values());
-        IPropertyDescriptor[] descriptors = new IPropertyDescriptor[list.size()];
-        System.arraycopy(list.toArray(), 0, descriptors, 0, list.size());
-
-        if (enclosed != null) {
-            IPropertyDescriptor[] enclosedDecriptors = enclosed
-                    .getPropertyDescriptors();
-            IPropertyDescriptor[] all = new IPropertyDescriptor[descriptors.length
-                    + enclosedDecriptors.length];
-            System.arraycopy(enclosedDecriptors, 0, all, 0,
-                    enclosedDecriptors.length);
-            System.arraycopy(descriptors, 0, all, enclosedDecriptors.length,
-                    descriptors.length);
-
-            return all;
-
-        }
-
-        return descriptors;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object)
-     */
-    public Object getPropertyValue(Object id) {
-        ICompositeSourcePropertyDescriptor descriptor = (ICompositeSourcePropertyDescriptor) getLocalDescriptors()
-                .get(id);
-        return descriptor != null ? descriptor.getPropertyValue()
-                : ((enclosed != null) ? enclosed.getPropertyValue(id) : null);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(java.lang.Object)
-     */
-    public boolean isPropertySet(Object id) {
-
-        return getLocalDescriptors().containsKey(id) ? true
-                : (enclosed != null ? enclosed.isPropertySet(id) : false);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object)
-     */
-    public void resetPropertyValue(Object id) {
-
-        ICompositeSourcePropertyDescriptor descriptor = (ICompositeSourcePropertyDescriptor) getLocalDescriptors()
-                .get(id);
-
-        if (descriptor != null) {
-            descriptor.resetPropertyValue();
-        } else if (enclosed != null)
-            enclosed.resetPropertyValue(id);
-    }
-
-    /**
-     * This delegates to IItemPropertyDescriptor.setPropertyValue().
-     */
-    public void setPropertyValue(Object propertyId, Object value) {
-
-    	ICompositeSourcePropertyDescriptor descriptor = (ICompositeSourcePropertyDescriptor) getLocalDescriptors()
-                .get(propertyId);
-
-        if (descriptor != null) {
-            descriptor.setPropertyValue(value);
-        } else if (enclosed != null)
-            enclosed.setPropertyValue(propertyId, value);
-    }
-
-    /**
-     * Returns the category, if one is set for this link.
-     * @return - the category, if one is set for this link. 
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    /**
-     * Returns the target of the properties.
-     * @return - the target of the properties. 
-     */
-    public Object getObject() {
-        return object;
-    }
-
-    /**
-     * Returns the descriptors local to this link.
-     * @return - the descriptors local to this link.
-     */
-    protected Map getLocalDescriptors() {
-        return propertyDescriptors;
-    }
-
-    /**
-     * Returns the next link on the linked list.
-     * @return - the next link on the linked list.
-     */
-    protected ICompositePropertySource getEnclosed() {
-        return enclosed;
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/CompositeSourcePropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/CompositeSourcePropertyDescriptor.java
deleted file mode 100644
index c38ef6b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/CompositeSourcePropertyDescriptor.java
+++ /dev/null

@@ -1,270 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.descriptors;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-/**
- * A concrete implementation of the
- * <code>ICompositeSourcePropertyDescriptor</code>. A property descriptor
- * designed to work with the CompositePropertySource.
- */
-public class CompositeSourcePropertyDescriptor extends PropertyDescriptor
-        implements ICompositeSourcePropertyDescriptor {
-
-    // target of the property
-    private Object object = null;
-
-    // readOnly flag
-    private boolean readOnly = false;
-
-    // custom cell editor - optional, may never be used, if sublcasses override
-    // createPropertyEditor()
-    private CellEditor propertyEditor = null;
-
-    //property value cache - optional, may never be used. Subclasses should
-    // override getEditableValue()
-    // and setPropertyValue()
-    private Object propertyValue = null;
-
-    // a default value of a property - the one that the property will reset when
-    // asked to reset to default
-    private Object defaultValue = null;
-
-    /**
-     * Create an instance of the <code>CompositeSourePropertyDescriptor</code>
-     * 
-     * @param object 
-     * @param id property id
-     * @param displayName property display name
-     */
-    public CompositeSourcePropertyDescriptor(Object object, Object id,
-            String displayName) {
-        super(id, displayName);
-        this.object = object;
-
-    }
-
-    /**
-     * Returns the object target of the property
-     * 
-     * @return target of the property
-     */
-    protected Object getObject() {
-        return object;
-    }
-
-    /**
-     * Returns the propertyEditor.
-     * 
-     * @return the propertyEditor.
-     */
-    public CellEditor getPropertyEditor() {
-        return propertyEditor;
-    }
-
-    /**
-     * Returns the readOnly property
-     * 
-     * @return true if read only, false otherwise
-     */
-    public boolean isReadOnly() {
-        return readOnly;
-    }
-
-    /**
-     * Add filter flag {@link org.eclipse.ui.views.properties.IPropertySheetEntry#FILTER_ID_EXPERT IPropertySheetEntry.FILTER_ID_EXPERT}
-     * 
-     * @param flag a filter flag
-     */
-    public void addFilterFlag(String flag) {
-        assert null != flag : "flag cannot be null"; //$NON-NLS-1$
-
-        List flags = Arrays.asList(getFilterFlags());
-        if (!flags.contains(flag)) {
-            int total = flags.size();
-            String[] newFlags = new String[total];
-            System.arraycopy(getFilterFlags(), 0, newFlags, 0, total);
-            newFlags[total - 1] = flag;
-            setFilterFlags(newFlags);
-        }
-    }
-
-    /**
-     * Returns the value of the property
-     * 
-     * @return the value of the property
-     */
-    public Object getPropertyValue() {
-
-        Object aValue = getEditableValue();
-        //		 see if we should convert the value to an editable value
-        IPropertySource source = getPropertySource(aValue);
-        if (source != null)
-            aValue = source.getEditableValue();
-
-        return aValue;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#resetPropertyValue()
-     */
-    public void resetPropertyValue() {
-        if (getDefaultValue() != null)
-            setPropertyValue(getDefaultValue());
-    }
-
-    /**
-     * Sets new value to the property
-     * 
-     * @param value the new value
-     */
-    public void setPropertyValue(final Object value) {
-
-        if (value == null)
-            return;
-
-        Object oldValue = getEditableValue();
-
-        if ((oldValue != null && oldValue.equals(value))
-                || (oldValue == null && value == null))
-            return;
-
-        setValue(value);
-
-    }
-
-    /**
-     * Utility method - all the checks and context set up are done in the
-     * setPropertyValue. This just executes the set.
-     * 
-     * @param value the new value
-     */
-    protected void setValue(Object value) {
-        this.propertyValue = value;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertyDescriptor#createPropertyEditor(org.eclipse.swt.widgets.Composite)
-     */
-    public CellEditor createPropertyEditor(Composite parent) {
-        if (isReadOnly())
-            return null;
-
-        if (getPropertyEditor() != null) {
-            if (getPropertyEditor().getControl() == null)
-                getPropertyEditor().create(parent);
-            return getPropertyEditor();
-        }
-
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertyDescriptor#isCompatibleWith(org.eclipse.ui.views.properties.IPropertyDescriptor)
-     */
-    public boolean isCompatibleWith(IPropertyDescriptor anotherProperty) {
-
-        if (this == anotherProperty)
-            return true;
-
-        if (!(this.getClass().isInstance(anotherProperty)))
-            return false;
-
-        return (getCategory().equals(anotherProperty.getCategory()) && getId()
-                .equals(anotherProperty.getId()));
-
-    }
-
-    /**
-     * Parametrize cell editor creation - assign a custom cell editor to an instance variable
-     *  
-     * @param propertyEditor a custom cell editor
-     */
-    public void setPropertyEditor(CellEditor propertyEditor) {
-        this.propertyEditor = propertyEditor;
-    }
-
-    /**
-     * This is a utility method, which allows recursive display of the
-     * properties. Should anyone desire to get rid of recursive display - this
-     * should become getPropertyValue()
-     * 
-     * @return editable property value
-     */
-    protected Object getEditableValue() {
-        return propertyValue;
-    }
-
-    /**
-     * Returns an property source for the given value.
-     * 
-     * @param  value an object for which to obtain a property source or
-     *         <code>null</code> if a property source is not available
-     * @return an property source for the given object
-     */
-    protected IPropertySource getPropertySource(Object value) {
-
-        return value == null ? null : (IPropertySource) Platform
-                .getAdapterManager().getAdapter(value, IPropertySource.class);
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#setReadOnly(boolean)
-     */
-    public void setReadOnly(boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    /**
-     * Returns default value
-     * 
-     * @return the default value of the property, to which the reset to defaults
-     *         will revert to. In case if this is null - reset will do nothing
-     */
-    public Object getDefaultValue() {
-        return defaultValue;
-    }
-
-    /**
-     * Assigns a default value to this property
-     * 
-     * @param defaultValue assign a default value to this property
-     */
-    public void setDefaultValue(Object defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    /** 
-     * @param value
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#resetPropertyValue()
-     */
-    public void resetPropertyValue(Object value) {
-        setPropertyValue(getDefaultValue());
-        
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/ICompositeSourcePropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/ICompositeSourcePropertyDescriptor.java
deleted file mode 100644
index f1353f2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/ICompositeSourcePropertyDescriptor.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.descriptors;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-/**
- * A descriptor object to work together with the
- * <code>CompositePropertySource</code> object.
- * 
- * Clients who would like to take advantage of the concrete implementation of the
- * <code>ICompositePropertySource</code>
- * <code>CompositePropertySource</code>
- * class, should implement interface for custom property descriptors.
- * 
- * This interface can also be used by custom property provider objects to
- * initialize properties - e.g. write protect, set initial property value, etc.
- */
-public interface ICompositeSourcePropertyDescriptor
-	extends IPropertyDescriptor {
-
-	/**
-	 * Set read-only to true if the property is read-only, or to false otherwise
-	 * 
-	 * @param read -
-	 *            true if the property is read-only, or to false otherwise
-	 */
-	public void setReadOnly(boolean read);
-
-	/**
-	 * Return read-only status - true if editing of the property is not allowed,
-	 * false otherwise
-	 * 
-	 * @return - read-only status - true if editing of the property is not
-	 *         allowed, false otherwise
-	 */
-	public boolean isReadOnly();
-
-	/**
-	 * Sets the property category name
-	 * 
-	 * @param name
-	 *            The category name in which the property is to be displayed.
-	 */
-	public void setCategory(String name);
-
-	/**
-	 * Return a value of the the property represented by this descriptor
-	 * 
-	 * @return - a value of this property
-	 */
-	public Object getPropertyValue();
-
-	/**
-	 * This method is used by the property source to set the property that this
-	 * property descriptor maps to.
-	 * 
-	 * @param value
-	 */
-	public void setPropertyValue(Object value);
-
-	/**
-	 * This method is used by the property source to reset the property that
-	 * this property descriptor maps to.
-	 */
-	public void resetPropertyValue();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/package.html b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/package.html
deleted file mode 100644
index 5e8d807..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/descriptors/package.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a framework to contribute contribute properties to the Eclipse property view, given a workbench selection.</p>
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ElementValue.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ElementValue.java
deleted file mode 100644
index cc71bc7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ElementValue.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-/**
- * Helper class used by dialog cell editors in the Collection Editor.
- * 
- * There is a deficiency in Eclipse Table Viewers - they only support one 
- * cell editor per column.  
- * 
- * @author Michael Yee
- */
-public class ElementValue {
-    /** the element */
-    final private Object element;
-
-    /** the element's value */
-    private Object value;
-
-    /**
-     * Constructor for ElementValue.
-     * @param element the element
-     * @param value the element's value
-     */
-    public ElementValue(Object element, Object value) {
-        this.element = element;
-        this.value = value;
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString() {
-        return value.toString();
-    }
-
-    /**
-     * Returns the element.
-     * @return Object
-     */
-    public Object getElement() {
-        return element;
-    }
-
-    /**
-     * Returns the element's value.
-     * @return Object
-     */
-    public Object getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the element's value
-     * @param value the value
-     */
-    public void setValue(Object value) {
-        this.value = value;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedBooleanPropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedBooleanPropertyDescriptor.java
deleted file mode 100644
index 6b0490a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedBooleanPropertyDescriptor.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.internal.l10n.CommonUIServicesPropertiesMessages;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-
-/**
- * @author Tauseef A. Israr
- * Created on: Sep 9, 2002
- */
-public class ExtendedBooleanPropertyDescriptor
-	extends ExtendedComboboxPropertyDescriptor {
-
-	/**
-	 * Constructor for ExtendedBooleanPropertyDescriptor.
-	 * 
-	 * @param id
-	 * @param displayName
-	 */
-	public ExtendedBooleanPropertyDescriptor(Object id, String displayName) {
-		super(id, displayName, new String[] { 
-			CommonUIServicesPropertiesMessages.ExtendedBooleanPropertyDescriptor_False, 
-			CommonUIServicesPropertiesMessages.ExtendedBooleanPropertyDescriptor_True 
-		});
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.IPropertyDescriptor#getLabelProvider()
-	 */
-	public ILabelProvider getLabelProvider() {
-		return new LabelProvider() {
-			public String getText(Object object) {
-				if (object instanceof Integer) {
-					if (((Integer) object).intValue() == 0)
-						return CommonUIServicesPropertiesMessages.ExtendedBooleanPropertyDescriptor_False;
-					else if (((Integer) object).intValue() == 1)
-						return CommonUIServicesPropertiesMessages.ExtendedBooleanPropertyDescriptor_True;
-				}
-				return (String) getBlank();
-			}
-		};
-	}
-
-	/**
-	 * Convert value to index.
-	 * 
-	 * @param b 
-	 * @return an instance of <code>Integer</code>
-	 */
-	static public Integer valueToIndex(Boolean b) {
-		return new Integer(b.booleanValue() ? 1 : 0);
-	}
-
-	/**
-	 * Convert value to index.
-	 * 
-	 * @param i
-	 * @return an instance of <code>Boolean</code>
-	 */
-	static public Boolean indexToValue(Integer i) {
-		return Boolean.valueOf(i.intValue() != 0);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedComboBoxCellEditor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedComboBoxCellEditor.java
deleted file mode 100644
index 2282c19..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedComboBoxCellEditor.java
+++ /dev/null

@@ -1,299 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author Tauseef A. Israr Created on: Sep 6, 2002
- * 
- * A cell editor that presents a list of items in a combo box. The cell editor's
- * value is an integer zero-based index
- *  
- */
-
-public class ExtendedComboBoxCellEditor extends CellEditor {
-
-    /**
-     * The list of items to present in the combo box.
-     */
-    final private String[] items;
-
-
-    /**
-     * The zero-based index of the selected item.
-     */
-    private int selection;
-
-    /**
-     * The custom combo box control.
-     */
-    private CCombo comboBox;
-
-    /**
-     * This keeps track of the list of model objects.
-     */
-    protected List list;
-    
-    /** The combo box item which maps to an empty string in the text box */
-    final private String emptyItem;
-    
-    /**
-     * Create a list of <code>String</code> items.
-     * 
-     * @param list
-     * @param labelProvider
-     * @return list of <code>String</code> items
-     */
-    public static String[] createItems(List list, ILabelProvider labelProvider) {
-        String[] result;
-
-        // If there are objects to populate...
-        //
-        if (list != null && list.size() > 0) {
-            // Create an new array..
-            //
-            result = new String[list.size()];
-
-            // Fill in the array with label/value pair items.
-            //
-            int i = 0;
-            for (Iterator objects = list.iterator(); objects.hasNext(); ++i) {
-                Object object = objects.next();
-                result[i] = labelProvider.getText(object);
-            }
-
-        } else {
-            result = new String[] { labelProvider.getText(null) };
-        }
-
-        return result;
-    }
-
-    /**
-     * Convenience constructor for ExtendedComboBoxCellEditor
-     * 
-     * @param parent
-     *            the parent control
-     * @param list
-     *            the list of strings for the combo box
-     * @param labelProvider -
-     *            label rpovider to create an array of strings from the list
-     * @param style
-     *            the style
-     */
-
-    public ExtendedComboBoxCellEditor(Composite parent, List list,
-            ILabelProvider labelProvider, int style) {
-        this(parent, createItems(list, labelProvider), null, style);
-        this.list = list;
-    }
-
-
-
-    /**
-     * Creates a new cell editor with a combo containing the given list of
-     * choices and parented under the given control.
-     * 
-     * @param parent
-     *            the parent control
-     * @param items
-     *            the list of strings for the combo box
-     * @param style
-     *            the style
-     */
-    public ExtendedComboBoxCellEditor(Composite parent, String[] items, int style) {
-        this(parent, items, null, style);
-       
-    }
-    
-    /**
-     * Creates a new cell editor with a combo containing the given list of
-     * choices and parented under the given control.
-     * 
-     * @param parent
-     *            the parent control
-     * @param items
-     *            the list of strings for the combo box
-     * @param emptyItem
-     *            the combo box item which maps to an empty string in the text
-     *            box
-     * @param style
-     *            the style
-     */
-    public ExtendedComboBoxCellEditor(Composite parent, String[] items,
-            String emptyItem, int style) {
-        super(parent, style);
-        assert null != items : "list of items cannot be null"; //$NON-NLS-1$
-        this.items = items;   
-        this.emptyItem = emptyItem;
-        selection = 0;
-        populateComboBoxItems();
-    }
-
-    /**
-     * Applies the currently selected value and deactiavates the cell editor
-     */
-    void applyEditorValueAndDeactivate() {
-    	//	must set the selection before getting value
-    	selection = comboBox.getSelectionIndex();
-    	Object newValue = doGetValue();
-    	markDirty();
-    	setValueValid(isCorrect(newValue));
-    	if (!isValueValid()) {
-
-    		// try to insert the current value into the error message.
-    		setErrorMessage(
-    			MessageFormat.format(getErrorMessage(), new Object[] {newValue})); 
-    	}
-    	fireApplyEditorValue();
-    	deactivate();
-    }
-    
-    /**
-     * @see org.eclipse.jface.viewers.CellEditor#createControl(org.eclipse.swt.widgets.Composite)
-     */
-    protected Control createControl(Composite parent) {
-
-        comboBox = new CCombo(parent, getStyle());
-        comboBox.setFont(parent.getFont());
-        comboBox.setBackground(parent.getBackground());
-
-        comboBox.addKeyListener(new KeyAdapter() {
-
-            // hook key pressed - see PR 14201
-            public void keyPressed(KeyEvent e) {
-                keyReleaseOccured(e);
-            }
-        });
-
-        comboBox.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetDefaultSelected(SelectionEvent event) {
-                // called when combo box or text field selected
-                applyEditorValueAndDeactivate();
-            }
-
-            public void widgetSelected(SelectionEvent e) {
-                // called when combo box selected
-                widgetDefaultSelected(e);
-            }
-        });
-
-         comboBox.addTraverseListener(new TraverseListener() {
-
-            public void keyTraversed(TraverseEvent e) {
-                if (e.detail == SWT.TRAVERSE_ESCAPE
-                        || e.detail == SWT.TRAVERSE_RETURN) {
-                    e.doit = false;
-                }
-            }
-        });
-
-        if(emptyItem != null)
-        	comboBox.setText(emptyItem);
-        
-        return comboBox;
-    }
-
-
-
-    /**
-     * @see org.eclipse.jface.viewers.CellEditor#doSetFocus()
-     */
-    protected void doSetFocus() {
-        comboBox.setFocus();
-    }
-
-    /**
-     * Sets the minimum width of the cell to 30 pixels to make sure the arrow
-     * button is visible even when the list contains long strings.
-     */
-    public LayoutData getLayoutData() {
-        LayoutData layoutData = super.getLayoutData();
-        layoutData.minimumWidth = Math.max(30, layoutData.minimumWidth);
-        return layoutData;
-    }
-
-    public Object doGetValue() {
-    	
-    	    if (list != null && selection >= 0) {
-    	        // Get the index into the list via this call to super.
-
-    	        return selection < list.size() && selection >= 0 ? list.get(selection) : null;
-    	    }
-    	
-    	    if (getStyle() == SWT.READ_ONLY && selection >= 0) 
-                return new Integer(selection);
-    	    
-            if(selection < 0)
-                return comboBox.getText();
-            
-            return comboBox.getItem(selection);
-    	}
-
-
-    public void doSetValue(Object value) {
-
-        if (list != null) {
-            // Set the index of the object value in the list via this call to
-            // super.
-            //
-            int index = list.indexOf(value);
-            if (index != -1) {
-                doSetValue1(new Integer(index));
-            }
-        } else
-            doSetValue1(value);
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.CellEditor#doSetValue(java.lang.Object)
-     */
-    private void doSetValue1(Object value) {
-        assert null != comboBox : "comboBox cannot be null"; //$NON-NLS-1$
-        if (value instanceof Integer) {
-            selection = ((Integer) value).intValue();
-            comboBox.select(selection);
-        }
-        if (getStyle() != SWT.READ_ONLY) {
-            comboBox.setText(value.toString());
-        }
-    }
-
-    /**
-     * Add the items to the combo box.
-     */
-    private void populateComboBoxItems() {
-        if (comboBox != null && items != null) {
-            for (int i = 0; i < items.length; i++)
-                comboBox.add(items[i], i);
-
-            setValueValid(true);
-        }
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedComboboxPropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedComboboxPropertyDescriptor.java
deleted file mode 100644
index ed32835..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedComboboxPropertyDescriptor.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author Tauseef A. Israr
- * Created on: Sep 9, 2002
- */
-public class ExtendedComboboxPropertyDescriptor
-	extends ExtendedPropertyDescriptor {
-
-	/**
-	* The list of possible values to display in the combo box
-	*/
-	private String[] values;
-
-	/** The combo box item which maps to an empty string in the text box */
-	final private String emptyItem;
-
-	/**
-	 * Whether the whether the text field in the combobox is editable
-	 */
-	private final boolean isTextEditable;
-
-	/**
-	 * Convenience constructor for ExtendedComboboxPropertyDescriptor
-	 * 
-	 * @param id the id of the property
-	 * @param displayName the name to display for the property
-	 * @param valuesArray the list of possible values to display in the combo box
-	 */
-	public ExtendedComboboxPropertyDescriptor(
-		Object id,
-		String displayName,
-		String[] valuesArray) {
-
-		this(id, displayName, valuesArray, null, false);
-	}
-
-	/**
-	 * Creates an property descriptor with the given id, display name, and list
-	 * of value labels to display in the combo box cell editor.
-	 * 
-	 * @param id the id of the property
-	 * @param displayName the name to display for the property
-	 * @param valuesArray the list of possible values to display in the combo box
-	 * @param emptyItem the combo box item which maps to an empty string in the text box
-	 * @param isTextEditable whether the text field in the combobox is editable
-	 */
-	public ExtendedComboboxPropertyDescriptor(
-		Object id,
-		String displayName,
-		String[] valuesArray,
-		String emptyItem,
-		boolean isTextEditable) {
-
-		super(id, displayName);
-		values = valuesArray;
-		this.emptyItem = emptyItem;
-		this.isTextEditable = isTextEditable;
-	}
-
-	/**
-	 * The <code>ComboBoxPropertyDescriptor</code> implementation of this 
-	 * <code>IPropertyDescriptor</code> method creates and returns a new
-	 * <code>ComboBoxCellEditor</code>.
-	 * <p>
-	 * The editor is configured with the current validator if there is one.
-	 * </p>
-	 */
-	public CellEditor createPropertyEditor(Composite parent) {
-		if (isReadOnly())
-			return null;
-
-		int style = isTextEditable ? SWT.NONE : SWT.READ_ONLY;
-
-		CellEditor editor =
-			new ExtendedComboBoxCellEditor(parent, values, emptyItem, style);
-
-		if (isReadOnly()) {
-			Control control = editor.getControl();
-			control.setEnabled(false);
-		}
-		editor.setValidator(getValidator());
-		return editor;
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.IPropertyDescriptor#getLabelProvider()
-	 */
-	public ILabelProvider getLabelProvider() {
-		return new LabelProvider() {
-			public String getText(Object object) {
-				if (object instanceof Integer) {
-					int index = ((Integer) object).intValue();
-					if (0 <= index && index < values.length)
-						return values[index];
-				}
-				return object.toString();
-
-			}
-		};
-	}
-
-	//	/**
-	//	 * @see org.eclipse.ui.views.properties.IPropertyDescriptor#isCompatibleWith(IPropertyDescriptor)
-	//	 */
-	//	public boolean isCompatibleWith(IPropertyDescriptor anotherProperty) {
-	//		assert null != anotherProperty;
-	//
-	//		IExtendedPropertyDescriptor xdePropertyDescriptor =
-	//			(IExtendedPropertyDescriptor) anotherProperty;
-	//		if (anotherProperty.getId().equals(this.getId())) {
-	//
-	//			Object value1 = getPropertySource().getPropertyValue(getId());
-	//			Object value2 =
-	//				xdePropertyDescriptor.getPropertySource().getPropertyValue(
-	//					getId());
-	//
-	//			if (!value1.equals(value2)) {
-	//				setDirtyFlag(true);
-	//				
-	//			}
-	//			return true;
-	//		}
-	//		return false;
-	//	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedPropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedPropertyDescriptor.java
deleted file mode 100644
index e1a72ab..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedPropertyDescriptor.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.internal.l10n.CommonUIServicesPropertiesMessages;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-/**
- * @author Tauseef A. Israr Created on: Sep 9, 2002
- */
-public class ExtendedPropertyDescriptor
-	extends PropertyDescriptor
-	implements IExtendedPropertyDescriptor {
-
-	private IPropertySource propertySource;
-
-	private boolean dirty = false;
-
-	private boolean readOnly = false;
-
-	/**
-	 * The property display name
-	 */
-	private String displayName;
-
-	/**
-	 * @param id
-	 * @param displayName
-	 */
-	public ExtendedPropertyDescriptor(Object id, String displayName) {
-		super(id, displayName);
-		this.displayName = displayName;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertyDescriptor#getPropertySource()
-	 */
-	public IPropertySource getPropertySource() {
-		return propertySource;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertyDescriptor#isDirty()
-	 */
-	public boolean isDirty() {
-		return dirty;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertyDescriptor#setDirtyFlag(boolean)
-	 */
-	public void setDirtyFlag(boolean dirty) {
-		this.dirty = dirty;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertyDescriptor#setPropertySource(org.eclipse.ui.views.properties.IPropertySource)
-	 */
-	public void setPropertySource(IPropertySource propertySource) {
-		this.propertySource = propertySource;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertyDescriptor#getBlank()
-	 */
-	public Object getBlank() {
-		return CommonUIServicesPropertiesMessages.ExtendedPropertyDescriptor_blank;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#isReadOnly()
-	 */
-	public boolean isReadOnly() {
-		return this.readOnly;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#setReadOnly(boolean)
-	 */
-	public void setReadOnly(boolean read) {
-		this.readOnly = read;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#setPropertyValue(java.lang.Object)
-	 */
-	public void setPropertyValue(Object value) {
-		/* method not implemented */
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.IPropertyDescriptor#isCompatibleWith(org.eclipse.ui.views.properties.IPropertyDescriptor)
-	 */
-	public boolean isCompatibleWith(IPropertyDescriptor anotherProperty) {
-		assert null != anotherProperty;
-
-		if (!(anotherProperty instanceof ExtendedPropertyDescriptor))
-			return false;
-
-		IExtendedPropertyDescriptor xdePropertyDescriptor = (IExtendedPropertyDescriptor) anotherProperty;
-
-		if ((getPropertySource() == null)
-			|| (xdePropertyDescriptor.getPropertySource() == null))
-			return false;
-
-		IPropertySource propertySource1 = getPropertySource();
-		IPropertySource propertySource2 = xdePropertyDescriptor
-			.getPropertySource();
-
-		Object value1 = propertySource1.getPropertyValue(getId());
-		Object value2 = propertySource2.getPropertyValue(getId());
-
-		if ((value1 == null) && (value2 == null))
-			return true;
-
-		if ((value1 != null) && (value2 != null)) {
-			if (!value1.equals(value2)) {
-				setDirtyFlag(true);
-			}
-		} else {
-			setDirtyFlag(true);
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.IPropertyDescriptor#getDisplayName()
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertyDescriptor#setDisplayName(java.lang.String)
-	 */
-	public void setDisplayName(String displayName) {
-		this.displayName = displayName;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#getPropertyValue()
-	 */
-	public Object getPropertyValue() {
-		return getPropertySource().getPropertyValue(getId());
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor#resetPropertyValue()
-	 */
-	public void resetPropertyValue() {
-		// do nothing by default
-
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedTextPropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedTextPropertyDescriptor.java
deleted file mode 100644
index 32f9485..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedTextPropertyDescriptor.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import java.text.MessageFormat;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.internal.l10n.CommonUIServicesPropertiesMessages;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Tauseef A. Israr
- * Created on: Sep 9, 2002
- */
-public class ExtendedTextPropertyDescriptor
-	extends ExtendedPropertyDescriptor {
-
-	/**
-	 * Constructor for ExtendedTextPropertyDescriptor.
-	 * @param id
-	 * @param displayName
-	 */
-	public ExtendedTextPropertyDescriptor(Object id, String displayName) {
-		super(id, displayName);
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.IPropertyDescriptor#createPropertyEditor(Composite)
-	 */
-	public CellEditor createPropertyEditor(Composite parent) {
-		if (isReadOnly())
-			return null;
-
-		TextCellEditor editor = new TextCellEditor(parent) {
-
-			/**
-			* Processes a modify event that occurred in this text cell editor.
-			* This framework method performs validation and sets the error message
-			* accordingly, and then reports a change via <code>fireEditorValueChanged</code>.
-			* Subclasses should call this method at appropriate times. Subclasses
-			* may extend or reimplement.
-			*
-			* @param e the SWT modify event
-			*/
-			protected void editOccured(ModifyEvent e) {
-				String value = text.getText();
-				if (value == null)
-					value = ""; //$NON-NLS-1$
-				Object typedValue = value;
-				boolean oldValidState = isValueValid();
-				boolean newValidState = isCorrect(typedValue);
-				if (typedValue == null && newValidState)
-					assert (false) : "Validator isn't limiting the cell editor's type range"; //$NON-NLS-1$
-				if (!newValidState) {
-					// try to insert the current value into the error message.
-					setErrorMessage(
-						MessageFormat.format(
-							getErrorMessage(),
-							new Object[] { value }));
-				}
-
-				valueChanged(oldValidState, newValidState);
-
-			}
-
-			/**
-			* Processes a key release event that occurred in this cell editor.
-			* <p>
-			* The default implementation of this framework method interprets
-			* the ESC key as canceling editing, and the RETURN key
-			* as applying the current value.
-			* </p>
-			*
-			* @param keyEvent the key event
-			*/
-			protected void keyReleaseOccured(KeyEvent keyEvent) {
-				if (keyEvent.character == '\u001b') { // Escape character
-					fireCancelEditor();
-					return;
-				} else if (keyEvent.character == '\r') { // Return key
-					String value = text.getText();
-					if (value == null) {
-						value = ""; //$NON-NLS-1$
-					}
-					boolean newValidState = isCorrect(value);
-					if (value == null && newValidState)
-						assert (false) : "Validator isn't limiting the cell editor's type range"; //$NON-NLS-1$
-					if (!newValidState) {
-						MessageDialog.openError(
-							Display.getCurrent().getActiveShell(),
-							CommonUIServicesPropertiesMessages.ExtendedTextPropertyDescriptor_PropertiesViewErrorDialog_Title,
-							getErrorMessage());
-						fireCancelEditor();
-					} else {
-						fireApplyEditorValue();
-						deactivate();
-					}
-					return;
-				}
-			}
-		};
-
-		editor.setValidator(this.getValidator());
-		return editor;
-
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IExtendedPropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IExtendedPropertyDescriptor.java
deleted file mode 100644
index 296e40a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IExtendedPropertyDescriptor.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor;
-
-/**
- * @author Tauseef A. Israr
- * Created on: Sep 3, 2002
- * 
- */
-public interface IExtendedPropertyDescriptor extends ICompositeSourcePropertyDescriptor {
-	
-	/**
-	 * Retrieve <code>IPropertySource</code>
-	 * 
-	 * @return an instance of <code>IPropertySource</code>
-	 */
-    public IPropertySource getPropertySource();
-
-    /**
-     * Sets specified <code>IPropertySource</code>
-     * 
-     * @param propertySource an instance of <code>IPropertySource</code>
-     */
-    public void setPropertySource(IPropertySource propertySource);
-
-    /**
-     * Retrieve the boolean isDirty flag.
-     * 
-     * @return value of isDirty flag
-     */
-    public boolean isDirty();
-   
-    /**
-     * @param dirtyFlag
-     */
-    public void setDirtyFlag(boolean dirtyFlag);
-
-    /**
-     * This method returns a blank value for a cell.
-     * 
-     * @return a blank value for a cell
-     */
-    public Object getBlank();
-
-
-
-    /**
-     * Sets the validator for this propertyDescriptor
-     * @param validator The <code>ICellEditorValidator</code>
-     */
-    public void setValidator(ICellEditorValidator validator);
-
-    /**
-     * Sets the display name
-     * @param displayName the display name
-     */
-    public void setDisplayName(String displayName);
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IExtendedPropertySource.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IExtendedPropertySource.java
deleted file mode 100644
index 7b3a7f4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IExtendedPropertySource.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource;
-
-/**
- * @author Tauseef A. Israr
- *
- * This interface extends <code>IPropertySource</code> interface.
- * 
- * 
- */
-public interface IExtendedPropertySource extends ICompositePropertySource {
-
-    /**
-     * Returns the element.
-     * @return Object
-     */
-    public Object getElement();
-
-    /**
-     * add properties to the properties map
-     * @param id Object
-     * @param property Object 
-     */
-    public void addProperty(Object id, Object property);
-
-    /**
-     * removes properties from the properties map
-     * @param id Object
-     */
-    public void removeProperty(Object id);
-
-    /**
-    * Adds propertyDescriptor to this property source.
-    * @param propertyDescriptor IExtendedPropertyDescriptor that is to be added
-    */
-    public void addPropertyDescriptor(IExtendedPropertyDescriptor propertyDescriptor);
-    
-    /**
-     * Set the element of which the properties belong to.
-     * 
-     * @param element Object The element to which the properties belong to.
-     */
-    public void setElement(Object element);
-    
-    /**
-     * Set the dirty flag to boolean.  This functionality is used when the 
-     * property source itself is a value of a property and we need to show 
-     * some value other than the editable value in case of multiple select 
-     * unequal value.
-     * @param flag : Flag = true means dirty, Flag = false means not dirty.
-     */
-    public void setDirty(boolean flag);
-    
-    /**
-     * Return if the dirty flag.
-     * @return flag: True means dirty and viceversa.
-     */
-    public boolean isDirty();
-    
-    /**
-     * Refresh properties
-     */
-    public void refresh();
-    
-    
-    /**
-     * Returns the properties.
-     * @return Map
-     */
-    public Map getProperties();
-    
-    /**
-     * Returns true if the property value is not equal to BLANK as displayed
-     * in multiple select unequal values.
-     * 
-     * @param id property id
-     * @param value value to verify
-     * @return <code>true</code> if value is ok, <code>false</code> otherwise
-     */
-    public boolean isValueOkay(Object id, Object value);
-    
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IPropertyAction.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IPropertyAction.java
deleted file mode 100644
index b86ce40..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/IPropertyAction.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import org.eclipse.swt.widgets.Control;
-
-/**
- * Property related action
- *
- * @author dmisic
- */
-public interface IPropertyAction {
-
-	/**
-	 * Executes the action
-	 * 
-	 * @param owner The logical owner control; does not have to be control that
-	 *              initiated the action
-	 * @return The result of the action; may be null
-	 */
-	public Object execute(Control owner);
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/MultiButtonCellEditor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/MultiButtonCellEditor.java
deleted file mode 100644
index 353c796..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/MultiButtonCellEditor.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Cell editor that provides for a read-only label representation of the value
- * and multiple buttons at the end. The last button receives the focus. The
- * subclasses have to override the initButtons() method. The implementation of
- * that method should only make calls to the method addButton() to initialize
- * the desired buttons.
- * 
- * @author dmisic
- */
-public abstract class MultiButtonCellEditor
-	extends CellEditor {
-
-	/**
-	 * The cell editor control itself
-	 */
-	private Composite editor;
-
-	/**
-	 * Font used by all controls
-	 */
-	private Font font;
-
-	/**
-	 * The label part of the editor
-	 */
-	private Control label;
-
-	/**
-	 * Array of the editor's buttons
-	 */
-	private ArrayList buttonList;
-
-	/**
-	 * The value of the cell editor; initially null
-	 */
-	private Object value = null;
-
-	/**
-	 * Internal layout manager for multi button cell editors
-	 */
-	private class MultiButtonCellLayout
-		extends Layout {
-
-		/**
-		 * @see org.eclipse.swt.widgets.Layout#computeSize(org.eclipse.swt.widgets.Composite,
-		 *      int, int, boolean)
-		 */
-		protected Point computeSize(Composite composite, int wHint, int hHint,
-				boolean flushCache) {
-
-			// check the hints
-			if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) {
-				return new Point(wHint, hHint);
-			}
-
-			// calculate size of the buttons area
-			int height = 0;
-			int sumWidth = 0;
-			int count = buttonList.size();
-			for (int i = 0; i < count; i++) {
-				Point size = ((Button) buttonList.get(i)).computeSize(
-					SWT.DEFAULT, SWT.DEFAULT, flushCache);
-				sumWidth += size.x;
-				height = Math.max(height, size.y);
-			}
-
-			// label size
-			Point labelSize = label.computeSize(SWT.DEFAULT, SWT.DEFAULT,
-				flushCache);
-
-			return new Point(sumWidth, Math.max(labelSize.y, height));
-		}
-
-		/**
-		 * @see org.eclipse.swt.widgets.Layout#layout(org.eclipse.swt.widgets.Composite,
-		 *      boolean)
-		 */
-		protected void layout(Composite composite, boolean flushCache) {
-			Rectangle bounds = editor.getClientArea();
-			int count = buttonList.size();
-			int sumWidth = 0;
-			int[] widthArray = new int[count];
-			int start = 0;
-
-			// calculate the aggregate width of the buttons
-			for (int i = 0; i < count; i++) {
-				Point size = ((Button) buttonList.get(i)).computeSize(
-					SWT.DEFAULT, SWT.DEFAULT, flushCache);
-				sumWidth += size.x;
-				widthArray[i] = size.x;
-			}
-
-			// set the size for the label
-			if (label != null) {
-				label.setBounds(0, 0, bounds.width - sumWidth, bounds.height);
-				start = bounds.width - sumWidth;
-			}
-
-			// set the size for the buttons
-			for (int i = 0; i < count; i++) {
-				Button button = (Button) buttonList.get(i);
-				button.setBounds(start, 0, widthArray[i], bounds.height);
-				start += widthArray[i];
-			}
-		}
-	}
-
-	/**
-	 * @param parent
-	 *            The parent control
-	 */
-	public MultiButtonCellEditor(Composite parent) {
-		this(parent, SWT.NONE);
-	}
-
-	/**
-	 * @param parent
-	 *            The parent control
-	 * @param style
-	 *            The style bits
-	 */
-	public MultiButtonCellEditor(Composite parent, int style) {
-		super(parent, style);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.CellEditor#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createControl(Composite parent) {
-		buttonList = new ArrayList();
-		font = parent.getFont();
-		Color bg = parent.getBackground();
-
-		// create the cell editor
-		editor = new Composite(parent, getStyle());
-		editor.setFont(font);
-		editor.setBackground(bg);
-		editor.setLayout(new MultiButtonCellLayout());
-
-		// create the label
-        if (isModifiable()) {
-            label = (new Text(editor, SWT.LEFT));
-        } else {
-            label = (new Label(editor, SWT.LEFT));
-        }
-		label.setFont(font);
-		label.setBackground(bg);
-		updateLabel(value);
-
-		// init the buttons (there must be at least one)
-		initButtons();
-		assert buttonList.size() > 0 : "button list size must > 0"; //$NON-NLS-1$
-
-		setValueValid(true);
-
-		return editor;
-	}
-
-    /**
-     * Determine if the label in the cell editor is modifiable. The default is a
-     * read-only label representation of the value.
-     * 
-     * @return <code>true</code> if the label is modifiable
-     */
-    protected boolean isModifiable() {
-        return false;
-    }
-    
-	/**
-	 * @see org.eclipse.jface.viewers.CellEditor#doGetValue()
-	 */
-	protected Object doGetValue() {
-		return value;
-	}
-
-	/**
-	 * This implementations sets focus on the last button
-	 * 
-	 * @see org.eclipse.jface.viewers.CellEditor#doSetFocus()
-	 */
-	protected void doSetFocus() {
-		((Button) buttonList.get(buttonList.size() - 1)).setFocus();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.CellEditor#doSetValue(java.lang.Object)
-	 */
-	protected void doSetValue(Object val) {
-		this.value = val;
-		updateLabel(val);
-	}
-
-	/**
-	 * Creates and adds the button to the cell editor
-	 * 
-	 * @param buttonLabel
-	 *            Button label
-	 * @param buttonAction
-	 *            The action to be executed when the button is invoked
-	 */
-	protected void addButton(String buttonLabel,
-			final IPropertyAction buttonAction) {
-
-		// create button
-		Button button = new Button(editor, SWT.DOWN);
-		button.setText(buttonLabel);
-		button.setFont(font);
-
-		// selection listener
-		button.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				Object newValue = buttonAction.execute(editor);
-				if (newValue != null) {
-					boolean newValidState = isCorrect(newValue);
-					if (newValidState) {
-						markDirty();
-						doSetValue(newValue);
-					} else {
-						setErrorMessage(MessageFormat.format(getErrorMessage(),
-							new Object[] {newValue.toString()}));
-					}
-					fireApplyEditorValue();
-				}
-			}
-		});
-
-		// key listener
-		button.addKeyListener(new KeyAdapter() {
-
-			public void keyReleased(KeyEvent e) {
-				if (e.character == '\u001b') { // Escape char
-					fireCancelEditor();
-				}
-			}
-		});
-
-		buttonList.add(button);
-	}
-
-	/**
-	 * Updates the label showing the value. The default implementation converts
-	 * the passed object to a string using <code>toString</code> and sets this
-	 * as the text of the label widget.
-	 * 
-	 * @param val
-	 *            The new value
-	 */
-	protected void updateLabel(Object val) {
-		if (label == null)
-			return;
-
-		String text = ""; //$NON-NLS-1$
-		if (val != null) {
-			text = val.toString();
-		}
-        if (label instanceof Label) {
-            ((Label)label).setText(text);
-        } else if (label instanceof Text) {
-            ((Text)label).setText(text);
-        }
-	}
-
-	/**
-	 * The subclasses have to override this method. The implementation should
-	 * only make calls to the method addButton() to initialize the desired
-	 * buttons. Note: the implementation of the IPropertyAction's execute method
-	 * should return the new value for the editor or null if the value has not
-	 * changed.
-	 */
-	protected abstract void initButtons();
-
-	/**
-     * Get the label widget.
-	 * @return the label widget.
-	 */
-	protected Label getLabel() {
-        return (label != null && label instanceof Label) ? (Label) label
-            : null;
-	}
-	
-    /**
-     * Get the text widget in the case where the label is modifiable.
-     * @return the label widget.
-     */
-	protected Text getText() {
-	    return (label != null && label instanceof Text) ? (Text) label
-            : null;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyId.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyId.java
deleted file mode 100644
index 587122a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyId.java
+++ /dev/null

@@ -1,173 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-/**
- * @author Tauseef A. Israr
- * Created on: Oct 7, 2002
- * 
- * The purpose of this class is to provide an id and a hook for a "hint" that
- * can be used in setting the property.
- * 
- * 
- */
-public class PropertyId {
-
-	/** ID of slot property. */
-	public static final String SLOT_ID = "slot_id"; //$NON-NLS-1$
-
-	/** ID of stereotype property. */
-	public static final String STEREOTYPE_VALUE_ID = "stereotype_value_id"; //$NON-NLS-1$
-
-	/** Default ID. */
-	public static final String DEFAULT_ID = "default_id"; //$NON-NLS-1$
-
-	/**
-	 * String representation of the id.
-	 * This variable is used by eclipse to compare properties in multiple 
-	 * select.  Therefore, it is not unique, as there can exists properties
-	 * with same ids.
-	 * 
-	 * Usually the id is CategoryName concatenated by the attribute name
-	 * 
-	 */
-	private String id;
-
-	/** 
-	 * Hint variable is neccessary to provide a handle to this property.
-	 * It is used in retrieving the object, the property.is associated with 
-	 */
-	private Object hint;
-
-	/**
-	 * It is the type of property.  For instance, type can be slot,taggedValue
-	 * etc etc.
-	 */
-	private String type;
-
-	/**
-	 * Constructor for PropertyId.
-	 * @param id String
-	 * @param hint Object
-	 * @param type String
-	 */
-	public PropertyId(String id, Object hint, String type) {
-		super();
-		this.id = id;
-		this.hint = hint;	
-	}
-
-	/**
-	 * Returns the hint.
-	 * 
-	 * @return Object
-	 */
-	public Object getHint() {
-		return hint;
-	}
-
-	/**
-	 * Returns the id.
-	 * @return String
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Returns the type.
-	 * @return String
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(Object)
-	 */
-	public boolean equals(Object arg0) {
-
-		if (arg0 == this)
-			return true;
-
-		if (arg0 instanceof PropertyId) {
-
-			PropertyId propertyId = (PropertyId) arg0;
-			if ((propertyId.getId() == getId())
-				&& (propertyId.getHint() == getHint())
-				&& (propertyId.getType() == getType())) {
-				return true;
-			}
-			boolean equals = false;
-			if ((propertyId.getId() != null) && (getId() != null)) {
-				equals = getId().equals(propertyId.getId());
-				if (!equals)
-					return false;
-			}
-			if ((getHint() != null) && (propertyId.getHint() != null)) {
-				equals = getHint().equals(propertyId.getHint());
-				if (!equals)
-					return false;
-			}
-			if ((getType() != null) && (propertyId.getType() != null)) {
-				equals = getType().equals(propertyId.getType());
-				if (!equals)
-					return false;
-			}
-            return equals;
-		}
-		return false;
-	}
-
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		int code = 0;
-        if(getId() != null)
-            code = code + getId().hashCode();
-        if (getType() != null)
-            code = code + getType().hashCode();
-        if (getHint() != null)
-            code = code + getHint().hashCode();              
-		return code;
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getId();
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setId(String string) {
-		id = string;
-	}
-
-	/**
-	 * @param object
-	 */
-	public void setHint(Object object) {
-		hint = object;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setType(String string) {
-		type = string;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyPageCellEditor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyPageCellEditor.java
deleted file mode 100644
index 13e293e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyPageCellEditor.java
+++ /dev/null

@@ -1,304 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.dialogs.PropertiesDialog;
-import org.eclipse.gmf.runtime.common.ui.services.properties.PropertiesService;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * Cell editor for properties that can be modified via a property page.
- * This cell editor is composed of an elipsis button for editing via
- * a property page.
- * 
- * @author ldamus
- */
-public class PropertyPageCellEditor extends MultiButtonCellEditor {
-
-    /**
-	 * My property descriptor
-	 */
-	private final PropertyPagePropertyDescriptor propertyDescriptor;
-
-	/**
-	 * Creates a new property page cell editor parented under the given control.
-	 * The cell editor value is <code>null</code> initially, and has no 
-	 * validator.
-	 *
-	 * @param parent The parent control
-	 * @param descriptor The property descriptor for this cell
-	 */
-	public PropertyPageCellEditor(
-		Composite parent,
-		PropertyPagePropertyDescriptor descriptor) {
-		this(parent, descriptor, SWT.NONE);
-	}
-
-	/**
-	 * Creates a new property page cell editor parented under the given control.
-	 * The cell editor value is <code>null</code> initially, and has no 
-	 * validator.
-	 *
-	 * @param parent The parent control
-	 * @param descriptor The property descriptor for this cell
-	 * @param style the style bits
-	 */
-	public PropertyPageCellEditor(
-		Composite parent,
-		PropertyPagePropertyDescriptor descriptor,
-		int style) {
-		super(parent, style);
-		propertyDescriptor = descriptor;
-	}
-
-	/**
-	 * Gets the property descriptor for this cell editor.
-	 * 
-	 * @return the property descriptor
-	 */
-	private PropertyPagePropertyDescriptor getPropertyDescriptor() {
-		return propertyDescriptor;
-	}
-
-	/**
-	 * Opens the {@link org.eclipse.gmf.runtime.common.ui.dialogs.PropertiesDialog}. Always
-	 * returns null. The UI is updated by the model event when the property
-	 * is modified by the property dialog.
-	 * 
-	 * @see org.eclipse.jface.viewers.DialogCellEditor#openDialogBox(org.eclipse.swt.widgets.Control)
-	 */
-	protected Object openDialogBox(Control cellEditorWindow) {
-
-		// Invoke the property dialog
-		PropertiesDialog dialog =
-			new PropertiesDialog(
-				getControl().getShell(),
-				new PreferenceManager());
-
-		// handle invokation of cell editor from collection editor
-		PropertyPagePropertyDescriptor realDescriptor = null;
-		if (getValue() instanceof ElementValue) {
-			Object element = ((ElementValue) getValue()).getElement();
-			if (element instanceof PropertyPagePropertyDescriptor) {
-				realDescriptor = (PropertyPagePropertyDescriptor) element;
-			}
-		}
-
-		List pages = null;
-		if (realDescriptor != null) {
-			pages = realDescriptor.createPropertyPages();
-		} else {
-			pages = getPropertyDescriptor().createPropertyPages();
-		}
-
-		for (Iterator i = pages.iterator(); i.hasNext();) {
-			PropertyPage page = (PropertyPage) i.next();
-
-			// handle invokation of cell editor from collection editor
-			if (realDescriptor != null) {
-				final IPropertySource source =
-					realDescriptor.getPropertySource();
-				page.setElement(new IAdaptable() {
-					public Object getAdapter(Class adapter) {
-						if (adapter.equals(IPropertySource.class)) {
-							return source;
-						}
-						return null;
-					}
-				});
-			}
-
-			dialog.getPreferenceManager().addToRoot(
-				new PreferenceNode(StringStatics.BLANK, page));
-		}
-
-		dialog.create();
-		dialog.open();
-
-		// refresh property for collection editor
-		for (Iterator i = pages.iterator(); i.hasNext();) {
-			PropertyPage page = (PropertyPage) i.next();
-			IAdaptable adaptable = page.getElement();
-			if (adaptable != null) {
-				IPropertySource source =
-					(IPropertySource) adaptable.getAdapter(
-						IPropertySource.class);
-				if (source instanceof IExtendedPropertySource) {
-					Object element =
-						((IExtendedPropertySource) source).getElement();
-
-					IPropertySource propertySource =
-						PropertiesService.getInstance().getPropertySource(
-						
-							element);
-					assert null != propertySource;
-
-					for (Iterator j =
-						Arrays
-							.asList(propertySource.getPropertyDescriptors())
-							.iterator();
-						j.hasNext();
-						) {
-						IPropertyDescriptor descriptor =
-							(IPropertyDescriptor) j.next();
-						if (descriptor
-							.getId()
-							.equals(getPropertyDescriptor().getId())) {
-							// apply new value in cell editor
-							setValue(
-								new ElementValue(
-									source,
-									propertySource.getPropertyValue(
-										descriptor.getId())));
-							fireApplyEditorValue();
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Determines if there is text to copy.
-	 * 
-	 * @return <code>true</code> if the text selection is not empty, 
-	 * <code>false</code>otherwise
-     */
-	public boolean isCopyEnabled() {
-		return false;
-	}
-
-	/**
-	 * Determines if there is text to cut
-	 * 
-	 * @return <code>true</code> if the text selection is not empty, 
-	 * <code>false</code>otherwise
-     */
-	public boolean isCutEnabled() {
-		return false;
-	}
-
-	/**
-	 * Determines if there is text to delete
-	 * 
-	 * @return <code>true</code> if the text selection is not empty, 
-	 * <code>false</code>otherwise
-     */
-	public boolean isDeleteEnabled() {
-		return false;
-	}
-
-	/**
-	 * Determines if there is a text widget on which text can be pasted
-	 * 
-	 * @return <code>true</code> if the text selection is not empty, 
-	 * <code>false</code>otherwise
-     */
-	public boolean isPasteEnabled() {
-		return false;
-	}
-
-	/**
-	 * Determines if there is a text widget in which text can be saved
-	 * 
-	 * @return <code>true</code> if the text widget is not disposed, 
-	 * <code>false</code>otherwise
-     */
-	public boolean isSaveAllEnabled() {
-        return false;
-	}
-
-	/**
-	 * Determines if there is text to be selected.
-	 * 
-	 * @return <code>true</code> if select all is possible,
-	 *  <code>false</code> otherwise
-     */
-	public boolean isSelectAllEnabled() {
-        return false;
-	}
-
-	/**
-	 * Copies the selected text
-     */
-	public void performCopy() {
-        // default implementation do nothing
-	}
-
-	/**
-	 * Cuts the selected text to the clipboard. 
-     */
-	public void performCut() {
-        /* not suppoerted */
-	}
-
-	/**
-	 * Deletes the selected text or, if there is no selection,
-	 * the character next character from the current position. 
-     */
-	public void performDelete() {
-        /* not suppoerted */
-	}
-
-	/**
-	 * Pastes the the clipboard contents over the selected text. 
-     */
-	public void performPaste() {
-        /* not suppoerted */
-	}
-
-	/**
-	 * Selects all of the text
-     */
-	public void performSelectAll() {
-        /* not suppoerted */
-	}
-	
-	/**
-	 * Getter method for value
-	 * @return the value of this cell editor
-     */
-	protected Object getCellObjectValue() {
-		return super.doGetValue();
-	}
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.MultiButtonCellEditor#initButtons()
-     */
-    protected void initButtons() {
-        // 'set' button
-        IPropertyAction setAction = new IPropertyAction() {
-
-            public Object execute(Control owner) {
-                return openDialogBox(owner);
-            }
-        };
-        addButton("...", setAction); //$NON-NLS-1$
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyPagePropertyDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyPagePropertyDescriptor.java
deleted file mode 100644
index 97a2a64..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertyPagePropertyDescriptor.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * A property descriptor for a property that is edited via a property page.
- * <P>
- * Implements IAdaptable. When the cell editor for this descriptor is asked
- * to show the property page, the dialog action is initialized with
- * an instance of this object as its selection. The property page dialog and
- * property pages expect to be able to talk to this object as all of the
- * following types:
- * <P>
- * <UL>
- * <LI>IPropertySource</LI>
- * </UL>
- * 
- * 
- * @author ldamus
- */
-abstract public class PropertyPagePropertyDescriptor
-	extends ExtendedPropertyDescriptor
-	implements IAdaptable {
-
-	/**
-	 * My cell editor which is null until it is created
-	 */
-	private CellEditor propertyEditor;
-
-	/**
-	 * Creates a property page property descriptor with the given id,
-	 * and display name.
-	 * 
-	 * @param id the id of the property
-	 * @param displayName the name to display for the property
-	 */
-	public PropertyPagePropertyDescriptor(Object id, String displayName) {
-		super(id, displayName);
-	}
-
-	/**
-	 * Creates and returns property pages for the property descriptor
-	 * @return List the list of property pages
-	 */
-	abstract public List createPropertyPages();
-
-	/**
-	 * The <code>PropertyPagePropertyDescriptor</code> implementation of this 
-	 * <code>IPropertyDescriptor</code> method creates and returns a new
-	 * <code>PropertyPageCellEditor</code>.
-	 * <p>
-	 * The editor is configured with the current validator if there is one.
-	 * </p>
-	 */
-	public CellEditor createPropertyEditor(Composite parent) {
-		if (isReadOnly())
-			return null;
-
-		CellEditor editor = createCellEditor(parent);
-
-		if (getValidator() != null) {
-			editor.setValidator(getValidator());
-		}
-		setPropertyEditor(editor);
-		return editor;
-	}
-
-	/**
-	 * Creates a cell editor for the property descriptor
-	 * @param parent the parent composite
-	 * @return CellEditor the cell editor
-	 */
-	protected CellEditor createCellEditor(Composite parent) {
-		return new PropertyPageCellEditor(parent, this);
-	}
-
-	/**
-	 * Gets my property editor, or null if it hasn't been created
-	 * @return my property editor
-	 */
-	private CellEditor getPropertyEditor() {
-		return propertyEditor;
-	}
-
-	/**
-	 * Sets my property editor
-	 * @param editor The property editor
-	 */
-	private void setPropertyEditor(CellEditor editor) {
-		propertyEditor = editor;
-	}
-
-	/**
-	 * Adapts this propertyDescriptor to its IPropertySource or
-	 * IActionFilter, IPropertyDescriptor or
-	 * CellEditor source.
-	 * 
-	 * @param adapter The adapter class
-	 * @return the adapted object, or null if I don't adapt to
-	 *          <code>adapter</code>
-	 */
-	public Object getAdapter(Class adapter) {
-
-		if (IPropertySource.class.equals(adapter)) {
-			return getPropertySource();
-
-		} else if (IPropertyDescriptor.class.equals(adapter)) {
-			return this;
-
-		} else if (CellEditor.class.equals(adapter)) {
-			return getPropertyEditor();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Determines if <code>value</code> is the same value as is already on
-	 * the property source.
-	 * 
-	 * @param value to be verified
-	 * @return <code>true</code> if the value is the same value as on the property source, <code>false</code> otherwise
-	 */
-	protected boolean isSameValue(Object value) {
-		return getPropertySource().getPropertyValue(getId()).equals(value);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertySource.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertySource.java
deleted file mode 100644
index 359d634..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/PropertySource.java
+++ /dev/null

@@ -1,372 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.extended;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource;
-import org.eclipse.gmf.runtime.common.ui.services.properties.internal.l10n.CommonUIServicesPropertiesMessages;
-
-/**
- * @author Tauseef A. Israr Created on: Aug 27, 2002
- *  
- */
-public class PropertySource implements IExtendedPropertySource {
-
-    /**
-     * refernce to the model element to whose properties are represented by this
-     * propertysource instance
-     */
-    private Object element;
-
-    /**
-     * map containing properties key: id Value: property
-     */
-    protected Map properties;
-
-    /**
-     * map containing propertyDescriptors key: id value: propertydescriptor
-     */
-    protected Map propertyDescriptors;
-
-
-
-    /**
-     * A flag which is set when we want to show an editable value other than the
-     * real editable value incase of mulitple select unequality.
-     */
-    private boolean flag = false;
-
-    /** <code>ICompositePropertySource</code> */
-    protected ICompositePropertySource enclosed = null;
-
-    /**
-     * basic constructor
-     * 
-     */
-    public PropertySource() {
-        propertyDescriptors = new HashMap();
-        properties = new HashMap();
-    }
-
-    /**
-     * Add enclosed property source object (a child) - this creates a linked
-     * list of property sources
-     * 
-     * @param source -
-     *            an eclosed (a child) property source object
-     */
-    public void addPropertySource(ICompositePropertySource source) {
-        assert (this != source); // self is not allowed - this will
-        // result in stack overflows
-
-        if (this.enclosed == null)
-            enclosed = source;
-
-        else
-            enclosed.addPropertySource(source);
-
-    }
-
-    /**
-     * The constructor which accepts an element object as an argument.
-     * 
-     * @param element
-     *            The element which is in the selection
-     */
-    public PropertySource(Object element) {
-        this();
-        this.element = element;
-    }
-
-    /**
-     * 
-     * getter for the editable value
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue()
-     */
-    public Object getEditableValue() {
-        if (isDirty()) {
-            setDirty(false);
-            return CommonUIServicesPropertiesMessages.ExtendedPropertyDescriptor_blank;
-        }
-        if (getElement() == null && enclosed != null)
-            return enclosed.getEditableValue();
-
-        return getElement();
-    }
-
-    /**
-     * Setter of the editor value
-     * 
-     * @param object
-     * @deprecated
-     */
-    public void setEditableValue(Object object) {
-    	assert (false) : "This method is obsolete and should not be used"; //$NON-NLS-1$
-    }
-
-    /**
-     * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()
-     */
-    public IPropertyDescriptor[] getPropertyDescriptors() {
-        List list = new ArrayList(propertyDescriptors.values());
-        IPropertyDescriptor[] descriptors = new IPropertyDescriptor[list.size()];
-        System.arraycopy(list.toArray(), 0, descriptors, 0, list.size());
-
-        if (enclosed != null) {
-            IPropertyDescriptor[] enclosedDecriptors = enclosed
-                    .getPropertyDescriptors();
-            IPropertyDescriptor[] all = new IPropertyDescriptor[descriptors.length
-                    + enclosedDecriptors.length];
-            System.arraycopy(enclosedDecriptors, 0, all, 0,
-                    enclosedDecriptors.length);
-            System.arraycopy(descriptors, 0, all, enclosedDecriptors.length,
-                    descriptors.length);
-
-            return all;
-
-        }
-
-        return descriptors;
-    }
-
-    /**
-     * Adds propertyDescriptor to this property source. Also sets back link from
-     * property descriptor to this property source.
-     * 
-     * @param propertyDescriptor IExtendedPropertyDescriptor descriptor to be added
-     */
-    public void addPropertyDescriptor(
-            IExtendedPropertyDescriptor propertyDescriptor) {
-        assert null != propertyDescriptor;
-
-        propertyDescriptors.put(propertyDescriptor.getId(), propertyDescriptor);
-        propertyDescriptor.setPropertySource(this);
-
-    }
-
-    /**
-     * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(Object)
-     */
-    public Object getPropertyValue(Object id) {
-
-        assert null != id;
-
-        if (properties.containsKey(id)) {
-            IExtendedPropertyDescriptor propertyDescriptor = (IExtendedPropertyDescriptor) propertyDescriptors
-                    .get(id);
-
-            Object[] args = new Object[1];
-            args[0] = id;
-            String message = MessageFormat.format(CommonUIServicesPropertiesMessages.PropertySource__ERROR__descriptorError,
-            	args);
-
-            assert null != propertyDescriptor : message;
-            if (propertyDescriptor.isDirty()) {
-                propertyDescriptor.setDirtyFlag(false);
-                if (properties.get(id) instanceof IExtendedPropertySource) {
-                    ((IExtendedPropertySource) properties.get(id))
-                            .setDirty(true);
-                    return properties.get(id);
-                }
-                return propertyDescriptor.getBlank();
-            } else
-                return properties.get(id);
-        }
-
-        if (enclosed != null)
-            return enclosed.getPropertyValue(id);
-
-        return null;
-    }
-
-    /**
-     * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(Object)
-     */
-    public boolean isPropertySet(Object id) {
-
-        assert null != id;
-        
-        if (propertyDescriptors.containsKey(id))
-            return true;
-
-        if (enclosed != null)
-            return enclosed.isPropertySet(id);
-
-        return false;
-    }
-
-    /**
-     * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(Object)
-     */
-    public void resetPropertyValue(Object id) {
-        /* method not implemented */
-    }
-
-    /**
-     * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(Object,
-     *      Object)
-     */
-    public void setPropertyValue(Object id, Object value) {
-        if (propertyDescriptors.containsKey(id)) {
-
-            if (isValueOkay(id, value)) {
-                // necessary to avoid infinite loops
-                Object oldValue = getPropertyValue(id);
-                if ((oldValue != null && oldValue.equals(value))
-                        || (oldValue == null && value == null)) {
-                    return;
-                }
-                boolean failed = true;
-                addProperty(id, value);
-
-                try {
-                    getPropertyDescriptor(id).setPropertyValue(value);
-                    failed = false;
-                } finally {
-                    if (failed) {
-                        addProperty(id, oldValue);
-                    }
-                }
-            }
-        } else if (enclosed != null)
-            enclosed.setPropertyValue(id, value);
-
-    }
-
-    /**
-     * Returns the element.
-     * 
-     * @return Object
-     */
-    public Object getElement() {
-        return element;
-    }
-
-    /**
-     * Sets the element.
-     * 
-     * @param element
-     *            The modelElement to set
-     */
-    public void setElement(Object element) {
-        assert null != element;
-        this.element = element;
-    }
-
-    /**
-     * add properties to the properties map
-     * 
-     * @param id Object
-     * @param property Object
-     */
-    public void addProperty(Object id, Object property) {
-        properties.put(id, property);
-    }
-
-    /**
-     * removes properties from the properties map
-     * 
-     * @param id Object
-     */
-    public void removeProperty(Object id) {
-        assert null != id;
-        propertyDescriptors.remove(id);
-        properties.remove(id);
-    }
-
-    /**
-     * Gets <code>IExtendedPropertyDescriptor</code>
-     * 
-     * @param id
-     *            The id of the property descriptor.
-     * @return the <code>IExtendedPropertyDescriptor</code>
-     */
-    public IExtendedPropertyDescriptor getPropertyDescriptor(Object id) {
-        assert null != id;
-
-        return (IExtendedPropertyDescriptor) propertyDescriptors.get(id);
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertySource#isDirty()
-     */
-    public boolean isDirty() {
-        return flag;
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertySource#setDirty(boolean)
-     */
-    public void setDirty(boolean flag) {
-        this.flag = flag;
-    }
-
-    /**
-     * Returns the properties.
-     * 
-     * @return Map
-     */
-    public Map getProperties() {
-        return properties;
-    }
-
-    /**
-     * Sets the properties.
-     * 
-     * @param properties
-     *            The properties to set
-     */
-    public void setProperties(Map properties) {
-        this.properties = properties;
-    }
-
-    /**
-     * Sets the propertyDescriptors.
-     * 
-     * @param propertyDescriptors
-     *            The propertyDescriptors to set
-     */
-    public void setPropertyDescriptors(Map propertyDescriptors) {
-        this.propertyDescriptors = propertyDescriptors;
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.services.properties.extended.IExtendedPropertySource#refresh()
-     */
-    public void refresh() {
-        /* method not implemented */
-    }
-
-    /**
-     * checks to see if the value entered is the same as the BLANK value
-     * displayed in multiple select. If it is the same as BLANK value, return
-     * false; else return true
-     */
-    public boolean isValueOkay(Object id, Object value) {
-        if (value == null)
-            return true;
-        if (value instanceof String) {
-            if (((String) value).equals(CommonUIServicesPropertiesMessages.ExtendedPropertyDescriptor_blank))
-                return false;
-        }
-        return true;
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/package.html b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/package.html
deleted file mode 100644
index 37bd813..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/package.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes for working with modeling platform properties.</p>
- 
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFCommonUIPlugin.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFCommonUIPlugin.java
deleted file mode 100644
index aeb5bd4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFCommonUIPlugin.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.properties.*
- */
-public class PSFCommonUIPlugin
-	extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static PSFCommonUIPlugin INSTANCE;
-
-	/**
-	 * Constructor.
-	 */
-	public PSFCommonUIPlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static PSFCommonUIPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFPluginDebugOptions.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFPluginDebugOptions.java
deleted file mode 100644
index 398a505..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFPluginDebugOptions.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.internal;
-
-
-/**
- * @canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.properties.*
- * @author nbalaba
- */
-public class PSFPluginDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private PSFPluginDebugOptions() {
-		/* private constructor */
-	}
-
-	/** Debug option. */
-    public static final String DEBUG = PSFCommonUIPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-	
-    /** Debug option for tracing exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-			+ "/exceptions/catching"; //$NON-NLS-1$
-	
-	/** Debug option for tracing exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFPluginStatusCodes.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFPluginStatusCodes.java
deleted file mode 100644
index 41ec5a0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/PSFPluginStatusCodes.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.common.ui.services.properties.internal;
-
-/**
- * @canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.properties.*
- * @author nbalaba
- */
-public class PSFPluginStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private PSFPluginStatusCodes() {
-		/* private constructor */
-	}
-
-	/**
-	 * Status code warning that an exception was ignored
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 9;
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/CommonUIServicesPropertiesMessages.java b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/CommonUIServicesPropertiesMessages.java
deleted file mode 100644
index a33345c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/CommonUIServicesPropertiesMessages.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.common.ui.services.properties.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CommonUIServicesPropertiesMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.ui.services.properties.internal.l10n.CommonUIServicesPropertiesMessages";//$NON-NLS-1$
-
-	private CommonUIServicesPropertiesMessages() {
-		// Do not instantiate
-	}
-
-	public static String ExtendedColorPropertyLabelProvider_RGBValue;
-	public static String ExtendedBooleanPropertyDescriptor_True;
-	public static String ExtendedBooleanPropertyDescriptor_False;
-	public static String ExtendedPropertyDescriptor_blank;
-	public static String ExtendedTextPropertyDescriptor_PropertiesViewErrorDialog_Title;
-	public static String PropertySource__ERROR__descriptorError;
-	public static String CellValidatorFactory_InvalidIntegerFormat;
-	public static String CellValidatorFactory_InvalidPositiveZeroInclusiveIntegerFormat;
-	public static String CellValidatorFactory_InvalidPositiveZeroExclusiveIntegerFormat;
-	public static String CellValidatorFactory_InvalidNegativeZeroInclusiveIntegerFormat;
-	public static String CellValidatorFactory_InvalidNegativeZeroExclusiveIntegerFormat;
-	public static String CellValidatorFactory_InvalidRealFormat;
-	public static String CellValidatorFactory_InvalidByteFormat;
-	public static String CellValidatorFactory_InvalidFloatFormat;
-	public static String CellValidatorFactory_InvalidLongFormat;
-	public static String CellValidatorFactory_InvalidShortFormat;
-	public static String CellValidatorFactory_InvalidCharFormat;
-	public static String PropertyPageCellEditor_PropertiesDialog_title;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonUIServicesPropertiesMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/CommonUIServicesPropertiesMessages.properties b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/CommonUIServicesPropertiesMessages.properties
deleted file mode 100644
index b33ce47..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/CommonUIServicesPropertiesMessages.properties
+++ /dev/null

@@ -1,51 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-# Properties View values
-# RGB is short for Red, Green, Blue and {0},{1},{2} contains the red, green, and blue values respectively.
-ExtendedColorPropertyLabelProvider_RGBValue = RGB ({0},{1},{2})
-
-# Properties View values
-# Properties View boolean values
-ExtendedBooleanPropertyDescriptor_True = True
-ExtendedBooleanPropertyDescriptor_False = False
-
-# the blank value for a cell
-ExtendedPropertyDescriptor_blank=<multiple unequal values>
-
-# properties view error dialog title
-ExtendedTextPropertyDescriptor_PropertiesViewErrorDialog_Title=Properties Error
-
-# Error getting the property descriptor
-# {0} = Property ID
-PropertySource__ERROR__descriptorError= IRJA0287E Error. The property of given id {0} exists without a descriptor
-
-
-# Properties View error messages
-CellValidatorFactory_InvalidIntegerFormat = Invalid integer format.
-CellValidatorFactory_InvalidPositiveZeroInclusiveIntegerFormat = Invalid integer format. Value must be greater than or equal to 0.
-CellValidatorFactory_InvalidPositiveZeroExclusiveIntegerFormat = Invalid integer format. Value must be greater than or equal to 1.
-CellValidatorFactory_InvalidNegativeZeroInclusiveIntegerFormat = Invalid integer format. Value must be less than or equal to 0.
-CellValidatorFactory_InvalidNegativeZeroExclusiveIntegerFormat = Invalid integer format. Value must be less than or equal to -1.
-CellValidatorFactory_InvalidRealFormat=Invalid real format.
-CellValidatorFactory_InvalidByteFormat=Invalid byte format.
-CellValidatorFactory_InvalidFloatFormat=Invalid float format.
-CellValidatorFactory_InvalidLongFormat=Invalid long format.
-CellValidatorFactory_InvalidShortFormat=Invalid short format.
-CellValidatorFactory_InvalidCharFormat=Invalid char format.
-
-# properties dialog title
-PropertyPageCellEditor_PropertiesDialog_title=Properties
-
-

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/package.html b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/package.html
deleted file mode 100644
index e390b2c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/l10n/package.html
+++ /dev/null

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Resource Manager for localized string for this plug-in. The strings are private to this plug-in. 
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.properties.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/package.html b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/package.html
deleted file mode 100644
index 32a4fb6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/internal/package.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides the properties service and framework to apply modifiers to a property source provided by a provider.</p>
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/package.html b/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/package.html
deleted file mode 100644
index 47fd066..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/package.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a framework to contribute contribute property descriptors to the Eclipse property view, given a workbench selection.</p>
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.diagram.core/.classpath b/org.eclipse.gmf.runtime.diagram.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.core/.cvsignore b/org.eclipse.gmf.runtime.diagram.core/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.diagram.core/.options b/org.eclipse.gmf.runtime.diagram.core/.options
deleted file mode 100644
index edf43d4..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.options
+++ /dev/null

@@ -1,15 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.diagram.core plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.diagram.core plug-in
-org.eclipse.gmf.runtime.diagram.core/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.diagram.core/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting=false
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/.project b/org.eclipse.gmf.runtime.diagram.core/.project
deleted file mode 100644
index 98ee911..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.core</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/org.eclipse.gmf.runtime.diagram.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 6c65eb9..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.core; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.core,
- org.eclipse.gmf.runtime.diagram.core.commands,
- org.eclipse.gmf.runtime.diagram.core.edithelpers,
- org.eclipse.gmf.runtime.diagram.core.internal;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.core.internal.commands;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.core.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.core.internal.listener;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.core.listener,
- org.eclipse.gmf.runtime.diagram.core.preferences,
- org.eclipse.gmf.runtime.diagram.core.providers,
- org.eclipse.gmf.runtime.diagram.core.services,
- org.eclipse.gmf.runtime.diagram.core.services.eventbroker,
- org.eclipse.gmf.runtime.diagram.core.services.view,
- org.eclipse.gmf.runtime.diagram.core.util,
- org.eclipse.gmf.runtime.diagram.core.view.factories
-Require-Bundle: org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.core/about.html b/org.eclipse.gmf.runtime.diagram.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/build.properties b/org.eclipse.gmf.runtime.diagram.core/build.properties
deleted file mode 100644
index 61f4273..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               schema/,\
-               .options,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.diagram.core/plugin.properties b/org.eclipse.gmf.runtime.diagram.core/plugin.properties
deleted file mode 100644
index 69b090f..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/plugin.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram Core
-Plugin.providerName = Eclipse.org
-
-# ===============================================================================
-# Diagram Internal - Translation Instruction : do not translate this section 
-# ===============================================================================
-
-
-
-# ==============================================================================
-#  Diagram - section to be translated
-# ==============================================================================
-
-extPoint.viewProviders = Presentation View Providers
-extPoint.diagramEventBrokerProviders = Diagram Event Broker Providers

diff --git a/org.eclipse.gmf.runtime.diagram.core/plugin.xml b/org.eclipse.gmf.runtime.diagram.core/plugin.xml
deleted file mode 100644
index 95e6807..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/plugin.xml
+++ /dev/null

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2006  IBM Corporation and others.                 -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension-point id="viewProviders" name="%extPoint.viewProviders" schema="schema/viewProviders.exsd"/>
-     <extension-point id="diagramEventBrokerProviders" name="%extPoint.diagramEventBrokerProviders" schema="schema/diagramEventBrokerProviders.exsd"/>
-     
-     <extension
-           point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-        <metamodel nsURI="http://www.eclipse.org/emf/2002/Ecore">
-           <adviceBinding
-                 class="org.eclipse.gmf.runtime.diagram.core.edithelpers.NotationViewDependentsAdvice"
-                 id="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"
-                 inheritance="none"
-                 typeId="*"/>
-           <adviceBinding
-                 class="org.eclipse.gmf.runtime.diagram.core.edithelpers.RemoveBookmarksAdvice"
-                 id="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"
-                 inheritance="none"
-                 typeId="*"/>
-        </metamodel>
-     </extension>
-     
-     <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-        <binding context="org.eclipse.gmf.runtime.emf.type.core.defaultContext">
-           <elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-           <elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"/>
-        </binding>
-     </extension>
-   
-</plugin>

diff --git a/org.eclipse.gmf.runtime.diagram.core/schema/diagramEventBrokerProviders.exsd b/org.eclipse.gmf.runtime.diagram.core/schema/diagramEventBrokerProviders.exsd
deleted file mode 100644
index 2901df8..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/schema/diagramEventBrokerProviders.exsd
+++ /dev/null

@@ -1,168 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.core" id="diagramEventBrokerProviders" name="Diagram Event Broker Providers"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="diagramEventBrokerProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="diagramEventBrokerProvider">
-      <annotation>
-         <documentation>
-            The diagram event broker extension point
-This extension point is inteded to be used only by GMF runtime experts, Since changing the diagram event broker could have severe implications on diagrams that share the same editing domain
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="editingDomain" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of the diagram event broker provider class
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.diagram.core.providers.AbstractDiagramEventBrokerProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="editingDomain">
-      <annotation>
-         <documentation>
-            The editing domain to associate the diagram event broker with
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="ID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the id of the editing domain
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the duagram event broker provider
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The priority of the provider. It can be one of the following values:
-&gt;Lowest, Low, Medium, High, Highest&gt;. Consideration of dependencies has to be done when choosing the priority. A provider that adds contributions to paths (menus | groups) contributed by other providers has to have a higher priority than them.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2007 IBM Corporation and others.&lt;br&gt;
- 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 
- &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.diagram.core/schema/viewProviders.exsd b/org.eclipse.gmf.runtime.diagram.core/schema/viewProviders.exsd
deleted file mode 100644
index 27b0523..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/schema/viewProviders.exsd
+++ /dev/null

@@ -1,358 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.core" id="viewProviders" name="Presentation View Providers"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="viewProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point, i.e. &lt;tt&gt;org.eclipse.gmf.runtime.diagram.core.viewProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. viewProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.viewProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="viewProvider">
-      <annotation>
-         <documentation>
-            The view provider description tag. A provider&apos;s description outlines zero or more objects to be referenced by the provider&apos;s contexts, and then lists zero or more contexts supported by the provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="object" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="context" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of the view provider class
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the view provider
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The priority of the provider. It can be one of the following values:
-&gt;Lowest, Low, Medium, High, Highest&gt;. Consideration of dependencies has to be done when choosing the priority. A provider that adds contributions to paths (menus | groups) contributed by other providers has to have a higher priority than them.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="object">
-      <annotation>
-         <documentation>
-            A descriptor of an object that is examined by this provider. The object can have an optional set of methods to call upon.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="staticMethod" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique (within the context of this provider XML definition) identifier for the object
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface who is assignable from or adaptable to the object. The name could be followed (between paranthesis &quot;()&quot;) by the id of a plugin whose classloader is able to load that class. The finaly syntax is:
-className&lt;(plugin id)&gt;?
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="staticMethod">
-      <annotation>
-         <documentation>
-            A static method to call by reflection on the class.
-The static method has a name and a value. The value could be described by its string representation (value &amp; notValue), or as an object &quot;value&quot; or &quot;notValue&quot;. 
-
-The rules of evaluation are as follows:
-1- The return value string has to be in the &quot;value&quot; string set.
-2- The return value string has to be not in the &quot;notValue&quot; string set.
-3- The return value object has to be in the &quot;value&quot; object set.
-4- The return value object has to be not in the &quot;notValue&quot; object set.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="value" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="notValue" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the Static Method, the format should be PluginID\ClassName.method followed by an optional paramter set between paranthesis &quot;()&quot;. The parameter set can contain any number of primitive parameters or %Context(pluginID/className) to use the context object as a parameter . other param types are not supported. The method name could contain nested calling separated by &quot;.&quot; The general format for this method name is : &lt;pluginID/ClassName.func(&lt;param&lt;,param&gt;*&gt;?).&lt;&lt;func(&lt;param&lt;,param&gt;*&gt;?)&gt;*
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated (&quot;,&quot;) list of string representations of the method return value. The string representation of the value is expected to be &quot;one&quot; of those in the list. The syntax to use is the following: &lt;string&gt;&lt;,&lt;string&gt;&gt;*
-If (&quot;,&quot;) is expected to be in one of the strings, it has to be escaped by a forward slash (&quot;\&quot;). &quot;null&quot; is accepted as a string and it means (a null object).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="notValue" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated (&quot;,&quot;) list of string representations of the method return value that is not expected (the execulsion set). The string representation of the value is expected &quot;not&quot; to be &quot;one&quot; of those in the list. The syntax to use is the following: &lt;string&gt;&lt;,&lt;string&gt;&gt;*
-If (&quot;,&quot;) is expected to be in one of the strings, it has to be escaped by a forward slash (&quot;\&quot;). &quot;null&quot; is accepted as a string and it means (a null object).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="method">
-      <annotation>
-         <documentation>
-            A method to call by reflection on the object. The method has a name and a value. The value could be described by its string representation (value &amp; notValue), or as an object &quot;value&quot; or &quot;notValue&quot;. 
-
-The rules of evaluation are as follows:
-
-1- The return value string has to be in the &quot;value&quot; string set.
-2- The return value string has to be not in the &quot;notValue&quot; string set.
-3- The return value object has to be in the &quot;value&quot; object set.
-4- The return value object has to be not in the &quot;notValue&quot; object set.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="value" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="notValue" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the method followed by an optional paramter set between paranthesis &quot;()&quot;. The parameter set can contain any number of string parameters (literals). other param types are not supported. The method name could contain nested calling separated by &quot;.&quot; The general format for this method name is : &lt;func(&lt;param&lt;,param&gt;*&gt;?).&lt;&lt;func(&lt;param&lt;,param&gt;*&gt;?)&gt;*
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated (&quot;,&quot;) list of string representations of the method return value. The string representation of the value is expected to be &quot;one&quot; of those in the list. The syntax to use is the following: &lt;string&gt;&lt;,&lt;string&gt;&gt;*
-If (&quot;,&quot;) is expected to be in one of the strings, it has to be escaped by a forward slash (&quot;\&quot;). &quot;null&quot; is accepted as a string and it means (a null object).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="notValue" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated (&quot;,&quot;) list of string representations of the method return value that is not expected (the execulsion set). The string representation of the value is expected &quot;not&quot; to be &quot;one&quot; of those in the list. The syntax to use is the following: &lt;string&gt;&lt;,&lt;string&gt;&gt;*
-If (&quot;,&quot;) is expected to be in one of the strings, it has to be escaped by a forward slash (&quot;\&quot;). &quot;null&quot; is accepted as a string and it means (a null object).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="value">
-      <annotation>
-         <documentation>
-            A descriptor of an object that represents a method&apos;s returned value. The descriptor can include an optional set of methods to call on the &quot;value&quot; object.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface that is assignable from or adaptable to the &quot;value&quot; object. The name could be followed (between paranthesis &quot;()&quot;) by the id of a plugin whose classloader is able to load that class. The finaly syntax is:
-className&lt;(plugin id)&gt;?
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="notValue">
-      <annotation>
-         <documentation>
-            A descriptor of an object that represents a method&apos;s returned value that is not required. The descriptor can include an optional set of methods to call on the &quot;notValue&quot; object.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface that is assignable from or adaptable to the &quot;value&quot; object. The name could be followed (between paranthesis &quot;()&quot;) by the id of a plugin whose classloader is able to load that class. The finaly syntax is:
-className&lt;(plugin id)&gt;?
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="context">
-      <annotation>
-         <documentation>
-            A context supported by the view provider which contains values for the different hint parameters needed to create views.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="viewClass">
-            <annotation>
-               <documentation>
-                  A fully qualified name of a view class from a list of different kinds of views createable by the view service that the provider can accept in this context. This field is an enumeration consisting of one of the following possible values:
-
-org.eclipse.gmf.runtime.notation.Node
-org.eclipse.gmf.runtime.notation.Diagram
-org.eclipse.gmf.runtime.notation.Edge
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="org.eclipse.gmf.runtime.notation.Node">
-                  </enumeration>
-                  <enumeration value="org.eclipse.gmf.runtime.notation.Diagram">
-                  </enumeration>
-                  <enumeration value="org.eclipse.gmf.runtime.notation.Edge">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-         <attribute name="elements" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated list of object ids (from the provider XML definition) that represents elements that this provider can accept for in this context.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="containerViews" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated list of object ids (from the provider XML definition) that represents container views that this provider can accept in this context.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="semanticHints" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated list of strings that represents semantic hints that this provider can accept in this context.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
- 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 
- &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/DiagramEditingDomainFactory.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/DiagramEditingDomainFactory.java
deleted file mode 100644
index 7700d2d..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/DiagramEditingDomainFactory.java
+++ /dev/null

@@ -1,355 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListener;
-import org.eclipse.emf.transaction.ResourceSetListenerImpl;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionChangeDescription;
-import org.eclipse.emf.transaction.TransactionalCommandStack;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.FilterManager;
-import org.eclipse.emf.transaction.impl.InternalTransaction;
-import org.eclipse.emf.transaction.impl.ReadWriteValidatorImpl;
-import org.eclipse.emf.transaction.impl.TransactionValidator;
-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
-import org.eclipse.emf.transaction.util.ConditionalRedoCommand;
-import org.eclipse.emf.transaction.util.TriggerCommand;
-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
-import org.eclipse.emf.workspace.impl.WorkspaceCommandStackImpl;
-import org.eclipse.gmf.runtime.diagram.core.internal.listener.NotationSemProc;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-
-
-/**
- * Factory for {@link TransactionalEditingDomain}s that are properly configured
- * to support a GMF diagram application. This factory should be preferred over
- * the {@link GMFEditingDomainFactory} because it attaches a listener required
- * to update the notation model after changes to the semantic model. Also, it
- * handles special use cases involving the DiagramEventBroker.
- * 
- * @author cmahoney
- */
-public class DiagramEditingDomainFactory
-    extends GMFEditingDomainFactory {
-	
-	protected static class DiagramEditingDomain extends TransactionalEditingDomainImpl {
-		// The following variable acts as a special latch for the DiagramEventBroker
-		//  listener so that we can allow it to execute in a write transaction context
-		//  while handling a post-commit event.
-		private InternalTransaction originatingTransaction = null;
-		private DiagramEventBroker deb = null;
-		private ResourceSetListener debWrapper = null;
-		
-		public void addResourceSetListener(ResourceSetListener l) {
-			if (DiagramEventBroker.class.isInstance(l)) {
-				assert deb == null;
-				deb = (DiagramEventBroker)l;
-				debWrapper = new ResourceSetListenerImpl() {
-					public boolean isAggregatePrecommitListener() {
-						return deb.isAggregatePrecommitListener();
-					}
-					
-					public boolean isPrecommitOnly() {
-						return true;
-					}
-					
-					public Command transactionAboutToCommit(ResourceSetChangeEvent event)
-						throws RollbackException {
-						return deb.transactionAboutToCommit(event);
-					}
-					
-					public void resourceSetChanged(ResourceSetChangeEvent event) {
-						deb.resourceSetChanged(event);
-					}
-					
-					public NotificationFilter getFilter() {
-						return deb.getFilter();
-					}
-					
-					public boolean isPostcommitOnly() {
-						return false;
-					}
-				};
-				
-				super.addResourceSetListener(debWrapper);
-			} else {
-				super.addResourceSetListener(l);
-			}
-		}
-		
-		public void removeResourceSetListener(ResourceSetListener l) {
-			if (DiagramEventBroker.class.isInstance(l)) {
-				assert deb != null;
-				deb = null;
-				super.removeResourceSetListener(debWrapper);
-				debWrapper = null;
-			} else {
-				super.removeResourceSetListener(l);
-			}
-		}
-		
-		public DiagramEditingDomain(AdapterFactory adapterFactory, ResourceSet resourceSet) {
-			super(adapterFactory, resourceSet);
-		}
-
-		public DiagramEditingDomain(AdapterFactory adapterFactory, TransactionalCommandStack stack, ResourceSet resourceSet) {
-			super(adapterFactory, stack, resourceSet);
-		}
-
-		public DiagramEditingDomain(AdapterFactory adapterFactory, TransactionalCommandStack stack) {
-			super(adapterFactory, stack);
-		}
-
-		public DiagramEditingDomain(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
-		
-		public void precommit(InternalTransaction tx) throws RollbackException {
-			super.precommit(tx);
-			
-			if ((tx.getParent() == null) && (deb != null)) {
-				// ensure that when the top-level transaction commits, it
-				//    has a self-chaining composite command as a trigger to
-				//    insert the DiagramEventBroker's post-commit changes into,
-				//    so that the transaction's change description and any other
-				//    AbstractEMFOperation will get the changes automatically
-				Command existingTriggers = tx.getTriggers();
-				if (existingTriggers instanceof CompoundCommand) {
-					// nothing to do:  already a self-chaining command
-				} else if (existingTriggers != null) {
-					// force it to be a compound by appending a no-op
-					tx.addTriggers(NOOP_TRIGGER);
-				} else {
-					// no triggers, yet?  have to add *two* no-ops
-					tx.addTriggers(NOOP_TRIGGER);
-					tx.addTriggers(NOOP_TRIGGER);
-				}
-			}
-		}
-		
-		public void broadcastUnbatched(Notification notification) {
-            super.broadcastUnbatched(notification);
-            final ResourceSetChangeEvent unbatchedChangeEvent =
-                new ResourceSetChangeEvent(this, null, Collections.singletonList(notification));
-            try {
-            runExclusive(new Runnable() {
-                public void run() {
-                    try {
-                        if (deb!=null)
-                            deb.resourceSetChanged(unbatchedChangeEvent);
-                    }catch (Exception e) {
-                        // do nothing for now  
-                    }
-                }});
-            } catch (InterruptedException e) {
-                // do ntohing for now
-            }
-        }
-
-        protected void postcommit(InternalTransaction tx) {
-			try {
-				List notifications = getValidator().getNotificationsForPostcommit(tx);
-				
-				if (deb != null && notifications != null && !notifications.isEmpty()) {	
-					TransactionValidator originalValidator = null;
-					
-					// Set the latch if it has not yet been set
-					if (originatingTransaction == null) {
-						originatingTransaction = tx;
-						originalValidator = getValidator();
-						setValidator(new ReadWriteValidatorImpl());
-					} else {
-						// In this case we must copy over the notifications and change
-						//  descriptions to the originatingTransaction.  Do this
-						//  as a "late trigger command" because the trigger
-						//  mechanism is already understood by some of the
-						//  operations that need to undo/redo these changes
-						originatingTransaction.addTriggers(new TriggerCommand(
-								Collections.singletonList(
-										new DiagramEventBrokerCommand(
-												tx.getChangeDescription()))));
-						originatingTransaction.getNotifications().addAll(notifications);
-					}
-					
-					try {
-						ArrayList cache = new ArrayList(notifications.size());
-						
-						List filtered = FilterManager.getInstance().select(
-							notifications,
-							deb.getFilter(),
-							cache);
-						
-						HashMap options = new HashMap(originatingTransaction.getOptions());
-						options.put(Transaction.OPTION_NO_UNDO, Boolean.FALSE);
-						InternalTransaction newTx = startTransaction(false, options);
-						deb.resourceSetChanged(
-							new ResourceSetChangeEvent(
-								this,
-								tx,
-								filtered));
-
-						newTx.commit();
-					} catch (RollbackException e) {
-						// Do nothing in the rollback case, we have no change descriptions
-						//  or notifications to propagate.
-					} finally {
-						// Undo the latch if we are top-most in the recursion.
-						if (originatingTransaction == tx) {
-							originatingTransaction = null;
-							getValidator().dispose();
-							setValidator(originalValidator);
-						}
-					}
-				}
-			} catch (InterruptedException e) {
-				// Simply fall-through in this case and allow the post commit listeners
-				//  to be notified.
-			}
-			
-			// We will only call super on the top-most in the recursion.
-			if (originatingTransaction == null) {
-				super.postcommit(tx);
-			}
-		}
-	}
-	
-	private static class DiagramEventBrokerCommand
-			extends AbstractCommand
-			implements ConditionalRedoCommand {
-		private final TransactionChangeDescription change;
-		
-		DiagramEventBrokerCommand(TransactionChangeDescription change) {
-			this.change = change;
-		}
-		
-		protected boolean prepare() {
-			return true;
-		}
-		
-		public final void execute() {
-			// never executed
-		}
-
-		public boolean canUndo() {
-			return (change != null) && change.canApply();
-		}
-		
-		public final void undo() {
-			if (change != null) {
-				change.applyAndReverse();
-			}
-		}
-		
-		public boolean canRedo() {
-			return (change != null) && change.canApply();
-		}
-		
-		public final void redo() {
-			if (change != null) {
-				change.applyAndReverse();
-			}
-		}
-	}
-	
-	static final TriggerCommand NOOP_TRIGGER = new TriggerCommand(
-			Collections.singletonList(new AbstractCommand() {
-				protected boolean prepare() { return true; }
-				public void execute() {}
-				public boolean canUndo() { return true;	}
-				// this command does not need to implement canRedo() because it
-				//    is assumed to be redoable, anyway, which is what we want
-				public void undo() {}
-				public void redo() {}}));
-	
-    /**
-     * The single shared instance of the GMF diagram editing domain factory.
-     */
-    private static DiagramEditingDomainFactory instance = new DiagramEditingDomainFactory();
-
-    /**
-     * Gets the single shared instance of the GMF diagram editing domain factory.
-     * 
-     * @return the editing domain factory
-     */
-    public static WorkspaceEditingDomainFactory getInstance() {
-        return instance;
-    }  
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory#configure(org.eclipse.emf.transaction.TransactionalEditingDomain)
-     */
-    protected void configure(TransactionalEditingDomain domain) {
-        super.configure(domain);
-        domain.addResourceSetListener(new NotationSemProc());
-    }
-
-    public TransactionalEditingDomain createEditingDomain() {
-		TransactionalEditingDomain result = createEditingDomain(OperationHistoryFactory.getOperationHistory());
-		configure(result);
-		return result;
-    }
-    
-    public TransactionalEditingDomain createEditingDomain(IOperationHistory history) {
-		WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
-		
-		TransactionalEditingDomain result = new DiagramEditingDomain(
-			new ComposedAdapterFactory(
-				ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
-			stack);
-		
-		mapResourceSet(result);
-		
-		configure(result);
-		return result;
-    }
-    
-    public TransactionalEditingDomain createEditingDomain(ResourceSet rset) {
-		TransactionalEditingDomain result = createEditingDomain(
-			rset,
-			OperationHistoryFactory.getOperationHistory());
-		configure(result);
-		return result;
-    }
-    
-    public TransactionalEditingDomain createEditingDomain(ResourceSet rset, IOperationHistory history) {
-		WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
-		
-		TransactionalEditingDomain result = new DiagramEditingDomain(
-			new ComposedAdapterFactory(
-				ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
-			stack,
-			rset);
-		
-		mapResourceSet(result);
-		configure(result);
-		return result;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/AddCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/AddCommand.java
deleted file mode 100644
index 6feb9bd..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/AddCommand.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A command to add a view to a another view at a given index
- * 
- * @author melaasar
- */
-public class AddCommand extends AbstractTransactionalCommand {
-
-	private IAdaptable parent;
-	private IAdaptable child;
-	private int index;
-
-	/**
-     * Creates a new <code>AddCommand</code>
-     * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param parent
-     *            The parent view adapter
-     * @param child
-     *            The child view adapter
-     */
-	public AddCommand(TransactionalEditingDomain editingDomain, IAdaptable parent, IAdaptable child) {
-		this(editingDomain, parent, child, ViewUtil.APPEND);
-	}
-	
-	/**
-	 * Creates a new <code>AddCommand</code>
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param parent The parent view adapter
-	 * @param child The child view adapter
-	 * @param index the child insertion index
-	 */
-	public AddCommand(TransactionalEditingDomain editingDomain, IAdaptable parent, IAdaptable child, int index) {
-		super(editingDomain,
-            DiagramCoreMessages.AddCommand_Label, null);
-        assert null != parent : "Null parent in AddCommand";//$NON-NLS-1$
-		assert null != child : "Null child in AddCommand";//$NON-NLS-1$		
-		this.parent = parent;
-		this.child = child;
-		this.index = index;
-	}
-    
-    public List getAffectedFiles() {
-        View view = (View) parent.getAdapter(View.class);
-        
-        if (view != null) {
-            List result = new ArrayList();
-            IFile file = WorkspaceSynchronizer.getFile(view.eResource());
-            
-            if (file != null) {
-                result.add(file);
-            }
-            return result;
-        }
-        
-        return super.getAffectedFiles();
-    }
-
-	/** 
-	 * executes the command; which will get the child and the containaer from
-	 * the <code>IAdaptable<code> and then insert the child at the given index
-	 * in the containers child list.
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-            IAdaptable info)
-        throws ExecutionException {
-        
-		View childView = (View) child.getAdapter(View.class);
-		View parentView = (View) parent.getAdapter(View.class);
-		if (index==ViewUtil.APPEND)
-			parentView.insertChild(childView);
-		else
-			parentView.insertChildAt(childView, index);
-		return CommandResult.newOKCommandResult();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.command.ICommand#getLabel()
-	 */
-	public String getLabel() {
-		return DiagramCoreMessages.AddCommand_Label;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/CreateDiagramCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/CreateDiagramCommand.java
deleted file mode 100644
index 3f5bf14..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/CreateDiagramCommand.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramStatusCodes;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * Creates a diagram
- *
- * @author schafe
- */
-public class CreateDiagramCommand
-	extends AbstractTransactionalCommand {
-
-	private final String _diagramType;
-
-	private EObject _semanticContext;
-	
-	private PreferencesHint _preferencesHint;
-
-	/**
-	 * creates a create diagram command.
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label command label
-	 * @param anElementContext semantic element to contain the diagram
-	 * @param aDiagramKindType diagram type ID
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 */
-	public CreateDiagramCommand(TransactionalEditingDomain editingDomain, String label, EObject anElementContext,
-		String aDiagramKindType, PreferencesHint preferencesHint) {
-		super(editingDomain, label, null);
-		assert null != anElementContext: "Null element context in CreateDiagramCommand";//$NON-NLS-1$		
-		_semanticContext = anElementContext;
-		_diagramType = aDiagramKindType;
-		_preferencesHint = preferencesHint;
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		// Create the new diagram element
-		//IElementCollection contents = getOwnedDiagramCollection(createOwningElement(progressMonitor));
-		Diagram diagram = ViewService.getInstance().createDiagram(
-			new EObjectAdapter(getSemanticContext()), getDiagramType(), getPreferencesHint());
-        int severity = IStatus.OK;
-        if (diagram==null)
-            severity = IStatus.ERROR;
-		return new CommandResult(new Status(severity, getPluginId(),
-			DiagramStatusCodes.OK, StringStatics.BLANK, null), diagram);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.command.AbstractCommand2#getPluginId()
-	 */
-	protected String getPluginId() {
-		return DiagramPlugin.getPluginId();
-	}
-
-	/**
-	 * gives access to the diagram type.
-	 * @return DiagramKind diagramType
-	 */
-	protected String getDiagramType() {
-		return _diagramType;
-	}
-
-	/**
-	 * gives access to the semantic context
-	 * @return the semantic context
-	 */
-	protected EObject getSemanticContext() {
-		return _semanticContext;
-
-	}
-
-	/**
-	 * Gets the preferences hint that is to be used to find the appropriate
-	 * preference store from which to retrieve diagram preference values. The
-	 * preference hint is mapped to a preference store in the preference
-	 * registry <@link DiagramPreferencesRegistry>.
-	 * 
-	 * @return the preferences hint
-	 */
-	protected PreferencesHint getPreferencesHint() {
-		return _preferencesHint;
-
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/DeleteCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/DeleteCommand.java
deleted file mode 100644
index 5451597..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/DeleteCommand.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Deletes a view.  The views affected connections are also deleted if
- * it is a primary view.
- * @author melaasar
- */
-public class DeleteCommand extends AbstractTransactionalCommand {
-
-	private View view;
-
-	/**
-	 * Creates a new Delete command
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param view
-	 */
-	public DeleteCommand(TransactionalEditingDomain editingDomain, View view) {
-		super(editingDomain, DiagramCoreMessages.DeleteCommand_Label,
-            getWorkspaceFiles(view));
-        this.view = view;
-	}
-    
-    /**
-     * Creates a new Delete command. Derives the editing domain from the
-     * <code>view</code>.
-     * 
-     * @param view
-     */
-    public DeleteCommand(View view) {
-        this(TransactionUtil.getEditingDomain(view), view);
-    }
-
-	/**
-	 * getter for the View that will be deleted
-	 * @return the view to be deleted
-	 */
-	protected View getView() {
-		return view;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.command.AbstractCommand2#doExecute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		ViewUtil.destroy(view);
-		return CommandResult.newOKCommandResult();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/RemoveBookmarkCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/RemoveBookmarkCommand.java
deleted file mode 100644
index a86e6d1..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/RemoveBookmarkCommand.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.core.commands;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramDebugOptions;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-
-/**
- * Removes all bookmark(s) of a supplied object.
- * 
- * @author satif
- */
-public class RemoveBookmarkCommand extends AbstractTransactionalCommand {
-	
-	private Set bookmarks;
-	
-	/**
-	 * constructor
-	 * 
-     * @param editingDomain 	the editing domain
-	 * @param label 			the command label
-	 * @param bookmarks			the <code>Set</code> of <code>IMarker</code>s to delete
-	 */
-	public RemoveBookmarkCommand(TransactionalEditingDomain editingDomain, String label, Set bookmarks) {
-		super(editingDomain, label, null);
-		this.bookmarks = bookmarks;	
-	}
-
-	/**
-	 * Deletes the <code>Set</code> of bookmarks 
-	 */
-	protected void deleteBookmarks() {
-		if (getBookmarkedObjects() == null) 
-			return;
-		
-		Iterator iterBookmarks = getBookmarkedObjects().iterator();
-		
-		while (iterBookmarks.hasNext()) {
-			Object oBookmark = iterBookmarks.next();
-			
-			if (oBookmark instanceof IMarker) {
-				try {
-					((IMarker)oBookmark).delete();
-				} catch (CoreException e) {
-					Trace.catching(DiagramPlugin.getInstance(), DiagramDebugOptions.EXCEPTIONS_CATCHING, 
-							getClass(), "deleteBookmarks", e); //$NON-NLS-1$
-					Log.error(DiagramPlugin.getInstance(), IStatus.ERROR, "deleteBookmarks"); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) 
-		throws ExecutionException {
-		
-		deleteBookmarks();
-		
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * @return <code>Set</code> of bookmarks to be deleted.
-	 */
-	public Set getBookmarkedObjects() {
-		return bookmarks;
-	}
-
-	/**
-	 * @param bookmarks set the <code>Set</code> of bookmarks to be deleted.
-	 */
-	public void setBookmarkedObjects(Set bookmarks) {
-		this.bookmarks = bookmarks;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetConnectionAnchorsCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetConnectionAnchorsCommand.java
deleted file mode 100644
index fd1c612..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetConnectionAnchorsCommand.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.IdentityAnchor;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Sets a connections end points.
- * 
- * @author melaasar
- * 
- */
-public class SetConnectionAnchorsCommand
-	extends AbstractTransactionalCommand {
-
-	private IAdaptable edgeAdaptor;
-
-	private String newSourceTerminal;
-
-	private String newTargetTerminal;
-
-	/**
-	 * constructor
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label
-	 *            the command label
-	 */
-	public SetConnectionAnchorsCommand(TransactionalEditingDomain editingDomain, String label) {
-		super(editingDomain, label, null);
-	}
-
-	public List getAffectedFiles() {
-		View view = (View) edgeAdaptor.getAdapter(View.class);
-		if (view != null)
-			return getWorkspaceFiles(view);
-		return super.getAffectedFiles();
-	}
-
-	/**
-	 * gets the edge adaptor.
-	 * 
-	 * @return IAdaptable the edge adapter
-	 */
-	public IAdaptable getEdgeAdaptor() {
-		return edgeAdaptor;
-	}
-
-	/**
-	 * gets for the new source terminal.
-	 * 
-	 * @return String the newSourceTerminal.
-	 */
-	public String getNewSourceTerminal() {
-		return newSourceTerminal;
-	}
-
-	/**
-	 * gets for the new target terminal.
-	 * 
-	 * @return String the newTargetTerminal
-	 */
-	public String getNewTargetTerminal() {
-		return newTargetTerminal;
-	}
-
-	/**
-	 * Sets the edge adaptor.
-	 * 
-	 * @param edgeAdaptor
-	 *            The edgeAdaptor to set
-	 */
-	public void setEdgeAdaptor(IAdaptable edgeAdaptor) {
-		this.edgeAdaptor = edgeAdaptor;
-	}
-
-	/**
-	 * Sets the new source terminal.
-	 * 
-	 * @param newSourceTerminal
-	 *            The new source terminal to set
-	 */
-	public void setNewSourceTerminal(String newSourceTerminal) {
-		this.newSourceTerminal = newSourceTerminal;
-	}
-
-	/**
-	 * Sets the new target terminal.
-	 * 
-	 * @param newTargetTerminal
-	 *            The new target terminal to set
-	 */
-	public void setNewTargetTerminal(String newTargetTerminal) {
-		this.newTargetTerminal = newTargetTerminal;
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		assert null != edgeAdaptor : "Null child in SetConnectionAnchorsCommand";//$NON-NLS-1$		
-
-		Edge edge = (Edge) getEdgeAdaptor().getAdapter(Edge.class);
-		assert null != edge : "Null edge in SetConnectionAnchorsCommand";//$NON-NLS-1$		
-
-		if (getNewSourceTerminal() != null) {
-			if (getNewSourceTerminal().length() == 0)
-				edge.setSourceAnchor(null);
-			else {
-				IdentityAnchor a = (IdentityAnchor) edge.getSourceAnchor();
-				if (a == null)
-					a = NotationFactory.eINSTANCE.createIdentityAnchor();
-				a.setId(getNewSourceTerminal());
-				edge.setSourceAnchor(a);
-			}
-		}
-		if (getNewTargetTerminal() != null) {
-			if (getNewTargetTerminal().length() == 0)
-				edge.setTargetAnchor(null);
-			else {
-				IdentityAnchor a = (IdentityAnchor) edge.getTargetAnchor();
-				if (a == null)
-					a = NotationFactory.eINSTANCE.createIdentityAnchor();
-				a.setId(getNewTargetTerminal());
-				edge.setTargetAnchor(a);
-			}
-
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetConnectionEndsCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetConnectionEndsCommand.java
deleted file mode 100644
index c84149e..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetConnectionEndsCommand.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Command that sets a connections end points.
- * 
- * @author melaasar
- * 
- */
-public class SetConnectionEndsCommand
-	extends AbstractTransactionalCommand {
-
-	private IAdaptable edgeAdaptor;
-
-	private IAdaptable newSourceAdaptor;
-
-	private IAdaptable newTargetAdaptor;
-
-	/**
-	 * constructor
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label
-	 *            the command label
-	 */
-	public SetConnectionEndsCommand(TransactionalEditingDomain editingDomain, String label) {
-		super(editingDomain, label, null);
-	}
-
-	public List getAffectedFiles() {
-		View view = (View) edgeAdaptor.getAdapter(View.class);
-		if (view != null)
-			return getWorkspaceFiles(view);
-		return super.getAffectedFiles();
-	}
-
-	/**
-	 * gets the edge adaptor.
-	 * 
-	 * @return the edge adapter
-	 */
-	public IAdaptable getEdgeAdaptor() {
-		return edgeAdaptor;
-	}
-
-	/**
-	 * gets the new source adaptor.
-	 * 
-	 * @return new source adaptor.
-	 */
-	public IAdaptable getNewSourceAdaptor() {
-		return newSourceAdaptor;
-	}
-
-	/**
-	 * gets the new target adaptor.
-	 * 
-	 * @return the new target adaptor.
-	 */
-	public IAdaptable getNewTargetAdaptor() {
-		return newTargetAdaptor;
-	}
-
-	/**
-	 * Sets the edge adaptor.
-	 * 
-	 * @param edgeAdaptor
-	 *            the edgeAdaptor to set
-	 */
-	public void setEdgeAdaptor(IAdaptable edgeAdaptor) {
-		this.edgeAdaptor = edgeAdaptor;
-	}
-
-	/**
-	 * Sets the new source adaptor.
-	 * 
-	 * @param newSourceAdaptor
-	 *            The newSourceAdaptor to set
-	 */
-	public void setNewSourceAdaptor(IAdaptable newSourceAdaptor) {
-		this.newSourceAdaptor = newSourceAdaptor;
-	}
-
-	/**
-	 * Sets the new target adaptor.
-	 * 
-	 * @param newTargetAdaptor
-	 *            The newTargetAdaptor to set
-	 */
-	public void setNewTargetAdaptor(IAdaptable newTargetAdaptor) {
-		this.newTargetAdaptor = newTargetAdaptor;
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		assert null != edgeAdaptor : "Null child in SetConnectionEndsCommand";//$NON-NLS-1$
-
-		Edge edge = (Edge) getEdgeAdaptor().getAdapter(Edge.class);
-		assert null != edge : "Null edge in SetConnectionEndsCommand";//$NON-NLS-1$
-
-		if (getNewSourceAdaptor() != null) {
-			View newSourceView = (View) getNewSourceAdaptor().getAdapter(
-				View.class);
-			edge.setSource(newSourceView);
-		}
-		if (getNewTargetAdaptor() != null) {
-			View newTargetView = (View) getNewTargetAdaptor().getAdapter(
-				View.class);
-			edge.setTarget(newTargetView);
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetPropertyCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetPropertyCommand.java
deleted file mode 100644
index 077eb50..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetPropertyCommand.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.commands;
-
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * A command to a set a property of a view
- *  
- * @author melaasar
- */
-public class SetPropertyCommand extends AbstractTransactionalCommand {
-
-	static final private String CHANGE_PROPERTY_PATTERN = DiagramCoreMessages.Command_ChangeViewProperty_ChangePropertyPattern; 
-
-	private IAdaptable viewAdapter;
-	private String propertyName;
-	private String propertyId;
-	private Object newValue;
-
-	/**
-	 * Creates a set property command with a given label
-     * @param editingDomain the editing domain
-	 * @param label the command label
-	 * @param viewAdapter	the view adapter of the <code>View<code> that owns the property
-	 * @param propertyId	the property Id of the property to set
-	 * @param newValue		the new value of the property
-	 */
-	public SetPropertyCommand(TransactionalEditingDomain editingDomain, String label,
-            IAdaptable viewAdapter, String propertyId, Object newValue) {
-		super(editingDomain, label, null);
-		this.viewAdapter = viewAdapter;
-		this.propertyId = propertyId;
-		this.newValue = newValue;
-	}
-	
-	/**
-	 * Creates a set property command with a default label based on property name
-	 * @param editingDomain the editing domain
-	 * @param viewAdapter	the view adapter of the <code>View<code> that owns the property
-	 * @param propertyId	the property Id of the property to set
-	 * @param propertyName  the property name 
-	 * @param newValue		the new value of the property
-	 */
-	public SetPropertyCommand(TransactionalEditingDomain editingDomain, IAdaptable viewAdapter, String propertyId, String propertyName, Object newValue) {
-		this(editingDomain, null, viewAdapter, propertyId, newValue);
-		this.propertyName = propertyName;
-	}
-
-	public List getAffectedFiles() {
-
-		if (viewAdapter != null) {
-			View view = (View) viewAdapter.getAdapter(View.class);
-			if (view != null)
-				return getWorkspaceFiles(view);
-		}
-		return super.getAffectedFiles();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.command.ICommand#getLabel()
-	 */
-	public String getLabel() {
-		String label = super.getLabel();
-		return (label != null) ? label
-			: (NLS.bind(CHANGE_PROPERTY_PATTERN, propertyName));
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		View view = (View) viewAdapter.getAdapter(View.class);
-		if (view != null){
-			ENamedElement namedElement =  PackageUtil.getElement(propertyId);
-			if (namedElement instanceof EStructuralFeature)
-				ViewUtil.setStructuralFeatureValue(view,(EStructuralFeature)namedElement, newValue);
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * Returns the new value of the property.
-	 * @return the new value
-	 */
-	protected Object getNewValue() {
-		return newValue;
-	}
-
-	/**
-	 * Returns the property Id.
-	 * @return property Id
-	 */
-	protected Object getPropertyId() {
-		return propertyId;
-	}
-
-	/**
-	 * Returns the view Adapter that owns the property.
-	 * @return the view adapter
-	 */
-	protected IAdaptable getViewAdapter() {
-		return viewAdapter;
-	}
-
-	/**
-	 * Gets the property name
-	 * @return the property name
-	 */
-	protected String getPropertyName() {
-		return propertyName;
-	}
-
-	/**
-	 * Sets the newValue that will be set for the property.
-	 * @param newValue The newValue to set
-	 */
-	protected void setNewValue(Object newValue) {
-		this.newValue = newValue;
-	}
-
-	/**
-	 * Sets the propertyId of the property.
-	 * @param propertyId The propertyId to set
-	 */
-	protected void setPropertyId(String propertyId) {
-		this.propertyId = propertyId;
-	}
-
-	/**
-	 * Sets the viewAdapter that owns the property.
-	 * @param viewAdapter The viewAdapter to set
-	 */
-	protected void setViewAdapter(IAdaptable viewAdapter) {
-		this.viewAdapter = viewAdapter;
-	}
-
-	/**
-	 * Sets the property name
-	 * @param string the property name
-	 */
-	protected void setPropertyName(String string) {
-		propertyName = string;
-	}
-    
-    /**
-     * Returns the value of the feature of the property
-     * @param view the view to use to get the value
-     * @param feature the feature to use
-     * @return the value of the property, or <code>null</code>
-     */
-    protected EStructuralFeature getPropertyStructuralFeature() {
-        if (getPropertyId() instanceof String) {
-            ENamedElement namedElement = PackageUtil
-                .getElement((String) getPropertyId());
-            if (namedElement instanceof EStructuralFeature) {
-                return (EStructuralFeature) namedElement;
-            }
-        }
-        return null;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/package.html
deleted file mode 100644
index 03f65cf..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>this package contains all the supported commands by the diagram layer</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/CreateElementRequestAdapter.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/CreateElementRequestAdapter.java
deleted file mode 100644
index 462ea35..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/CreateElementRequestAdapter.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.edithelpers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.IProxyEObject;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-/**
- * Descriptor for a create element request that can adapt to the request type,
- * the container element and the element type to be created.
- * 
- * @author ldamus
- */
-public class CreateElementRequestAdapter
-	implements IAdaptable, IProxyEObject {
-
-	/**
-	 * The request to create a new element.
-	 */
-	private final CreateElementRequest createElementRequest;
-
-	/**
-	 * Constructs a new adapter.
-	 * 
-	 * @param createElementRequest
-	 *            the request to create a new element.
-	 */
-	public CreateElementRequestAdapter(CreateElementRequest createElementRequest) {
-
-		assert null != createElementRequest : "Null createElementRequest not supported in CreateElementRequestAdapter";//$NON-NLS-1$
-
-		this.createElementRequest = createElementRequest;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.isInstance(createElementRequest)) {
-			return createElementRequest;
-		}
-
-		if (adapter.isInstance(getNewElement())) {
-			return getNewElement();
-		}
-		if (adapter.isInstance(getElementType())) {
-			return getElementType();
-		}
-		if (adapter.isInstance(this)) {
-			return this;
-		}
-		
-		return Platform.getAdapterManager().getAdapter(createElementRequest, adapter);
-	}
-
-	/**
-	 * Gets the new element that has been created in response to this request.
-	 * 
-	 * @return the new element
-	 */
-	private EObject getNewElement() {
-		return createElementRequest.getNewElement();
-	}
-
-	/**
-	 * Gets the element type for the new element.
-	 * 
-	 * @return the element typeO
-	 */
-	private IElementType getElementType() {
-		return createElementRequest.getElementType();
-	}
-
-	/**
-	 * Sets the new element that has been created in response to this request.
-	 * @param newElement the new element
-	 */
-	public void setNewElement(EObject newElement) {
-		createElementRequest.setNewElement(newElement);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.core.internal.util.IProxyEObject#getProxyClassID()
-	 */
-	public Object getProxyClassID() {
-		return getNewElement() == null ? null
-			: PackageUtil.getID(EMFCoreUtil.getProxyClass(getNewElement()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.core.internal.util.IProxyEObject#resolve()
-	 */
-	public EObject resolve() {
-		return getNewElement() == null ? null
-			: EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(createElementRequest.getContainer()), getNewElement()); 
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/NotationViewDependentsAdvice.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/NotationViewDependentsAdvice.java
deleted file mode 100644
index ead45a0..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/NotationViewDependentsAdvice.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.edithelpers;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Edit helper advice for the {@link DestroyDependentsRequest} that destroys
- * notations views under the following circumstances:
- * <ul>
- *   <li>element being destroyed is the view's semantic referent</li>
- *   <li>element being destroyed is a Node or Edge to which an Edge is connected</li>
- * </ul>
- *
- * @author Christian W. Damus (cdamus)
- */
-public class NotationViewDependentsAdvice extends AbstractEditHelperAdvice {
-
-	public ICommand getBeforeEditCommand(IEditCommandRequest request) {
-		if (request instanceof DestroyDependentsRequest) {
-			return getBeforeDestroyDependentsCommand((DestroyDependentsRequest) request);
-		}
-		return null;
-	}
-	
-	public ICommand getAfterEditCommand(IEditCommandRequest request) {		
-		return null;
-	}
-	
-	protected ICommand getBeforeDestroyDependentsCommand(
-			DestroyDependentsRequest request) {
-		
-		EObject destructee = request.getElementToDestroy();
-		CrossReferenceAdapter crossReferenceAdapter = getCrossReferenceAdapter(request, destructee);
-		ICommand result = getDestroyDependentsCommand(destructee, request,
-				NotationPackage.Literals.VIEW__ELEMENT, crossReferenceAdapter);
-		// handle the node entries for views
-		if (destructee instanceof View) {
-			result = CompositeCommand.compose(result, getDestroyDependentsCommand(destructee, request,
-				NotationPackage.Literals.NODE_ENTRY__KEY, crossReferenceAdapter));
-
-			//  handle the edges connected to nodes or other edges        
-			if (destructee instanceof Node || destructee instanceof Edge) {
-				View view = (View) destructee;
-
-				if (view.eIsSet(NotationPackage.Literals.VIEW__SOURCE_EDGES)) {
-					result = CompositeCommand.compose(result, request
-						.getDestroyDependentsCommand(view.getSourceEdges()));
-				}
-				if (view.eIsSet(NotationPackage.Literals.VIEW__TARGET_EDGES)) {
-					result = CompositeCommand.compose(result, request
-						.getDestroyDependentsCommand(view.getTargetEdges()));
-				}
-			}			
-		}
-		return result;
-	}
-	
-	private CrossReferenceAdapter getCrossReferenceAdapter(
-			DestroyDependentsRequest request, EObject destructee) {
-		
-		CrossReferenceAdapter crossReferenceAdapter = null;
-		Map cacheMaps = (Map) request.getParameter("Cache_Maps");//$NON-NLS-1$ RequestCacheEntries.Cache_Maps
-		if (cacheMaps != null) {
-			crossReferenceAdapter = (CrossReferenceAdapter) cacheMaps
-					.get("CrossRefAdapter");//$NON-NLS-1$ RequestCacheEntries.CrossRefAdapter
-		}
-
-		if (crossReferenceAdapter == null) {
-			crossReferenceAdapter = CrossReferenceAdapter
-					.getExistingCrossReferenceAdapter(destructee);
-			if (crossReferenceAdapter == null) {
-				TransactionalEditingDomain domain = TransactionUtil
-						.getEditingDomain(destructee);
-				if (domain != null) {
-					crossReferenceAdapter = CrossReferenceAdapter
-							.getCrossReferenceAdapter(domain.getResourceSet());
-				}
-			}
-		}
-		return crossReferenceAdapter;
-	}
-	
-	
-	private ICommand getDestroyDependentsCommand(EObject destructee,
-			DestroyDependentsRequest request, EReference eRef, CrossReferenceAdapter crossReferenceAdapter) {
-		
-		if (crossReferenceAdapter != null) {
-			Collection revRefs = crossReferenceAdapter
-				.getNonNavigableInverseReferences(destructee);
-			if (revRefs.isEmpty() == false) {
-				Set set = null;
-				Iterator it = revRefs.iterator();
-				while (it.hasNext()) {
-					Setting setting = (Setting) it.next();
-					if (setting.getEStructuralFeature() == eRef) {
-						if (set == null) {
-							set = new HashSet();
-						}
-						set.add(setting.getEObject());
-					}
-				}
-
-				if (set != null) {
-					return request.getDestroyDependentsCommand(set);
-				}
-			}
-		}
-
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/RemoveBookmarksAdvice.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/RemoveBookmarksAdvice.java
deleted file mode 100644
index d3ec1c8..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/RemoveBookmarksAdvice.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.core.edithelpers;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.resources.IBookmark;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.commands.RemoveBookmarkCommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramDebugOptions;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Edit helper advice that provides commands to remove associated bookmarks 
- * of all dependents as well as the main destructee.
- * 
- * @author satif
- */
-
-public class RemoveBookmarksAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * @param bookmarkedObject	the <code>EObject</code> to retrieve bookmarks for
-	 * @param fileResourceMap cache of EResource to IFile (avoids repeatedly finding IFile for EResource)
-	 * @return <code>Set</code> of <code>IMarker</code>s related to the <b>bookmarkedObject</b>
-	 */
-	private Set gatherSingleBookmark(EObject bookmarkedObject, Map fileResourceMap) {
-		Resource eResource = null;
-		
-		if (bookmarkedObject == null || (eResource = bookmarkedObject.eResource()) == null)
-			return null;
-		
-		IResource resource = null;
-		
-		if (fileResourceMap.containsKey(eResource))
-			resource = (IFile)fileResourceMap.get(eResource);
-		else {
-			resource = WorkspaceSynchronizer.getFile(eResource);
-			fileResourceMap.put(eResource, resource);
-		}
-		
-		if (resource == null)
-			return null;
-		
-		String elementID = ((XMLResource)eResource).getID(bookmarkedObject);
-		
-		IMarker[] bookmarks = null;
-		
-		try {
-			bookmarks = resource.findMarkers(IBookmark.TYPE, true,
-				IResource.DEPTH_INFINITE);
-		} catch (CoreException e) {
-			Trace.catching(DiagramPlugin.getInstance(), DiagramDebugOptions.EXCEPTIONS_CATCHING, 
-					getClass(), "gatherSingleBookmark", e); //$NON-NLS-1$
-			Log.error(DiagramPlugin.getInstance(), IStatus.ERROR, "gatherSingleBookmark"); //$NON-NLS-1$
-		}
-		Assert.isNotNull(bookmarks);
-		
-		Set retSet = new HashSet();
-
-		for (int i = 0; i < bookmarks.length; i++) {
-			
-			IMarker bookmark = bookmarks[i];
-			
-			String bookmarkElementID = bookmark.getAttribute(IBookmark.ELEMENT_ID,StringStatics.BLANK);
-			
-			if (elementID.equals(bookmarkElementID))				
-				retSet.add(bookmark);
-		}
-		
-		return retSet;
-	}
-	
-	/**
-	 * @param bookmarkedObjects the <code>Set</code> of <code>EObject</code>s to retrieve bookmarks for
-	 * @param fileResourceMap cache of EResource to IFile (avoids repeatedly finding IFile for EResource)
-	 * @return <code>Set</code> of <code>IMarker</code>s related to the <b>bookmarkedObjects</b>
-	 */
-	private Set gatherAllBookmarks(Set bookmarkedObjects, HashMap fileResourceMap) {
-		
-		Iterator iterBObjects = bookmarkedObjects.iterator();
-		
-		Set retSet = new HashSet();
-		
-		while (iterBObjects.hasNext()) {
-			Object oElement = iterBObjects.next();
-			
-			if (oElement instanceof EObject) {
-				Set tempSet = gatherSingleBookmark((EObject)oElement, fileResourceMap);
-				if (tempSet != null) {
-					retSet.addAll(tempSet);
-				}
-			}
-		}
-		
-		return retSet;
-	}
-	
-	
-	public ICommand getBeforeEditCommand(IEditCommandRequest request) {		
-		return null;
-	}
-	
-	public ICommand getAfterEditCommand(IEditCommandRequest request) {
-		if (request instanceof DestroyElementRequest) {
-			return getAfterDestroyElementCommand((DestroyElementRequest) request);
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)
-	 */
-	protected ICommand getAfterDestroyElementCommand(DestroyElementRequest request) {
-
-		ICommand result = null;
-		
-		Object oInitialDestructee = request.getParameter(DestroyElementRequest.INITIAL_ELEMENT_TO_DESTROY_PARAMETER);
-		
-		if (oInitialDestructee != null && 
-			oInitialDestructee instanceof EObject && 
-			request.getElementToDestroy().equals(oInitialDestructee)) {
-			
-			Object oDependentElements = request.getParameter(DestroyElementRequest.DESTROY_DEPENDENTS_REQUEST_PARAMETER);
-			
-			if (oDependentElements == null)
-				return null;
-			
-			HashMap fileResourceMap = new HashMap();
-			Set	bookmarksItems = gatherAllBookmarks(
-					((DestroyDependentsRequest)oDependentElements).getDependentElementsToDestroy(), fileResourceMap),
-				bookmarksDestructee = gatherSingleBookmark(request.getElementToDestroy(), fileResourceMap);
-			
-			if (bookmarksDestructee != null) 
-				bookmarksItems.addAll(bookmarksDestructee);
-			
-			if (!bookmarksItems.isEmpty()) {
-				result = new RemoveBookmarkCommand(request.getEditingDomain(),
-								request.getLabel(), bookmarksItems);
-			}
-			
-		}
-		
-		return result;
-	}
-	
-	
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/package.html
deleted file mode 100644
index efafed7..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-this package contains classes used to help in create the element requests </p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramDebugOptions.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramDebugOptions.java
deleted file mode 100644
index 224117f..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramDebugOptions.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- *  @author Yasser Lulu
- *
- */
-public final class DiagramDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramDebugOptions() {
-		//static class: prevent instatiation
-	}
-
-	public static final String DEBUG = DiagramPlugin.getPluginId()
-		+ "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-	
-	public static final String EVENTS = DEBUG + "/filter/events";//$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramPlugin.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramPlugin.java
deleted file mode 100644
index 3c33875..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramPlugin.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.internal;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Yasser Lulu
- */
-public class DiagramPlugin
-	extends Plugin {
-
-	//The shared instance.
-	private static DiagramPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DiagramPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramStatusCodes.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramStatusCodes.java
deleted file mode 100644
index ac4d966..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramStatusCodes.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- *  @author Yasser Lulu
- *
- */
-public final class DiagramStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramStatusCodes() {
-		//static class: prevent instatiation
-	}
-
-	public static final int OK = 0;	
-	/**
-	 * Status code indicating that an error occurred with a resource, such as
-	 * loading an image file.
-	 * Set to 5 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int RESOURCE_FAILURE = 5;
-
-	/**
-	 * Status code indicating that a UI error occurred.
-	 * Set to 6 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int GENERAL_UI_FAILURE = 6;
-
-	/**
-	 * Status code warning that an exception was ignored.
-	 * Set to 9 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 9;
-	
-	/**
-	 * Status code warning that an exception was ignored.
-	 * Set to 9 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int SERVICE_FAILURE = 7;
-	
-
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringForwardCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringForwardCommand.java
deleted file mode 100644
index af796be..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringForwardCommand.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command moves a view from its current location to one step
- * closer to the "front" of the list.
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class BringForwardCommand extends ZOrderCommand {
-	
-	/**
-	 * Create a BringForward Command.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param toMove The child view to move
-	 */
-	public BringForwardCommand(TransactionalEditingDomain editingDomain, View toMove ) {
-		super(editingDomain, DiagramCoreMessages.BringForwardCommand_Label, toMove); 
-	}
-
-    protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-		List children = containerView.getChildren();
-		int oldIndex = children.indexOf(toMove);
-		if (oldIndex < children.size()-1)
-			ViewUtil.repositionChildAt(containerView,toMove, oldIndex + 1 );
-		return CommandResult.newOKCommandResult();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringToFrontCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringToFrontCommand.java
deleted file mode 100644
index 5965e3b..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringToFrontCommand.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command moves a view from it's container and appends it to the "Front"
- * of the list.
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class BringToFrontCommand extends ZOrderCommand {
-
-    /**
-     * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param toMove
-     */
-	public BringToFrontCommand(TransactionalEditingDomain editingDomain, View toMove ) {
-		super(editingDomain, DiagramCoreMessages.BringToFrontCommand_Label, toMove ); 
-	}
-
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		ViewUtil.repositionChildAt(containerView,toMove, containerView.getChildren().size()-1);
-		return CommandResult.newOKCommandResult();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/CreateDiagramLinkCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/CreateDiagramLinkCommand.java
deleted file mode 100644
index 12e0a27..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/CreateDiagramLinkCommand.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-/**
- * Command to set the semantic reference for the provided model view to the given 
- * notational diagram.
- * 
- * @author jcorchis
- * @canBeSeenBy %level1
- */
-
-public class CreateDiagramLinkCommand extends AbstractTransactionalCommand {
-
-	private View view = null;
-	private Diagram diagram = null;
-
-	/**
-	 * Constructor for SetDiagramLinkCommand.
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label
-	 * @param context
-	 */
-	public CreateDiagramLinkCommand(TransactionalEditingDomain editingDomain, 
-		String label,
-		View view,
-		Diagram diagram) {
-		super(editingDomain, label, getWorkspaceFiles(view));
-
-		this.view = view;
-		this.diagram = diagram;
-	}
-	
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		view.setElement(diagram);
-		return CommandResult.newOKCommandResult();
-	}
-
-	public boolean canExecute() {
-		if (view == null) {
-			return false;
-		}
-		return true;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/IPropertyValueDeferred.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/IPropertyValueDeferred.java
deleted file mode 100644
index 29d1a6e..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/IPropertyValueDeferred.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-/**
- * @author sshaw
- * @canBeSeenBy %level1
- *
- * This is an empty interface used for type checking when getting a deferred value
- * in the SetPropertyCommand.  It is used as a kind passed to the getAdapter method.
- */
-public interface IPropertyValueDeferred {
-	//marker interface
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/PersistElementCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/PersistElementCommand.java
deleted file mode 100644
index 6e26900..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/PersistElementCommand.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author mmostafa
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.core.*
- * Command that will persist transient views.
- */
-public class PersistElementCommand extends AbstractTransactionalCommand { 
-	private View _view;
-
-    /**
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param view
-     */
-	public PersistElementCommand(TransactionalEditingDomain editingDomain, View view) {
-		super(editingDomain, DiagramCoreMessages.AddCommand_Label,
-            null);
-		_view = view;
-	}
-	
-	/**
-	 * Creates a new instance.
-	 * @param domain
-	 * @param label
-	 * @param options
-	 * @param affectedFiles
-	 */
-	public PersistElementCommand(TransactionalEditingDomain editingDomain, View view, Map options) {
-		super(editingDomain, DiagramCoreMessages.AddCommand_Label, options, 
-            null);
-		_view = view;
-	}
-
-	/**
-	 * Walks up the supplied element's container tree until a container is
-	 * found in the detached element map and then moves all of the detached
-	 * element's children over to the attached elements.
-	 *
-	 * @return the detached root element.
-	 */
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		try {
-			assert null != _view: "Null view in PersistElementCommand::doExecute";//$NON-NLS-1$
-			EObject container = _view.eContainer();
-			if (_view instanceof Edge){
-				Diagram diagram = (Diagram)container;
-				diagram.persistEdges();
-			}
-			else if (container instanceof View)
-				((View)container).persistChildren();
-			
-			return CommandResult.newOKCommandResult(_view);
-		}
-		catch (Exception e) {
-			Log.error(DiagramPlugin.getInstance(), IStatus.ERROR,
-				e.getMessage(), e);
-			return CommandResult.newErrorCommandResult(e.getMessage());
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/PersistViewsCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/PersistViewsCommand.java
deleted file mode 100644
index 295a77e..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/PersistViewsCommand.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author Yasser Lulu
- * 
- */
-public class PersistViewsCommand
-    extends AbstractTransactionalCommand {
-
-    private List views;
-
-    /**
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param view
-     */
-    public PersistViewsCommand(TransactionalEditingDomain editingDomain,
-            List views) {
-        super(editingDomain, DiagramCoreMessages.AddCommand_Label, null);
-        this.views = views;
-    }
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param domain
-     * @param label
-     * @param options
-     * @param affectedFiles
-     */
-    public PersistViewsCommand(TransactionalEditingDomain editingDomain,
-            List views, Map options) {
-        super(editingDomain, DiagramCoreMessages.AddCommand_Label, options,
-            null);
-        this.views = views;
-    }
-
-    /**
-     * persisted the views, by moving them from the transient Feature
-	 * to the persisted feature. This command supports persisteing Views or  Edges
-     * @return the persisted views.
-     */
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        try {
-            Iterator it = views.iterator();
-            while (it.hasNext()) {
-                View view = (View) it.next();
-                EObject container = view.eContainer();
-                if (view instanceof Edge) {
-                    Diagram diagram = (Diagram) container;
-                    diagram.persistEdges();
-                } else if (container instanceof View) {
-                    ((View) container).persistChildren();
-                }
-            }
-            return CommandResult.newOKCommandResult(views);
-        } catch (Exception e) {
-            Log.error(DiagramPlugin.getInstance(), IStatus.ERROR, e
-                .getMessage(), e);
-            return CommandResult.newErrorCommandResult(e.getMessage());
-        }
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendBackwardCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendBackwardCommand.java
deleted file mode 100644
index 2444441..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendBackwardCommand.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command moves a view from its current location to one step
- * closer to the "back" of the list.
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class SendBackwardCommand extends ZOrderCommand {
-	
-	/**
-	 * Create a SendBackward Command.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param toMove The child view to move
-	 */
-	public SendBackwardCommand(TransactionalEditingDomain editingDomain, View toMove ) {
-		super(editingDomain, DiagramCoreMessages.SendBackwardCommand_Label, toMove ); 
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		int oldIndex = containerView.getChildren().indexOf(toMove);
-		if (oldIndex > 0)
-			ViewUtil.repositionChildAt(containerView,toMove, oldIndex - 1 );
-		return CommandResult.newOKCommandResult();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendToBackCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendToBackCommand.java
deleted file mode 100644
index f590294..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendToBackCommand.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command moves a view from it's container and inserts it in the "back"
- * of the list.
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class SendToBackCommand extends ZOrderCommand {
-
-    /**
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param toMove
-     */
-	public SendToBackCommand(TransactionalEditingDomain editingDomain, View toMove ) {
-		super(editingDomain, DiagramCoreMessages.SendToBackCommand_Label, toMove ); 
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		// Reposition the child
-		ViewUtil.repositionChildAt(containerView,toMove, 0);
-		return CommandResult.newOKCommandResult();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/ZOrderCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/ZOrderCommand.java
deleted file mode 100644
index c1aebbc..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/ZOrderCommand.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.core.internal.commands;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-/**
- * This is an abstract class that contains common behaviour for all
- * the ZOrder Commands.
- * 
- * @author jschofie
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.core.*
- */
-public abstract class ZOrderCommand extends AbstractTransactionalCommand {
-	
-	protected View toMove;
-	protected View containerView;
-
-    /**
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param label
-     * @param view
-     */
-	public ZOrderCommand(TransactionalEditingDomain editingDomain, String label,View view ) {
-		super(editingDomain, label, getWorkspaceFiles(view));
-
-		this.toMove = view;
-		containerView = ViewUtil.getContainerView(toMove);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.java
deleted file mode 100644
index da80559..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.diagram.core.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages";//$NON-NLS-1$
-
-	private DiagramCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String AddCommand_Label;
-	public static String DeleteCommand_Label;
-	public static String Command_ChangeViewProperty_ChangePropertyPattern;
-	public static String AbstractViewProvider_create_view_failed_ERROR_;
-    
-    public static String BringForwardCommand_Label;
-    public static String BringToFrontCommand_Label;
-    public static String SendBackwardCommand_Label;
-    public static String SendToBackCommand_Label;
-    
-    public static String GroupCommand_Label;
-    public static String UngroupCommand_Label;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramCoreMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.properties b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.properties
deleted file mode 100644
index 53c9e24..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.properties
+++ /dev/null

@@ -1,36 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2004, 2007  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Diagram General - Translation Instruction: section to be translated
-# ==============================================================================
-
-AddCommand_Label=Add View
-DeleteCommand_Label=Delete
-Command_ChangeViewProperty_ChangePropertyPattern=Change {0}
-
-BringForwardCommand_Label=Bring Forward
-BringToFrontCommand_Label=Bring To Front
-SendBackwardCommand_Label=Send Backward
-SendToBackCommand_Label=Send To Back
-
-GroupCommand_Label = Group Shapes
-UngroupCommand_Label = Ungroup Shapes
-
-# ===============================================================================
-# Diagram Internal - Translation Instruction : do not translate this section
-# ===============================================================================
-
-AbstractViewProvider_create_view_failed_ERROR_ = IRJS0005E Failed to create view {0}
-
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/package.html
deleted file mode 100644
index 8d5fe08..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.core.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/listener/NotationSemProc.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/listener/NotationSemProc.java
deleted file mode 100644
index bd97645..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/listener/NotationSemProc.java
+++ /dev/null

@@ -1,261 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.internal.listener;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.TriggerListener;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * The following class implements the Notation semantic procedures.
- * 
- * @author rafikj, cmahoney
- */
-public class NotationSemProc extends TriggerListener {
-
-	private static NotationPackage notation = NotationPackage.eINSTANCE;
-
-	private static Set autoNamedElements = new HashSet();
-
-	private static Set nonAutoNamedElements = new HashSet();
-
-	static {
-
-		autoNamedElements.add(notation.getDiagram());
-	}
-    
-    private boolean shouldHandleNotification(Notification notification){
-        if (notification.getNotifier() instanceof EObject && 
-            notification.getFeature() instanceof EReference &&
-            ((EReference)notification.getFeature()).isContainment()){
-            Object newValue = notification.getNewValue();
-            if (newValue!=null){
-                if (newValue instanceof Diagram)
-                    return true;
-                if (newValue instanceof Collection){
-                    Collection collection = (Collection)newValue;
-                    for (Iterator iter = collection.iterator(); iter.hasNext();) {
-                        if (iter.next() instanceof Diagram)
-                           return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-	/**
-	 * Handle sem-proc event.
-	 */
-    protected Command trigger(TransactionalEditingDomain editingDomain, Notification notification) {
-        if (!shouldHandleNotification(notification))
-            return null;
-        int eventType = notification.getEventType();
-
-		Object notifier = notification.getNotifier();
-
-		Object feature = notification.getFeature();
-
-		Object newValue = notification.getNewValue();
-
-		if (notifier instanceof EObject) {
-
-			EObject eObject = (EObject) notifier;
-
-			if ((feature instanceof EReference)
-				&& (((EReference) feature).isContainment())) {
-
-				if ((eventType == Notification.ADD)
-					&& (newValue instanceof EObject)) {
-
-					return getAutoNameCommand(editingDomain, eObject, (EReference) feature, (EObject) newValue);
-
-				} else if ((eventType == Notification.ADD_MANY)
-					&& (newValue instanceof Collection)) {
-
-                    return getAutoNameCommand(editingDomain, eObject, (EReference) feature,
-						(Collection) newValue);
-
-				} else if (((eventType == Notification.SET) || (eventType == Notification.UNSET))) {
-
-					if (newValue instanceof EObject) {
-
-                        return getAutoNameCommand(editingDomain, eObject, (EReference) feature,
-							(EObject) newValue);
-
-					}
-
-				}
-			}
-		}
-        return null;
-	}
-
-    /**
-     * Returns a command that will auto-name the collection of
-     * <code>EObjects</code> passed in.
-     * 
-     * @param editingDomain
-     * @param container
-     * @param reference
-     * @param objects
-     * @return
-     */
-    private Command getAutoNameCommand(
-            TransactionalEditingDomain editingDomain, final EObject container,
-            final EReference reference, final Collection objects) {
-        return new RecordingCommand(editingDomain) {
-
-            protected void doExecute() {
-                autoName(container, reference, objects);
-            }
-
-        };
-    }
-
-    /**
-     * Returns a command that will auto-name the <code>EObject</code> passed
-     * in.
-     * 
-     * @param editingDomain
-     * @param container
-     * @param reference
-     * @param eObject
-     * @return
-     */
-    private Command getAutoNameCommand(
-            TransactionalEditingDomain editingDomain, final EObject container,
-            final EReference reference, final EObject eObject) {
-        return new RecordingCommand(editingDomain) {
-
-            protected void doExecute() {
-                autoName(container, reference, eObject);
-            }
-
-        };
-    }
-
-    /**
-     * Can I auto-name object?
-     */
-	private static boolean canAutoName(EClass eClass) {
-
-		if (autoNamedElements.contains(eClass))
-			return true;
-
-		if (nonAutoNamedElements.contains(eClass))
-			return false;
-
-		Iterator i = eClass.getESuperTypes().iterator();
-
-		while (i.hasNext()) {
-
-			if (canAutoName((EClass) i.next()))
-				return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Auto-name objects.
-	 */
-	private static void autoName(EObject container, EReference reference,
-			Collection objects) {
-
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-
-			Object object = i.next();
-
-			if (object instanceof EObject) {
-
-				EObject eObject = (EObject) object;
-
-				autoName(container, reference, eObject);
-			}
-		}
-	}
-
-	/**
-	 * Auto-name object.
-	 */
-	private static void autoName(EObject container, EReference reference,
-			EObject eObject) {
-
-		String name = null;
-
-		if (eObject instanceof Diagram)
-			name = ((Diagram) eObject).getName();
-
-		else
-			return;
-
-		if (((name == null) || (name.equals(StringStatics.BLANK))
-			&& (canAutoName(eObject.eClass())))) {
-
-			name = PackageUtil.getLocalizedName(eObject.eClass());
-
-			if (reference.isMany()) {
-
-				Set set = new HashSet();
-
-				Iterator i = ((Collection) container.eGet(reference))
-					.iterator();
-
-				while (i.hasNext()) {
-
-					Object sibling = i.next();
-
-					if (sibling != null) {
-
-						String n = null;
-
-						if (sibling instanceof Diagram)
-							n = ((Diagram) sibling).getName();
-
-						if (n != null)
-							set.add(n);
-					}
-				}
-
-				for (int j = 1; j <= Integer.MAX_VALUE; j++) {
-
-					String n = name + j;
-
-					if (!set.contains(n)) {
-
-						name = n;
-						break;
-					}
-				}
-			}
-
-			if (eObject instanceof Diagram)
-				((Diagram) eObject).setName(name);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/package.html
deleted file mode 100644
index bb05b6c..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.core.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/DiagramEventBroker.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/DiagramEventBroker.java
deleted file mode 100644
index dbf21f4..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/DiagramEventBroker.java
+++ /dev/null

@@ -1,759 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.listener;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListenerImpl;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.EMFOperationCommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.PersistViewsCommand;
-import org.eclipse.gmf.runtime.diagram.core.services.DiagramEventBrokerService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-
-/**
- * A model server listener that broadcast EObject events to all registered
- * listeners.
- * 
- * @author melaasar, mmostafa, cmahoney
- */
-public class DiagramEventBroker
-    extends ResourceSetListenerImpl {
-
-    private static String LISTEN_TO_ALL_FEATURES = "*"; //$NON-NLS-1$
-
-    /** listener map */
-    private final NotifierToKeyToListenersSetMap preListeners = new NotifierToKeyToListenersSetMap();
-
-    private final NotifierToKeyToListenersSetMap postListeners = new NotifierToKeyToListenersSetMap();
-
-    private static final Map instanceMap = new WeakHashMap();
-    
-    private WeakReference editingDomainRef;
-    
-    /**
-     * returns the pre commit listeners map
-     * @return pre commit listeners map
-     */
-    protected NotifierToKeyToListenersSetMap getPreCommitListenersMap() {
-        return preListeners;
-    }
-    
-    /**
-     * returns the post commit listeners map
-     * @return post commit listeners map
-     */
-    protected NotifierToKeyToListenersSetMap getPostCommitListenersMap() {
-        return postListeners;
-    }
-
-    /**
-     * Utility class representing a Map of Notifier to a Map of Keys to a Set of
-     * listener
-     * 
-     * @author mmostafa
-     */
-    public final class NotifierToKeyToListenersSetMap {
-
-        /**
-         * internal map to hold the listeners
-         */
-        private final Map listenersMap = new WeakHashMap();
-
-        /**
-         * Adds a listener to the map
-         * 
-         * @param notifier
-         *            the notifier the listener will listen to
-         * @param key
-         *            a key for the listener, this help in categorizing the
-         *            listeners based on their interest
-         * @param listener
-         *            the listener
-         */
-        public void addListener(EObject notifier, Object key, Object listener) {
-            Map keys = (Map) listenersMap.get(notifier);
-            if (keys == null) {
-                keys = new HashMap(4);
-                listenersMap.put(notifier, keys);
-            }
-            Map listenersSet = (Map) keys.get(key);
-            if (listenersSet == null) {
-                listenersSet = new LinkedHashMap(4);
-                keys.put(key, listenersSet);
-            }
-            listenersSet.put(listener,null);
-        }
-
-        /**
-         * Adds a listener to the notifier; this listener is added againest a
-         * generic key, <code>LISTEN_TO_ALL_FEATURES<code>
-         * so it can listen to all events on the notifier 
-         * @param notifier the notifier the listener will listen to
-         * @param listener the listener
-         */
-        public void addListener(EObject notifier, Object listener) {
-            addListener(notifier, LISTEN_TO_ALL_FEATURES, listener);
-        }
-
-        /**
-         * removes a listener from the map
-         * 
-         * @param notifier
-         * @param key
-         * @param listener
-         */
-        public void removeListener(EObject notifier, Object key, Object listener) {
-            Map keys = (Map) listenersMap.get(notifier);
-            if (keys != null) {
-                Map listenersSet = (Map) keys.get(key);
-                if (listenersSet != null) {
-                    listenersSet.remove(listener);
-                    if (listenersSet.isEmpty()) {
-                        keys.remove(key);
-                    }
-                }
-                if (keys.isEmpty())
-                    listenersMap.remove(notifier);
-            }
-        }
-
-        /**
-         * get listeners interested in the passed notifier and key
-         * 
-         * @param notifier
-         * @param key
-         * @return <code>Set</code> of listeners
-         */
-        public Set getListeners(Object notifier, Object key) {
-            Map keys = (Map) listenersMap.get(notifier);
-            if (keys != null) {
-                Map listenersSet = (Map) keys.get(key);
-                if (listenersSet != null) {
-                    return listenersSet.keySet();
-                }
-            }
-            return Collections.EMPTY_SET;
-        }
-
-        /**
-         * return all listeners interested in the passed notifier
-         * 
-         * @param notifier
-         * @return
-         */
-        public Set getAllListeners(Object notifier) {
-            Map keys = (Map) listenersMap.get(notifier);
-            if (keys == null || keys.isEmpty()) {
-                return Collections.EMPTY_SET;
-            }
-            Set listenersCollection = new LinkedHashSet();
-            Set enteries = keys.entrySet();
-            for (Iterator iter = enteries.iterator(); iter.hasNext();) {
-                Map.Entry entry = (Map.Entry) iter.next();
-                Map listenersSet = (Map) entry.getValue();
-                if (listenersSet != null && !listenersSet.isEmpty())
-                    listenersCollection.addAll(listenersSet.keySet());
-            }
-            return listenersCollection;
-        }
-        
-        public boolean isEmpty() {
-            return listenersMap.isEmpty();
-        }
-    }
-
-    /**
-     * Creates a <code>DiagramEventBroker</code> that listens to all
-     * <code>EObject </code> notifications for the given editing domain.
-     */
-    protected DiagramEventBroker() {
-        super(NotificationFilter.createNotifierTypeFilter(EObject.class));
-    }    
-    
-
-    /**
-     * Gets the diagmam event broker instance for the editing domain passed in.
-     * There is one diagram event broker per editing domain.
-     * 
-     * @param editingDomain
-     * @return Returns the diagram event broker.
-     */
-    public static DiagramEventBroker getInstance(
-            TransactionalEditingDomain editingDomain) {
-    	
-    	return initializeDiagramEventBroker(editingDomain);
-    }
-
-    /**
-     * Creates a new diagram event broker instance for the editing domain passed
-     * in only if the editing domain does not already have a diagram event
-     * broker. There is one diagram event broker per editing domain. Adds the
-     * diagram event broker instance as a listener to the editing domain.
-     * 
-     * @param editingDomain
-     */
-    public static void startListening(TransactionalEditingDomain editingDomain) {
-    	initializeDiagramEventBroker(editingDomain);
-    }
-
-	private static DiagramEventBroker initializeDiagramEventBroker(TransactionalEditingDomain editingDomain) {
-        WeakReference reference = (WeakReference) instanceMap.get(editingDomain);
-        if (reference == null) {
-            DiagramEventBroker diagramEventBroker = DiagramEventBrokerService.getInstance().createDiagramEventBroker(editingDomain);
-            if (null == diagramEventBroker)
-                diagramEventBroker = debFactory.createDiagramEventBroker(editingDomain);
-            if (diagramEventBroker.editingDomainRef == null) {
-				diagramEventBroker.editingDomainRef = new WeakReference(
-					editingDomain);
-			}
-            editingDomain.addResourceSetListener(diagramEventBroker);
-            reference = new WeakReference(diagramEventBroker);
-            instanceMap.put(editingDomain, reference);
-        }
-        return (DiagramEventBroker) reference.get();
-	}
-    
-    /**
-     * Factory interface that can be used to create overrides of the DiagramEventBroker class
-     * @author sshaw
-     */
-    public static interface DiagramEventBrokerFactory {
-    	/**
-    	 * @param editingDomain the <code>TransactionalEditingDomain</code> that is associated
-    	 * with the <code>DiagramEventBroker</code> instance.
-    	 * @return the <code>DiagramEventBroker</code> instance.
-    	 */
-    	public DiagramEventBroker createDiagramEventBroker(TransactionalEditingDomain editingDomain); 
-    }
-    
-    private static class DiagramEventBrokerFactoryImpl implements DiagramEventBrokerFactory {
-    	public DiagramEventBroker createDiagramEventBroker(TransactionalEditingDomain editingDomain) {
-            DiagramEventBroker diagramEventBroker =  new DiagramEventBroker();
-            diagramEventBroker.editingDomainRef = new WeakReference(
-                editingDomain);
-            return diagramEventBroker;
-    	}
-    }
-    
-    private static DiagramEventBrokerFactory debFactory = new DiagramEventBrokerFactoryImpl();
-    
-    /**
-     * @param newDebFactory
-     */
-    public static void registerDiagramEventBrokerFactory(DiagramEventBrokerFactory newDebFactory) {
-    	debFactory = newDebFactory;
-    }
-
-    /**
-     * @param editingDomain
-     */
-    public static void stopListening(TransactionalEditingDomain editingDomain) {
-        DiagramEventBroker diagramEventBroker = getInstance(editingDomain);
-        if (diagramEventBroker != null) {
-            editingDomain.removeResourceSetListener(diagramEventBroker);
-            instanceMap.remove(editingDomain);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.emf.transaction.ResourceSetListenerImpl#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)
-     */
-    public Command transactionAboutToCommit(ResourceSetChangeEvent event) {
-        Set deletedObjects = NotificationUtil.getDeletedObjects(event);
-        Set existingObjects = new HashSet();
-        Set elementsInPersistQueue = new LinkedHashSet();
-        CompoundCommand cc = new CompoundCommand();
-        TransactionalEditingDomain editingDomain = (TransactionalEditingDomain) editingDomainRef
-            .get();
-        boolean hasPreListeners = (preListeners.isEmpty() == false);
-        List viewsToPersistList = new ArrayList();
-        boolean deleteElementCheckRequired = !deletedObjects.isEmpty();
-        for (Iterator i = event.getNotifications().iterator(); i.hasNext();) {
-            final Notification notification = (Notification) i.next();
-            if (shouldIgnoreNotification(notification))
-                continue;
-            Object notifier = notification.getNotifier();            
-            if (notifier instanceof EObject) {
-                boolean deleted = false;
-                if (deleteElementCheckRequired){
-                    deleted = !existingObjects.contains(notifier);
-                    if (deleted){
-                        deleted = isDeleted(deletedObjects, (EObject)notifier);
-                        if (!deleted)
-                            existingObjects.add(notifier);
-                    }
-                }
-            	if (deleted) {
-                    continue;
-                }
-                if (editingDomain != null) {
-                    View viewToPersist = getViewToPersist(notification,
-                        elementsInPersistQueue);
-                    if (viewToPersist != null) {
-                        viewsToPersistList.add(viewToPersist);
-                    }
-                }
-                if (hasPreListeners) {
-                    Command cmd = fireTransactionAboutToCommit(notification);
-                    if (cmd != null) {
-                        cc.append(cmd);
-                    }
-                }
-            }
-        }
-
-        if (viewsToPersistList.isEmpty() == false) {
-            PersistViewsCommand persistCmd = new PersistViewsCommand(
-                editingDomain, viewsToPersistList);
-            cc.append(new EMFOperationCommand(editingDomain, persistCmd));
-        }
-
-        return cc.isEmpty() ? null
-            : cc;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.emf.transaction.ResourceSetListenerImpl#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
-     */
-    public void resourceSetChanged(ResourceSetChangeEvent event) {
-    	if (postListeners.isEmpty()) {
-            return;
-        }
-        Set deletedObjects = NotificationUtil.getDeletedObjects(event);
-        Set existingObjects = new HashSet();
-        boolean deleteElementCheckRequired = !deletedObjects.isEmpty();
-        for (Iterator i = event.getNotifications().iterator(); i.hasNext();) {
-            final Notification notification = (Notification) i.next();
-            boolean customNotification = NotificationUtil.isCustomNotification(notification);
-            if (!customNotification && shouldIgnoreNotification(notification))
-                continue;
-            Object notifier = notification.getNotifier();
-            if (notifier instanceof EObject) {
-                boolean deleted = false;
-                if (deleteElementCheckRequired && !customNotification){
-                    deleted = !existingObjects.contains(notifier);
-                    if (deleted){
-                        deleted = isDeleted(deletedObjects, (EObject)notifier);
-                        if (!deleted)
-                            existingObjects.add(notifier);
-                    }
-                }
-                if (!customNotification && deleted) {
-                    handleNotificationOnDeletedElement(event);
-                    continue;
-                }
-
-                fireNotification(notification);
-            }
-        }
-    }
-
-
-    /**
-     * This method allows clients to customize the Diagram event broker behavior when
-     * it comes to handling events on deleted objects.
-     * The default behavior will just ignore them
-     * @param event event being handled
-     */
-    protected void handleNotificationOnDeletedElement(ResourceSetChangeEvent event) {
-        // default implementation does nothing
-        
-    }
-
-
-    /**
-     * decide if the passed object is deleted or not; the decision is done by 
-     * checking is the passed notifier or any of its ancestors exists in the passed
-     * deletedObjects Set, if it find the obnject to be deleted it will add it 
-     * to the deleted objects set.
-     * @param deletedObjects
-     * @param notifier
-     * @return
-     */
-    protected boolean isDeleted(Set deletedObjects, EObject notifier) {
-        EObject object = notifier;
-        while (object!=null){
-            if (deletedObjects.contains(object)){
-                if (object != notifier){
-                    //so we do not waste time on the second call
-                    addDeletedBranch(deletedObjects,notifier);
-                }
-                return true;
-            }
-            object = object.eContainer();
-        }
-        return false;
-    }
-    
-    private void addDeletedBranch(Set deletedObjects, EObject notifier) {
-        EObject object = notifier;
-        while (object != null){
-            if (!deletedObjects.add(object)){
-                break;
-            }
-            object = object.eContainer();
-        }
-        
-    }
-
-
-    /**
-     * determine if the passed notification can be ignored or not the default
-     * implementation will ignore touch event if it is not a resolve event, also
-     * it will ignore the mutable feature events
-     * 
-     * @param notification
-     *            the notification to check
-     * @return true if the notification should be ignored, otherwise false
-     */
-    protected boolean shouldIgnoreNotification(Notification notification) {
-        if ((notification.isTouch() && notification.getEventType() != Notification.RESOLVE)
-            || NotationPackage.eINSTANCE.getView_Mutable().equals(
-                notification.getFeature())) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Forward the supplied event to all listeners listening on the supplied
-     * target element.
-     * <P>
-     * <B> Note, for the MSL migration effort, each listener will be forwarded 2
-     * events. First, a MSL complient Notification event followed by an
-     * ElementEvent (for backwards compatibility). The ElementEvent will be
-     * removed one the MSL migration is complete.
-     */
-    protected void fireNotification(Notification event) {
-        Collection listenerList = getInterestedNotificationListeners(event,
-        	postListeners);
-        if (!listenerList.isEmpty()) {			
-			for (Iterator listenerIT = listenerList.iterator(); listenerIT
-				.hasNext();) {
-				NotificationListener listener = (NotificationListener) listenerIT
-					.next();
-				listener.notifyChanged(event);
-			}
-		}
-    }
-
-    /**
-     * Forwards the event to all interested listeners.
-     * 
-     * @param event
-     *            the event to handle
-     * @p
-     */
-    private Command fireTransactionAboutToCommit(Notification event) {
-        Collection listenerList = getInterestedNotificationListeners(event,
-            preListeners);       
-        if (!listenerList.isEmpty()) {
-        	 CompoundCommand cc = new CompoundCommand();            
-            for (Iterator listenerIT = listenerList.iterator(); listenerIT
-                .hasNext();) {
-                NotificationPreCommitListener listener = (NotificationPreCommitListener) listenerIT
-                    .next();
-                Command cmd = listener.transactionAboutToCommit(event);
-                if (cmd != null) {
-                    cc.append(cmd);
-                }
-            }
-            return cc.isEmpty() ? null
-            : cc;
-        }
-		return null;        
-    }
-
-    private View getViewToPersist(Notification event, Set elementsInPersistQueue) {
-        if (!event.isTouch()) {
-            EObject elementToPersist = (EObject) event.getNotifier();
-            while (elementToPersist != null
-                && !(elementToPersist instanceof View)) {
-                elementToPersist = elementToPersist.eContainer();
-            }
-            if (elementToPersist != null
-                && !elementsInPersistQueue.contains(elementToPersist)
-                && ViewUtil.isTransient(elementToPersist)) {
-                if (!NotificationFilter.READ.matches(event)) {
-                    elementsInPersistQueue.add(elementToPersist);
-                    View view = (View) elementToPersist;
-                    if (!view.isMutable()) {
-                        // get Top view needs to get persisted
-                        View viewToPersist = ViewUtil.getTopViewToPersist(view);
-                        if (viewToPersist != null) {                            
-                            elementsInPersistQueue.add(viewToPersist);
-                            return viewToPersist;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Add the supplied <tt>listener</tt> to the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param listener
-     *            the listener
-     */
-    public void addNotificationListener(EObject target,
-            NotificationPreCommitListener listener) {
-        if (target != null) {
-            preListeners.addListener(target, LISTEN_TO_ALL_FEATURES, listener);
-        }
-    }
-
-    /**
-     * Add the supplied <tt>listener</tt> to the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param listener
-     *            the listener
-     */
-    public void addNotificationListener(EObject target,
-            NotificationListener listener) {
-        if (target != null) {
-            postListeners.addListener(target, LISTEN_TO_ALL_FEATURES, listener);
-        }
-    }
-
-    /**
-     * Add the supplied <tt>listener</tt> to the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param key
-     *            the key for the listener
-     * @param listener
-     *            the listener
-     */
-    public void addNotificationListener(EObject target,
-            EStructuralFeature key, NotificationPreCommitListener listener) {
-        if (target != null) {
-            preListeners.addListener(target, key, listener);
-        }
-    }
-
-    /**
-     * Add the supplied <tt>listener</tt> to the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param key
-     *            the key for the listener
-     * @param listener
-     *            the listener
-     */
-    public void addNotificationListener(EObject target,
-            EStructuralFeature key, NotificationListener listener) {
-        if (target != null) {
-            postListeners.addListener(target, key, listener);
-        }
-    }
-
-    /**
-     * remove the supplied <tt>listener</tt> from the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param listener
-     *            the listener
-     */
-    public void removeNotificationListener(EObject target,
-            NotificationPreCommitListener listener) {
-        if (target != null) {
-            preListeners.removeListener(target, LISTEN_TO_ALL_FEATURES,
-                listener);
-        }
-    }
-
-    /**
-     * remove the supplied <tt>listener</tt> from the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param listener
-     *            the listener
-     */
-    public void removeNotificationListener(EObject target,
-            NotificationListener listener) {
-        if (target != null) {
-            postListeners.removeListener(target, LISTEN_TO_ALL_FEATURES,
-                listener);
-        }
-    }
-
-    /**
-     * remove the supplied <tt>listener</tt> from the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param key
-     *            the key for the listener
-     * @param listener
-     *            the listener
-     */
-    public void removeNotificationListener(EObject target, Object key,
-            NotificationPreCommitListener listener) {
-        if (target != null) {
-            preListeners.removeListener(target, key, listener);
-        }
-    }
-
-    /**
-     * remove the supplied <tt>listener</tt> from the listener list.
-     * 
-     * @param target
-     *            the traget to listen to
-     * @param key
-     *            the key for the listener
-     * @param listener
-     *            the listener
-     */
-    public void removeNotificationListener(EObject target, Object key,
-            NotificationListener listener) {
-        if (target != null) {
-            postListeners.removeListener(target, key, listener);
-        }
-    }
-
-    private Set getNotificationListeners(Object notifier, NotifierToKeyToListenersSetMap listeners) {       
-        return listeners.getListeners(notifier, LISTEN_TO_ALL_FEATURES);
-    }
-
-    /**
-     * @param notifier
-     * @param key
-     * @param preCommit
-     * @return
-     */
-    private Set getNotificationListeners(Object notifier, Object key,
-    		NotifierToKeyToListenersSetMap listeners) {
-        if (key != null) {
-            if (!key.equals(LISTEN_TO_ALL_FEATURES)) {
-                Set listenersSet = new LinkedHashSet();
-                Collection c = listeners.getListeners(notifier, key);
-                if (c != null && !c.isEmpty())
-                    listenersSet.addAll(c);
-                c = listeners.getListeners(notifier, LISTEN_TO_ALL_FEATURES);
-                if (c != null && !c.isEmpty())
-                    listenersSet.addAll(c);
-                return listenersSet;
-            } else if (key.equals(LISTEN_TO_ALL_FEATURES)) {
-                return listeners.getAllListeners(notifier);
-            }
-        }
-        return listeners.getAllListeners(notifier);
-    }
-
-    /**
-     * gets a subset of all the registered listeners who are interested in
-     * receiving the supplied event.
-     * 
-     * @param event
-     *            the event to use
-     * @return the interested listeners in the event
-     */
-     protected Set getInterestedNotificationListeners(Notification event,
-    		NotifierToKeyToListenersSetMap listeners) {
-        Set listenerSet = new LinkedHashSet();
-
-        Collection c = getNotificationListeners(event.getNotifier(), event
-            .getFeature(), listeners);
-        if (c != null) {
-            listenerSet.addAll(c);
-        }
-
-        EObject notifier = (EObject) event.getNotifier();
-        // the Visibility Event get fired to all interested listeners in the
-        // container
-        if (NotationPackage.eINSTANCE.getView_Visible().equals(
-            event.getFeature())
-            && notifier.eContainer() != null) {
-            listenerSet.addAll(getNotificationListeners(notifier.eContainer(),
-            	listeners));
-        } else if (notifier instanceof EAnnotation) {
-            addListenersOfNotifier(listenerSet, notifier.eContainer(), event,
-            	listeners);
-        } else if (!(notifier instanceof View)) {
-            while (notifier != null && !(notifier instanceof View)) {
-                notifier = notifier.eContainer();
-            }
-            addListenersOfNotifier(listenerSet, notifier, event, listeners);
-        }
-        return listenerSet;
-    }
-    
-    public boolean isAggregatePrecommitListener() {
-    	return true;
-    }
-    
-    /**
-     * Helper method to add all the listners of the given <code>notifier</code>
-     * to the list of listeners
-     * 
-     * @param listenerSet
-     * @param notifier
-     */
-    private void addListenersOfNotifier(Set listenerSet, EObject notifier,
-            Notification event, NotifierToKeyToListenersSetMap listeners) {
-        if (notifier != null) {
-            Collection c = getNotificationListeners(notifier, event
-                .getFeature(), listeners);
-            if (c != null) {
-                if (listenerSet.isEmpty())
-                    listenerSet.addAll(c);
-                else {
-                    Iterator i = c.iterator();
-                    while (i.hasNext()) {
-                        Object o = i.next();
-                        listenerSet.add(o);
-                    }
-                }
-            }
-        }
-    }    
-    
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationListener.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationListener.java
deleted file mode 100644
index da36308..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationListener.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.listener;
-
-import org.eclipse.emf.common.notify.Notification;
-
-/**
- * Defines an EMF {@link Notification} listener; any class interested in
- * listening to post-commit events from the {@link DiagramEventBroker} which
- * implements this interface. The notifyChanged method will get called by the
- * {@link DiagramEventBroker#handleElementEvent(Notification)}
- * 
- * @author mmostafa
- * 
- */
-public interface NotificationListener {
-
-	/**
-	 * Will be called when a Notification event gets sent from the
-	 * DiagramEventBroker after the transaction has been closed.
-	 * 
-	 * @param notification
-	 *            the notification object
-	 */
-	public void notifyChanged(Notification notification);
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationPreCommitListener.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationPreCommitListener.java
deleted file mode 100644
index 9eca2c8..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationPreCommitListener.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.listener;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-
-/**
- * Defines an EMF {@link Notification} listener; any class interested in
- * listening to pre-commit events from the {@link DiagramEventBroker} which
- * implements this interface. the transactionAboutToCommit method will get
- * called by the
- * {@link DiagramEventBroker#handleTransactionAboutToCommitEvent(Notification)}
- * 
- * @author cmahoney
- */
-public interface NotificationPreCommitListener {
-
-	/**
-	 * Will be called when a Notification event gets sent from the
-	 * DiagramEventBroker during the firing of pre-commit events.
-	 * 
-	 * @param notification
-	 *            the notification object
-	 */
-	public Command transactionAboutToCommit(Notification notification);
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationUtil.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationUtil.java
deleted file mode 100644
index 295486f..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationUtil.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.listener;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-
-/**
- * Utility class that implements few helper methods around the EMF
- * <code>Notification</code> object
- * 
- * @author mmostafa
- */
-public class NotificationUtil {
-
-	/**
-	 * checks if the event resulted in a slot modification (set/unset event)
-	 * @return <tt>true</tt> if the event type is
-	 * one of {@link Notification#SET} or {@link Notification#UNSET};
-	 * otherwise <tt>false</tt>.
-	 */
-	public static boolean isSlotModified(Notification notification) {
-		return notification.getEventType() == Notification.SET || 
-			   notification.getEventType() == Notification.UNSET;
-	}
-
-	/**
-	 * checks if the event resulted in adding an element
-	 * @return <tt>true</tt> if the event type is
-	 * one of {@link Notification#ADD} or {@link Notification#ADD_MANY};
-	 * otherwise <tt>false</tt>.
-	 */
-	public static boolean isElementAddedToSlot(Notification notification) {
-		return notification.getEventType() == Notification.ADD ||
-			   notification.getEventType() == Notification.ADD_MANY;
-	}
-
-	/**
-	 * checks if the event resulted in removing an element
-	 * @return <tt>true</tt> if the event type is
-	 * one of {@link Notification#REMOVE} or {@link Notification#REMOVE_MANY};
-	 * otherwise <tt>false</tt>.
-	 */
-	public static boolean isElementRemovedFromSlot(Notification notification) {
-		return notification.getEventType() == Notification.REMOVE ||
-			   notification.getEventType() == Notification.REMOVE_MANY;
-	}
-
-	/**
-	 * checks if the event is an {@link Notification.MOVE} event.
-	 * @return <tt>true</tt> if the event type equals
-	 * {@link Notification.MOVE}; otherwise <tt>false</tt>.
-	 */
-	public static boolean isMove(Notification notification) {
-		return notification.getEventType() == Notification.MOVE;
-	}
-
-    /**
-     * checks if the Notification is a custom notification or not
-     * @return <tt>true</tt> if the noptificatio is custom notification otherwise <tt>false</tt>. 
-     */
-    public static boolean isCustomNotification(Notification notification) {
-        if (notification.getEventType() < 0 || notification.getEventType() >= Notification.EVENT_TYPE_COUNT)
-            return true;
-        return false;
-    }
-
-    /**
-     * Collect the deleted objects from all the notifications in the event.
-     * 
-     * @param event
-     * @return
-     */
-    public static Set getDeletedObjects(ResourceSetChangeEvent event) {
-        HashSet deletedObjects = new HashSet();
-        for (Iterator i = event.getNotifications().iterator(); i.hasNext();) {
-            Notification notification = (Notification) i.next();
-            int eventType = notification.getEventType();
-            if ((eventType == Notification.REMOVE_MANY)
-                || (eventType == Notification.REMOVE)) {
-                Object feature = notification.getFeature();
-                if (feature instanceof EReference
-                    && ((EReference) feature).isContainment()) {                    
-                    if (eventType == Notification.REMOVE_MANY) {
-                        for (Iterator iter = ((Collection) notification
-                            .getOldValue()).iterator(); iter.hasNext();) {
-                            EObject removedObject = (EObject) iter.next();
-                            if (removedObject.eResource() == null) {
-                                deletedObjects.add(removedObject);
-                            }
-                        }
-                    } else if (((EObject) notification.getOldValue())
-                        .eResource() == null) {
-                        deletedObjects.add(notification.getOldValue());
-                    }
-                }
-            }            
-        }
-        return deletedObjects;
-    }
-    
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/package.html
deleted file mode 100644
index 6d73386..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>this package contains classes related to the listening and Notifying capabilities provided
-by the diagram layer</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/preferences/PreferencesHint.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/preferences/PreferencesHint.java
deleted file mode 100644
index ff92423..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/preferences/PreferencesHint.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.core.preferences;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This specifies the hint with which a preference store containing the diagram
- * preferences will be registered against in the preferences registry. This hint
- * will be passed around and when a view is created it will use this hint to
- * initialize its properties based on the values in the preference store
- * registered against this hint in the preferences registry.
- * 
- * @author cmahoney
- */
-public class PreferencesHint {
-
-	/**
-	 * The hint that indicates there are no preferences to be used for the
-	 * generic diagram preferences, instead use the default values.
-	 */
-	public static PreferencesHint USE_DEFAULTS = new PreferencesHint(
-		"UseDefaults"); //$NON-NLS-1$
-
-	/**
-	 * A map of preference hints to preference stores
-	 * {@link org.eclipse.jface.preference.IPreferenceStore}.
-	 */
-	private static Map preferenceStores = new HashMap();
-
-	/**
-	 * The unique id string of this hint.
-	 */
-	private String id;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param id
-	 *            the unique id string of this hint
-	 */
-	public PreferencesHint(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * Gets the unique id string of this hint
-	 * 
-	 * @return the id
-	 */
-	private String getId() {
-		return id;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object arg0) {
-		return arg0 instanceof PreferencesHint ? getId().equals(
-			((PreferencesHint) arg0).getId())
-			: false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getId().hashCode();
-	}
-
-	/**
-	 * Registers a preference store containing some or all of the generic
-	 * diagram preferences (those preferences defined in the diagram layer) to a
-	 * preference hint. When a diagram preference is needed, it will be
-	 * retrieved from the preference store using the hint specified in the root
-	 * editpart. This allows each diagram editor to have its own diagram
-	 * preferences. The preference store is only registered against the hint
-	 * given if there is not already a preference store registered with that
-	 * same preference hint.
-	 * 
-	 * @param preferencesHint
-	 *            the preference hint for which the preferences store is to be
-	 *            associated
-	 * @param preferenceStore
-	 *            the preference store initialized with the diagram preferences
-	 *            (an instance of
-	 *            {@link org.eclipse.jface.preference.IPreferenceStore})
-	 * @return true if the preference store was successfully registered; false
-	 *         otherwise
-	 */
-	public static boolean registerPreferenceStore(PreferencesHint preferencesHint,
-			Object preferenceStore) {
-		if (preferenceStores.containsKey(preferencesHint)) {
-			return false;
-		}
-		preferenceStores.put(preferencesHint, preferenceStore);
-		return true;
-	}
-
-	/**
-	 * Gets the preference store registered with the preference hint given.
-	 * 
-	 * @param preferenceHint
-	 *            the preference hint
-	 * @return the preference store (an instance of
-	 *         {@link org.eclipse.jface.preference.IPreferenceStore})
-	 *         registered with the preferences hint given; if no preference
-	 *         store has been registered with this hint the preference store
-	 *         with the default values is returned.
-	 */
-	public Object getPreferenceStore() {
-		Object store = preferenceStores.get(this);
-		if (store == null) {
-			store = preferenceStores.get(PreferencesHint.USE_DEFAULTS);
-		}
-		return store;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/AbstractDiagramEventBrokerProvider.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/AbstractDiagramEventBrokerProvider.java
deleted file mode 100644
index de4ab3f..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/AbstractDiagramEventBrokerProvider.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.providers;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.eventbroker.CreateDiagramEventBrokerOperation;
-
-/**
- * The Diagram Event Broker Factory Interface
- * This factory interface allows clients of the Diagram layer to provide
- * Their own Diagram event broker instances.
- * @author MMostafa
- */
-abstract public class AbstractDiagramEventBrokerProvider
-    extends AbstractProvider
-    implements DiagramEventBrokerProvider {
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-     */
-    public boolean provides(IOperation operation) {
-        if (operation instanceof CreateDiagramEventBrokerOperation)
-            return provides((CreateDiagramEventBrokerOperation) operation);
-        return false;
-    }
-
-    /**
-     * Indicates whether this provider provides the specified operation.
-     * @return <code>true</code> if this provider provides the operation;
-     *         <code>false</code> otherwise.
-     * @param operation
-     *            The operation in question.
-     */
-    abstract public boolean provides(CreateDiagramEventBrokerOperation operation);
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/AbstractViewProvider.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/AbstractViewProvider.java
deleted file mode 100644
index 82feb34..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/AbstractViewProvider.java
+++ /dev/null

@@ -1,343 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.providers;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramStatusCodes;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Implements of the <code>IViewProvider</code> interface. This
- * implementations invokes the approrpiate factory method by inspecting the
- * supplied operation and provides the actual view creation functionality.
- */
-public class AbstractViewProvider
-	extends AbstractProvider
-	implements IViewProvider {
-
-	private static String viewCreationMethodName = "createView"; //$NON-NLS-1$
-
-	private static String diagramCreationMethodName = "createDiagram"; //$NON-NLS-1$
-	
-	static protected class ClassToCreationMethodMap
-		extends HashMap {
-		static final long serialVersionUID = 1;
-		
-		public void addMethod(Class clazz, Method method) {
-			if (get(clazz) == null)
-				put(clazz, method);
-		}
-
-		public Method getCreationMethod(Class clazz) {
-			return (Method) get(clazz);
-		}
-	}
-
-	public static ClassToCreationMethodMap classToCreateMethod = new ClassToCreationMethodMap();
-
-	/**
-	 * Determines whether this view provider can provide for the required
-	 * operation It inspects the type of view operation and calls the
-	 * corresponding <code>provides</code> method.
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(IOperation)
-	 */
-	public final boolean provides(IOperation operation) {
-		/* if this is the CreateViewForKindOperation operation */
-		if (operation instanceof CreateViewForKindOperation)
-			return provides((CreateViewForKindOperation) operation);
-
-		/* Make sure it is a view operation */
-		assert operation instanceof CreateViewOperation : "operation is not CreateViewOperation in AbstractViewProvider";//$NON-NLS-1$
-
-		/* call the specific provides method */
-		if (operation instanceof CreateDiagramViewOperation)
-			return provides((CreateDiagramViewOperation) operation);
-		else if (operation instanceof CreateEdgeViewOperation)
-			return provides((CreateEdgeViewOperation) operation);
-		else if (operation instanceof CreateNodeViewOperation)
-			return provides((CreateNodeViewOperation) operation);
-		return false;
-	}
-
-	public final Diagram createDiagram(IAdaptable contextElement,
-			String diagramKind, PreferencesHint preferencesHint) {
-		return (Diagram) createNewView(getDiagramViewClass(contextElement,
-			diagramKind), new Object[] {contextElement, diagramKind,
-			preferencesHint});
-	}
-
-	public final Edge createEdge(IAdaptable semanticAdapter,
-			View containerView, String semanticHint, int index,
-			boolean persisted, PreferencesHint preferencesHint) {
-
-		return (Edge) createNewView(getEdgeViewClass(semanticAdapter,
-			containerView, semanticHint), new Object[] {semanticAdapter,
-			containerView, semanticHint, new Integer(index),
-			Boolean.valueOf(persisted), preferencesHint});
-	}
-
-	public final Node createNode(IAdaptable semanticAdapter,
-			View containerView, String semanticHint, int index,
-			boolean persisted, PreferencesHint preferencesHint) {
-
-		return (Node) createNewView(getNodeViewClass(semanticAdapter,
-			containerView, semanticHint), new Object[] {semanticAdapter,
-			containerView, semanticHint, new Integer(index),
-			Boolean.valueOf(persisted), preferencesHint});
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified view
-	 * creation operation
-	 * 
-	 * @param operation
-	 *            Contains a semantic kind and a containerView
-	 * @return boolean
-	 */
-	protected boolean provides(CreateViewForKindOperation op) {
-		if (op.getViewKind() == Node.class)
-			return getNodeViewClass(op.getSemanticAdapter(), op
-				.getContainerView(), op.getSemanticHint()) != null;
-		if (op.getViewKind() == Edge.class)
-			return getEdgeViewClass(op.getSemanticAdapter(), op
-				.getContainerView(), op.getSemanticHint()) != null;
-		return true;
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified diagram
-	 * view operation
-	 * 
-	 * @param operation
-	 * @return boolean
-	 */
-	protected boolean provides(CreateDiagramViewOperation operation) {
-		return getDiagramViewClass(operation.getSemanticAdapter(), operation
-			.getSemanticHint()) != null;
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified edge view
-	 * operation
-	 * 
-	 * @param operation
-	 * @return boolean
-	 */
-	protected boolean provides(CreateEdgeViewOperation operation) {
-		return (getEdgeViewClass(operation.getSemanticAdapter(), operation
-			.getContainerView(), operation.getSemanticHint()) != null);
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified node view
-	 * operation
-	 * 
-	 * @param operation
-	 * @return boolean
-	 */
-	protected boolean provides(CreateNodeViewOperation operation) {
-		return (getNodeViewClass(operation.getSemanticAdapter(), operation
-			.getContainerView(), operation.getSemanticHint()) != null);
-	}
-
-	/**
-	 * Returns the diagram view class to instantiate based on the passed params
-	 * 
-	 * @param semanticAdapter
-	 *            TODO
-	 * @param semanticAdapter
-	 * @return Class
-	 */
-	protected Class getDiagramViewClass(IAdaptable semanticAdapter,
-			String diagramKind) {
-		return null;
-	}
-
-	/**
-	 * Returns the edge view class to instantiate based on the passed params
-	 * 
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getEdgeViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * Returns the node view class to instantiate based on the passed params
-	 * 
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getNodeViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * creates a view instance via reflection.
-	 * 
-	 * @param constructorParams
-	 *            the view's constructor parameters.
-	 */
-	private View createNewView(Class viewClass, Object[] constructorParams) {
-		try {
-			assert null != viewClass : "Null viewClass in AbstractProvider";//$NON-NLS-1$			
-			assert null != constructorParams : "Null constructorParams in AbstractProvider";//$NON-NLS-1$
-
-			Constructor constructor = getFactoryConstructor(viewClass);
-			if (constructor == null) {
-				Log
-					.error(
-						DiagramPlugin.getInstance(),
-						DiagramStatusCodes.SERVICE_FAILURE,
-						"View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
-				return null;
-			}
-
-			Object factory = constructor.newInstance(null);
-			Method method = getCreationMethod(viewClass, constructorParams);
-			if (method == null) {
-				Log
-					.error(
-						DiagramPlugin.getInstance(),
-						DiagramStatusCodes.SERVICE_FAILURE,
-						"View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
-				return null;
-			}
-			return (View) method.invoke(factory, constructorParams);
-		} catch (Throwable e) {
-			String eMsg = NLS
-				.bind(
-					DiagramCoreMessages.AbstractViewProvider_create_view_failed_ERROR_,
-					viewClass.getName());
-			Log.warning(DiagramPlugin.getInstance(), IStatus.WARNING, eMsg, e);
-			return null;
-		}
-	}
-
-	private Constructor getFactoryConstructor(Class viewClass) {
-		if (viewClass != null) {
-			Constructor[] ctors = viewClass.getConstructors();
-			for (int i = 0; i < ctors.length; i++) {
-				if (ctors[i].getParameterTypes().length == 0) {
-					return ctors[i];
-				}
-			}
-		}
-		return null;
-	}
-
-	/** Return the <i>creation</i> constructor for the cached view class. */
-	private Method getCreationMethod(Class viewClass, Object[] params) {
-		if (viewClass != null) {
-			Method method = classToCreateMethod.getCreationMethod(viewClass);
-			if (method != null)
-				return method;
-
-			Method[] methods = viewClass.getMethods();
-			for (int i = 0; i < methods.length; i++) {
-				method = methods[i];
-				String methodName = method.getName();
-				if (methodName.equals(viewCreationMethodName)
-					|| methodName.equals(diagramCreationMethodName)) {
-					classToCreateMethod.addMethod(viewClass, method);
-					return method;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the EClass associated with the semantic adapter
-	 * 
-	 * @param semanticAdapter
-	 * @return EClass
-	 */
-	protected EClass getSemanticEClass(IAdaptable semanticAdapter) {
-		if (semanticAdapter == null)
-			return null;
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null)
-			return EMFCoreUtil.getProxyClass(eObject);
-		IElementType type = (IElementType) semanticAdapter
-			.getAdapter(IElementType.class);
-		if (type != null)
-			return type.getEClass();
-		return null;
-	}
-
-	/**
-	 * Returns the semantic element associated with the semantic adapter
-	 * 
-	 * @param semanticAdapter
-	 * @return EClass
-	 */
-	protected EObject getSemanticElement(IAdaptable semanticAdapter) {
-		if (semanticAdapter == null)// TODO which MEditingDomain to use?
-			return null;
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null)
-			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);
-		return null;
-	}
-
-	/**
-	 * Returns the semantic element associated with the semantic adapter
-	 * 
-	 * @param semanticAdapter
-	 * @return EClass
-	 */
-	protected EObject getSemanticElement(IAdaptable semanticAdapter,
-			TransactionalEditingDomain domain) {
-		if (semanticAdapter == null)
-			return null;
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null)
-			return EMFCoreUtil.resolve(domain, eObject);
-		return null;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/DiagramEventBrokerProvider.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/DiagramEventBrokerProvider.java
deleted file mode 100644
index 9bdf505..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/DiagramEventBrokerProvider.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.providers;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-
-/**
- * @author MMostafa The diagram event broker provider interface
- *         <p>
- *         This interface is <EM>not</EM> intended to be implemented by
- *         clients as new methods may be added in the future. Extend
- *         {@link AbstractDiagramEventBrokerProvider} instead.
- *         </p>
- */
-
-public interface DiagramEventBrokerProvider
-    extends IProvider {
-
-    /**
-     * Creates a <code>DiagramEventBroker</code> instance and associate it
-     * with the passed <code>TransactionalEditingDomain</code>
-     * 
-     * @param editingDomain
-     *            the editing domain that will be associated with the diagram
-     *            event broker
-     * @return a new diagram event broker instance
-     */
-    public DiagramEventBroker createDiagramEventBroker(
-            TransactionalEditingDomain editingDomain);
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/IViewProvider.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/IViewProvider.java
deleted file mode 100644
index ae4e6a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/IViewProvider.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.providers;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author melaasar, mmostafa
- * 
- * An interface for manipulating the notational model Defines the factory
- * methods for creating the various view elements.
- * <p>
- * This interface is <EM>not</EM> intended to be implemented by clients as new
- * methods may be added in the future. Extend {@link AbstractViewProvider}
- * instead.
- * </p>
- */
-public interface IViewProvider extends IProvider {
-
-	/**
-	 * create an <code>Diagram</code> element.
-	 * @param IAdaptable (for semantic element)
-	 * @param diagramKind  indicates the diagram type 
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 *  @return the created <code>Diagram</code>
-	 */
-	public Diagram createDiagram(
-		IAdaptable semanticAdapter,
-		String diagramKind, PreferencesHint preferencesHint);
-
-	/** 
-	 * create an <code>Edge</code> element.
-	 * @param IAdaptable (for semantic element)
-	 * @param containerView the container view that will contain the created view.
-	 * @param indicates the type of the Edge, it could be used later to determine the edge type
-	 * @param index position in the container view's list of children views.
-	 * @param persisted indicates if the created edge will be persisted or not
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return the created <code>Edge</code>
-	 */
-	public Edge createEdge(
-		IAdaptable semanticAdapter,
-		View containerView,
-		String semanticHint,
-		int index,
-		boolean persisted, PreferencesHint preferencesHint);
-		
-	/** 
-	 * create a <code>Node</code>.
-	 * @param IAdaptable (for semantic element)
-	 * @param containerView the container view that will contain the created view.
-	 * @param indicates the type of the view, it could be used later to determine the view type
-	 * @param index position in the container view's list of children views.
-	 * @param persisted indicates if the created view will be persisted or not
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return the created <code>Node</code>
-	 */
-	public Node createNode(
-		IAdaptable semanticAdapter,
-		View containerView,
-		String semanticHint,
-		int index,
-		boolean persisted, PreferencesHint preferencesHint);
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/ViewProviderConfiguration.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/ViewProviderConfiguration.java
deleted file mode 100644
index 8886756..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/providers/ViewProviderConfiguration.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.providers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author melaasar
- *
- * A provider configuration for the ViewService. It helps in filtering out
- * and delay loading unrelated providers.
- */
-public class ViewProviderConfiguration extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String CONTEXT = "context"; //$NON-NLS-1$
-	private static final String VIEW_CLASS = "viewClass"; //$NON-NLS-1$
-	private static final String ELEMENTS = "elements"; //$NON-NLS-1$
-	private static final String CONTAINERVIEWS = "containerViews"; //$NON-NLS-1$
-	private static final String SEMANTICHINTS = "semanticHints"; //$NON-NLS-1$
-
-	/** a map of requests supported by this provider to their target contexts*/
-	private List requests = new ArrayList();
-
-	/**
-	 * Builds a new provider contribution descriptor by parsing its configuration element
-	 * 
-	 * @param configElement A provider configuration element
-	 * @return A provider XML contribution descriptor
-	 */
-	public static ViewProviderConfiguration parse(IConfigurationElement configElement) {		
-		assert null != configElement : "Null provider configuration elemen in ViewProviderConfiguration";//$NON-NLS-1$
-		return new ViewProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private ViewProviderConfiguration(IConfigurationElement configElement) {
-		IConfigurationElement configChildren[];
-
-		// read the object descriptors
-		Map objects = new HashMap();
-		configChildren = configElement.getChildren(OBJECT);
-		for (int i = 0; i < configChildren.length; i++) {
-			String id = configChildren[i].getAttribute(ID);
-			if (id != null)
-				objects.put(id, new ObjectDescriptor(configChildren[i]));
-		}
-
-		// read the context descriptors
-		configChildren = configElement.getChildren(CONTEXT);
-		for (int i = 0; i < configChildren.length; i++) {
-			String viewClassName = configChildren[i].getAttribute(VIEW_CLASS);
-			List elements =
-				getObjectList(
-					configChildren[i].getAttribute(ELEMENTS),
-					objects, configElement);
-			List parentViews =
-				getObjectList(
-					configChildren[i].getAttribute(CONTAINERVIEWS),
-					objects, configElement);
-			Set semanticHints =
-				getStrings(configChildren[i].getAttribute(SEMANTICHINTS));
-			if (viewClassName != null
-				|| elements != null
-				|| parentViews != null
-				|| semanticHints != null)
-				requests.add(
-					new ContextDescriptor(
-						viewClassName,
-						elements,
-						parentViews,
-						semanticHints));
-		}
-	}
-
-	/**
-	 * Determines if the provider understands the given context
-	 * The provider understands the request if:
-	 * 1- There are no listed provider contexts
-	 * 2- The context matches one of the provider contexts 
-	 * 
-	 * @param viewKind The view kind
-	 * @param semanticAdapter The semantic adapter
-	 * @param containerView The container view
-	 * @param semanticHint the factory hint
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supports(
-		Class viewKind,
-		IAdaptable semanticAdapter,
-		View containerView,
-		String semanticHint) {
-		if (requests.isEmpty())
-			return true;
-
-		for (Iterator iter = requests.iterator();iter.hasNext();) {
-			ContextDescriptor request = (ContextDescriptor) iter.next();
-			if (request
-				.matches(
-					viewKind,
-					semanticAdapter,
-					containerView,
-					semanticHint))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * A descriptor for a provider context
-	 */
-	private static class ContextDescriptor {
-		/** the view's kind class name */
-		private String viewClassName;
-		/** the request's elements */
-		private final List elements;
-		/** the request's parent views */
-		private final List parentViews;
-		/** the request's semantic hints */
-		private final Set semanticHints;
-
-		/**
-		 * creates a new context descriptor from some context
-		 * 
-		 * @param viewKind The view kind
-		 * @param semanticAdapter The semantic adapter
-		 * @param containerView The container view
-		 * @param semanticHint the factory hint
-		 */
-		public ContextDescriptor(
-			String viewClassName,
-			List elements,
-			List parentViews,
-			Set semanticHints) {
-			this.viewClassName = viewClassName;
-			this.elements = elements;
-			this.parentViews = parentViews;
-			this.semanticHints = semanticHints;
-		}
-
-		/**
-		 * Determines if the context descriptor matches the given context
-		 * 
-		 * @param viewKind The view kind
-		 * @param semanticAdapter The semantic adapter
-		 * @param containerView The container view
-		 * @param semanticHint the semantic hint
-		 * @return boolean
-		 */
-		public boolean matches(
-			Class viewKind,
-			IAdaptable semanticAdapter,
-			View containerView,
-			String semanticHint) {
-			if (viewClassName != null) {
-				if (!viewClassName.equals(viewKind.getName()))
-					return false;
-			}
-			if (semanticHints != null) {
-				if (!semanticHints.contains(semanticHint))
-					return false;
-			}
-			if (elements != null) {
-				if (!objectMatches(semanticAdapter, elements))
-					return false;
-			}
-			if (parentViews != null) {
-				if (!objectMatches(containerView, parentViews))
-					return false;
-			}
-			return true;
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/DiagramEventBrokerService.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/DiagramEventBrokerService.java
deleted file mode 100644
index 3b20dc2..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/DiagramEventBrokerService.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.providers.DiagramEventBrokerProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.eventbroker.CreateDiagramEventBrokerOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;
-
-/**
- * A service for manipulating Diagram Event broker creations
- * 
- * @author mmostafa
- */
-public class DiagramEventBrokerService
-    extends Service
-    implements DiagramEventBrokerProvider {
-
-    /**
-     * The singleton instance of the Diagram Event Broker Factory service.
-     */
-    private final static DiagramEventBrokerService instance = new DiagramEventBrokerService();
-
-    static {
-        instance.configureProviders(DiagramPlugin.getPluginId(),
-            "diagramEventBrokerProviders"); //$NON-NLS-1$
-    }
-
-    /**
-     * Retrieves the singleton instance of the diagram Event Broker Factory
-     * service
-     * 
-     * @return The diagram Event Broker Factory service singleton.
-     */
-    public static DiagramEventBrokerService getInstance() {
-        return instance;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.diagram.core.providers.DiagramEventBrokerFactory#createDiagramEventBroker(org.eclipse.emf.transaction.TransactionalEditingDomain)
-     */
-    public final DiagramEventBroker createDiagramEventBroker(
-            TransactionalEditingDomain editingDomain) {
-        return (DiagramEventBroker) executeUnique(ExecutionStrategy.FIRST,
-            new CreateDiagramEventBrokerOperation(editingDomain));
-    }
-
-    protected static class ProviderDescriptor
-        extends Service.ProviderDescriptor {
-
-        private IConfigurationElement element;
-
-        public ProviderDescriptor(IConfigurationElement element) {
-            super(element);
-            this.element = element;
-        }
-
-        /**
-         * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-         */
-        public boolean provides(IOperation operation) {
-            if (!policyInitialized) {
-                policy = getPolicy();
-                policyInitialized = true;
-            }
-            if (policy != null)
-                return policy.provides(operation);
-            if (provider == null) {
-                if (isSupportedInExtention(operation)) {
-                    return getProvider().provides(operation);
-                }
-                return false;
-            }
-            return getProvider().provides(operation);
-        }
-
-        private boolean isSupportedInExtention(IOperation operation) {
-            IConfigurationElement[] ids = element.getChildren("editingDomain");//$NON-NLS-1$
-            if (null == ids || ids.length == 0)
-                return false;
-            String id = ((CreateDiagramEventBrokerOperation) operation)
-                .getEditingDomain().getID();
-            if (null == id)
-                return false;
-            for (int i = 0; i < ids.length; i++) {
-                if (id.equals(ids[i].getAttribute("ID")))//$NON-NLS-1$
-                    return true;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.core.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
-     */
-    protected Service.ProviderDescriptor newProviderDescriptor(
-            IConfigurationElement _element) {
-        return new ProviderDescriptor(_element);
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.core.service.Service#createPriorityCache()
-     */
-    protected Map createPriorityCache() {
-        return new HashMap();
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.core.service.Service#getCacheKey(org.eclipse.gmf.runtime.common.core.service.IOperation)
-     */
-    protected Object getCachingKey(IOperation operation) {
-        return ((CreateViewOperation) operation).getCachingKey();
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/ViewService.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/ViewService.java
deleted file mode 100644
index cb546ef..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/ViewService.java
+++ /dev/null

@@ -1,503 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.providers.ViewProviderConfiguration;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateChildViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- ** A service for manipulating the notational models
- * @author melaasar, mmostafa
- */
-final public class ViewService
-	extends Service
-	implements IViewProvider {
-
-	/**
-	 * A descriptor for <code>ISemanticProvider</code> defined
-	 * by a configuration element.
-	 */
-	protected static class ProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/** the provider configuration parsed from XML */
-		private ViewProviderConfiguration providerConfiguration;
-
-		/**
-		 * Constructs a <code>ISemanticProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element The configuration element describing the provider.
-		 */
-		public ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-			this.providerConfiguration = ViewProviderConfiguration
-				.parse(element);
-			assert null != providerConfiguration : "Null providerConfiguration in ProviderDescriptor";//$NON-NLS-1$
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		public boolean provides(IOperation operation) {
-			if (!policyInitialized){
-				policy = getPolicy();
-				policyInitialized = true;
-			}
-			if (policy != null)
-				return policy.provides(operation);
-			if (provider == null) {
-				if (isSupportedInExtention(operation)) {
-					providerConfiguration = null;
-					return getProvider().provides(operation);
-				}
-				return false;
-			}
-			return getProvider().provides(operation);
-		}
-
-		/**
-		 * Cheks if the operation is supported by the XML extension
-		 * @param operation
-		 * @return
-		 */
-		private boolean isSupportedInExtention(IOperation operation) {
-			if (operation instanceof CreateViewOperation) {
-				CreateViewOperation o = (CreateViewOperation) operation;
-				Class viewKind = o.getViewKind();
-				IAdaptable semanticAdapter = o.getSemanticAdapter();
-				String semanticHint = o.getSemanticHint();
-				View containerView = null;
-				if (o instanceof CreateChildViewOperation) {
-					CreateChildViewOperation cvo = (CreateChildViewOperation) o;
-					containerView = cvo.getContainerView();
-				}
-
-				return providerConfiguration.supports(viewKind,
-					semanticAdapter, containerView, semanticHint);
-			}
-			return false;
-		}
-
-		/** 
-		 * the default implementation is overriden here to make it easier to debug
-		 * XML providers, now when you select the ProviderDescriptor in the debug
-		 * window the provider class name will be displayed
-		 * @return the provider class name
-		 */
-		public String toString() {
-			return getElement().getAttribute("class"); 	 //$NON-NLS-1$
-			//return (super.toString();
-		}
-
-	}
-
-	/**
-	 * The singleton instance of the notation service.
-	 */
-	private final static ViewService instance = new ViewService();
-
-	static {
-		instance.configureProviders(DiagramPlugin.getPluginId(), "viewProviders"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Retrieves the singleton instance of the notation service.
-	 * 
-	 * @return The notation service singleton.
-	 */
-	public static ViewService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * creates an instance
-	 */
-	protected ViewService() {
-		super(true, false);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	protected Service.ProviderDescriptor newProviderDescriptor(
-		IConfigurationElement element) {
-		return new ProviderDescriptor(element);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.Service#createPriorityCache()
-	 */
-	protected Map createPriorityCache() {
-		return new HashMap();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.Service#getCacheKey(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	protected Object getCachingKey(IOperation operation) {
-		return ((CreateViewOperation) operation).getCachingKey();
-	}
-
-	/**
-	 * Executes the specified operation using the FIRST execution
-	 * strategy.
-	 * @return The result of executing the model operation.
-	 * @param operation The model operation to be executed.
-	 */
-	private Object execute(IOperation operation) {
-		List results = execute(ExecutionStrategy.FIRST, operation);
-		return results.isEmpty() ? null : results.get(0);
-	}
-
-	/**
-	 * A convenience method to determine whether there is a provider 
-	 * that can create a view with the given parameters
-	 * @param viewKind
-	 * @param semanticAdapter adapts to either <code>Integer<code> or <code>IReference</code>
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return boolean
-	 */
-	public final boolean provides(Class viewKind, IAdaptable semanticAdapter,
-		View containerView, String semanticHint, int index,
-		boolean persisted, PreferencesHint preferencesHint) {
-		
-		assert (viewKind == Diagram.class ||
-				viewKind == Edge.class ||
-				viewKind == Node.class ) :
-				"The default View service does not support " + viewKind.getName() + " as a view kind";//$NON-NLS-1$ //$NON-NLS-2$
-
-		/* if the semantic adapter adapters to the semantic kind */
-		if (semanticAdapter != null) {
-			if (semanticAdapter.getAdapter(CreateElementRequest.class) != null) {
-				return providerExistsFor(new CreateViewForKindOperation(
-					viewKind, semanticAdapter, containerView, semanticHint,
-					index, preferencesHint));
-			}
-		}
-		if (viewKind == Diagram.class)
-			return providerExistsFor(new CreateDiagramViewOperation(
-				semanticAdapter, semanticHint, preferencesHint));
-		else if (viewKind == Edge.class)
-			return providerExistsFor(new CreateEdgeViewOperation(
-				semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint));
-		else if (viewKind == Node.class)
-			return providerExistsFor(new CreateNodeViewOperation(
-				semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint));
-		return false;
-	}
-
-	private boolean providerExistsFor(IOperation operation) {
-		return provides(operation);
-	}
-
-	/**
-	 * A convenience method to create a view with the given parameters
-	 * @param viewKind
-	 * @param semanticAdapter adapts to <code>IReference<code>
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return IView
-	 */
-	public final View createView(Class viewKind, IAdaptable semanticAdapter,
-		View containerView, String semanticHint, int index,
-		boolean persisted, PreferencesHint preferencesHint) {
-		
-		assert (viewKind == Diagram.class ||
-				viewKind == Edge.class ||
-				viewKind == Node.class ) :
-			    "The default View service does not support " + viewKind.getName() + " as a view kind";//$NON-NLS-1$ //$NON-NLS-2$
-
-		if (viewKind == Diagram.class)
-			return createDiagram(semanticAdapter, semanticHint, preferencesHint);
-		else if (viewKind == Edge.class)
-			return createEdge(semanticAdapter, containerView,
-				semanticHint, index, persisted, preferencesHint);
-		else if (viewKind == Node.class)
-			return createNode(semanticAdapter, containerView, semanticHint,
-				index, persisted, preferencesHint);
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider#createDiagram(org.eclipse.core.runtime.IAdaptable, java.lang.String, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
-	 */
-	public final Diagram createDiagram(IAdaptable semanticAdapter,
-		String diagramKindType, PreferencesHint preferencesHint) {
-		Diagram view = (Diagram) execute(new CreateDiagramViewOperation(
-			semanticAdapter, diagramKindType, preferencesHint));
-		return view;
-	}
-	
-	/**
-	 * Creates a diagram with the given context and kind
-	 * 
-	 * @param context
-	 *            The diagram element context
-	 * @param kind
-	 *            diagram kind, check {@link ViewType} for predefined values
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return A newly created <code>Diagram</code>
-	 */
-	public static Diagram createDiagram(EObject context, String kind,
-			PreferencesHint preferencesHint) {
-		IAdaptable viewModel = (context != null) ? new EObjectAdapter(context)
-				: null;
-		String viewType = (kind != null) ? kind : ""; //$NON-NLS-1$
-		return ViewService.getInstance().createDiagram(viewModel, viewType,
-				preferencesHint);
-	}
-	
-	/**
-	 * Creates a diagram with a kind
-	 * @param kind
-	 *            diagram kind, check {@link ViewType} for predefined values
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return A newly created <code>Diagram</code>
-	 */
-	public static Diagram createDiagram(String kind,
-			PreferencesHint preferencesHint) {
-		return ViewService.createDiagram((EObject)null, kind,
-				preferencesHint);
-	}
-	
-	/**
-	 * Creates a node for a given eObject and with a given type and inserts it
-	 * into a given container
-	 * 
-	 * @param container
-	 *            The node view container
-	 * @param eObject
-	 *            The node view object context
-	 * @param type
-	 *            The node view type, check {@link ViewType} for predefined
-	 *            values
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return A newly created <code>Node</code>
-	 */
-	public static Node createNode(View container, EObject eObject, String type,
-			PreferencesHint preferencesHint) {
-		assert null != container : "The container is null";//$NON-NLS-1$
-		IAdaptable viewModel = (eObject != null) ? new EObjectAdapter(eObject)
-				: null;
-		String viewType = (type != null) ? type : ""; //$NON-NLS-1$
-		View view = ViewService.getInstance().createNode(viewModel, container,
-				viewType, ViewUtil.APPEND, preferencesHint);
-		return (view != null) ? (Node) view : null;
-	}
-	
-	/**
-	 * Creates a node for a with a given type and inserts it thegiven container
-	 * 
-	 * @param container
-	 *            The node view container
-	 * @param type
-	 *            The node view type, check {@link ViewType} for predefined
-	 *            values
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return A newly created <code>Node</code>
-	 */
-	public static Node createNode(View container,String type,
-			PreferencesHint preferencesHint) {
-		return ViewService.createNode(container,(EObject)null,type,
-			 preferencesHint);
-	}
-	
-	
-	/**
-	 * Creates an edge for a given eObject and with a given type and connects it
-	 * between a given source and a given target
-	 * 
-	 * @param source
-	 *            The edge's source view
-	 * @param target
-	 *            The edge's target view
-	 * @param eObject
-	 *            The edge view object context
-	 * @param type
-	 *            The edge view type, check {@link ViewType} for predefined
-	 *            values
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return A newly created <code>Edge</code>
-	 */
-	public static Edge createEdge(View source, View target, EObject eObject,
-			String type, PreferencesHint preferencesHint) {
-		assert source != null : "The source is null"; //$NON-NLS-1$
-		assert target != null : "The target is null"; //$NON-NLS-1$
-		assert source.getDiagram() !=null : "The source is detached"; //$NON-NLS-1$
-		assert target.getDiagram() !=null : "The target is detached"; //$NON-NLS-1$
-		IAdaptable viewModel = (eObject != null) ? new EObjectAdapter(eObject)
-				: null;
-		Edge edge = (Edge)ViewService.getInstance().createEdge(viewModel,source.getDiagram(),
-				type, ViewUtil.APPEND, preferencesHint);
-		if (edge != null) {
-			edge.setSource(source);
-			edge.setTarget(target);
-		}
-		return edge;
-	}
-	
-	/**
-	 * Creates an edge with a given type and connects it between the given 
-	 * source and  target
-	 * 
-	 * @param source
-	 *            The edge's source view
-	 * @param target
-	 *            The edge's target view
-	 * @param type
-	 *            The edge view type, check {@link ViewType} for predefined
-	 *            values
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return A newly created <code>Edge</code>
-	 */
-	public static Edge createEdge(View source, View target,
-			String type, PreferencesHint preferencesHint) {
-		return ViewService.createEdge(source,target,(EObject)null,
-			type,preferencesHint);
-	}
-
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider#createEdge(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
-	 */
-	public final Edge createEdge(IAdaptable semanticAdapter,
-		View containerView, String semanticHint, int index,
-		boolean persisted, PreferencesHint preferencesHint) {
-		Edge edge = (Edge) execute(new CreateEdgeViewOperation(
-			semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint));
-		return edge;
-	}
-
-	/**
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return
-	 */
-	public final View createEdge(IAdaptable semanticAdapter,
-		View containerView, String semanticHint, int index, PreferencesHint preferencesHint) {
-		return createEdge(semanticAdapter, containerView,
-			semanticHint, index, true, preferencesHint);
-	}
-
-	/**
-	 * creates a persisted Node
-	 * @param semanticElement
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return the created node
-	 */
-	public final Node createNode(IAdaptable semanticElement,
-		View containerView, String semanticHint, int index, PreferencesHint preferencesHint) {
-		return createNode(semanticElement, containerView, semanticHint,
-			index, true, preferencesHint);
-	}
-
-	/**
-	 * creates a Node
-	 * @param semanticElement
-	 * @param containerView
-	 * @param semanticHint
-	 * @param persisted
-	 * @param index
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return the created node
-	 */
-	public Node createNode(IAdaptable semanticAdapter,
-			View containerView, String semanticHint, int index,
-			boolean persisted, PreferencesHint preferencesHint) {
-		Node node = (Node) execute(new CreateNodeViewOperation(
-			semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint));
-		return node;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/eventbroker/CreateDiagramEventBrokerOperation.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/eventbroker/CreateDiagramEventBrokerOperation.java
deleted file mode 100644
index 980eb19..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/eventbroker/CreateDiagramEventBrokerOperation.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services.eventbroker;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractDiagramEventBrokerProvider;
-
-/**
- * Operation used in creating a Diagram evnet broker instance
- * 
- * @author MMostafa
- */
-public class CreateDiagramEventBrokerOperation
-    implements IOperation {
-
-    // the transaction editing domain to use
-    private TransactionalEditingDomain editingDomain;
-
-    /**
-     * constructor
-     * 
-     * @param editingDomain
-     *            the editing domain to use during this operation
-     */
-    public CreateDiagramEventBrokerOperation(
-            TransactionalEditingDomain editingDomain) {
-        this.editingDomain = editingDomain;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-     */
-    public Object execute(IProvider provider) {
-        if (provider instanceof AbstractDiagramEventBrokerProvider)
-            return ((AbstractDiagramEventBrokerProvider) provider)
-                .createDiagramEventBroker(editingDomain);
-        else
-            return null;
-    }
-
-    /**
-     * @return editing domain
-     */
-    public TransactionalEditingDomain getEditingDomain() {
-        return editingDomain;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateChildViewOperation.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateChildViewOperation.java
deleted file mode 100644
index ba55f14..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateChildViewOperation.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services.view;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author melaasar
- *
- * Base of child view creation operations
- */
-public abstract class CreateChildViewOperation extends CreateViewOperation {
-
-	/** containerView view */
-	private final View containerView;
-
-	/** index of child in containerView children collection */
-	private final int index;
-
-	/** cached persisted flag. */
-	private boolean _persisted = true;
-	
-	/**
-	 * Method CreateChildViewOperation.
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param persisted
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 */
-	protected CreateChildViewOperation(
-		IAdaptable semanticAdapter,
-		View containerView,
-		String semanticHint,
-		int index,
-		boolean persisted, PreferencesHint preferencesHint) {
-		super(semanticAdapter, semanticHint, preferencesHint);
-
-		
-		assert null != containerView : "Null containerView in CreateChildViewOperation";//$NON-NLS-1$		
-		assert index >= ViewUtil.APPEND : "Invalid index in CreateChildViewOperation";//$NON-NLS-1$
-
-		this.containerView = containerView;
-		this.index = index;
-		_persisted = persisted;	
-	}
-
-	/**
-	 * Method getParent.
-	 * @return IContainerView
-	 */
-	public final View getContainerView() {
-		return containerView;
-	}
-
-	/**
-	 * Method getIndex.
-	 * @return int
-	 */
-	public final int getIndex() {
-		return index;
-	}
-
-	/** Return the <i>persisted</i> paramter value. */
-	public final boolean getPersisted() { 
-		return _persisted; 
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateDiagramViewOperation.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateDiagramViewOperation.java
deleted file mode 100644
index d3f7d90..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateDiagramViewOperation.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services.view;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * @author melaasar
- *
- * Diagram view creation operation
- */
-public final class CreateDiagramViewOperation extends CreateViewOperation {
-	
-	/**
-	 * Creates a new instance.
-	 * @param semanticAdapter
-	 * @param diagramKindType
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 */
-	public CreateDiagramViewOperation(IAdaptable semanticAdapter, String diagramKindType, PreferencesHint preferencesHint) {
-		super(semanticAdapter, diagramKindType, preferencesHint);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation#getViewKind()
-	 */
-	public final Class getViewKind() {
-		return Diagram.class;
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IViewProvider) provider).createDiagram(getSemanticAdapter(), getSemanticHint(), getPreferencesHint());
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateEdgeViewOperation.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateEdgeViewOperation.java
deleted file mode 100644
index f2c6941..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateEdgeViewOperation.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services.view;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * 
- * Edge view creation operation
- * @author melaasar
- */
-public final class CreateEdgeViewOperation extends CreateChildViewOperation {
-
-	/**
-	 * Creates a new instance.
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param persisted
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 */
-	public CreateEdgeViewOperation(
-		IAdaptable semanticAdapter,
-		View containerView,
-		String semanticHint,
-		int index,
-		boolean persisted, PreferencesHint preferencesHint) {
-		super(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation#getViewKind()
-	 */
-	public final Class getViewKind() {
-		return Edge.class;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IViewProvider) provider).createEdge(
-			getSemanticAdapter(),
-			getContainerView(),
-			getSemanticHint(),
-			getIndex(),
-			getPersisted(), getPreferencesHint());
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateNodeViewOperation.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateNodeViewOperation.java
deleted file mode 100644
index 3e35907..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateNodeViewOperation.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services.view;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Node view creation operation
- * @author melaasar
- */
-public final class CreateNodeViewOperation extends CreateChildViewOperation 
-{
-	/**
-	 * Constructor for CreateNodeViewOperation.
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param persisted
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 */
-	public CreateNodeViewOperation(
-		IAdaptable semanticAdapter,
-		View containerView,
-		String semanticHint,
-		int index,
-		boolean persisted, PreferencesHint preferencesHint) {
-		super(
-			semanticAdapter,
-			containerView,
-			semanticHint,
-			index,
-			persisted, preferencesHint);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation#getViewKind()
-	 */
-	public final Class getViewKind() {
-		return Node.class;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IViewProvider) provider).createNode(
-			getSemanticAdapter(),
-			getContainerView(),
-			getSemanticHint(),
-			getIndex(),
-			getPersisted(), getPreferencesHint());
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateViewForKindOperation.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateViewForKindOperation.java
deleted file mode 100644
index ef388ba..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateViewForKindOperation.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services.view;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author melaasar
- *
- * This operation is used to determine if there is a provider that can
- * create a view for the given element descriptor in the given container
- * 
- * The operation is "not" meant to be executed and is only passed to view
- * providers in their <code>provides</code> method for the above mentioned reason
- * To properly create a view, refer to <code>CreateViewOperation</code>
- * 
- */
-public final class CreateViewForKindOperation extends CreateChildViewOperation {
-	
-	private final Class viewKind;
-
-	/**
-	 * @param viewKind
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @param index
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 */
-	public CreateViewForKindOperation(
-		Class viewKind,
-		IAdaptable semanticAdapter,
-		View containerView,		
-		String semanticHint,
-		int index, PreferencesHint preferencesHint) {
-		super(
-			semanticAdapter,
-			containerView,
-			semanticHint,
-			index,
-			true, preferencesHint);
-		this.viewKind = viewKind;
-	}
-
-	/**
-	 * @return
-	 */
-	public final Class getViewKind() {
-		return viewKind;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		throw new UnsupportedOperationException("This operation cannot be executed. It is used to check if there is a view provider for the given ElementDescriptor"); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateViewOperation.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateViewOperation.java
deleted file mode 100644
index 141c4c9..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/CreateViewOperation.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.services.view;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author melaasar
- *
- * Base of view creation operations
- */
-public abstract class CreateViewOperation implements IOperation {
-
-	/** The semantic adapter */
-	private final IAdaptable semanticAdapter;
-	
-	/** child view factory hint */
-	private final String semanticHint;
-	
-	/**
-	 * The hint used to find the appropriate preference store from which general
-	 * diagramming preference values for properties of shapes, connections, and
-	 * diagrams can be retrieved. This hint is mapped to a preference store in
-	 * the {@link DiagramPreferencesRegistry}.
-	 */
-	private final PreferencesHint preferencesHint;
-
-	/**
-	 * Method CreateViewOperation.
-	 * @param semanticRef adapts to <code<IReference</code>
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 */
-	protected CreateViewOperation(
-		IAdaptable semanticAdapter,
-		String semanticHint, PreferencesHint preferencesHint) {
-		
-		this.semanticAdapter = semanticAdapter;		
-		this.semanticHint = semanticHint;
-		this.preferencesHint = preferencesHint;
-	}
-
-	/**
-	 * Method getSemanticAdapter.
-	 * @return IAdaptable
-	 */
-	public final IAdaptable getSemanticAdapter() {
-		return semanticAdapter;
-	}
-
-	/**
-	 * Returns the view kind class
-	 * 
-	 * @return class of the view kind
-	 */
-	public abstract Class getViewKind();
-
-	/**
-	 * Method extractContainerView.
-	 * Return the supplied view's container. This method requires that the supplied
-	 * view be <b>incarnated</b> in order to get the container.
-	 * @param view
-	 * @return IContainerView
-	 */
-	static final View extractContainerView(View view) {
-		/*return (IContainerView) ViewService.getInstance().incarnateView(
-			ViewUtil.getContainerView(view));*/
-		EObject container = view.eContainer();
-		if (container instanceof View)
-			return (View)container;
-		return null;
-	}
-
-	/**
-	 * Method extractSemanticHint.
-	 * Return the supplied view's semantic hint
-	 * @param view
-	 * @return String
-	 */
-	static final String extractSemanticHint(View view) {
-		return view.getType();
-	}
-
-	/**
-	 * Method extractSemanticAdapter.
-	 * @param umlView
-	 * @return IAdaptable
-	 */
-	static final IAdaptable extractSemanticAdapter(View view) {
-		EObject element = view.getElement();
-		if (element  != null)
-			return  new EObjectAdapter(element);
-		return null;
-	}
-
-	/**
-	 * Method getSemanticHint.
-	 * @return String
-	 */
-	public final String getSemanticHint() {
-		return semanticHint;
-	}
-
-	/**
-	 * Gets the preferences hint that is to be used to find the appropriate
-	 * preference store from which to retrieve diagram preference values. The
-	 * preference hint is mapped to a preference store in the preference
-	 * registry <@link DiagramPreferencesRegistry>.
-	 * 
-	 * @return the preferences hint
-	 */
-	public final PreferencesHint getPreferencesHint() {
-		return preferencesHint;
-	}
-	
-	private String cachingKey;
-	private static final String dummyHiny = "dummy";  //$NON-NLS-1$
-
-	public String getCachingKey() {
-		if (cachingKey == null)
-			cachingKey = determineCachingKey();
-		return cachingKey;
-	}
-	
-	private String determineCachingKey() {
-		String type = getSemanticHint();
-		if (type != null && type.length() > 0)
-			return type;
-		
-		String classId = getSemanticEClassId();
-		if (classId != null)
-			return classId;
-		
-		return dummyHiny;
-	}
-
-	/** Return the supplied view's underlying notation element's eClass */
-	private String getSemanticEClassId() {
-		if (semanticAdapter == null)
-			return null;
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null)
-			return PackageUtil.getID(EMFCoreUtil.getProxyClass(eObject));
-		IElementType type = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-		if (type != null)
-			PackageUtil.getID(type.getEClass());
-		return null;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/package.html
deleted file mode 100644
index 68f7113..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/services/view/package.html
+++ /dev/null

@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-Provides a set of classes to use when creating <i>views</i>.
-</p>
-<p>Each created view façade object has two constructors:</p>
-<ul>
-<li> Creation constructor: creates the notational element, adds custom properties, initializes the properties with preferred values from the preference store and then creates any required children sub-views.
-<li> Incarnation constructor: only aggregates the given notational element.
-</ul>
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewRefactorHelper.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewRefactorHelper.java
deleted file mode 100644
index 7c4415d..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewRefactorHelper.java
+++ /dev/null

@@ -1,469 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.FilteringStyle;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.SortingStyle;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A helper class to perform notational refactoring based on a semantic refactoring.
- * The helper provides a typical or generic implementation of the refactoring operation
- * based on the Notation metamodel. However, if the notations being refactoring use other
- * extended notation metamodels, the implementation of this helper class might need to
- * be extended. This can be achieved by directly subclassing this helper class.
- * 
- * @author melaasar - Maged Elaasar
- */
-public class ViewRefactorHelper {
-
-	private PreferencesHint preferencesHint;
-	
-	/**
-	 * Constructs a new <code>ViewRefactorHelper</code> with a given preferences hint 
-	 */
-	public ViewRefactorHelper() {
-		this(PreferencesHint.USE_DEFAULTS);
-	}
-
-	/**
-	 * Constructs a new <code>ViewRefactorHelper</code> with a given preferences hint 
-	 * 
-	 * @param preferencesHint The preferences hint to be used to perform refactoring
-	 */
-	public ViewRefactorHelper(PreferencesHint preferencesHint) {
-		this.preferencesHint = preferencesHint;
-	}
-	
-	/**
-	 * Returns the preferences hint
-	 * 
-	 * @return The preferences hint
-	 */
-	public PreferencesHint getPreferencesHint() {
-		return preferencesHint;
-	}
-
-	/**
-	 * Refactors the notations associated with the old element to make them
-	 * consistent with the new element.
-	 * 
-	 * @param oldElement The semantic element being refactored
-	 * @param newElement The semantic element that replaces the refactored one
-	 */
-	public void refactor(EObject oldElement, EObject newElement) {
-
-		// refactor views
-		Collection views = getReferencingViews(oldElement); 
-		for (Iterator i = views.iterator(); i.hasNext();) {
-			View oldView = (View) i.next();
-			if (oldView instanceof Node) {
-				refactorNode((Node)oldView, newElement);
-			} else if (oldView instanceof Edge) {
-				refactorEdge((Edge)oldView, newElement);
-			} else if (oldView instanceof Diagram) {
-				refactorDiagram((Diagram)oldView, newElement);
-			}
-			DestroyElementCommand.destroy(oldView);
-		}
-		
-		// refactor filtering styles
-		Collection filterStyles = EMFCoreUtil.getReferencers(oldElement, new EReference[]{NotationPackage.eINSTANCE.getFilteringStyle_FilteredObjects()});
-		for (Iterator i = filterStyles.iterator(); i.hasNext();) {
-			List filteredObjects = ((FilteringStyle) i.next()).getFilteredObjects();
-			if (!filteredObjects.contains(oldElement))
-				filteredObjects.add(filteredObjects.indexOf(oldElement), newElement);
-			filteredObjects.remove(oldElement);
-		}
-		
-		// refactor sorting styles
-		Collection sortingStyles = EMFCoreUtil.getReferencers(oldElement, new EReference[]{NotationPackage.eINSTANCE.getSortingStyle_SortedObjects()});
-		for (Iterator i = sortingStyles.iterator(); i.hasNext();) {
-			List sortingObjects = ((SortingStyle) i.next()).getSortedObjects();
-			if (!sortingObjects.contains(oldElement))
-				sortingObjects.add(sortingObjects.indexOf(oldElement), newElement);
-			sortingObjects.remove(oldElement);
-		}
-	}
-	
-	/**
-	 * Refactors an old node to a new one with the given new element
-	 * 
-	 * @param oldNode The old node being refactored
-	 * @param newElement The replacing new element 
-	 * @return A new refactored node
-	 */
-	protected Node refactorNode(Node oldNode, EObject newElement) {
-		if (oldNode.eContainingFeature() == NotationPackage.eINSTANCE.getView_PersistedChildren()) {
-			Node newNode = createNode(oldNode, newElement);
-
-			if (newNode != null) {
-				copyNodeFeatures(oldNode, newNode);
-				View container = (View) oldNode.eContainer();
-				container.getPersistedChildren().move(container.getPersistedChildren().indexOf(oldNode), newNode);
-				refactorGuides(oldNode, newNode);
-				return newNode;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Refactors an old edge to a new one with the given new element
-	 * 
-	 * @param oldEdge The old edge being refactored
-	 * @param newElement The replacing new element 
-	 * @return A new refactored edge
-	 */
-	protected Edge refactorEdge(Edge oldEdge, EObject newElement) {
-		if (oldEdge.eContainingFeature() == NotationPackage.eINSTANCE.getDiagram_PersistedEdges()) {
-			Edge newEdge = createEdge(oldEdge, newElement);
-			
-			if (newEdge != null) {
-				copyEdgeFeatures(oldEdge, newEdge);
-				Diagram container = (Diagram)oldEdge.eContainer();
-				container.getPersistedEdges().move(container.getPersistedEdges().indexOf(oldEdge), newEdge);
-				return newEdge;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Refactors an old diagram to a new one with the given new element
-	 * 
-	 * @param oldDiagram The old diagram being refactored
-	 * @param newElement The replacing new element 
-	 * @return A new refactored diagram
-	 */
-	protected Diagram refactorDiagram(Diagram oldDiagram, EObject newElement) {
-		if (oldDiagram.eContainingFeature() == EcorePackage.eINSTANCE.getEAnnotation_Contents()) {
-			Diagram newDiagram = createDiagram(oldDiagram, newElement);
-			
-			if (newDiagram != null) {
-				copyDiagramFeatures(oldDiagram, newDiagram);
-				EAnnotation container = (EAnnotation) oldDiagram.eContainer(); 
-				container.getContents().add(container.getContents().indexOf(oldDiagram), newDiagram);
-				refactorDiagramLinks(oldDiagram, newDiagram);
-				return newDiagram;
-			}
-		}
-		return null;
-	}
-
-	protected void refactorDiagramLinks(Diagram oldDiagram, Diagram newDiagram) {
-		Collection links = EMFCoreUtil.getReferencers(oldDiagram, new EReference[]{NotationPackage.eINSTANCE.getView_Element()});
-		for (Iterator i = links.iterator(); i.hasNext();) {
-			View view = (View) i.next();
-			view.setElement(newDiagram);
-		}
-	}
-	
-	/**
-	 * Copies the notational features of the old node to the new node
-	 * 
-	 * @param oldNode The old node to copy features from
-	 * @param newNode The new node to copy features to
-	 */
-	protected void copyNodeFeatures(Node oldNode, Node newNode) {
-		newNode.setLayoutConstraint(oldNode.getLayoutConstraint());
-		copyViewFeatures(oldNode, newNode);
-	}
-
-	/**
-	 * Copies the notational features of the old edge to the new edge
-	 * 
-	 * @param oldEdge The old edge to copy features from
-	 * @param newEdge The new edge to copy features to
-	 */
-	protected void copyEdgeFeatures(Edge oldEdge, Edge newEdge) {
-		newEdge.setBendpoints(oldEdge.getBendpoints());
-		newEdge.setSourceAnchor(oldEdge.getSourceAnchor());
-		newEdge.setTargetAnchor(oldEdge.getTargetAnchor());
-		copyViewFeatures(oldEdge, newEdge);
-	}
-
-	/**
-	 * Copies the notational features of the old diagram to the new diagram
-	 * 
-	 * @param oldDiagram The old diagram to copy features from
-	 * @param newDiagram The new diagram to copy features to
-	 */
-	protected void copyDiagramFeatures(Diagram oldDiagram, Diagram newDiagram) {
-		newDiagram.setName(oldDiagram.getName());
-		newDiagram.getPersistedEdges().addAll(oldDiagram.getPersistedEdges());
-		copyViewFeatures(oldDiagram, newDiagram);
-	}
-
-	/**
-	 * Copies the notational features of the old view to the new view
-	 * 
-	 * @param oldView The old view to copy features from
-	 * @param newView The new view to copy features to
-	 */
-	protected void copyViewFeatures(View oldView, View newView) {
-		copyViewAppearance(oldView, newView, new ArrayList());
-		newView.getSourceEdges().addAll(oldView.getSourceEdges());
-		newView.getTargetEdges().addAll(oldView.getTargetEdges());
-		copyViewChildren(oldView, newView);
-	}
-
-	/**
-	 * Copies the appearance of the old view to the new view.  Typically this means copying the visibility
-	 * and the styles of the root and it's children.
-	 * 
-	 * @param oldView The old view to copy style features from
-	 * @param newView The new view to copy style features to
-	 * @param excludeStyles the <code>List</code> of <code>Style.eClass</code> types to exclude
-	 * from the copy operation.
-	 */
-	public void copyViewAppearance(View oldView, View newView, final List excludeStyles) {
-		newView.setVisible(oldView.isVisible());
-		copyViewStyles(oldView, newView, excludeStyles);
-		
-		for (Iterator j = new ArrayList(oldView.getPersistedChildren()).iterator(); j.hasNext();) {
-			Node oldChildNode = (Node) j.next();
-			if (oldView.getElement() == oldChildNode.getElement() && oldChildNode.getType() != null) {
-				Node newChildNode = (Node) ViewUtil.getChildBySemanticHint(newView, oldChildNode.getType());
-				if (newChildNode != null) {
-					copyViewAppearance(oldChildNode, newChildNode, excludeStyles);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Copies the style features of the old view to the new view
-	 * 
-	 * @param oldView The old view to copy style features from
-	 * @param newView The new view to copy style features to
-	 */
-	protected void copyViewStyles(View oldView, View newView) {
-		copyViewStyles(oldView, newView, new ArrayList());
-	}
-	
-	/**
-	 * Copies all styles feature from the old view to the new view
-	 * 
-	 * @param oldView The old view to copy style features from
-	 * @param newView The new view to copy style features to
-	 * @param excludeStyles the <code>List</code> of <code>Style.eClass</code> types to exclude
-	 * from the copy operation.
-	 */
-	protected void copyViewStyles(View oldView, View newView, List excludeStyles) {
-		for (Iterator i = oldView.getStyles().iterator(); i.hasNext();) {
-			Style oldStyle = (Style) i.next();
-			copyViewStyle(oldView, newView, oldStyle, excludeStyles);
-		}
-	}
-	
-	/**
-	 * Copies the given style features of the old view to the new view
-	 * 
-	 * @param oldView The old view to copy style features from
-	 * @param newView The new view to copy style features to
-	 * @param oldStyle The old style to copy
-	 * @param excludeStyles the list of <code>Style.eClass</code> types to exclude
-	 */
-	protected void copyViewStyle(View oldView, View newView, Style oldStyle, List excludeStyles) {
-		// since the same structural feature may appear in styles with different eClass(s)
-		// we really need to get the new style that has the feature; which could be of different 
-		// eClass than the source style
-		
-		Map eClassMap = new HashMap();
-		for (Iterator j = oldStyle.eClass().getEAllStructuralFeatures().iterator(); j.hasNext();) {
-			EStructuralFeature feature = (EStructuralFeature) j.next();
-			Style newStyle;
-			
-			EClass containingStyleEClass = feature.getEContainingClass();
-			if (excludeStyles.contains(containingStyleEClass))
-				continue;
-			
-			if (eClassMap.containsKey(feature.getEContainingClass())) {
-				newStyle = (Style) eClassMap.get(feature.getEContainingClass());
-			} else {
-				eClassMap.put(feature.getEContainingClass(), newStyle = newView.getStyle(feature.getEContainingClass()));
-			}
-			if (newStyle != null) {
-				newStyle.eSet(feature, oldStyle.eGet(feature));
-			}
-		}
-	}
-	
-	/**
-	 * Copies the notational properties of the old view children to the new view children
-	 * 
-	 * @param oldView The old view to copy children notational features from
-	 * @param newView The new view to copy children notational features to
-	 */
-	protected void copyViewChildren(View oldView, View newView) {
-		for (Iterator j = new ArrayList(oldView.getPersistedChildren()).iterator(); j.hasNext();) {
-			Node oldChildNode = (Node) j.next();
-			copyViewChild(oldView, newView, oldChildNode);
-		}
-	}
-	
-	/**
-	 * If the child view has the same element as the parent and also has a type, it is considered a subview
-	 * and therefore only its properties are copied to matching subviews (if any) of the new parent.
-	 * Otherwise, the default behavior is for the child view to be moved to the new parent
-	 * 
-	 * @param oldView The old view to copy children notational features from
-	 * @param newView The new view to copy children notational features to
-	 * @param oldChildNode A child node of the old view
-	 */
-	protected void copyViewChild(View oldView, View newView, Node oldChildNode) {
-		if (oldView.getElement() == oldChildNode.getElement() && oldChildNode.getType() != null) {
-			Node newChildNode = (Node) ViewUtil.getChildBySemanticHint(newView, oldChildNode.getType());
-			if (newChildNode != null) {
-				copyNodeFeatures(oldChildNode, newChildNode);
-			}
-		} else
-			newView.getPersistedChildren().add(oldChildNode);
-	}
-
-	/**
-	 * Refactors the diagram guides to reference the new node instead of the old one
-	 * 
-	 * @param oldNode The old node being refactored
-	 * @param newNode The replacing new node
-	 */
-	protected final void refactorGuides(Node oldNode, Node newNode) {
-		Collection guides = EMFCoreUtil.getReferencers(oldNode, new EReference[]{NotationPackage.eINSTANCE.getNodeEntry_Key()});
-		for (Iterator i = guides.iterator(); i.hasNext();) {
-			EMap nodeMap =  ((Guide) ((EObject) i.next()).eContainer()).getNodeMap();
-			nodeMap.put(newNode, nodeMap.get(oldNode));
-			nodeMap.remove(oldNode);
-		}
-	}
-
-	/**
-	 * A utility to get all the views of the given element to be refactored. The implementation
-	 * of method delegated to a reverse look up map to get those views. Override if you have
-	 * a more efficient way of getting those view or to cover more or less views.
-	 * 
-	 * @param element The element referenced by views to be refactored
-	 * @return A collection of views that reference the given element to refactor
-	 */
-	protected Collection getReferencingViews(EObject element) {
-		Collection views = EMFCoreUtil.getReferencers(element, new EReference[]{NotationPackage.eINSTANCE.getView_Element()});
-
-		// remove subviews since they will be refactored with their parent
-		for (Iterator i = views.iterator(); i.hasNext();) {
-			View view = (View) i.next();
-			
-			EObject parent = null;
-			while ((parent = view.eContainer()) instanceof View) { 
-				if (views.contains(parent)) {
-					i.remove();
-					break;
-				}
-				view = (View) parent;
-			}
-		}
-		return views;
-	}
-
-	/**
-	 * A utility to create a new node for the given new element that would replace the given old node.
-	 * The method uses default parameters to create the new node for the element. Override and change 
-	 * this method if you think this is not the proper way to create a node of this new element.
-	 * 
-	 * @param oldNode The old node being refactored
-	 * @param newElement The new element to create a node on
-	 * @return A new node that references the given new element
-	 */
-	protected Node createNode(Node oldNode, EObject newElement) {
-		return ViewService.getInstance().createNode(
-			new EObjectAdapter(newElement), 
-			(View)oldNode.eContainer(), 
-			getNewViewType(oldNode, newElement), 
-			ViewUtil.APPEND, 
-			preferencesHint);
-	}
-	
-	/**
-	 * A utility to create a new edge for the given new element that would replace the given old edge.
-	 * The method uses default parameters to create the new edge for the element. Override and change 
-	 * this method if you think this is not the proper way to create a edge of this new element.
-	 * 
-	 * @param oldEdge The old edge being refactored
-	 * @param newElement The new element to create a edge on
-	 * @return A new edge that references the given new element
-	 */
-	protected Edge createEdge(Edge oldEdge, EObject newElement) {
-		Edge edge = (Edge) ViewService.getInstance().createEdge(
-			new EObjectAdapter(newElement), 
-			oldEdge.getDiagram(), 
-			getNewViewType(oldEdge, newElement), 
-			ViewUtil.APPEND, 
-			preferencesHint);
-		if (edge != null) {
-			edge.setSource(oldEdge.getSource());
-			edge.setTarget(oldEdge.getTarget());
-		}
-		return edge;
-	}
-
-	/**
-	 * A utility to create a new diagram for the given new element that would replace the given old diagram.
-	 * The method uses default parameters to create the new diagram for the element. Override and change 
-	 * this method if you think this is not the proper way to create a diagram of this new element.
-	 * 
-	 * @param oldDiagram The old diagram being refactored
-	 * @param newElement The new element to create a diagram on
-	 * @return A new diagram that references the given new element
-	 */
-	protected Diagram createDiagram(Diagram oldDiagram, EObject newElement) {
-		return ViewService.getInstance().createDiagram(
-			new EObjectAdapter(newElement), 
-			getNewViewType(oldDiagram, newElement),
-			preferencesHint);
-	}
-
-	/**
-	 * Returns the type of the new view that replaces the old one 
-	 * 
-	 * @param oldView The old view being replaced
-	 * @param newElement The new element of the new view
-	 * @return The type of the new view
-	 */
-	protected String getNewViewType(View oldView, EObject newElement) {
-		return oldView.getType();
-	}
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewType.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewType.java
deleted file mode 100644
index d9fc012..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewType.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.core.util;
-
-/**
- * Defines the basic view types.
- * The view type is required at View creation time; It could be an empty string 
- * or it could be a String that indicates what this view respresent.
- * The View type will be set by the {@link ViewService} on the {@link org.eclipse.gmf.runtime.notation.View}, 
- * and it can be retrieved by calling {@link org.eclipse.gmf.runtime.notation.View#getType()}
- * 
- */
-public class ViewType {
-	/**
-	 * the note semantic hint
-	 */
-	public static String NOTE = "Note"; //$NON-NLS-1$
-	/**
-	 * the text semanti hint
-	 */
-	public static String TEXT = "Text"; //$NON-NLS-1$
-	/**
-	 * the note attachment semantic hint
-	 */
-	public static String NOTEATTACHMENT = "NoteAttachment"; //$NON-NLS-1$	
-	/**
-	 * diagram name semantic hint
-	 */
-	public static String DIAGRAM_NAME = "DiagramName"; //$NON-NLS-1$
-	/**
-	 * the diagram link semantic hint
-	 */
-	public static String DIAGRAM_LINK = "DiagramLink"; //$NON-NLS-1$
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewUtil.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewUtil.java
deleted file mode 100644
index c17ba80..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewUtil.java
+++ /dev/null

@@ -1,749 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramDebugOptions;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramStatusCodes;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.PersistElementCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * provides different utility functions for the notation view
- * 
- * @author mmostafa
- */
-public class ViewUtil {
-
-    /**
-     * the append index, this is the index you should use to append a view to a
-     * container
-     */
-    public static final int APPEND = -1;
-
-    /**
-     * create a list of View Adapters from a Notation View collection
-     * 
-     * @param views
-     *            a collection of Notation <code>View</code>s
-     * @return list of <code>EObjectAdapter</code>s
-     */
-    public static List makeViewsAdaptable(Collection views) {
-        List list = new ArrayList();
-        Iterator it = views.iterator();
-        while (it.hasNext()) {
-            list.add(new EObjectAdapter((View) it.next()));
-        }
-        return list;
-    }
-
-    /**
-     * move the supplied view from, and all of its parents from the transient
-     * collections to the persisted collections. This Api will modify the model
-     * and make it dirty, it needs to run within a write action or unchecked
-     * operation. A view will get persisted if the following conditions are met
-     * <UL>
-     * <LI> this method is invoked inside an UNDO interval
-     * <LI> the supplied view is in a transient list or owned by a transient
-     * container
-     * </UL>
-     * 
-     * @param view
-     *            the <code>View</code> to persist
-     */
-    public static void persistElement(View view) {
-        assert null != view : "null view in ViewUtil.persistElement";//$NON-NLS-1$
-
-        TransactionalEditingDomain editingDomain = TransactionUtil
-            .getEditingDomain(view);
-
-        if (!view.isMutable()) {
-            // get first view needs to get persisted
-            View viewToPersist = getTopViewToPersist(view);
-            if (viewToPersist != null) {
-                // now create a command to persisted the view and exectue it
-                PersistElementCommand pvc = new PersistElementCommand(
-                    editingDomain, viewToPersist);
-                try {
-                    pvc.execute(new NullProgressMonitor(), null);
-                } catch (ExecutionException e) {
-                    Trace.catching(DiagramPlugin.getInstance(),
-                        DiagramDebugOptions.EXCEPTIONS_CATCHING,
-                        ViewUtil.class, "persistElement", e); //$NON-NLS-1$
-                    Log.error(DiagramPlugin.getInstance(),
-                        DiagramStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                            .getLocalizedMessage(), e);
-                }
-
-                CommandResult result = pvc.getCommandResult();
-                view = (View) result.getReturnValue();
-            }
-        }
-    }
-
-    /**
-     * Returns the top view that should be persisted, starting from the passed
-     * view, it could return the passed view itself if it is a transient view,
-     * other wise it will check its parent and so on ...
-     * 
-     * @param view ,
-     *            view to start from
-     * @return first view needs to get persisted
-     */
-    static public View getTopViewToPersist(View view) {
-        EObject container = view.eContainer();
-        // if the view had no container then it can not get persisted
-        if (container == null)
-            return null;
-        // now edges are special case, becuase they do not exist in the
-        // children lists, but in the edgs lists
-        if (view instanceof Edge) {
-            Diagram dContainer = (Diagram) container;
-            // always make sure that the feature is set before calling get
-            // to avoid creating unwanted EList that will stay in the memory
-            // till the model is closed
-            if (dContainer.eIsSet(NotationPackage.Literals
-                .DIAGRAM__TRANSIENT_EDGES))
-                return view;
-            else
-                return (getTopViewToPersist(dContainer));
-        } else if (container instanceof View) {
-            View vContainer = (View) container;
-            // always make sure that the feature is set before calling get
-            // to avoid creating unwanted EList that will stay in the memory
-            // till the model is closed
-            if (vContainer.eIsSet(NotationPackage.Literals
-                .VIEW__TRANSIENT_CHILDREN))
-                return view;
-            else
-                return (getTopViewToPersist(vContainer));
-        }
-        return null;
-    }
-
-    /**
-     * Destroys the supplied view notational element and remove any references
-     * this class may have to it.
-     * 
-     * @param view
-     *            view to destroy
-     */
-    public static void destroy(View view) {
-        if (view == null)
-            return;        
-        Iterator it = new ArrayList(view.getChildren()).iterator();        
-        while (it.hasNext()) {
-            View child = (View) it.next();
-            destroy(child);
-        }
-        DestroyElementCommand.destroy(view);
-    }
-
-    /**
-     * Returns the container view, or null if the container is not a view or
-     * null
-     * 
-     * @param eObject
-     *            a notation view
-     * @return the container <code>View</code>
-     */
-    static public View getContainerView(View eObject) {
-        EObject container = eObject.eContainer();
-        if (container instanceof View) {
-            return (View) container;
-        }
-        return null;
-    }
-
-    /**
-     * inserts a child <code>View</code> in a container. the view will be
-     * inserted in the persisted collection if the <tt>persisted</tt> flag is
-     * <tt>true</tt>; otherwise it will be added to the transied collection.
-     * inserting a transient child does not dirty the model, inserting a
-     * persisted child will dirty the model
-     * 
-     * @param containerView
-     *            the view's container
-     * @param childView
-     *            notation <code>View</Code> to insert 
-     * @param index the view's position within the container's list
-     * @param persisted indicats the persisted state of the view
-     *
-     */
-    public static void insertChildView(View containerView, View childView,
-            int index, boolean persisted) {
-        if (persisted) {
-            insertPersistedElement(containerView, childView, index);
-        } else {
-            insertTransientElement(containerView, childView);
-        }
-    }
-
-    /**
-     * inserts a child into the transient list, inserting a transient child does
-     * not dirty
-     * 
-     * @param child ,
-     *            the child to insert
-     * @param container
-     *            notational element's container
-     */
-    static private void insertTransientElement(final View container,
-            final View child) {
-        if (child instanceof Edge) {
-            Diagram diagram = (Diagram) container;
-            diagram.insertEdge((Edge) child, false);
-        } else {
-            container.insertChild(child, false);
-        }
-        return;
-    }
-
-    /**
-     * inserts a child into the persisted list
-     * 
-     * @param container
-     *            the notational element's container
-     * @param child ,
-     *            the child to insert
-     * @param index
-     *            the notational element's position within the container.
-     */
-    static private void insertPersistedElement(View container, View child,
-            int index) {
-        if (child instanceof Edge) {
-            Diagram diagram = (Diagram) container;
-            if (index == -1)
-                diagram.insertEdge((Edge) child);
-            else
-                diagram.insertEdgeAt((Edge) child, index);
-        } else {
-            if (index == -1)
-                container.insertChild(child);
-            else
-                container.insertChildAt(child, index);
-        }
-    }
-
-    /**
-     * checks if the passed view is transient or exists in a transient branch
-     * 
-     * @param view
-     *            <code>View</code> to check
-     * @return true if transient otherwise false
-     */
-    static public boolean isTransient(EObject view) {
-        EStructuralFeature sFeature = view.eContainingFeature();
-        // root element will have a null containing feature
-        if (sFeature == null)
-            return false;
-        if (sFeature.isTransient()) {
-            return true;
-        }
-        EObject container = view.eContainer();
-        if (container != null) {
-            return isTransient(container);
-        }
-        return false;
-    }
-
-    /**
-     * gets a the first child in the passed <code>View</code> that had the
-     * same type as the passed semantic hint.
-     * 
-     * @param view
-     *            the view to search inside
-     * @param semanticHint
-     *            the semantic hint to look for
-     * @return the found view or null if none is found
-     */
-    public static View getChildBySemanticHint(View view, String semanticHint) {
-        for (Iterator children = view.getChildren().iterator(); children
-            .hasNext();) {
-            View child = (View) children.next();
-            if (semanticHint.equals(child.getType())) {
-                return child;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * checks if the passed property is supported bythe passed view
-     * 
-     * @param view
-     *            the view to use for the search
-     * @param id
-     *            the property to look for
-     * @return boolean <tt>true</tt> if supported otherwise <tt>false</tt>
-     */
-    public static boolean isPropertySupported(View view, Object id) {
-        if (id instanceof String) {
-            EStructuralFeature feature = (EStructuralFeature) PackageUtil
-                .getElement((String) id);
-            if (feature != null) {
-                return isPropertySupported(view, feature, feature
-                    .getEContainingClass());
-            }
-        }
-        return false;
-    }
-
-    /**
-     * checks if the passed feature is supported by the passed view
-     * 
-     * @param view
-     *            the view to use for the search
-     * @param feature
-     *            the feature to look for
-     * @return boolean <tt>true</tt> if supported otherwise <tt>false</tt>
-     */
-    public static boolean isFeatureSupported(View view,
-            EStructuralFeature feature) {
-        if (feature != null) {
-            return isPropertySupported(view, feature, feature
-                .getEContainingClass());
-        }
-        return false;
-    }
-
-    /**
-     * checks if the passed feature is supported by the passed view
-     * 
-     * @param view
-     *            the view to use for the search
-     * @param feature
-     *            the feature to look for
-     * @param featureClass
-     *            the feature's <code>EClass</code>
-     * @return boolean <tt>true</tt> if supported otherwise <tt>false</tt>
-     */
-    public static boolean isPropertySupported(View view,
-            EStructuralFeature feature, EClass featureClass) {
-        // check if the id belongs to the view
-        if (view.getStyle(featureClass) != null)
-            return true;
-
-        if (view instanceof Node) {
-            LayoutConstraint constraint = ((Node) view).getLayoutConstraint();
-            if (constraint != null && featureClass.isInstance(constraint))
-                return true;
-        }
-
-        // check if the id belongs to a style owned by the view
-        return featureClass.isInstance(view);
-    }
-
-    /**
-     * Returns the value of the passed feature inside the passed view
-     * 
-     * @param view
-     *            the view to use to get the value
-     * @param feature
-     *            the feature to use
-     * @return the value of the property, or <code>null</code>
-     */
-    static public final Object getStructuralFeatureValue(View view,
-            EStructuralFeature feature) {
-        if (feature != null) {
-            return ViewUtil.getPropertyValue(view, feature, feature
-                .getEContainingClass());
-        }
-        return null;
-    }
-
-    /**
-     * Returns the value of the featrue inside a specific EClass within the
-     * passed view
-     * 
-     * @param view
-     *            the view to use to get the value
-     * @param feature
-     *            the featrue to use to get the value
-     * @param featureClass
-     *            the <code>EClass</code> to use to get the feature
-     * @return the value of the feature, or <code>null</code>
-     */
-    public static Object getPropertyValue(View view,
-            EStructuralFeature feature, EClass featureClass) {
-        // check if the id belongs to a style owned by the view
-        Style style = view.getStyle(featureClass);
-        if (style != null)
-            return style.eGet(feature);
-
-        if (view instanceof Node) {
-            LayoutConstraint constraint = ((Node) view).getLayoutConstraint();
-            if (constraint != null && featureClass.isInstance(constraint))
-                return constraint.eGet(feature);
-        }
-
-        // check if the id belongs to the view
-        if (featureClass.isInstance(view))
-            return view.eGet(feature);
-
-        return feature.getDefaultValue(); // for extra robustness
-    }
-
-    /**
-     * Sets the passed feature if possible on the passed view to the passed
-     * value.
-     * 
-     * @param view
-     *            the view to set the value on
-     * @param feature
-     *            the feature to use
-     * @param value
-     *            the value of the property being set
-     */
-    public static void setStructuralFeatureValue(View view,
-            EStructuralFeature feature, Object value) {
-        if (feature != null) {
-            ViewUtil.setPropertyValue(view, feature, feature
-                .getEContainingClass(), value);
-            return;
-        }
-    }
-
-    /**
-     * Sets the passed featrue on the passed EClass inside the passed view to
-     * the new value if possible
-     * 
-     * @param view
-     *            the view to set the value on
-     * @param feature
-     *            the feature to set
-     * @param featureClass
-     *            <code> EClass </code> that owns the feature
-     * @param value
-     *            the value of the feature being set
-     */
-    public static void setPropertyValue(View view, EStructuralFeature feature,
-            EClass featureClass, Object value) {
-        if (view == null)
-            return;
-        // check if the id belongs to a style owned by the view
-        Style style = view.getStyle(featureClass);
-        if (style != null) {
-            style.eSet(feature, value);
-            return;
-        }
-
-        if (view instanceof Node) {
-            Node node = (Node) view;
-            LayoutConstraint constraint = node.getLayoutConstraint();
-            if (constraint != null & featureClass.isInstance(constraint)) {
-                constraint.eSet(feature, value);
-                return;
-            }
-        }
-
-        // check if the id belongs to the view
-        if (featureClass.isInstance(view)) {
-            view.eSet(feature, value);
-            return;
-        }
-    }
-
-    /**
-     * resolves the passed <code>View<code>'s semantic element, and returns it.
-     * If the semantic element is unresolvable the method will returns <code>null</code>
-     * @param view the view to use to get the semantic element
-     * @return the semanticelement or null if there is no semantic element or if it is unresolvable
-     */
-    public static EObject resolveSemanticElement(View view) {
-        EObject element = view.getElement();
-        if (element != null && element.eIsProxy()) {
-            TransactionalEditingDomain domain = TransactionUtil
-                .getEditingDomain(view);
-            if (domain != null) {
-                return EMFCoreUtil.resolve(domain, element);
-            }
-        }
-        return element;
-    }
-
-    /**
-     * resolves the passed element, and returns it. If the element is
-     * unresolvable the method will returns <code>null</code>
-     * 
-     * @param the
-     *            element to resolve
-     * @return the element or null if it is unresolvable
-     */
-    public static EObject resolve(EObject object) {
-        if (object != null && object.eIsProxy()) {
-            TransactionalEditingDomain domain = TransactionUtil
-                .getEditingDomain(object);
-            if (domain != null)
-                return EMFCoreUtil.resolve(domain, object);
-        }
-        return object;
-    }
-
-    /**
-     * gets the <code>View</code>'s semantic element Class Id, this could be
-     * used to check the semantic element type
-     * 
-     * @param view
-     *            the owner of the semantic element
-     * @return the semantic element class Id
-     */
-    public static String getSemanticElementClassId(View view) {
-        EObject element = view.getElement();
-        return element == null ? null
-            : PackageUtil.getID(EMFCoreUtil.getProxyClass(element));
-    }
-
-    /**
-     * gets all the <code>Edge</code>'s whose source is this view
-     * 
-     * @param view
-     *            the view to use
-     * @return List the edges list
-     */
-    public static List getSourceConnections(View view) {
-        if (!view.eIsSet(NotationPackage.Literals.VIEW__SOURCE_EDGES))
-            return Collections.EMPTY_LIST;
-        return view.getSourceEdges();
-    }
-    
-    /**
-     * gets all the <code>Edge</code>'s whose target is this view
-     * 
-     * @param view
-     *            the view to use
-     * @return List the edges list
-     */
-    public static List getTargetConnections(View view) {
-        if (!view.eIsSet(NotationPackage.Literals.VIEW__TARGET_EDGES))
-            return Collections.EMPTY_LIST;
-        return view.getTargetEdges();
-    }
-    
-    /**
-     * gets all the <code>Edge</code>'s whose source is this view
-     * 
-     * @param view
-     *            the view to use
-     * @return List the edges list
-     */
-     public static List getSourceConnectionsConnectingVisibleViews(View view) {
-        if (!view.eIsSet(NotationPackage.Literals.VIEW__SOURCE_EDGES))
-            return Collections.EMPTY_LIST;
-        List sourceConnections = new ArrayList();
-        Iterator iter = view.getSourceEdges().iterator();
-        while (iter.hasNext()) {
-            Edge edge = (Edge)iter.next();
-            View target = edge.getTarget();
-            if (edge.isVisible() && isVisible(target)){
-                sourceConnections.add(edge);
-            }
-            
-        }
-        return sourceConnections;
-     }
-    
-    
-
-     private static boolean isVisible(View target) {
-        if (target.isVisible()){
-            EObject parent = target.eContainer();
-            if (parent instanceof View){
-                return isVisible((View)parent);
-            }
-            return true;
-        }
-        return false;
-    }
-     
-    /**
-     * gets all the <code>Edge</code>'s whose target is this view
-     * 
-     * @param view
-     *            the view to use
-     * @return List the edges list
-     */
-     public static List getTargetConnectionsConnectingVisibleViews(View view) {
-        if (!view.eIsSet(NotationPackage.Literals.VIEW__TARGET_EDGES))
-            return Collections.EMPTY_LIST;
-        List targteConnections = new ArrayList();
-        Iterator iter = view.getTargetEdges().iterator();
-        while (iter.hasNext()) {
-            Edge edge = (Edge)iter.next();
-            View source = edge.getSource();
-            if (edge.isVisible() && isVisible(source)){
-                targteConnections.add(edge);
-            }
-        }
-        return targteConnections;
-     }
-
-    /**
-     * return eClass Name of the view's semantic element, this method works only
-     * if the semantic element is a NameElement, otherwise it will return an
-     * Empty String
-     * 
-     * @param view
-     *            the view object
-     * @return the eClass name
-     */
-    public static String getSemanticEClassName(View view) {
-        EObject eObject = view.getElement();
-        if (eObject != null)
-            return PackageUtil.getID(EMFCoreUtil.getProxyClass(eObject));
-        return ""; //$NON-NLS-1$
-    }
-
-    /**
-     * returns the unique GUID of the view
-     * 
-     * @param view
-     *            the view
-     * @return String the GUID of a view (constant)
-     */
-    public static String getIdStr(View view) {
-        String id = ((XMLResource) view.eResource()).getID(view);
-        if (id != null) {
-            return id;
-        }
-
-        // Remain compatible with previous behavior.
-        return StringStatics.BLANK;
-    }
-
-    /**
-     * reorders the child at the oldIndex to the newIndex
-     * 
-     * @param container
-     *            the view's container
-     * @param child
-     *            the child to reposition
-     * @param newIndex
-     *            (zero-based)
-     * @throws IndexOutOfBoundsException
-     *             if index is out of bounds
-     * @throws IllegalArgumentException
-     *             if the child is not contianed by the container, or if the new
-     *             position is the <code>ViewUtil.APPEND</code>position
-     */
-    static public void repositionChildAt(View container, View child,
-            int newIndex) {
-        ViewUtil.persistElement(child);
-        if (child.eContainer() != container)
-            throw new IllegalArgumentException(
-                "child is not an existing child of the view"); //$NON-NLS-1$
-        if (newIndex == APPEND)
-            throw new IllegalArgumentException(
-                "append position is not allowed for reposition"); //$NON-NLS-1$
-        container.removeChild(child);
-        container.insertChildAt(child, newIndex);
-    }
-
-    /**
-     * returns the first child whose id matched the given id
-     * 
-     * @param view
-     *            the view to search in
-     * @param idStr
-     *            the child's id
-     * @return View the first matching child or null if no one was found
-     */
-    static public View getChildByIdStr(View view, String idStr) {
-        for (Iterator children = view.getChildren().iterator(); children
-            .hasNext();) {
-            View child = (View) children.next();
-            if (idStr.equals(((XMLResource) child.eResource()).getID(child))) {
-                return child;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets the property with the given id if possible on the passed view to the
-     * passed value.
-     * 
-     * @param view
-     *            the view to set the value on
-     * @param id
-     *            the id of the property being set
-     * @param value
-     *            the value of the property being set
-     * @deprecated use
-     *             {@link ViewUtil#setStructuralFeatureValue(View, EStructuralFeature, Object}}
-     *             instead
-     */
-    public static void setPropertyValue(View view, Object id, Object value) {
-        if (id instanceof String) {
-            EStructuralFeature feature = (EStructuralFeature) PackageUtil
-                .getElement((String) id);
-            if (feature != null) {
-                ViewUtil.setPropertyValue(view, feature, feature
-                    .getEContainingClass(), value);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Returns the value of the property with the given id inside the passed
-     * view
-     * 
-     * @param view
-     *            the view to use to get the value
-     * @param id
-     *            the id of the property to get
-     * @return the value of the property, or <code>null</code>
-     * @deprecated use
-     *             {@link ViewUtil#getStructuralFeatureValue(View, EStructuralFeature)}
-     *             instead
-     */
-    static public final Object getPropertyValue(View view, Object id) {
-        if (id instanceof String) {
-            EStructuralFeature feature = (EStructuralFeature) PackageUtil
-                .getElement((String) id);
-            if (feature != null) {
-                return ViewUtil.getPropertyValue(view, feature, feature
-                    .getEContainingClass());
-            }
-        }
-        return null;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/package.html
deleted file mode 100644
index 326308b..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains <i>utility</i> classes used by this plugin.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/DiagramFactory.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/DiagramFactory.java
deleted file mode 100644
index 5ea3dd6..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/DiagramFactory.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * Interface defining the basic Diagram Factory APIs; a diagram factory is responsible for creating a diagram.
- * The <code>createDiagram</code> will be called by the <code>ViewService<code> (using reflection) during
- * a diagram creation process. The Diagram Factory implementation class is provided to the <code>ViewService</code>
- * by the <code>CreateDiagramViewOperation<code>
- * @see org.eclipse.gmf.runtime.diagram.core.services.ViewService
- * @see org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation
- * @author mmostafa
- */
-public interface DiagramFactory {
-	
-	/**
-	 * @param semanticAdapter
-	 * @param diagramKind
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * @return
-	 */
-	public Diagram createDiagram(IAdaptable semanticAdapter,
-							 	 String diagramKind, PreferencesHint preferencesHint);
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/ViewFactory.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/ViewFactory.java
deleted file mode 100644
index 3666fd0..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/ViewFactory.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.core.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Interface defining the basic View Factory APIs; a view factory is responsible for creating a view.
- * The <code>createView</code> will be called by the <code>ViewService<code> (using reflection) during
- * a view creation process. 
- * @see org.eclipse.gmf.runtime.diagram.core.services.ViewService
- * @see org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation
- * @author mmostafa
- */
-
-public interface ViewFactory {
-	
-	/**
-	 * factory method, that will be called by the view service to creat the view
-	 * 
-	 * @param semanticAdapter
-	 *            semanitc element of the view, it can be null
-	 * @param containerView
-	 *            the view to contain the connection
-	 * @param semanticHint
-	 *            a semantic hint to reflect the view type, it can be empty
-	 * @param index
-	 *            position with parent's child collection
-	 * @param persisted
-	 *            persisted flag, this will indicate if the created view will be
-	 *            a presisted or transient view, transient views never get
-	 *            serialized
-	 * @param preferenceStoreID
-	 *            the ID mapped to the preference store to be used when
-	 *            initializing the view's properties
-	 * @return the new view
-	 */
-	public View createView(final IAdaptable semanticAdapter,
-						   final View containerView,
-						   final String semanticHint,final int index,
-						   final boolean persisted, final PreferencesHint preferencesHint);
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/package.html b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/view/factories/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/.classpath b/org.eclipse.gmf.runtime.diagram.ui.actions/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.actions/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.actions/.cvsignore
deleted file mode 100644
index c64fc1c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/.options b/org.eclipse.gmf.runtime.diagram.ui.actions/.options
deleted file mode 100644
index 5fc8387..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.options
+++ /dev/null

@@ -1,15 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.diagram.ui.actions plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.diagram.ui.actions plug-in
-org.eclipse.gmf.runtime.diagram.ui.actions/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/exiting=false
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/.project b/org.eclipse.gmf.runtime.diagram.ui.actions/.project
deleted file mode 100644
index 478a8da..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.actions</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/org.eclipse.gmf.runtime.diagram.ui.actions/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.actions/META-INF/MANIFEST.MF
deleted file mode 100644
index 73072c2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.actions
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.actions,
- org.eclipse.gmf.runtime.diagram.ui.actions.internal;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.geoshapes",
- org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.geoshapes"
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/about.html b/org.eclipse.gmf.runtime.diagram.ui.actions/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/build.properties b/org.eclipse.gmf.runtime.diagram.ui.actions/build.properties
deleted file mode 100644
index e5b06c7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               icons/,\
-               META-INF/,\
-               .,\
-               .options,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/aleft.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/aleft.gif
deleted file mode 100644
index 26ea6bf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/aleft.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/all_comp_vis.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/all_comp_vis.gif
deleted file mode 100644
index 9d4f4d4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/all_comp_vis.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/blank.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/blank.gif
deleted file mode 100644
index e7abcb8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/blank.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/copy_appearance_properties.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/copy_appearance_properties.gif
deleted file mode 100644
index 99ce0a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/copy_appearance_properties.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrangeall.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrangeall.gif
deleted file mode 100644
index 99e31f4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrangeall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrangeselected.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrangeselected.gif
deleted file mode 100644
index 724fef9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrangeselected.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/autosize.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/autosize.gif
deleted file mode 100644
index 3604137..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/autosize.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bold.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bold.gif
deleted file mode 100644
index 582a779..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bold.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bring_forward.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bring_forward.gif
deleted file mode 100644
index 8a2ed3b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bring_forward.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bring_to_front.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bring_to_front.gif
deleted file mode 100644
index 504906f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/bring_to_front.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/copy_appearance_properties.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/copy_appearance_properties.gif
deleted file mode 100644
index 00ae2cd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/copy_appearance_properties.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/fill_color.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/fill_color.gif
deleted file mode 100644
index d538130..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/fill_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/font_color.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/font_color.gif
deleted file mode 100644
index ed952d3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/font_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/hideconnector.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/hideconnector.gif
deleted file mode 100644
index 88289ea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/hideconnector.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/italic.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/italic.gif
deleted file mode 100644
index 1abc408..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/italic.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_color.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_color.gif
deleted file mode 100644
index e7fad27..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_style_group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_style_group.gif
deleted file mode 100644
index aa82766..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_style_group.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/oblique.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/oblique.gif
deleted file mode 100644
index 7da2d71..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/oblique.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/recalcpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/recalcpagebreaks.gif
deleted file mode 100644
index f33127b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/recalcpagebreaks.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/rectilinear.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/rectilinear.gif
deleted file mode 100644
index 6d34374..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/rectilinear.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectall.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectall.gif
deleted file mode 100644
index efc3e49..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectconnectors.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectconnectors.gif
deleted file mode 100644
index e092486..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectconnectors.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectshapes.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectshapes.gif
deleted file mode 100644
index 1a3b7b0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/selectshapes.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/send_backward.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/send_backward.gif
deleted file mode 100644
index 83e6ea2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/send_backward.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/send_to_back.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/send_to_back.gif
deleted file mode 100644
index 000c65c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/send_to_back.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/show_compartments_group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/show_compartments_group.gif
deleted file mode 100644
index 11c35c4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/show_compartments_group.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/show_connector_group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/show_connector_group.gif
deleted file mode 100644
index 43dde24..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/show_connector_group.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/showconnector.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/showconnector.gif
deleted file mode 100644
index 43dde24..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/showconnector.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/sortfilter.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/sortfilter.gif
deleted file mode 100644
index 0035346..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/sortfilter.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/tree.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/tree.gif
deleted file mode 100644
index ace8973..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/tree.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/viewpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/viewpagebreaks.gif
deleted file mode 100644
index 2a40750..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/viewpagebreaks.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif
deleted file mode 100644
index c4f19bd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif
deleted file mode 100644
index 871bd3e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/autosize.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/autosize.gif
deleted file mode 100644
index 2988e3d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/autosize.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bold.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bold.gif
deleted file mode 100644
index ca8f423..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bold.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_forward.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_forward.gif
deleted file mode 100644
index b5116cf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_forward.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_to_front.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_to_front.gif
deleted file mode 100644
index bab3bc4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_to_front.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif
deleted file mode 100644
index 99ce0a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/fill_color.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/fill_color.gif
deleted file mode 100644
index 93d2da1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/fill_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif
deleted file mode 100644
index 291a7e3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif
deleted file mode 100644
index 0ba4147..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/italic.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/italic.gif
deleted file mode 100644
index c4f7b39..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/italic.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_color.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_color.gif
deleted file mode 100644
index 9dfa28c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif
deleted file mode 100644
index 3ff08ec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif
deleted file mode 100644
index 0abe0b6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif
deleted file mode 100644
index 11f5988..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif
deleted file mode 100644
index b21fcfd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif
deleted file mode 100644
index cf46586..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif
deleted file mode 100644
index bf4f2b4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif
deleted file mode 100644
index 9bf0f67..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_backward.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_backward.gif
deleted file mode 100644
index f6a4639..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_backward.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_to_back.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_to_back.gif
deleted file mode 100644
index a91d612..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_to_back.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/show_compartments_group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/show_compartments_group.gif
deleted file mode 100644
index 3ee1498..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/show_compartments_group.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/show_connector_group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/show_connector_group.gif
deleted file mode 100644
index 571c5e0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/show_connector_group.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif
deleted file mode 100644
index 571c5e0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif
deleted file mode 100644
index 26b8276..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif
deleted file mode 100644
index 13c758e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif
deleted file mode 100644
index 72a3d08..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/error.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/error.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/error.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/none_comp_vis.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/none_comp_vis.gif
deleted file mode 100644
index a2017d0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/none_comp_vis.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/noteattachment.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/noteattachment.gif
deleted file mode 100644
index 5779ec0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/noteattachment.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control.gif
deleted file mode 100644
index 749644c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control_height.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control_height.gif
deleted file mode 100644
index 5e06042..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control_height.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control_width.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control_width.gif
deleted file mode 100644
index 478cc1e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/size_to_control_width.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif
deleted file mode 100644
index 4bd5c75..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.actions/plugin.properties
deleted file mode 100644
index e35fba1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/plugin.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram Actions - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram Actions
-Plugin.providerName = Eclipse.org
-
-# ===============================================================================
-# Diagram Actions Internal - Translation Instruction : do not translate this section 
-# ===============================================================================
-
-
-
-# ==============================================================================
-#  Diagram Actions - section to be translated
-# ==============================================================================
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDiagramGlobalActionProxy.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDiagramGlobalActionProxy.java
deleted file mode 100644
index 20846fe..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDiagramGlobalActionProxy.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-
-/**
- * Proxy that instantiates the diagram action when necessary and destroys it
- * after use.
- * 
- * @author wdiu, Wayne Diu
- */
-abstract public class AbstractDiagramGlobalActionProxy
-	extends AbstractGlobalActionHandler {
-
-	/**
-	 * Instantiate the DiagramAction. You should call dispose() on the action
-	 * when done with it. This is particularly important when the action is a
-	 * selection listener.
-	 * 
-	 * Subclasses should return an instance of the DiagramAction
-	 * 
-	 * @param context
-	 *            the <code>IGlobalActionContext</code> holding nevessary
-	 *            context information for the action
-	 * @return DiagramAction the newly instantiated action
-	 */
-	abstract protected DiagramAction instantiateAction(
-			IGlobalActionContext context);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		DiagramAction action = instantiateAction(cntxt);
-		action.init();
-		action.refresh();
-		action.run();
-		action.dispose();
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#canHandle(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		DiagramAction action = instantiateAction(cntxt);
-		action.init();
-		action.refresh();
-		boolean isEnabled = action.isEnabled();
-		action.dispose();
-		return isEnabled;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDiagramModelActionDelegate.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDiagramModelActionDelegate.java
deleted file mode 100644
index 834b703..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDiagramModelActionDelegate.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsStatusCodes;
-import org.eclipse.gmf.runtime.emf.ui.action.AbstractModelActionDelegate;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Abstract action delegate for diagram actions that work with selected
- * <code>EObject</code> in a model.
- * 
- * @author ldamus
- */
-public abstract class AbstractDiagramModelActionDelegate
-	extends AbstractModelActionDelegate {
-
-	/**
-	 * Returns the elements in the given selection.
-	 * 
-	 * @return a list of <code>EObject</code>
-	 */
-	protected List getElements(final ISelection selection) {
-        final List result = new ArrayList();
-
-        if (selection instanceof IStructuredSelection) {
-            try {
-
-                getEditingDomain().runExclusive(new Runnable() {
-
-                    public void run() {
-                        if (selection instanceof IStructuredSelection) {
-                            IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-
-                            for (Iterator i = structuredSelection.iterator(); i
-                                .hasNext();) {
-                                Object next = i.next();
-
-                                View view = (View) ((IAdaptable) next)
-                                    .getAdapter(View.class);
-                                if (view != null) {
-                                    EObject eObject = ViewUtil
-                                        .resolveSemanticElement(view);
-                                    if (eObject != null) {
-                                        result.add(eObject);
-                                    } else {
-                                        result.add(view);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                });
-            } catch (InterruptedException e) {
-                Trace.catching(DiagramActionsPlugin.getInstance(),
-                    DiagramActionsDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "getElements", e); //$NON-NLS-1$
-
-                Log.error(DiagramActionsPlugin.getInstance(),
-                    DiagramActionsStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                        .getLocalizedMessage(), e);
-            }
-        }
-        return result;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AddNoteAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AddNoteAction.java
deleted file mode 100644
index 407d94d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AddNoteAction.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IEditableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.DiagramNotationType;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Concrete implemention of AttachShapeAction which attaches a new Notational Note to the
- * targeted shapes.
- * 
- * @author jcorchis 
- */
-public class AddNoteAction extends AttachShapeAction {
-
-	/**
-	 * Constructor
-	 * @param page the active workbenchPage. 
-	 */
-	public AddNoteAction(IWorkbenchPage page) {
-		super(page);
-
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init() {
-		super.init();
-		setText(DiagramUIActionsMessages.AddNoteAction_ActionLabelText);
-		setId(ActionIds.ACTION_ADD_NOTELINK);
-		setToolTipText(DiagramUIActionsMessages.AddNoteAction_ActionToolTipText);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_NOTE_ATTACHMENT);
-		setHoverImageDescriptor(getImageDescriptor());
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		if (getSelectedObjects().isEmpty())
-			return true;
-		List parts = getSelectedObjects();
-		for (int i = 0; i < parts.size(); i++) {
-			Object o = parts.get(i);
-			if (!(o instanceof INodeEditPart))
-				return false;
-			else{
-				INodeEditPart nodeEditPart = (INodeEditPart)o;
-				if (!(nodeEditPart.canAttachNote())){
-					return false;
-				}
-				
-				// consider edit mode of selected edit part
-				if (nodeEditPart instanceof IEditableEditPart
-						&& !((IEditableEditPart) nodeEditPart)
-								.isEditModeEnabled()) {
-					return false;
-				}
-
-				// consider edit mode of selected edit part's container
-				EditPart parentPart = nodeEditPart.getParent();
-				if (parentPart instanceof IEditableEditPart
-						&& !((IEditableEditPart) parentPart)
-								.isEditModeEnabled()) {
-					return false;
-				}
-				
-			}
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		List selectedEditParts = getSelectedObjects();
-		IDiagramWorkbenchPart editor = getDiagramWorkbenchPart();
-
-		// note request
-		ViewDescriptor viewDescriptor =
-			new ViewDescriptor(null, Node.class, DiagramNotationType.NOTE.getSemanticHint(), getPreferencesHint());
-		CreateViewRequest noteRequest = new CreateViewRequest(viewDescriptor);
-		
-		noteRequest.setLocation(getLocation(selectedEditParts));
-		
-		IGraphicalEditPart primaryPart = (IGraphicalEditPart) selectedEditParts.get(0);
-		if (primaryPart instanceof ConnectionEditPart) {
-			primaryPart = (IGraphicalEditPart) ((ConnectionEditPart) primaryPart).getSource();
-		}		
-
-		Command createNoteCmd =
-			getContainer(primaryPart).getCommand(noteRequest);
-
-		// note view adapter
-		IAdaptable noteViewAdapter =
-			(IAdaptable) ((List)noteRequest.getNewObject()).get(0);
-
-		// create the note attachments commands
-		CompositeCommand noteAttachmentCC =
-			new CompositeCommand(getToolTipText());
-
-		Iterator iter = selectedEditParts.iterator();
-		while (iter.hasNext()) {
-			IGraphicalEditPart targetEditPart =
-				(IGraphicalEditPart) iter.next();
-
-			noteAttachmentCC.compose(
-				new DeferredCreateConnectionViewCommand(targetEditPart.getEditingDomain(),
-					ViewType.NOTEATTACHMENT,
-					noteViewAdapter,
-					new EObjectAdapter((EObject)targetEditPart.getModel()),
-					editor.getDiagramGraphicalViewer(),
-					getPreferencesHint()));
-		}
-
-		CompoundCommand cc =
-			new CompoundCommand(getToolTipText());
-		cc.add(createNoteCmd);
-		cc.add(new ICommandProxy(noteAttachmentCC));
-
-		if (cc.canExecute()) {
-			editor.getDiagramEditDomain().getDiagramCommandStack().execute(cc);
-			selectAddedObject(editor.getDiagramGraphicalViewer(), noteRequest);
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AlignAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AlignAction.java
deleted file mode 100644
index a8a0f8a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AlignAction.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.requests.AlignmentRequest;
-import org.eclipse.gef.tools.ToolUtilities;
-import org.eclipse.gef.ui.actions.AlignmentAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author melaasar
- *
- * This action is cloned from the GEF AlignmentAction
- * @see org.eclipse.gef.actions.AlignmentAction
- */
-public class AlignAction extends DiagramAction {
-
-	private String id;
-	private int alignment;
-	private boolean isToolbarItem = true;
-
-	/**
-	 * Constructs an AlignAction with the given part and alignment ID.  The alignment ID
-	 * must by one of:
-	 * <UL>
-	 *   <LI>GEFActionConstants.ALIGN_LEFT
-	 *   <LI>GEFActionConstants.ALIGN_RIGHT
-	 *   <LI>GEFActionConstants.ALIGN_CENTER
-	 *   <LI>GEFActionConstants.ALIGN_TOP
-	 *   <LI>GEFActionConstants.ALIGN_BOTTOM
-	 *   <LI>GEFActionConstants.ALIGN_MIDDLE
-	 * </UL>  
-	 * @param part the workbench part used to obtain context
-	 * @param id the action ID.
-	 * @param align the aligment ID.
-	 */
-	public AlignAction(IWorkbenchPage workbenchPage, String id, int align) {
-		super(workbenchPage);
-		this.id = id;
-		this.alignment = align;
-		initUI();
-	}
-	
-/**
-	 * Constructs an AlignAction with the given part and alignment ID.  The alignment ID
-	 * must by one of:
-	 * <UL>
-	 *   <LI>GEFActionConstants.ALIGN_LEFT
-	 *   <LI>GEFActionConstants.ALIGN_RIGHT
-	 *   <LI>GEFActionConstants.ALIGN_CENTER
-	 *   <LI>GEFActionConstants.ALIGN_TOP
-	 *   <LI>GEFActionConstants.ALIGN_BOTTOM
-	 *   <LI>GEFActionConstants.ALIGN_MIDDLE
-	 * </UL>  
-	 * @param part the workbench part used to obtain context
-	 * @param id the action ID.
-	 * @param align the aligment ID.
-	 * @param isToolbarItem the indicator of whether or not this is a toolbar action
-	 * -as opposed to a context-menu action.
-	 */	
-	public AlignAction(IWorkbenchPage workbenchPage, String id, int align, boolean isToolbarItem) {
-		super(workbenchPage);
-		this.id = id;
-		this.alignment = align;
-		this.isToolbarItem = isToolbarItem;
-		initUI();
-	}
-
-	/**
-	 * Initializes the actions UI presentation.
-	 * Two sets of each align action are required.  One for the toolbar, 
-	 * and one for other menus.  The toolbar action has explicit text, 
-	 * the other menus do not.  For example: Align Left and Left.
-	 * 
-	 */
-	protected void initUI() {
-		
-		setId(this.id);
-		String text = null;
-		String toolTipText = null;
-		AlignmentAction gefAlignmentAction = new AlignmentAction(getWorkbenchPart(), alignment);
-		setHoverImageDescriptor(gefAlignmentAction.getHoverImageDescriptor());
-		setImageDescriptor(gefAlignmentAction.getImageDescriptor());				
-		setDisabledImageDescriptor(gefAlignmentAction.getDisabledImageDescriptor());
-		gefAlignmentAction.dispose();
-		
-		switch (alignment) {
-			case PositionConstants.LEFT: {
-				
-				if (isToolbarItem){
-					text = DiagramUIActionsMessages.AlignLeftToolbarAction_Label;
-					toolTipText = DiagramUIActionsMessages.AlignLeftToolbarAction_Tooltip;
-				}
-				else{
-					text = DiagramUIActionsMessages.AlignLeft;
-					toolTipText = DiagramUIActionsMessages.AlignLeft;
-				}				
-				break;
-			}
-			case PositionConstants.RIGHT: {
-				if (isToolbarItem){
-					text = DiagramUIActionsMessages.AlignRightToolbarAction_Label;
-					toolTipText = DiagramUIActionsMessages.AlignRightToolbarAction_Tooltip;
-				}
-				else{
-					text = DiagramUIActionsMessages.AlignRight;
-					toolTipText = DiagramUIActionsMessages.AlignRight;
-				}					
-				break;
-			}
-			case PositionConstants.TOP: {
-				if (isToolbarItem){
-					text = DiagramUIActionsMessages.AlignTopToolbarAction_Label;
-					toolTipText = DiagramUIActionsMessages.AlignTopToolbarAction_Tooltip;
-				}
-				else{
-					text = DiagramUIActionsMessages.AlignTop;
-					toolTipText = DiagramUIActionsMessages.AlignTop;
-				}				
-				break;
-			}
-			case PositionConstants.BOTTOM: {
-				if (isToolbarItem){
-					text = DiagramUIActionsMessages.AlignBottomToolbarAction_Label;
-					toolTipText = DiagramUIActionsMessages.AlignBottomToolbarAction_Tooltip;
-				}
-				else{
-					text = DiagramUIActionsMessages.AlignBottom;
-					toolTipText = DiagramUIActionsMessages.AlignBottom;
-				}		
-				break;
-			}
-			case PositionConstants.CENTER: {
-				if (isToolbarItem){
-					text = DiagramUIActionsMessages.AlignCenterToolbarAction_Label;
-					toolTipText = DiagramUIActionsMessages.AlignCenterToolbarAction_Tooltip;
-				}
-				else{
-					text = DiagramUIActionsMessages.AlignCenter;
-					toolTipText = DiagramUIActionsMessages.AlignCenter;
-				}	
-				break;
-			}
-			case PositionConstants.MIDDLE: {
-				if (isToolbarItem){
-					text = DiagramUIActionsMessages.AlignMiddleToolbarAction_Label;
-					toolTipText = DiagramUIActionsMessages.AlignMiddleToolbarAction_Tooltip;
-				}
-				else{
-					text = DiagramUIActionsMessages.AlignMiddle;
-					toolTipText = DiagramUIActionsMessages.AlignMiddle;
-				}	
-				break;
-			}			
-		}
-		setText(text);
-		setToolTipText(toolTipText);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-    
-    protected boolean isOperationHistoryListener() {
-        return true;
-    }
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createOperationSet()
-	 */
-	protected List createOperationSet() {
-		List editparts = super.createOperationSet();
-		editparts = ToolUtilities.getSelectionWithoutDependants(editparts);
-		if (editparts.size() < 2)
-			return Collections.EMPTY_LIST;
-		EditPart parent = ((EditPart)editparts.get(0)).getParent();
-		for (int i = 1; i < editparts.size(); i++) {
-			EditPart part = (EditPart)editparts.get(i);
-			if (part.getParent() != parent)
-				return Collections.EMPTY_LIST;
-		}
-		return editparts;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		AlignmentRequest request = new AlignmentRequest(RequestConstants.REQ_ALIGN);
-		request.setAlignment(alignment);
-		return request;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#updateTargetRequest()
-	 */
-	protected void updateTargetRequest() {
-		AlignmentRequest request = (AlignmentRequest) getTargetRequest();
-		request.setAlignmentRectangle(calculateAlignmentRectangle());
-		super.updateTargetRequest();
-	}
-
-	/**
-	 * Returns the alignment rectangle to which all selected parts should be aligned.	 
-	 * @return the alignment rectangle
-	 */
-	protected Rectangle calculateAlignmentRectangle() {
-		List editparts = getOperationSet();
-		if (editparts == null || editparts.isEmpty())
-			return null;
-		GraphicalEditPart part = (GraphicalEditPart)editparts.get(editparts.size() - 1);
-		Rectangle rect = new PrecisionRectangle(part.getFigure().getBounds());
-		part.getFigure().translateToAbsolute(rect);
-		return rect;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AttachShapeAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AttachShapeAction.java
deleted file mode 100644
index 72e70c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AttachShapeAction.java
+++ /dev/null

@@ -1,237 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Provides support for action which add an attached shapes to another shape.
- * Puts the added shape in direct edit mode after all the shapes and connections
- * are created.
- * 
- * @author jcorchis
- */
-public abstract class AttachShapeAction
-	extends DiagramAction {
-
-	/**
-	 * Constructor
-	 * 
-	 * @param workbenchPage
-	 *            the active workbenchPage
-	 */
-	public AttachShapeAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Method selectAddedObject. Selects Select the newly added shape view by
-	 * default
-	 * 
-	 * @param request
-	 *            the request object that holds a reference for the newly
-	 *            created object
-	 * @param viewer
-	 *            the viewer that contains the shapes to be selected. The shapes
-	 *            correspond to the newly created object.
-	 */
-	protected void selectAddedObject(EditPartViewer viewer,
-			CreateRequest request) {
-		final Object model = request.getNewObject();
-		if (model == null || !(model instanceof Collection))
-			return;
-		final Iterator models = ((Collection) model).iterator();
-		final List editparts = new ArrayList();
-
-		while (models.hasNext()) {
-			IAdaptable viewAdapter = (IAdaptable) models.next();
-			if (viewAdapter != null) {
-				Object editPart = viewer.getEditPartRegistry().get(
-					viewAdapter.getAdapter(View.class));
-				if (editPart != null)
-					editparts.add(editPart);
-			}
-		}
-
-		if (!editparts.isEmpty()) {
-			viewer.setSelection(new StructuredSelection(editparts));
-
-			// automatically put the first shape into edit-mode
-			Display.getCurrent().asyncExec(new Runnable() {
-
-				public void run() {
-					EditPart editPart = (EditPart) editparts.get(0);
-					editPart.performRequest(new Request(
-						RequestConstants.REQ_DIRECT_EDIT));
-				}
-			});
-		}
-	}
-
-	/**
-	 * Determines the location of for the shape to be created in relation to the
-	 * some other shape.
-	 * 
-	 * @param editParts
-	 *            the existing editparts of the shapes whose location is used to
-	 *            determine the location of the to be created shape
-	 * @return Point the point representing the location of the to be created
-	 *         shape
-	 */
-	protected Point getLocation(List editParts) {
-
-		Point referenceLocation = new Point(0, 0);
-
-		Rect compoundBounds = new Rect(Integer.MAX_VALUE, Integer.MAX_VALUE,
-			Integer.MIN_VALUE, Integer.MIN_VALUE);
-
-		for (int i = 0; i < editParts.size(); i++) {
-			GraphicalEditPart part = (GraphicalEditPart) editParts.get(i);
-			Rectangle bounds = null;
-			if (part.getFigure() instanceof PolylineConnectionEx)
-				bounds = ((PolylineConnectionEx) part.getFigure())
-					.getSimpleBounds();
-			else
-				bounds = part.getFigure().getBounds();
-			compoundBounds = compoundRectangle(compoundBounds, bounds);
-		}
-
-		referenceLocation = new Point(
-			(compoundBounds.x1 + compoundBounds.x2) / 2, compoundBounds.y1);
-
-		GraphicalEditPart part = (GraphicalEditPart) editParts.get(0);
-		int vertOffset = MapModeUtil.getMapMode(part.getFigure()).DPtoLP(100);
-		Point location = new Point();
-		location.x = referenceLocation.x;
-		location.y = referenceLocation.y - vertOffset;
-
-		// convert the location to screen coordinates as that is what the
-		// creation command expects
-		// this is done so that the new node don;t hide up in the scrollpane of
-		// the shapecompartment.
-		if ((location.y < 0)
-			&& (part.getParent() instanceof ShapeCompartmentEditPart)) {
-			location.y = referenceLocation.y;
-			location.x = part.getFigure().getBounds().getRight().x
-				+ vertOffset;
-		}
-		part.getFigure().translateToAbsolute(location);
-
-		return location;
-	}
-
-	/**
-	 * Builds a compound rectangle out of contributing rectangles
-	 * 
-	 * @param base
-	 *            the base rectangle to start with
-	 * @param added
-	 *            the newly added rectangle to be compounded
-	 * @return Rect the resulting compound rectangle
-	 * 
-	 */
-	private Rect compoundRectangle(Rect base, Rectangle added) {
-		if (added == null)
-			return base;
-
-		if (added.x + added.width > base.x2)
-			base.x2 = added.x + added.width;
-		if (added.y + added.height > base.y2)
-			base.y2 = added.y + added.height;
-		if (added.x < base.x1)
-			base.x1 = added.x;
-		if (added.y < base.y1)
-			base.y1 = added.y;
-
-		return base;
-	}
-
-	private class Rect {
-
-		public int x1, y1, x2, y2;
-
-		Rect(int x1, int y1, int x2, int y2) {
-			this.x1 = x1;
-			this.y1 = y1;
-			this.x2 = x2;
-			this.y2 = y2;
-		}
-
-		public Rectangle toRectangle() {
-			return new Rectangle(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/**
-	 * Return null since this action doesn't use request to execute its
-	 * commands.
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	/**
-	 * Return the first non {@link ShapeEditPart} and non
-	 * {@link ConnectionEditPart} instance in the supplied editparts editpart
-	 * hierarchy.
-	 * 
-	 * @param editPart
-	 *            starting editpart
-	 * @return an editpart the first non <code>ShapeEditPart</code> non
-	 *         <code>ConnectionEditPart</code> it found traversing the
-	 *         hierarchy upwards.
-	 */
-	protected EditPart getContainer(EditPart editPart) {
-		EditPart walker = editPart;
-		while (walker != null
-			&& (walker instanceof ShapeEditPart || walker instanceof ConnectionEditPart)) {
-			walker = walker.getParent();
-		}
-		if (walker instanceof RootEditPart) {
-			return ((RootEditPart) walker).getContents();
-		}
-		return walker;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/BooleanPropertyAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/BooleanPropertyAction.java
deleted file mode 100644
index b41b032..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/BooleanPropertyAction.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * A base action representing those that are responsible to setting boolean valued  
- *  properties
- * 
- * @author melaasar
- * 
- */
-public class BooleanPropertyAction extends CheckedPropertyAction {
-
-	/**
-	 * @param workbenchPage The workbench page
-	 * @param propertyName The property name
-	 * @param propertyId The property id
-	 */
-	protected BooleanPropertyAction(
-		IWorkbenchPage workbenchPage,
-		String propertyId,
-		String propertyName){
-		super(workbenchPage, propertyId, propertyName, Boolean.TRUE);
-	}
-
-	/**
-	 * Returns the new property value.
-	 * 
-	 * The default implementation assumes a <code>Boolean</code> property
-	 * If different, subclasses must override this method
-	 *  
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		Boolean value = (Boolean) getOperationSetPropertyValue(getPropertyId());
-		if (value != null)
-			return value.booleanValue() ? Boolean.FALSE : Boolean.TRUE;
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/CopyAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/CopyAction.java
deleted file mode 100644
index 1aa2b10..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/CopyAction.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The copy action that copies the bitmap information on to the clipboard
- * This action is not really a <code>DiagramAction</code> as it doesn't have
- * a request.  The doRun() and the refresh() and calculatedEnabled() have been overwritten
- * appropriately.
- * @author Vishy Ramaswamy
- * @author choang refactor to use ActionContribution item service
- */
-abstract public class CopyAction extends DiagramAction {
-	/**
-	 * JRE Version
-	 */
-	private static final String JRE_VERSION = System.getProperty("java.version"); //$NON-NLS-1$
-
-	
-	/**
-	 * Constructor
-	 * @param page the active workbenchpage
-	 */
-	public CopyAction(IWorkbenchPage page) {
-		super(page);
-	}	
-	
-	/**
-	 * initialize with the correct images and action id
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#init()
-	 */
-	public void init(){
-		super.init();
-		/* set the label for the action */
-		setText(DiagramUIActionsMessages.CopyAction_Copy);
-
-		/*  set the image */
-		ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-		
-		setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		setHoverImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED));
-
-		/* set the id */
-		setId(ActionIds.ACTION_COPY_BITMAP);
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-
-		/* Check if the JRE version is 1.4 or greater */
-		if (!JRE_VERSION.startsWith("1.4")) { //$NON-NLS-1$
-			return false;
-		}
-
-		if (isCopyAll()) {
-			return true;
-		}
-
-		return canCopy(getSelectedObjects());
-	}
-
-	
-
-	/**
-	 * If the selected object is a DiagramEditPart,
-	 * return true, otherwise return false.
-	 * If the selected object is a DiagramEditPart, the diagram
-	 * is selected, and all the diagram parts are copied.
-	 * 
-	 * @return boolean answering whether to copy all selected objects or not
-	 */
-	protected boolean isCopyAll() {
-		
-		List selectObjects = getStructuredSelection().toList();
-		if (selectObjects.size() == 1) {
-			if (selectObjects.get(0) instanceof DiagramEditPart) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * If this list of parts contains a ShapeEditPart,
-	 * return true, otherwise false.
-	 * Copy feature enabled only if at at least one
-	 * non-connection is selected.
-	 * 
-	 * @param parts the parts to check
-	 * @return boolean answering whether it is OK to copy the passed parts or not
-	 */
-	protected boolean canCopy(List parts) {
-		/*if one selected part is a non-connectable part, return true */
-		for (int i = 0; i < parts.size(); i++) {
-			Object o = parts.get(i);
-			if (o instanceof ShapeEditPart) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-
-	/** 
-	 * return true so this action cares about selection changes
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		
-		return true;
-	}
-
-	/**
-	 * This action is not really a <code>DiagramAction</code> as it doesn't have
-	 * a request.  The doRun() and the refresh() and calculatedEnabled() have been overwritten
-	 * appropriately.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		try {
-			//whatever we are copying belongs to the same editing domain as 
-			//the Diagram
-			getDiagramEditPart().getEditingDomain().runExclusive(
-				new Runnable() {
-
-					public void run() {
-						CopyAction.this.run();
-					}
-				});
-		} catch (Exception e) {
-			Trace.catching(DiagramActionsPlugin.getInstance(),
-				DiagramActionsDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"doRun()", //$NON-NLS-1$
-				e);
-			Log.error(DiagramActionsPlugin.getInstance(),
-				DiagramActionsStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getPropertyValue", e); //$NON-NLS-1$
-		}	
-	}
-
-	/** 
-	 * Refresh the enablement status based on whether the action is enabled or not.
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IActionWithProgress#refresh()
-	 */
-	public void refresh() {
-		setEnabled(calculateEnabled());
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/IndividualCompartmentAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/IndividualCompartmentAction.java
deleted file mode 100644
index e31201c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/IndividualCompartmentAction.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangeChildPropertyValueRequest;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * An abstract base class that represents a boolean-based action 
- * that is applicable to specific shape compartments
- * @author melaasar
- *
- */
-public abstract class IndividualCompartmentAction
-	extends BooleanPropertyAction {
-
-	/**
-	 * The targeted compartment semantic hint
-	 */
-	private final String compartmentSemanticHint;
-
-	/**
-	 * @param workbenchPage the active workbenchPage 
-	 * @param compartmentSemanticHint the hint indicating the compartment type	 
-	 */
-	public IndividualCompartmentAction(
-		IWorkbenchPage workbenchPage,
-		String compartmentSemanticHint) {
-		super(
-			workbenchPage,
-			PackageUtil.getID(NotationPackage.eINSTANCE.getView_Visible()),
-			DiagramUIActionsMessages.ConstrainedFlowLayoutEditPolicy_changeVisibilityCommand_label);
-		Assert.isNotNull(compartmentSemanticHint);
-		this.compartmentSemanticHint = compartmentSemanticHint;
-	}
-
-	
-	protected Request createTargetRequest() {
-		return new ChangeChildPropertyValueRequest(
-			getPropertyName(),
-			getPropertyId(),
-			getCompartmentSemanticHint());
-		
-	}
-
-
-	/**
-	 * Returns the request compartment semantic hint
-	 * 
-	 * @return The request compartment semantic hint
-	 */
-	protected String getCompartmentSemanticHint() {
-		return compartmentSemanticHint;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeAction#getPropertyValue(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart, java.lang.String)
-	 */
-	protected Object getPropertyValue(
-		final IGraphicalEditPart editPart,
-		final String thePropertyId) {
-		
-		try {
-			return editPart.getEditingDomain().runExclusive(
-				new RunnableWithResult.Impl() {
-
-					public void run() {
-						ENamedElement element = PackageUtil
-							.getElement(thePropertyId);
-						if (element instanceof EStructuralFeature) {
-							View view = editPart.getNotationView();
-							if (view != null) {
-								View childView = ViewUtil
-									.getChildBySemanticHint(view,
-										getCompartmentSemanticHint());
-								if (childView != null) {
-									setResult(ViewUtil
-										.getStructuralFeatureValue(childView,
-											(EStructuralFeature) element));
-								}
-							}
-						}
-					}
-				});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramActionsPlugin.getInstance(),
-				DiagramActionsDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getPropertyValue", e); //$NON-NLS-1$
-			Log.error(DiagramActionsPlugin.getInstance(),
-				DiagramActionsStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getPropertyValue", e); //$NON-NLS-1$
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/IndividualConnectionLabelAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/IndividualConnectionLabelAction.java
deleted file mode 100644
index cb8b7d3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/IndividualConnectionLabelAction.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author mboos
- * 
- * An action that toggles between showing and hiding labels on connections and
- * diagrams.
- */
-public abstract class IndividualConnectionLabelAction
-	extends BooleanPropertyAction {
-
-	private final String[] labelSemanticHints;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param workbenchPage
-	 *            the active workbenchPage
-	 * @param labelSemanticHints
-	 *            the semantic hints to use to figure out the target edit parts
-	 *            for this action
-	 */
-	protected IndividualConnectionLabelAction(IWorkbenchPage workbenchPage,
-			String[] labelSemanticHints) {
-		super(
-			workbenchPage,
-			PackageUtil.getID(NotationPackage.eINSTANCE.getView_Visible()),
-			DiagramUIActionsMessages.ConstrainedFlowLayoutEditPolicy_changeVisibilityCommand_label);
-		Assert.isNotNull(labelSemanticHints);
-		this.labelSemanticHints = labelSemanticHints;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getTargetEditParts(org.eclipse.gef.EditPart)
-	 */
-	protected List getTargetEditParts(EditPart editpart) {
-		EditPart targetEP = null;
-		List editParts = new ArrayList();
-		if (editpart instanceof ConnectionNodeEditPart) {
-			final ConnectionNodeEditPart conEP = (ConnectionNodeEditPart) editpart;
-			TransactionalEditingDomain editingDomain = conEP.getEditingDomain();
-			for (int i = 0; i < getLabelSemanticHints().length; i++) {
-				final int index = i;
-				
-				try {
-					targetEP = (EditPart) editingDomain
-						.runExclusive(new RunnableWithResult.Impl() {
-
-							public void run() {
-								setResult(conEP
-									.getChildBySemanticHint(getLabelSemanticHints()[index]));
-							}
-						});
-				} catch (InterruptedException e) {
-					Trace.catching(DiagramActionsPlugin.getInstance(),
-						DiagramActionsDebugOptions.EXCEPTIONS_CATCHING,
-						getClass(), "getTargetEditParts", e); //$NON-NLS-1$
-					Log.error(DiagramActionsPlugin.getInstance(),
-						DiagramActionsStatusCodes.IGNORED_EXCEPTION_WARNING,
-						"getTargetEditParts", e); //$NON-NLS-1$
-				}
-				
-				if (targetEP != null)
-					editParts.add(targetEP);
-			}
-
-		}
-		return (editParts.isEmpty()) ? Collections.EMPTY_LIST
-			: editParts;
-	}
-
-	/**
-	 * Returns the request connection label semantic hint
-	 * 
-	 * @return The request connection label semantic hint
-	 */
-	protected String[] getLabelSemanticHints() {
-		return labelSemanticHints;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AddMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AddMenuManager.java
deleted file mode 100644
index d8fbe3d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AddMenuManager.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * @author schafe
- * @canBeSeenBy %level1
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class AddMenuManager extends ActionMenuManager {
-
-	/**
-	 * The arrange menu action containing the UI for the arrange menu manager
-	 */
-	private static class AddMenuAction extends Action {
-		public AddMenuAction() {
-			setText(DiagramUIActionsMessages.Add_menuItem);
-			setToolTipText(DiagramUIActionsMessages.Add_menuItem);	
-		}
-	}
-	
-	/**
-	 * Creates a new instance of the arrange menu manager
-	 */
-	public AddMenuManager( String menuId ) {
-		super( menuId, new AddMenuAction(), true );
-	}
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AlignMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AlignMenuManager.java
deleted file mode 100644
index dc83ecf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AlignMenuManager.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * The align menu manager. It contains all align-related actions
- */
-public class AlignMenuManager extends ActionMenuManager {
-
-	/**
-	 * The align menu action containing the UI for the align menu manager
-	 */
-	private static class AlignMenuAction extends Action {
-		public AlignMenuAction() {
-			setText(DiagramUIActionsMessages.AlignActionMenu_AlignDropDownText);
-			setToolTipText(DiagramUIActionsMessages.AlignActionMenu_AlignDropDownTooltip);
-			ImageDescriptor imageDesc = DiagramUIActionsPluginImages.DESC_ALIGN;
-			setImageDescriptor(imageDesc);
-			setHoverImageDescriptor(imageDesc);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the align menu manager
-	 */
-	public AlignMenuManager() {
-		super(ActionIds.MENU_ALIGN, new AlignMenuAction(), true);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AllCompartmentsAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AllCompartmentsAction.java
deleted file mode 100644
index 19f9856..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AllCompartmentsAction.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AllCompartmentsAction extends PropertyChangeAction {
-	/**
-	 * The requested visibility of all compartments
-	 */
-	private Boolean visibility;
-
-	/**
-	 * @param workbenchPage
-	 * @param visibility
-	 */
-	protected AllCompartmentsAction(
-		IWorkbenchPage workbenchPage,
-		boolean visibility) {
-		super(
-			workbenchPage,
-			Properties.ID_ISVISIBLE,
-			DiagramUIActionsMessages.ConstrainedFlowLayoutEditPolicy_changeVisibilityCommand_label);
-		this.visibility = visibility ? Boolean.TRUE : Boolean.FALSE;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return visibility;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getCommandLabel()
-	 */
-	protected String getCommandLabel() {
-		if (((Boolean) getNewPropertyValue()).booleanValue())
-			return DiagramUIActionsMessages.ShowAllResizableCompartmentsAction_ShowAllText;
-		else
-			return DiagramUIActionsMessages.ShowAllResizableCompartmentsAction_HideAllText; 
-	}
-
-	/**
-	 * Creates the show all compartments action
-	 * @param workbenchPage
-	 * @return
-	 */
-	public static AllCompartmentsAction createShowAllCompartmentsAction(IWorkbenchPage workbenchPage) {
-		AllCompartmentsAction action =
-			new AllCompartmentsAction(workbenchPage, true);
-		action.setId(ActionIds.ACTION_COMPARTMENT_ALL);
-		action
-			.setText(DiagramUIActionsMessages.ShowAllResizableCompartmentsAction_ShowAllText);
-		action
-			.setToolTipText(DiagramUIActionsMessages.ShowAllResizableCompartmentsAction_ShowAllTooltip);
-
-		ImageDescriptor imageDesc = DiagramUIActionsPluginImages.DESC_SHOW_ALL_RESIZABLE_COMPARTMENTS;
-		action.setImageDescriptor(imageDesc);
-		action.setHoverImageDescriptor(imageDesc);
-		return action;
-	}
-
-	/**
-	 * Creates the hide all compartments action
-	 * @param workbenchPage
-	 * @return
-	 */
-	public static AllCompartmentsAction createHideAllCompartmentsAction(IWorkbenchPage workbenchPage) {
-		AllCompartmentsAction action =
-			new AllCompartmentsAction(workbenchPage, false);
-		action.setId(ActionIds.ACTION_COMPARTMENT_NONE);
-		action
-			.setText(DiagramUIActionsMessages.ShowAllResizableCompartmentsAction_HideAllText);
-		action
-			.setToolTipText(DiagramUIActionsMessages.ShowAllResizableCompartmentsAction_HideAllTooltip);
-
-		ImageDescriptor imageDesc = DiagramUIActionsPluginImages.DESC_HIDE_ALL_RESIZABLE_COMPARTMENTS;
-		action.setImageDescriptor(imageDesc);
-		action.setHoverImageDescriptor(imageDesc);
-		return action;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		Request request = super.createTargetRequest();
-		request.setType(RequestConstants.REQ_SHOW_ALL_COMPARTMENTS);
-		return request;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeAction.java
deleted file mode 100644
index b3d5d0d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeAction.java
+++ /dev/null

@@ -1,359 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.Animation;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.tools.ToolUtilities;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IEditableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * The Arrange Action: arranges a container editpart or a set of selected editparts
- * 
- * @author melaasar
- * @canBeSeenBy %level1
- */
-public class ArrangeAction extends DiagramAction {
-
-	private boolean selectionOnly;
-
-	/**
-	 * @param workbenchPage
-	 */
-	protected ArrangeAction(
-		IWorkbenchPage workbenchPage,
-		boolean selectionOnly) {
-		super(workbenchPage);
-		this.selectionOnly = selectionOnly;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new ArrangeRequest(getId());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#updateTargetRequest()
-	 */
-	protected void updateTargetRequest() {
-		ArrangeRequest request = (ArrangeRequest) getTargetRequest();
-		request.setPartsToArrange(getOperationSet());
-	}
-
-	private boolean isArrangeAll() {
-		return !selectionOnly;
-	}
-
-	protected Command getCommand() {
-		CompoundCommand arrangeCC = new CompoundCommand(getLabel());
-		if (isArrangeAll()) {
-			List elements = getOperationSet();
-			for (Iterator iter = elements.iterator(); iter.hasNext();) {
-				EditPart element = (EditPart) iter.next();
-				Command cmd = element.getCommand(getTargetRequest());
-				if (cmd != null)
-					arrangeCC.add(cmd);
-			}
-		} else if (getOperationSet().size() >= 2) {
-			EditPart parent = getSelectionParent(getOperationSet());
-			if (parent != null) {
-				Command cmd = parent.getCommand(getTargetRequest());
-				if (cmd != null)
-					arrangeCC.add(cmd);
-			}
-		}
-		return arrangeCC;
-	}
-
-	/**
-	 * Action is enabled if arrange all. If arrange selection, action is enabled
-	 * if the operation set's parent has XYLayout and there is atleast 2
-	 * siblings to arrange
-	 * 
-	 * @see org.eclipse.gef.ui.actions.EditorPartAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		
-		List operationSet = getOperationSet();
-		
-		//arrange all, always enable
-		if( isArrangeAll() && !operationSet.isEmpty()){
-			return true;
-		}
-
-		EditPart parentEP = getSelectionParent(operationSet);
-		
-		// bugzilla 156733: disable this action if the parent or selected edit parts are not editable
-		if ((parentEP instanceof IEditableEditPart)
-				&& !((IEditableEditPart) parentEP)
-						.isEditModeEnabled()) {
-			return false;
-		}
-		
-		for (Iterator i = operationSet.iterator(); i.hasNext();) {
-			Object next = i.next();
-			if ((next instanceof IEditableEditPart)
-					&& !((IEditableEditPart) next)
-							.isEditModeEnabled()) {
-				return false;
-			}
-		}
-		
-		//arrange selection
-		if (operationSet.size() >= 2) {
-			if (parentEP instanceof GraphicalEditPart) {
-				GraphicalEditPart parent = (GraphicalEditPart)parentEP;
-				if ((parent != null) &&(parent.getContentPane().getLayoutManager() instanceof XYLayout))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	/* 
-	 * The operation set is the shapes, connections or both on the diagrm edit part
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createOperationSet()
-	 */
-	protected List createOperationSet() {
-		List selection = getSelectedObjects();
-		
-		if( isArrangeAll() ) {
-			if( !selection.isEmpty()){
-				return getElementsToArrange(selection);
-			}
-			if( getDiagramEditPart() != null )				
-				return createOperationSet(getDiagramEditPart().getChildren());
-
-			return Collections.EMPTY_LIST;
-		}
-
-		if (selection.isEmpty() ||
-				!(selection.get(0) instanceof IGraphicalEditPart))
-			return Collections.EMPTY_LIST;
-
-		selection = ToolUtilities.getSelectionWithoutDependants(selection);
-		return createOperationSet(selection);
-	}
-
-	/**
-	 * getSelectionParent
-	 * Utility to return the logical parent of the selection list
-	 * 
-	 * @param editparts List to parse for a common parent.
-	 * @return EditPart that is the parent or null if a common parent doesn't exist.
-	 */
-	private EditPart getSelectionParent(List editparts) {
-		ListIterator li = editparts.listIterator();
-		while (li.hasNext()) {
-			Object obj = li.next();
-			if (!(obj instanceof ConnectionEditPart) && obj instanceof EditPart) {
-				return ((EditPart)obj).getParent();
-			}
-		}
-		
-		return null;
-	}
-	
-	private List createOperationSet(List editparts) {
-		if (editparts == null || editparts.isEmpty())
-			return Collections.EMPTY_LIST;
-		EditPart parent = getSelectionParent(editparts);
-		if (parent == null)
-			return Collections.EMPTY_LIST;
-		
-		for (int i = 1; i < editparts.size(); i++) {
-			EditPart part = (EditPart) editparts.get(i);
-			if (part instanceof ConnectionEditPart){
-				continue;
-			}
-			if (part.getParent() != parent)
-				return Collections.EMPTY_LIST;
-		}
-		return editparts;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/**
-	 * Creates the Arrange All action
-	 * @param workbenchPage
-	 */
-	public static ArrangeAction createArrangeAllAction(IWorkbenchPage workbenchPage) {
-		ArrangeAction action = new ArrangeAction(workbenchPage,false);
-		action.setId(ActionIds.ACTION_ARRANGE_ALL);
-		action.setText(DiagramUIActionsMessages.ArrangeAction_ArrangeAll_ActionLabelText);
-		action.setToolTipText(DiagramUIActionsMessages.ArrangeAction_ArrangeAll_ActionToolTipText);
-		
-		action
-			.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL);
-		action
-			.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL_DISABLED);
-		action
-			.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL);
-		return action;
-	}
-	
-	/**
-	 * Creates the Arrange All action for the toolbar menu
-	 * @param workbenchPage
-	 */
-	public static ArrangeAction createToolbarArrangeAllAction(IWorkbenchPage workbenchPage) {
-		ArrangeAction action = new ArrangeAction(workbenchPage, false);
-		action.setId(ActionIds.ACTION_TOOLBAR_ARRANGE_ALL);
-		action.setText(DiagramUIActionsMessages.ArrangeAction_toolbar_ArrangeAll_ActionLabelText);
-		action.setToolTipText(DiagramUIActionsMessages.ArrangeAction_toolbar_ArrangeAll_ActionToolTipText);
-		
-		action
-			.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL);
-		action
-			.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL_DISABLED);
-		action
-			.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL);
-		return action;
-	}
-
-	/**
-	 * Creates the Arrange Selection Only action
-	 * @param workbenchPage
-	 */
-	public static ArrangeAction createArrangeSelectionAction(IWorkbenchPage workbenchPage) {
-		ArrangeAction action = new ArrangeAction(workbenchPage, true);
-		action.setId(ActionIds.ACTION_ARRANGE_SELECTION);
-		action.setText(DiagramUIActionsMessages.ArrangeAction_ArrangeSelection_ActionLabelText);
-		action.setToolTipText(DiagramUIActionsMessages.ArrangeAction_ArrangeSelection_ActionToolTipText);
-		
-		action
-			.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_SELECTED);
-		action
-			.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_SELECTED_DISABLED);
-		action
-			.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_SELECTED);
-		return action;
-	}
-	
-	/**
-	 * Creates the Arrange Selection Only action for the toolbar menu
-	 * @param workbenchPage
-	 */
-	public static ArrangeAction createToolbarArrangeSelectionAction(IWorkbenchPage workbenchPage) {
-		ArrangeAction action = new ArrangeAction(workbenchPage, true);
-		action.setId(ActionIds.ACTION_TOOLBAR_ARRANGE_SELECTION);
-		action.setText(DiagramUIActionsMessages.ArrangeAction_toolbar_ArrangeSelection_ActionLabelText);
-		action.setToolTipText(DiagramUIActionsMessages.ArrangeAction_toolbar_ArrangeSelection_ActionToolTipText);
-		
-		action
-			.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_SELECTED);
-		action
-			.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_SELECTED_DISABLED);
-		action
-			.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_SELECTED);
-		return action;
-	}
-	
-	protected void doRun(IProgressMonitor progressMonitor) {
-		IPreferenceStore preferenceStore = (IPreferenceStore) getDiagramEditPart().getDiagramPreferencesHint().getPreferenceStore();
-		boolean animatedLayout = preferenceStore.getBoolean(
-			IPreferenceConstants.PREF_ENABLE_ANIMATED_LAYOUT);
-		
-		if (animatedLayout)
-			Animation.markBegin();
-			
-		super.doRun(progressMonitor);
-		
-		if (animatedLayout) {
-			int durationInc = 800;
-			int factor = 10;
-			int size = 0;
-			
-			List operationSet = getOperationSet();
-			if (isArrangeAll()){
-				for (Iterator iter = operationSet.iterator(); iter.hasNext();) {
-					IGraphicalEditPart element = (IGraphicalEditPart) iter.next();
-					size += element.getFigure().getChildren().size();
-				}
-			}
-			else if (operationSet != null && !operationSet.isEmpty()) {
-				IGraphicalEditPart container = (IGraphicalEditPart)getSelectionParent(operationSet);
-				size += container.getFigure().getChildren().size();
-			}
-			
-			int totalDuration = Math.min(durationInc * factor / 2, Math.max(durationInc, (size / 
-					factor) * durationInc));
-			
-			Animation.run(totalDuration);
-		}
-	}
-	
-	/**
-	 * @param selection
-	 * @return
-	 */
-	private List getElementsToArrange(List selection) {
-		Set parentsSet = new HashSet();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object element = iter.next();
-			if (element instanceof ShapeCompartmentEditPart || element instanceof DiagramEditPart){
-				parentsSet.add(element);
-			} else if (element instanceof EditPart){
-				EditPart gEditPart = 
-					(EditPart)element;
-				EditPart parentEditPart = gEditPart.getParent();
-				if (parentEditPart instanceof ShapeCompartmentEditPart ||
-					parentEditPart instanceof DiagramEditPart){
-					if (!parentsSet.contains(parentEditPart))
-						parentsSet.add(parentEditPart);
-				}
-			}
-		}
-		if (parentsSet.isEmpty())
-			return Collections.EMPTY_LIST;
-		List elements = new ArrayList();
-		elements.addAll(parentsSet);			
-		return elements;
-	}
-
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeMenuManager.java
deleted file mode 100644
index 0f5d1a2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeMenuManager.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler;
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * The arrange menu manager. It contains all arrange-related actions
- */
-public class ArrangeMenuManager extends ActionMenuManager {
-
-	/**
-	 * The arrange menu action containing the UI for the arrange menu manager
-	 */
-	private static class ArrangeMenuAction extends Action {
-		public ArrangeMenuAction() {
-			setText(DiagramUIActionsMessages.ArrangeMenuManager_Arrange_ActionLabelText);
-			setToolTipText(DiagramUIActionsMessages.ArrangeMenuManager_Arrange_ActionToolTipText);
-			
-			setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL);
-			setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL_DISABLED);
-			setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARRANGE_ALL);
-		}
-	}
-
-    /**
-     * Creates a new instance of the arrange menu manager
-     */
-    public ArrangeMenuManager() {
-        super(ActionIds.MENU_ARRANGE, new ArrangeMenuAction(), true);
-    }    
-    
-	/**
-	 * Creates a new instance of the arrange menu manager
-     * @param action default action associated with this menu manager (should not be null)
-	 */
-	public ArrangeMenuManager(IAction action) {
-		super(ActionIds.MENU_ARRANGE, action, true);
-
-        // If the action is null then use the original menu action
-        if (action == null) {
-            action = new ArrangeMenuAction();
-        }
-        
-       ((AbstractActionHandler) getDefaultAction()).setPartSelector(new IPartSelector() {
-            public boolean selects(IWorkbenchPart p) {
-                return p instanceof IDiagramWorkbenchPart;
-            }
-        });
-    }    
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AutoSizeAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AutoSizeAction.java
deleted file mode 100644
index fb04f3a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AutoSizeAction.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * 
- * @author melaasar
- */
-public class AutoSizeAction extends DiagramAction {
-
-    /**
-     * @param workbenchPage
-     */
-    public AutoSizeAction(IWorkbenchPage workbenchPage) {
-        super(workbenchPage);
-
-        setText(DiagramUIActionsMessages.AutoSizeAction_ActionLabelText);
-        setId(ActionIds.ACTION_AUTOSIZE);
-        setToolTipText(DiagramUIActionsMessages.AutoSizeAction_ActionToolTipText);
-        
-        setImageDescriptor(DiagramUIActionsPluginImages.DESC_AUTOSIZE);
-        setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_AUTOSIZE_DISABLED);
-        setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_AUTOSIZE);
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-     */
-    protected Request createTargetRequest() {
-        return new Request(RequestConstants.REQ_AUTOSIZE);
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-     */
-    protected boolean isSelectionListener() {
-        return true;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ColorPropertyContributionItem.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ColorPropertyContributionItem.java
deleted file mode 100644
index 91a74fe..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ColorPropertyContributionItem.java
+++ /dev/null

@@ -1,662 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ColorPropertyContributionItem
-	extends PropertyChangeContributionItem
-	implements Listener {
-
-	/**
-	 * An image descriptor that overlays two images: a basic icon
-	 * and a thin color bar underneath it
-	 */
-	private static class ColorMenuImageDescriptor
-		extends CompositeImageDescriptor {
-		/** the basic icon */
-		private ImageData basicImgData;
-		/** the color of the thin color bar */
-		private RGB rgb;
-
-		/**
-		 * Creates a new color menu image descriptor
-		 * @param basicIcon The basic Image data
-		 * @param rgb The color bar RGB value
-		 */
-		public ColorMenuImageDescriptor(ImageData basicImgData, RGB rgb) {
-			this.basicImgData = basicImgData;
-			this.rgb = rgb;
-		}
-
-		/**
-		* @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
-		*/
-		protected void drawCompositeImage(int width, int height) {
-			// draw the base image
-			drawImage(basicImgData, 0, 0);
-
-			// draw the thin color bar underneath
-			if (rgb != null) {
-				ImageData colorBar =
-					new ImageData(14, 4, 1, new PaletteData(new RGB[] { rgb }));
-				drawImage(colorBar, 1, height - 4);
-			}
-		}
-
-		/**
-		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-		 */
-		protected Point getSize() {
-			return ICON_SIZE;
-		}
-	}
-
-	/**
-	 * An image descriptor that creates a box with a given color
-	 */
-	private static class ColorBoxImageDescriptor extends ImageDescriptor {
-		/** the color value in RGB scheme */
-		private RGB rgb;
-
-		/**
-		 * Creates a new instance of the color box image descriptor with
-		 * a given color
-		 * 
-		 * @param rgb The color value in RGB scheme
-		 */
-		public ColorBoxImageDescriptor(RGB rgb) {
-			this.rgb = rgb;
-		}
-
-		/**
-		* @see org.eclipse.jface.resource.ImageDescriptor#getImageData()
-		*/
-		public ImageData getImageData() {
-			ImageData data =
-				new ImageData(
-					ICON_SIZE.x,
-					ICON_SIZE.y,
-					1,
-					new PaletteData(new RGB[] { rgb, OUTLINE_COLOR }));
-
-			for (int i = 0; i < ICON_SIZE.y; i++)
-				data.setPixel(0, i, 1);
-			for (int i = 0; i < ICON_SIZE.y; i++)
-				data.setPixel(ICON_SIZE.x - 1, i, 1);
-			for (int i = 0; i < ICON_SIZE.x; i++)
-				data.setPixel(i, 0, 1);
-			for (int i = 0; i < ICON_SIZE.x; i++)
-				data.setPixel(i, ICON_SIZE.y - 1, 1);
-			return data;
-		}
-	}
-
-	/**
-	 * A descirptor for an inventory color
-	 */
-	private static class InventoryColorDescriptor {
-		public RGB colorValue;
-		public String colorName;
-
-		public InventoryColorDescriptor(RGB colorValue, String colorName) {
-			this.colorValue = colorValue;
-			this.colorName = colorName;
-		}		
-	}
-
-	/** inventory colors */
-	private static final InventoryColorDescriptor WHITE = new InventoryColorDescriptor(new RGB(255, 255, 255), DiagramUIActionsMessages.ColorPropertyChangeAction_white);
-	private static final InventoryColorDescriptor BLACK = new InventoryColorDescriptor(new RGB(0, 0, 0), DiagramUIActionsMessages.ColorPropertyChangeAction_black);
-	private static final InventoryColorDescriptor LIGHT_GRAY = new InventoryColorDescriptor(new RGB(192, 192, 192), DiagramUIActionsMessages.ColorPropertyChangeAction_lightGray);
-	private static final InventoryColorDescriptor GRAY = new InventoryColorDescriptor(new RGB(128, 128, 128), DiagramUIActionsMessages.ColorPropertyChangeAction_gray);
-	private static final InventoryColorDescriptor DARK_GRAY = new InventoryColorDescriptor(new RGB(64, 64, 64), DiagramUIActionsMessages.ColorPropertyChangeAction_darkGray);
-	private static final InventoryColorDescriptor RED = new InventoryColorDescriptor(new RGB(227, 164, 156), DiagramUIActionsMessages.ColorPropertyChangeAction_red);
-	private static final InventoryColorDescriptor GREEN = new InventoryColorDescriptor(new RGB(166, 193, 152), DiagramUIActionsMessages.ColorPropertyChangeAction_green);
-	private static final InventoryColorDescriptor BLUE = new InventoryColorDescriptor(new RGB(152, 168, 191), DiagramUIActionsMessages.ColorPropertyChangeAction_blue);
-	private static final InventoryColorDescriptor YELLOW = new InventoryColorDescriptor(new RGB(225, 225, 135), DiagramUIActionsMessages.ColorPropertyChangeAction_yellow);
-	private static final InventoryColorDescriptor PURPLE = new InventoryColorDescriptor(new RGB(184, 151, 192), DiagramUIActionsMessages.ColorPropertyChangeAction_magenta);
-	private static final InventoryColorDescriptor TEAL = new InventoryColorDescriptor(new RGB(155, 199, 204), DiagramUIActionsMessages.ColorPropertyChangeAction_cyan);
-	private static final InventoryColorDescriptor PINK = new InventoryColorDescriptor(new RGB(228, 179, 229), DiagramUIActionsMessages.ColorPropertyChangeAction_pink);
-	private static final InventoryColorDescriptor ORANGE = new InventoryColorDescriptor(new RGB(237, 201, 122), DiagramUIActionsMessages.ColorPropertyChangeAction_orange);
-	/** default color icon width */
-	private static final Point ICON_SIZE = new Point(16, 16);
-	/** custom color group maximum length */
-	private static final int CUSTOM_SIZE = 3;
-	/** the default preference color */
-	private static final RGB DEFAULT_PREF_COLOR = new RGB(0, 0, 0);
-	/** the default preference color */
-	private static final RGB OUTLINE_COLOR = new RGB(192, 192, 192);
-	/** a color value that indicates the default color */
-	private static final String DEFAULT = "Default"; //$NON-NLS-1$
-	/** a color value that indicates to browse for a color */
-	private static final String CHOOSE = "Choose"; //$NON-NLS-1$
-	/** a color value that indicates to browse for a color */
-	private static final String CLEAR = "Clear"; //$NON-NLS-1$
-	/** the basic image data */
-	private ImageData basicImageData;
-	/** the disabledbasic image data */
-	private ImageData disabledBasicImageData;
-	/** the disabled basic image data **/
-	private Image disabledBasicImage;
-	/** the overlayed image */
-	private Image overlyedImage;
-	/** the last selected color */
-	private Integer lastColor;
-	/** the custom color list */
-	private List customColors = new ArrayList();
-	/** the inventory color list */
-	private List inventoryColors = new ArrayList();
-	/** the inventory color list  key: anRGB, value: anImage */
-	private HashMap imageColorMap = new HashMap();
-	/** the drop down menu */
-	private Menu menu;
-
-	/**
-	 * Creates a new color property contribution item
-	 * 
-	 * @param workbenchPage The part service
-	 * @param id The item id
-	 * @param propertyName The color property name (externalizable)
-	 * @param propertyId The color property id
-	 * @param toolTipText The tool tip text
-	 * @param basicImageData The basic image data
-	 */
-	public ColorPropertyContributionItem(
-		IWorkbenchPage workbenchPage,
-		String id,
-		String propertyId,
-		String propertyName,
-		String toolTipText,
-		ImageData basicImageData,
-		ImageData disabledBasicImageData) {
-		super(workbenchPage, id, propertyId, propertyName);
-        assert null != toolTipText;
-        assert null != basicImageData;
-		this.basicImageData = basicImageData;
-		this.disabledBasicImageData = disabledBasicImageData;
-		setLabel(toolTipText);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#init()
-	 */
-	protected void init() {
-		super.init();
-		this.overlyedImage =
-			new ColorMenuImageDescriptor(getBasicImageData(), null).createImage();
-		this.disabledBasicImage = new ColorMenuImageDescriptor(this.disabledBasicImageData, null).createImage();
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IContributionItem#dispose()
-	 */
-	public void dispose() {
-		if (overlyedImage != null && !overlyedImage.isDisposed()){
-			overlyedImage.dispose();
-			overlyedImage = null;
-		}
-		if (menu != null && !menu.isDisposed()){
-			menu.dispose();
-			menu = null;
-		}
-		for (Iterator i = imageColorMap.values().iterator(); i.hasNext();) {
-			Image image = (Image) i.next();
-			if (! image.isDisposed()) {
-				image.dispose();
-			}
-		}
-		if (disabledBasicImage != null && !disabledBasicImage.isDisposed()){
-			disabledBasicImage.dispose();
-			disabledBasicImage = null;
-		}
-		imageColorMap = new HashMap();
-		
-		super.dispose();
-	}
-
-	/**
-	 * Render the UI as a
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#createToolItem(org.eclipse.swt.widgets.ToolBar, int)
-	 */
-	protected ToolItem createToolItem(ToolBar parent, int index) {
-		ToolItem ti = new ToolItem(parent, SWT.DROP_DOWN, index);
-		ti.addListener(SWT.Selection, getItemListener());
-		ti.setImage(overlyedImage);
-		ti.setDisabledImage(this.disabledBasicImage);
-		return ti;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#createMenuItem(org.eclipse.swt.widgets.Menu, int)
-	 */
-	protected MenuItem createMenuItem(Menu parent, int index) {
-		MenuItem mi = index >= 0 
-			? new MenuItem(parent, SWT.CASCADE, index) 
-			: new MenuItem(parent, SWT.CASCADE);
-		createMenu(mi);
-		mi.setImage(overlyedImage);
-		return mi;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#handleWidgetEvent(org.eclipse.swt.widgets.Event)
-	 */
-	protected void handleWidgetEvent(Event e) {
-		switch (e.type) {
-			case SWT.Selection :
-				handleWidgetSelection(e);
-				break;
-			default :
-				super.handleWidgetEvent(e);
-		}
-	}
-
-	/**
-	 * Handles a widget selection event.
-	 */
-	private void handleWidgetSelection(Event e) {
-		if (e.detail == 4) { // on drop-down button
-			createMenu(getItem());
-		} else { // on icon button
-			if (lastColor != null)
-				runWithEvent(e);
-		}
-	}
-
-	/**
-	 * Creates the color menu
-	 */
-	private void createMenu(Item item) {
-		if (menu != null && !menu.isDisposed())
-			menu.dispose();
-
-		if (item instanceof ToolItem) {
-			ToolItem toolItem = (ToolItem) item;
-			menu = new Menu(toolItem.getParent());
-			Rectangle b = toolItem.getBounds();
-			Point p =
-				toolItem.getParent().toDisplay(new Point(b.x, b.y + b.height));
-			menu.setLocation(p.x, p.y); // waiting for SWT 0.42
-			menu.setVisible(true);
-		} else if (item instanceof MenuItem) {
-			MenuItem menuItem = (MenuItem) item;
-			menu = new Menu(menuItem.getParent());
-			menuItem.setMenu(menu);
-		}
-        
-        assert null != menu : "falid to create menu"; //$NON-NLS-1$
-		buildMenu(menu);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeContributionItem#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return lastColor;
-	}
-
-	/**
-	 * Builds the color menu consisting of :
-	 * inventory colors, custom colors, default and color picker
-	 * 
-	 * @param theMenu The menu
-	 */
-	private void buildMenu(Menu theMenu) {
-		// inventory colors
-		createInventoryColorMenuItem(theMenu, WHITE);
-		createInventoryColorMenuItem(theMenu, BLACK);
-		createInventoryColorMenuItem(theMenu, LIGHT_GRAY);
-		createInventoryColorMenuItem(theMenu, GRAY);
-		createInventoryColorMenuItem(theMenu, DARK_GRAY);
-		createInventoryColorMenuItem(theMenu, RED);
-		createInventoryColorMenuItem(theMenu, GREEN);
-		createInventoryColorMenuItem(theMenu, BLUE);
-		createInventoryColorMenuItem(theMenu, YELLOW);
-		createInventoryColorMenuItem(theMenu, PURPLE);
-		createInventoryColorMenuItem(theMenu, TEAL);
-		createInventoryColorMenuItem(theMenu, PINK);
-		createInventoryColorMenuItem(theMenu, ORANGE);
-
-		// history colors
-		if (!customColors.isEmpty()) {
-			createMenuSeparator(theMenu);
-			Iterator iter = customColors.iterator();
-			while (iter.hasNext()) {
-				RGB rgb = (RGB) iter.next();
-				createColorMenuItem(theMenu, rgb);
-			}
-			createClearCustomColorMenuItem(theMenu);
-		}
-
-		// default color and color picker
-		createMenuSeparator(theMenu);
-		createDefaultColorMenuItem(theMenu);
-		createChooseColorMenuItem(theMenu);
-	}
-
-	/**
-	 * Creates a new menu separator
-	 * 
-	 * @param theMenu The menu
-	 */
-	private void createMenuSeparator(Menu theMenu) {
-		new MenuItem(theMenu, SWT.SEPARATOR);
-	}
-
-	/**
-	 * Creates a inventory color menu item with the given color name and RGB value
-	 * 
-	 * @param theMenu The menu
-	 * @param color The color RGB value
-	 * @param colorName the color name (externalizable)
-	 */
-	private void createInventoryColorMenuItem(
-		Menu theMenu,
-		InventoryColorDescriptor color) {
-		
-		RGB rgb = color.colorValue;
-		Image image = (Image) imageColorMap.get(rgb);		
-		if (image == null){
-			image = new ColorBoxImageDescriptor(color.colorValue).createImage();
-			imageColorMap.put(rgb, image);
-		}		
-		MenuItem mi = createMenuItem(theMenu, color.colorName, image);
-		mi.setData(rgb);
-		inventoryColors.add(rgb);		
-	}
-
-	/**
-	 * Creates a color menu item with the RGB value as a name
-	 * 
-	 * @param theMenu The menu
-	 * @param rgb The color RGB value
-	 */
-	private void createColorMenuItem(Menu theMenu, RGB rgb) {
-		Image image = (Image) imageColorMap.get(rgb);		
-		if (image == null){
-			image = new ColorBoxImageDescriptor(rgb).createImage();
-			imageColorMap.put(rgb, image);
-		}
-		MenuItem mi = createMenuItem(theMenu, rgb.toString(), image);
-		mi.setData(rgb);		
-	}
-
-	/**
-	 * Creates a menu item for the default color
-	 * 
-	 * @param theMenu The menu
-	 */
-	private void createDefaultColorMenuItem(Menu theMenu) {
-		String text = DiagramUIActionsMessages.ColorPropertyChangeAction_default;
-		Image image = null; //new ColorBoxImageDescriptor(color).createImage();
-		MenuItem mi = createMenuItem(theMenu, text, image);
-		mi.setData(DEFAULT);
-	}
-
-	/**
-	 * Creates a menu item for the color picker
-	 * 
-	 * @param theMenu The menu
-	 */
-	private void createChooseColorMenuItem(Menu theMenu) {
-		String text = DiagramUIActionsMessages.ColorPropertyChangeAction_moreColors;
-		Image image = null; //new ColorBoxImageDescriptor(color).createImage();
-		MenuItem mi = createMenuItem(theMenu, text, image);
-		mi.setData(CHOOSE);
-	}
-
-	/**
-	 * Creates a menu item to clear the custom color menu group
-	 * 
-	 * @param theMenu The menu
-	 */
-	private void createClearCustomColorMenuItem(Menu theMenu) {
-		String text = DiagramUIActionsMessages.ColorPropertyChangeAction_clearColors;
-		Image image = null; //new ColorBoxImageDescriptor(color).createImage();
-		MenuItem mi = createMenuItem(theMenu, text, image);
-		mi.setData(CLEAR);
-	}
-
-	/**
-	 * Creates a menu item with a given text and image with the push style
-	 * 
-	 * @param theMenu The menu
-	 * @param text The menu item text
-	 * @param image The menu item image
-	 */
-	private MenuItem createMenuItem(Menu theMenu, String text, Image image) {
-		MenuItem mi = new MenuItem(theMenu, SWT.PUSH);
-		if (text != null)
-			mi.setText(text);
-		if (image != null)
-			mi.setImage(image);
-		mi.addListener(SWT.Selection, this);
-		return mi;
-	}
-
-	/**
-	 * Handle the selection of menu items in the color menu
-	 * 
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		MenuItem menuItem = (MenuItem) event.widget;
-		Object data = menuItem.getData();
-
-		RGB rgb = null;
-
-		if (data instanceof RGB) {
-			rgb = (RGB) data;
-		} else if (data.equals(CHOOSE)) {
-			rgb = getBrowseColor();
-		} else if (data.equals(DEFAULT)) {
-			rgb = getDefaultColor();
-		} else if (data.equals(CLEAR)) {
-			customColors.clear();
-		}
-
-		if (rgb != null) {
-			if (getToolItem() != null) {
-				// if a new custom color add it to history
-				if (!customColors.contains(rgb)
-					&& !inventoryColors.contains(rgb)) {
-					if (customColors.size() == CUSTOM_SIZE)
-						customColors.remove(0);
-					customColors.add(rgb);
-				}
-
-				// create a new overlayed icon with the new color
-				if (overlyedImage != null)
-					overlyedImage.dispose();
-				overlyedImage =
-					new ColorMenuImageDescriptor(
-						getBasicImageData(),
-						rgb)
-						.createImage();
-				getItem().setImage(overlyedImage);
-			}
-
-			// set the new color as the last color
-			lastColor = FigureUtilities.RGBToInteger(rgb);
-
-			// run the action
-			runWithEvent(event);
-		}
-	}
-
-	/**
-	 * Returns the color to use in the browse mode. By default,
-	 * this comes from the color picker dialog
-	 * 
-	 * @return The color to use in browse mode
-	 */
-	protected RGB getBrowseColor() {
-		ColorDialog dialog =
-			new ColorDialog(Display.getCurrent().getActiveShell());
-		WindowUtil.centerDialog(
-			dialog.getParent(),
-			Display.getCurrent().getActiveShell());
-		dialog.open();
-		return dialog.getRGB();
-	}
-
-	/**
-     * Returns the color to use in the default mode. A limitation is that if
-     * there are multiple editparts with different default colors only the
-     * default color of the first is returned.
-     * 
-     * @return The color to use in default mode
-     */
-    protected RGB getDefaultColor() {
-        for (Iterator iter = getOperationSet().iterator(); iter.hasNext();) {
-            EditPart editpart = (EditPart) iter.next();
-            if (editpart instanceof IGraphicalEditPart) {
-                final EStructuralFeature feature = (EStructuralFeature) PackageUtil
-                    .getElement(getPropertyId());
-
-                Object preferredValue = ((IGraphicalEditPart) editpart)
-                    .getPreferredValue(feature);
-                if (preferredValue instanceof Integer) {
-                    return FigureUtilities
-                        .integerToRGB((Integer) preferredValue);
-                }
-
-            }
-
-        }
-
-        return DEFAULT_PREF_COLOR;
-    }
-	
-	/**
-	 * Gets the basic image data.
-	 * @return ImageData basicImageData
-	 */
-	protected ImageData getBasicImageData(){
-		return this.basicImageData;
-	}
-
-	/**
-	 * Create the FONT color menu
-	 * 
-	 * @param workbenchPage The part service
-	 * @return The FONT color menu
-	 */
-	public static ColorPropertyContributionItem createFontColorContributionItem(IWorkbenchPage workbenchPage) {
-		String propertyName = DiagramUIActionsMessages.PropertyDescriptorFactory_FontColor;
-		String toolTipText = DiagramUIActionsMessages.ColorChangeActionMenu_fontColor;
-		ImageData basicImageData = DiagramUIActionsPluginImages.DESC_FONT_COLOR
-			.getImageData();
-		ImageData disabledBasicImageData = DiagramUIActionsPluginImages.DESC_FONT_COLOR_DISABLED
-			.getImageData();
-
-		return new ColorPropertyContributionItem(
-			workbenchPage,
-			ActionIds.CUSTOM_FONT_COLOR,
-			Properties.ID_FONTCOLOR,
-			propertyName,
-			toolTipText,
-			basicImageData,
-			disabledBasicImageData);
-	}
-
-	/**
-	 * Create the LINE color menu
-	 * 
-	 * @param workbenchPage The part service
-	 * @return The LINE color menu
-	 */
-	public static ColorPropertyContributionItem createLineColorContributionItem(IWorkbenchPage workbenchPage) {
-		String propertyName = DiagramUIActionsMessages.PropertyDescriptorFactory_LineColor;
-		String toolTipText = DiagramUIActionsMessages.ColorChangeActionMenu_lineColor;
-		ImageData basicImageData = 
-			DiagramUIActionsPluginImages.DESC_LINE_COLOR.getImageData();
-		ImageData disabledBasicImageData = DiagramUIActionsPluginImages.DESC_LINE_COLOR_DISABLED
-			.getImageData();
-
-		return new ColorPropertyContributionItem(
-			workbenchPage,
-			ActionIds.CUSTOM_LINE_COLOR,
-			Properties.ID_LINECOLOR,
-			propertyName,
-			toolTipText,
-			basicImageData,
-			disabledBasicImageData);
-	}
-
-	/**
-	 * Create the FILL color menu
-	 * 
-	 * @param workbenchPage The part service
-	 * @return The FILL color menu
-	 */
-	public static ColorPropertyContributionItem createFillColorContributionItem(IWorkbenchPage workbenchPage) {
-		String propertyName = DiagramUIActionsMessages.PropertyDescriptorFactory_FillColor;
-		String toolTipText = DiagramUIActionsMessages.ColorChangeActionMenu_fillColor;
-		ImageData basicImageData = 
-			DiagramUIActionsPluginImages.DESC_FILL_COLOR.getImageData();
-		ImageData disabledBasicImageData = DiagramUIActionsPluginImages.DESC_FILL_COLOR_DISABLED
-			.getImageData();
-
-		return new ColorPropertyContributionItem(
-			workbenchPage,
-			ActionIds.CUSTOM_FILL_COLOR,
-			Properties.ID_FILLCOLOR,
-			propertyName,
-			toolTipText,
-			basicImageData,
-			disabledBasicImageData);
-	}
-
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CompartmentMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CompartmentMenuManager.java
deleted file mode 100644
index 8c077b1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CompartmentMenuManager.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.jface.action.Action;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * The compartment menu manager. It contains all compartment-related actions
- */
-public class CompartmentMenuManager extends ActionMenuManager {
-
-	/**
-	 * The compartment menu action containing the UI for the compartment menu manager
-	 */
-	private static class CompartmentMenuAction extends Action {
-		public CompartmentMenuAction() {
-			setText(DiagramUIActionsMessages.ShowResizableCompartmentActionMenu_ShowResizeableCompartmentsText);
-			setToolTipText(DiagramUIActionsMessages.ShowResizableCompartmentActionMenu_ShowResizeableCompartmentsTooltip);
-
-			setImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_HIDE_COMPARTMENTS_GROUP);
-			setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_HIDE_COMPARTMENTS_GROUP_DISABLED);
-			setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_HIDE_COMPARTMENTS_GROUP);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the compartment menu manager
-	 */
-	public CompartmentMenuManager() {
-		super(ActionIds.MENU_COMPARTMENT, new CompartmentMenuAction(), true);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ConnectionLabelMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ConnectionLabelMenuManager.java
deleted file mode 100644
index d449ffe..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ConnectionLabelMenuManager.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.jface.action.Action;
-
-/**
- * @author mboos
- * @canBeSeenBy %level1
- * 
- * The connection label menu manager. It contains all connection label-related
- * actions
- */
-public class ConnectionLabelMenuManager
-	extends ActionMenuManager {
-
-	/**
-	 * The compartment menu action containing the UI for the connection label
-	 * menu manager
-	 */
-	private static class ConnectionLabelMenuAction
-		extends Action {
-
-		public ConnectionLabelMenuAction() {
-			setText(DiagramUIActionsMessages.ShowConnectionLabelsActionMenu_ShowConnectionLabelsText);
-			setToolTipText(DiagramUIActionsMessages.ShowConnectionLabelsActionMenu_ShowConnectionLabelsTooltip);
-
-			setImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_HIDE_CONNECTION_LABELS_GROUP);
-			setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_HIDE_CONNECTION_LABELS_GROUP_DISABLED);
-			setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_HIDE_CONNECTION_LABELS_GROUP);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the connection label menu manager
-	 */
-	public ConnectionLabelMenuManager() {
-		super(ActionIds.MENU_CONNECTION_LABEL, new ConnectionLabelMenuAction(),
-			true);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CopyAppearancePropertiesAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CopyAppearancePropertiesAction.java
deleted file mode 100644
index 269036f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CopyAppearancePropertiesAction.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.List;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.ApplyAppearancePropertiesRequest;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Action that takes the appearance properties of edit part first in the selection, and
- * applies it to the rest of the selected objects.
- * 
- * @author Natalia Balaba
- * @canBeSeenBy %level1
- * @author melaasar
- */
-public class CopyAppearancePropertiesAction extends DiagramAction {
-
-	/**
-	 * @param workbenchPage
-	 */
-	public CopyAppearancePropertiesAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-
-		setId(ActionIds.ACTION_COPY_APPEARANCE_PROPERTIES);
-		setText(DiagramUIActionsMessages.CopyAppearancePropertiesAction_text);
-		setToolTipText(DiagramUIActionsMessages.CopyAppearancePropertiesAction_toolTip);
-
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_COPY_APPEARANCE);
-		setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_COPY_APPEARANCE_DISABLED);
-		setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_COPY_APPEARANCE);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new ApplyAppearancePropertiesRequest();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#updateTargetRequest()
-	 */
-	protected void updateTargetRequest() {
-		ApplyAppearancePropertiesRequest request =
-			(ApplyAppearancePropertiesRequest) getTargetRequest();
-		List set = super.createOperationSet();
-		if (!set.isEmpty()) {
-			IGraphicalEditPart editPart = (IGraphicalEditPart) set.get(0);
-			request.setViewToCopyFrom(editPart.getNotationView());
-		}
-		super.updateTargetRequest();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createOperationSet()
-	 */
-	protected List createOperationSet() {
-		List operationSet = super.createOperationSet();
-		if (!operationSet.isEmpty())
-			operationSet.remove(0);
-		return operationSet;
-	}
-			}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateConnectionViewAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateConnectionViewAction.java
deleted file mode 100644
index b9cb988..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateConnectionViewAction.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-/*
- * Created on Jan 17, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gef.Request;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
-
-/**
- * This is the action handler for the diagram menu.   Adds actions to 
- * create note and text views.
- *
- * @author schafe
- * @canBeSeenBy %level1
- */
-public class CreateConnectionViewAction extends DiagramAction {
-
-	protected String semanticHint;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param workbenchPage, the workbench page
-	 * @param id, the id of this action
-	 * @param semanticHint
-	 * @param label, the menu item label the user will see
-	 * @param imageDescriptor, the image next to the label that the user sees
-	 */
-	public CreateConnectionViewAction(
-		IWorkbenchPage workbenchPage,
-		String actionId,
-		String semanticHint,
-		String label,
-		ImageDescriptor imageDescriptor) {
-
-		super(workbenchPage);
-		setId(actionId);
-		setSemanticHint(semanticHint);
-		setText(label);
-		setToolTipText(label);
-		setImageDescriptor(imageDescriptor);
-	}
-
-	/**
-	 * Creates a new request to create the shape view.
-	 * 
-	 * @return A request to create the shape view.
-	 */
-	protected Request createTargetRequest() {
-		ConnectionViewDescriptor viewDescriptor;
-		viewDescriptor = new ConnectionViewDescriptor(null, getSemanticHint(),
-			getPreferencesHint());
-		return new CreateViewRequest(viewDescriptor);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	protected void setSemanticHint(String hint) {
-		this.semanticHint = hint;
-	}
-
-	protected String getSemanticHint() {
-		return this.semanticHint;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateShapeViewAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateShapeViewAction.java
deleted file mode 100644
index 70d6014..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateShapeViewAction.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This is the action handler for the diagram menu.   Adds actions to 
- * create note and text views.
- *
- * @author schafe
- * @canBeSeenBy %level1
- */
-public class CreateShapeViewAction extends DiagramAction {
-
-	protected String semanticHint;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param workbenchPage, the workbench page
-	 * @param id, the id of this action
-	 * @param semanticHint
-	 * @param label, the menu item label the user will see
-	 * @param imageDescriptor, the image next to the label that the user sees
-	 */
-	public CreateShapeViewAction(
-		IWorkbenchPage workbenchPage,
-		String actionId,
-		String semanticHint,
-		String label,
-		ImageDescriptor imageDescriptor) {
-
-		super(workbenchPage);
-		setId(actionId);
-		setSemanticHint(semanticHint);
-		setText(label);
-		setToolTipText(label);
-		setImageDescriptor(imageDescriptor);
-	}
-
-	/**
-	 * Creates a new request to create the shape view.
-	 * 
-	 * @return A request to create the shape view.
-	 */
-	protected Request createTargetRequest() {
-		ViewDescriptor viewDescriptor;
-		viewDescriptor = new ViewDescriptor(null, Node.class,
-			getSemanticHint(), getPreferencesHint());
-		return new CreateViewRequest(viewDescriptor);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	protected void setSemanticHint(String hint) {
-		this.semanticHint = hint;
-	}
-
-	protected String getSemanticHint() {
-		return this.semanticHint;
-	}	
-	
-	protected void updateTargetRequest() {
-		super.updateTargetRequest();
-
-		CreateViewRequest req = (CreateViewRequest) getTargetRequest();
-		req.setLocation(getMouseLocation());
-	}
-    
-    protected void doRun(IProgressMonitor progressMonitor) {
-        super.doRun(progressMonitor);
-        selectAddedObject();
-    }
-    
-    /**
-     * Selects the newly added shape view(s) by default.
-     */
-    protected void selectAddedObject() {
-        Object result = ((CreateRequest) getTargetRequest()).getNewObject();
-        if (!(result instanceof Collection)) {
-            return;
-        }
-        final List editparts = new ArrayList(1);
-
-        IDiagramGraphicalViewer viewer = getDiagramGraphicalViewer();
-        if (viewer == null) {
-            return;
-        }
-
-        Map editpartRegistry = viewer.getEditPartRegistry();
-        for (Iterator iter = ((Collection) result).iterator(); iter.hasNext();) {
-            Object viewAdaptable = iter.next();
-            if (viewAdaptable instanceof IAdaptable) {
-                Object editPart = editpartRegistry
-                    .get(((IAdaptable) viewAdaptable).getAdapter(View.class));
-                if (editPart != null)
-                    editparts.add(editPart);
-            }
-        }
-
-        if (!editparts.isEmpty()) {
-            viewer.setSelection(new StructuredSelection(editparts));
-
-            // automatically put the first shape into edit-mode
-            Display.getCurrent().asyncExec(new Runnable() {
-
-                public void run() {
-                    EditPart editPart = (EditPart) editparts.get(0);
-                    editPart.performRequest(new Request(
-                        RequestConstants.REQ_DIRECT_EDIT));
-                }
-            });
-        }
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateViewAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateViewAction.java
deleted file mode 100644
index ad781c5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateViewAction.java
+++ /dev/null

@@ -1,161 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * This is the action handler for the diagram menu.   Adds actions to 
- * create note and text views.
- *
- * @author schafe
- * @canBeSeenBy %level1
- */
-public class CreateViewAction extends DiagramAction {
-	
-	protected String semanticHint;
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param workbenchPage, the workbench page
-	 * @param id, the id of this action
-	 * @param semanticHint
-	 * @param label, the menu item label the user will see
-	 * @param imageDescriptor, the image next to the label that the user sees
-	 */
-		public CreateViewAction(
-			IWorkbenchPage workbenchPage,
-			String actionId,
-			String semanticHint,
-			String label,
-			ImageDescriptor imageDescriptor) {
-			
-			super(workbenchPage);
-			setId(actionId);
-			setSemanticHint(semanticHint);
-			setText(label);
-			setToolTipText(label);
-			setImageDescriptor(imageDescriptor);						
-		}
-		
-	/**
-	 * Creates a new request to create the shape view.
-	 * 
-	 * @return A request to create the shape view.
-	 */
-	protected Request createTargetRequest() {
-		
-		ViewDescriptor viewDescriptor;
-	
-		if (getId().equals(ActionIds.ACTION_ADD_NOTE)) {
-			viewDescriptor = new ViewDescriptor(null, Node.class,
-				ViewType.NOTE, getPreferencesHint());
-		} else {
-			viewDescriptor = new ViewDescriptor(null, Node.class,
-				ViewType.TEXT, getPreferencesHint());
-		}
-		
-		return new CreateViewRequest(viewDescriptor);
-	}	
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}	
-	
-	protected void setSemanticHint(String hint){
-		this.semanticHint = hint;		
-	}
-	
-	protected String getSemanticHint(){
-		return this.semanticHint;
-	}
-
-	protected void updateTargetRequest() {
-		super.updateTargetRequest();
-
-		CreateViewRequest req = (CreateViewRequest) getTargetRequest();
-		req.setLocation(getMouseLocation());
-	}
-    
-    protected void doRun(IProgressMonitor progressMonitor) {
-        super.doRun(progressMonitor);
-        selectAddedObject();
-    }
-    
-    /**
-     * Selects the newly added shape view(s) by default.
-     */
-    protected void selectAddedObject() {
-        Object result = ((CreateRequest) getTargetRequest()).getNewObject();
-        if (!(result instanceof Collection)) {
-            return;
-        }
-        final List editparts = new ArrayList(1);
-
-        IDiagramGraphicalViewer viewer = getDiagramGraphicalViewer();
-        if (viewer == null) {
-            return;
-        }
-
-        Map editpartRegistry = viewer.getEditPartRegistry();
-        for (Iterator iter = ((Collection) result).iterator(); iter.hasNext();) {
-            Object viewAdaptable = iter.next();
-            if (viewAdaptable instanceof IAdaptable) {
-                Object editPart = editpartRegistry
-                    .get(((IAdaptable) viewAdaptable).getAdapter(View.class));
-                if (editPart != null)
-                    editparts.add(editPart);
-            }
-        }
-
-        if (!editparts.isEmpty()) {
-            viewer.setSelection(new StructuredSelection(editparts));
-
-            // automatically put the first shape into edit-mode
-            Display.getCurrent().asyncExec(new Runnable() {
-
-                public void run() {
-                    EditPart editPart = (EditPart) editparts.get(0);
-                    editPart.performRequest(new Request(
-                        RequestConstants.REQ_DIRECT_EDIT));
-                }
-            });
-        }
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DeleteFromDiagramAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DeleteFromDiagramAction.java
deleted file mode 100644
index fc5d69f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DeleteFromDiagramAction.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Action for delete from diagram.  Used by diagram context menus.
- *
- * @author schafe
- * @canBeSeenBy %level1
- */
-public class DeleteFromDiagramAction extends DiagramAction{
-	
-	/**
-	 * Creates a <code>DeleteFromDiagramAction</code> with a default label.
-	 *
-	 * @param editor The part this action will be associated with.
-	 */
-	public DeleteFromDiagramAction(IWorkbenchPart part) {
-		super(part);		
-	}
- 
-	/**
-	 * Constructor
-	 * @param workbenchPage
-	 */
-	public DeleteFromDiagramAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);		
-	}
-
-	/**
-	 * Initializes this action's text and images.
-	 */
-	public void init() {
-		super.init();
-		setId(ActionIds.ACTION_DELETE_FROM_DIAGRAM);
-		setText(DiagramUIActionsMessages.DeleteFromDiagram_ActionLabelText);
-		setToolTipText(DiagramUIActionsMessages.DeleteFromDiagram_ActionToolTipText);
-		ISharedImages workbenchImages = PlatformUI.getWorkbench().getSharedImages();
-		setHoverImageDescriptor(
-			workbenchImages.getImageDescriptor(
-				ISharedImages.IMG_TOOL_DELETE));
-		setImageDescriptor(
-			workbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
-		setDisabledImageDescriptor(
-			workbenchImages.getImageDescriptor(
-				ISharedImages.IMG_TOOL_DELETE_DISABLED));
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest(){
-		
-		/* Create the delete request */
-		GroupRequest deleteReq = new GroupRequest(
-			RequestConstants.REQ_DELETE);
-		return deleteReq;
-		
-	}
-	
-	/**
-	 * Gets a command to execute on the operation set based on the target request 
-	 * @return a command to execute
-	 */
-	protected Command getCommand() {
-		/* Get the selected edit parts */
-		List objects = createOperationSet();		
-		
-		if (!supportViews(objects) || isCanonical(objects)){
-			return null;
-		}
-		
-		CompoundCommand deleteCC = new CompoundCommand(getLabel());
-		for (Iterator iter = objects.iterator(); iter.hasNext();) {
-			/* Get the next part */
-			EditPart editPart = (EditPart) iter.next();
-			/* Send the request to the edit part */
-			deleteCC.add(editPart.getCommand(getTargetRequest()));
-		}
-		return deleteCC;
-	}
-	
-	private boolean supportViews(List objects) {
-		for (Iterator iter = objects.iterator(); iter.hasNext();) {
-			Object object = iter.next();
-			if (object instanceof GraphicalEditPart &&
-				!((GraphicalEditPart)object).hasNotationView()){
-				return false;
-			}
-			
-		}
-		return true;
-	}
-
-	/**
-	 * Filters the selected objects and returns only editparts.
-	 * @return a list of editparts selected.
-	 * 
-	 */
-	protected List createOperationSet() {
-		List selection = getSelectedObjects();
-		if (selection.isEmpty() || !(selection.get(0) instanceof IGraphicalEditPart))
-			return Collections.EMPTY_LIST;
-		return selection;
-	}
-	
-	/**
-	 * Return true if any of cntxt's selectedObjects reside in
-	 * containers that are canonical.
-	 * Returns false if the selectedObjects reside in non-canonical containers, 
-	 * or if the selectedObjects do not have semantic elements.
-	 * @param cntxt
-	 * @return
-	 */
-	private boolean isCanonical(List selectedItems){
-		
-		if (selectedItems.isEmpty()) {
- 			return false;
- 		}
- 		for (Iterator i = selectedItems.iterator(); i.hasNext();) {
- 			Object selectedObject = i.next(); 	
- 			
- 			if (!(selectedObject instanceof IGraphicalEditPart)){
- 				continue;
- 			}
- 				
- 			//If the selectedObject does not have a semanticElement,
- 			//the canonical check is irrelevant.  The delete from
- 			//diagram should apply.
- 			IGraphicalEditPart gep = (IGraphicalEditPart)selectedObject;
- 			Object model = gep.getModel();
-			if (!(model instanceof View)){
- 				continue;
-			}
-
-            EObject element = ((View)model).getElement();
- 			if (element == null || element instanceof View){
- 				
- 				if (selectedObject instanceof ConnectionEditPart) {
- 					if (!((ConnectionEditPart) selectedObject).isSemanticConnection()) {
- 						// not a reference connection (which has no element, but whose canonical-ness should be checked)
- 						continue;
- 					}
- 				} else {
- 	                // If there is no element or the element is a view (e.g. diagram
- 	                // link) than we want to support delete from diagram. See
- 	                // bugzilla#148453.
- 	                continue;
- 				}
- 			} 				
- 			//Check if container of connection is canonical. 
- 			//A connection's container is not necessarily the connection editPart's parent.
- 			if (selectedObject instanceof ConnectionEditPart){
- 				ConnectionEditPart ePart = (ConnectionEditPart)selectedObject;
- 				EditPart sEditPart = ePart.getSource();
-                EditPart tEditPart = ePart.getTarget();
- 				if (isCanonical(sEditPart) && isCanonical(tEditPart))
- 					return true;
- 			}
- 			//Check if container of shape is canonical.
- 			else { 				
- 				if (isCanonical(gep))
-					return true;
- 			} 			
- 		} 
- 		return false;		
-	}
-	
-	/**
-	 * @param gep
-	 * @return
-	 */
-	private boolean isCanonical(EditPart gep) {
-		if (gep instanceof IGraphicalEditPart){
-			return isCanonical((IGraphicalEditPart)gep);
-		}
-		return false;
-	}
-
-
-	/**
-	 * @param gep
-	 * @return
-	 */
-	private boolean isCanonical(IGraphicalEditPart gep) {
-		EditPart parent = gep.getParent();
-		if (parent instanceof IGraphicalEditPart) {
-			CanonicalEditPolicy cep = (CanonicalEditPolicy)parent.getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
-			if ( cep != null ) {
-				if (cep.isEnabled())
-					return true;
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionFilterProvider.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionFilterProvider.java
deleted file mode 100644
index 39d20b2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionFilterProvider.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.action.AbstractModelActionFilterProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * An action filter provider for the Diagram UI Actions plugin.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.actions.*
- */
-public class DiagramActionFilterProvider
-	extends AbstractModelActionFilterProvider {
-
-	/**
-	 * This string from XML is used to identify this provider
-	 */
-	private static final String CAN_DUPLICATE = "canDuplicate"; //$NON-NLS-1$
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.action.AbstractModelActionFilterProvider#doTestAttribute(java.lang.Object,
-	 *      java.lang.String, java.lang.String)
-	 */
-	protected boolean doTestAttribute(Object target, String name, String value) {
-		if (CAN_DUPLICATE.equals(name)) {
-			return DuplicateActionDelegate.canDuplicate(getStructuredSelection(), PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getPartService().getActivePart());
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.action.AbstractModelActionFilterProvider#doProvides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	protected boolean doProvides(IOperation operation) {
-		return true;
-	}
-    
-    /**
-     * Finds my editing domain by adating the current selection to
-     * <code>EObject</code>.
-     */
-    protected TransactionalEditingDomain getEditingDomain(Object target) {
-
-        TransactionalEditingDomain result = null;
-        IStructuredSelection selection = getStructuredSelection();
-
-        if (selection != null && !selection.isEmpty()) {
-
-            for (Iterator i = selection.iterator(); i.hasNext()
-                && result == null;) {
-                Object next = i.next();
-
-                if (next instanceof IAdaptable) {
-                    EObject element = (EObject) ((IAdaptable) next)
-                        .getAdapter(EObject.class);
-
-                    if (element != null) {
-                        result = TransactionUtil.getEditingDomain(element);
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsDebugOptions.java
deleted file mode 100644
index d23eb6c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsDebugOptions.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- *  @author Yasser Lulu
- *  @canBeSeenBy %level1
- *
- */
-public final class DiagramActionsDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramActionsDebugOptions() {
-		//static class: prevent instatiation
-	}
-
-	public static final String DEBUG = DiagramActionsPlugin.getPluginId()
-		+ "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsPlugin.java
deleted file mode 100644
index c557846..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsPlugin.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Yasser Lulu
- */
-public class DiagramActionsPlugin
-	extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static DiagramActionsPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramActionsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DiagramActionsPlugin getInstance() {
-		return plugin;
-	}
-	
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsStatusCodes.java
deleted file mode 100644
index a65efa8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsStatusCodes.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- *  @author Yasser Lulu
- *  @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.actions.*
- *
- */
-public final class DiagramActionsStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramActionsStatusCodes() {
-		//static class: prevent instatiation
-	}
-
-	public static final int OK = 0;	
-	/**
-	 * Status code indicating that an error occurred with a resource, such as
-	 * loading an image file.
-	 * Set to 5 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int RESOURCE_FAILURE = 5;
-
-	/**
-	 * Status code indicating that a UI error occurred.
-	 * Set to 6 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int GENERAL_UI_FAILURE = 6;
-
-	/**
-	 * Status code warning that an exception was ignored.
-	 * Set to 9 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 9;
-	
-
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DuplicateActionDelegate.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DuplicateActionDelegate.java
deleted file mode 100644
index 5f2036e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DuplicateActionDelegate.java
+++ /dev/null

@@ -1,260 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.commands.IHandlerListener;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * An action delegate that handles duplication of selected model elements and
- * views on a diagram.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.actions.*
- */
-public class DuplicateActionDelegate
-	extends AbstractActionDelegate
-	implements IObjectActionDelegate, IWorkbenchWindowActionDelegate, IHandler{
-    
-	/**
-	 * Runs this duplicate action delegate by executing a duplicate command on
-	 * the selected model elements or views.
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.action.AbstractActionDelegate#doRun(IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		Object request;
-		ICommand cmd;
-		if (getWorkbenchPart() instanceof IDiagramWorkbenchPart) {
-			request = new DuplicateRequest();
-			cmd = getDuplicateViewCommand(getStructuredSelection(),
-				getWorkbenchPart(), (DuplicateRequest) request);
-		} else {
-			request = new DuplicateElementsRequest(getEditingDomain(getStructuredSelection()));
-			cmd = getDuplicateElementsCommand(getStructuredSelection(),
-				(DuplicateElementsRequest) request);
-		}
-		if (cmd != null && cmd.canExecute()) {
-            try {
-                IStatus status = getActionManager().getOperationHistory()
-                    .execute(cmd, progressMonitor, null);
-                if (status.isOK()) {
-                    if (request instanceof DuplicateRequest) {
-                        selectViews(((DuplicateRequest) request)
-                            .getDuplicatedViews());
-                    }
-                }
-            } catch (ExecutionException e) {
-                Trace.catching(DiagramActionsPlugin.getInstance(),
-                    DiagramActionsDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "doRun", e); //$NON-NLS-1$
-                Log.error(DiagramActionsPlugin.getInstance(),
-                    DiagramActionsStatusCodes.IGNORED_EXCEPTION_WARNING,
-                    "doRun", e); //$NON-NLS-1$
-            }
-		}
-	}
-
-	/**
-     * Determines if the selection can be duplicated by trying to get a command
-     * to do so.
-     * 
-     * @param selection
-     * @param workbenchPart
-     * @return true if the selection can be duplicated; false otherwise.
-     */
-	static boolean canDuplicate(IStructuredSelection selection,
-			IWorkbenchPart workbenchPart) {
-
-		ICommand cmd = (workbenchPart instanceof IDiagramWorkbenchPart) ? getDuplicateViewCommand(
-			selection, workbenchPart, new DuplicateRequest())
-			: getDuplicateElementsCommand(selection,
-				new DuplicateElementsRequest(getEditingDomain(selection)));
-
-		return (cmd != null && cmd.canExecute());
-	}
-
-	/**
-	 * Tries to get a command to duplicate the selected elements by going to the
-	 * semantic service.
-	 * 
-	 * @param selection
-	 *            the selected elements
-	 * @param request
-	 *            the empty <code>DuplicateElementsRequest</code>
-	 * @return a command to duplicate the elements, or null if one could not be
-	 *         found.
-	 */
-	private static ICommand getDuplicateElementsCommand(
-			IStructuredSelection selection, DuplicateElementsRequest request) {
-		HashSet elements = new HashSet();
-		for (Iterator i = selection.iterator(); i.hasNext();) {
-			EObject element = (EObject) ((IAdaptable) i.next())
-				.getAdapter(EObject.class);
-			if (null != element) {
-				elements.add(element);
-			}
-		}
-
-		if (!elements.isEmpty()) {
-			request.setElementsToBeDuplicated(new ArrayList(elements));
-            
-            IElementType elementType = ElementTypeRegistry.getInstance()
-                .getElementType(request.getEditHelperContext());
-            
-            if (elementType != null) {
-                return elementType.getEditCommand(request);
-            }
-		}
-		return null;
-	}
-
-	/**
-	 * Tries to get a command to duplicate the selected views by sending a
-	 * request to the diagram editpart.
-	 * 
-	 * @param selection
-	 *            the selected editparts
-	 * @param workbenchPart
-	 *            the workbench part from which the diagram editpart can be
-	 *            found
-	 * @param request
-	 *            the empty <code>DuplicateElementsRequest</code>
-	 * @return a command to duplicate the views (and underlying elements), or
-	 *         null if one could not be found.
-	 */
-	private static ICommand getDuplicateViewCommand(
-			IStructuredSelection selection, IWorkbenchPart workbenchPart,
-			DuplicateRequest request) {
-		List eps = new ArrayList();
-		for (Iterator i = selection.iterator(); i.hasNext();) {
-			Object selectedItem = i.next();
-			if (selectedItem instanceof IGraphicalEditPart) {
-				eps.add(selectedItem);
-			}
-		}
-
-		if (!eps.isEmpty()) {
-			request.setEditParts(eps);
-			Command cmd = ((IDiagramWorkbenchPart) workbenchPart)
-				.getDiagramEditPart().getCommand(request);
-			if (cmd != null && cmd.canExecute()) {
-				return new CommandProxy(cmd);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Selects the newly added views on the diagram.
-	 */
-	private void selectViews(List views) {
-		IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart) getWorkbenchPart())
-			.getDiagramGraphicalViewer();
-		if (viewer != null && views != null && !views.isEmpty()) {
-
-			List editparts = new ArrayList();
-			for (Iterator iter = views.iterator(); iter.hasNext();) {
-				Object view = iter.next();
-				if (view instanceof View) {
-					Object ep = viewer.getEditPartRegistry().get(view);
-					if (ep != null) {
-						editparts.add(ep);
-					}
-				}
-			}
-
-			if (!editparts.isEmpty()) {
-				viewer.setSelection(new StructuredSelection(editparts));
-			}
-		}
-	}
-    
-    public static TransactionalEditingDomain getEditingDomain(
-            IStructuredSelection selection) {
-
-        for (Iterator i = selection.iterator(); i.hasNext();) {
-            EObject element = (EObject) ((IAdaptable) i.next())
-                .getAdapter(EObject.class);
-
-            if (element != null) {
-                TransactionalEditingDomain editingDomain = TransactionUtil
-                    .getEditingDomain(element);
-
-                if (editingDomain != null) {
-                    return editingDomain;
-                }
-            }
-        }
-        return null;
-    }
-    
-    // Documentation copied from superclass
-    protected TransactionalEditingDomain getEditingDomain() {
-        return getEditingDomain(getStructuredSelection());
-    }
-
-    public void addHandlerListener(IHandlerListener handlerListener) {
-        // nothing
-    }
-
-    public Object execute(ExecutionEvent event)
-        throws ExecutionException {
-        return null;
-    }
-
-    public boolean isEnabled() {
-        return true;
-    }
-
-    public boolean isHandled() {
-        return true;
-    }
-
-    public void removeHandlerListener(IHandlerListener handlerListener) {
-        // nothing
-        
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/EditMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/EditMenuManager.java
deleted file mode 100644
index d3adf3e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/EditMenuManager.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * The edit menu manager. It contains all edit-related actions.
- *
- * @author chmahone
- * @canBeSeenBy %level1
- */
-public class EditMenuManager extends ActionMenuManager {
-
-	/**
-	 * The edit menu action containing the UI for the edit menu manager
-	 */
-	private static class EditMenuAction extends Action {
-		public EditMenuAction() {
-			setText(DiagramUIActionsMessages.EditMenuManager_Edit_ActionLabelText);
-			setToolTipText(DiagramUIActionsMessages.EditMenuManager_Edit_ActionToolTipText);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the edit menu manager
-	 */
-	public EditMenuManager() {
-		super(ActionIds.MENU_EDIT, new EditMenuAction(), true);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FileMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FileMenuManager.java
deleted file mode 100644
index 7b9c159..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FileMenuManager.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * The file menu manager. It contains all file-related actions.
- *
- * @author chmahone
- * @canBeSeenBy %level1
- */
-public class FileMenuManager extends ActionMenuManager {
-
-	/**
-	 * The file menu action containing the UI for the file menu manager
-	 */
-	private static class FileMenuAction extends Action {
-		public FileMenuAction() {
-			setText(DiagramUIActionsMessages.FileMenuManager_File_ActionLabelText);
-			setToolTipText(DiagramUIActionsMessages.FileMenuManager_File_ActionToolTipText);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the file menu manager
-	 */
-	public FileMenuManager() {
-		super(ActionIds.MENU_FILE, new FileMenuAction(), false);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FiltersMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FiltersMenuManager.java
deleted file mode 100644
index f526365..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FiltersMenuManager.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * The filters menu manager. It contains all filters-related actions.
- *
- * @author chmahone
- * @canBeSeenBy %level1
- */
-public class FiltersMenuManager extends ActionMenuManager {
-
-	/**
-	 * The filters menu action containing the UI for the filters menu manager
-	 */
-	private static class FiltersMenuAction extends Action {
-		public FiltersMenuAction() {
-			setText(DiagramUIActionsMessages.FiltersMenuManager_Filters_ActionLabelText);
-			setToolTipText(DiagramUIActionsMessages.FiltersMenuManager_Filters_ActionToolTipText);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the filters menu manager
-	 */
-	public FiltersMenuManager() {
-		super(ActionIds.MENU_FILTERS, new FiltersMenuAction(), true);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontDialogAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontDialogAction.java
deleted file mode 100644
index 278dc41..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontDialogAction.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.FontDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class FontDialogAction extends PropertyChangeAction {
-
-	/**
-	 * @param workbenchPage
-	 * @param propertyId
-	 * @param propertyName
-	 */
-	public FontDialogAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage, Properties.ID_FONTCOLOR,
-			DiagramUIActionsMessages.PropertyDescriptorFactory_Font);
-		setId(ActionIds.ACTION_FONT_DIALOG);
-		setText(DiagramUIActionsMessages.FontAction_text);
-		setToolTipText(DiagramUIActionsMessages.FontAction_tooltip);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_FONT_COLOR);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		String name = (String) getOperationSetPropertyValue(Properties.ID_FONTNAME);
-		Integer height = (Integer) getOperationSetPropertyValue(Properties.ID_FONTSIZE);
-		Boolean bold = (Boolean) getOperationSetPropertyValue(Properties.ID_FONTBOLD);
-		Boolean italic = (Boolean) getOperationSetPropertyValue(Properties.ID_FONTITALIC);
-		int style = (bold.booleanValue()? SWT.BOLD : SWT.NORMAL) | (italic.booleanValue()? SWT.ITALIC : SWT.NORMAL);
-		FontData initFontData = new FontData(name, height.intValue(), style);
-
-		Integer color = (Integer) getOperationSetPropertyValue(Properties.ID_FONTCOLOR);
-		RGB initFontColor = FigureUtilities.integerToRGB(color);
-		
-		Shell shell = getDiagramGraphicalViewer().getControl().getShell();
-		FontDialog fontDialog = new FontDialog(shell);
-		fontDialog.setFontList(new FontData[] {initFontData});
-		fontDialog.setRGB(initFontColor);
-		FontData fData = fontDialog.open();
-		RGB fColor = fontDialog.getRGB();
-
-		if (fData != null && fColor != null) {
-			CompoundCommand cc = new CompoundCommand(DiagramUIActionsMessages.PropertyDescriptorFactory_Font);
-			cc.add(getCommand(new ChangePropertyValueRequest(Properties.ID_FONTNAME, Properties.ID_FONTNAME, fData.getName())));
-			cc.add(getCommand(new ChangePropertyValueRequest(Properties.ID_FONTSIZE, Properties.ID_FONTSIZE, new Integer(fData.getHeight()))));
-			cc.add(getCommand(new ChangePropertyValueRequest(Properties.ID_FONTBOLD, Properties.ID_FONTBOLD, Boolean.valueOf((fData.getStyle() & SWT.BOLD) != 0))));
-			cc.add(getCommand(new ChangePropertyValueRequest(Properties.ID_FONTITALIC, Properties.ID_FONTITALIC, Boolean.valueOf((fData.getStyle() & SWT.ITALIC) != 0))));
-			cc.add(getCommand(new ChangePropertyValueRequest(Properties.ID_FONTCOLOR, Properties.ID_FONTCOLOR, FigureUtilities.RGBToInteger(fColor))));
-			execute(cc, progressMonitor);
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontNameContributionItem.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontNameContributionItem.java
deleted file mode 100644
index 1842a47..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontNameContributionItem.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.FontHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.IUIConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Drop down combo box conbtribution item that changes font's name
- * 
- * @author Natalia Balaba
- * @canBeSeenBy %level1
- */
-public class FontNameContributionItem
-	extends PropertyChangeContributionItem
-	implements Listener {
-
-	/**
-	 * The current font name
-	 */
-	private String lastFontName;
-	
-	/**
-	 * Constructor for FontNameContributionItem.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.ui.actions.ActionContribution#ActionContribution(IEditorPart, String)
-	 */
-	public FontNameContributionItem(IWorkbenchPage workbenchPage) {
-		super(workbenchPage, ActionIds.CUSTOM_FONT_NAME,
-			Properties.ID_FONTNAME,
-			DiagramUIActionsMessages.PropertyDescriptorFactory_FontName);
-		setLabel(DiagramUIActionsMessages.FontNameContributionItem_tooltip);
-	}
-
-	/**
-	 * Create and return a drop down combo box and populate it with font names
-	 * 
-	 * @see org.eclipse.jface.action.ControlContribution#createControl(Composite)
-	 */
-	protected Control createControl(Composite parent) {
-		String[] strings = FontHelper.getFontNames();
-		
-		Combo box = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
-		box.setVisibleItemCount(IUIConstants.DEFAULT_DROP_DOWN_SIZE);
-		box.setItems(strings);
-		box.addListener(SWT.Selection, this);
-		box.select(0);
-		return box;
-	}
-
-	/**
-	 * Assert a new proprty value to be set to the selected IView object(s) [whenever there is
-	 * a mutiple selection this method will be called per valid selected item]
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeContributionItem#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return lastFontName;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#refreshItem()
-	 */
-	protected void refreshItem() {
-		Combo box = (Combo) getControl();
-		String fontName = (String) getOperationSetPropertyValue(getPropertyId(),false);
-
-		if (fontName != null) {
-			int index = box.indexOf(fontName);
-			box.select(index);
-		} else {
-			box.clearSelection();
-		}
-		super.refreshItem();
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		Combo box = (Combo) getControl();
-		lastFontName = box.getItem(box.getSelectionIndex());
-		runWithEvent(event);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#isOperationHistoryListener()
-	 */
-	protected boolean isOperationHistoryListener() {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontSizeContributionItem.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontSizeContributionItem.java
deleted file mode 100644
index dae3737..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontSizeContributionItem.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.FontHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.IUIConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Drop down combo box conbtribution item that changes font's size
- * 
- * @author Natalia Balaba
- * @canBeSeenBy %level1
- */
-public class FontSizeContributionItem
-	extends PropertyChangeContributionItem
-	implements Listener {
-
-	/**
-	 * The current font name
-	 */
-	private Integer lastFontSize;
-
-
-	/**
-	 * Constructor for FontSizeContributionItem.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.ui.actions.ActionContribution#ActionContribution(IEditorPart, String)
-	 */
-	public FontSizeContributionItem(IWorkbenchPage workbenchPage) {
-		super(workbenchPage, ActionIds.CUSTOM_FONT_SIZE,
-			Properties.ID_FONTSIZE,
-			DiagramUIActionsMessages.PropertyDescriptorFactory_FontSize);
-		setLabel(DiagramUIActionsMessages.FontSizeContributionItem_tooltip);
-	}
-
-	/**
-	 * Create a drop down combo box anb populate it with font sizes
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.ui.actions.ActionContribution#newControl(Composite)
-	 */
-	protected Control createControl(Composite parent) {
-		Combo box = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
-		box.setVisibleItemCount(IUIConstants.DEFAULT_DROP_DOWN_SIZE);
-		box.setItems(FontHelper.getFontSizes());
-		box.addListener(SWT.Selection, this);
-		box.select(0);
-		return box;
-	}
-
-	/**
-	 * Assert a new proprty value to be set to the selected IView object(s) [whenever there is
-	 * a mutiple selection this method will be called per valid selected item]
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeContributionItem#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return lastFontSize;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#refreshItem()
-	 */
-	protected void refreshItem() {
-		Combo box = (Combo) getControl();
-		Integer fontSize = (Integer) getOperationSetPropertyValue(getPropertyId(),false);
-
-		if (fontSize != null) {
-			int index = box.indexOf(Integer.toString(fontSize.intValue()));
-			box.select(index);
-		} else {
-			box.clearSelection();
-		}
-		super.refreshItem();
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		Combo box = (Combo) getControl();
-		int selectedSize =
-			Integer.parseInt(box.getItem(box.getSelectionIndex()));
-		lastFontSize = new Integer(selectedSize);
-		runWithEvent(event);
-	}
-    
-    protected boolean isOperationHistoryListener() {
-        return true;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontStyleAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontStyleAction.java
deleted file mode 100644
index c432b4c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontStyleAction.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.BooleanPropertyAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- * 
- * An action to change one of the font style properties: BOLD or ITALIC
- */
-public class FontStyleAction extends BooleanPropertyAction {
-
-	/**
-	 * Creates a new FontStyleAction instance
-	 * 
-	 * @param workbenchPage The part Service
-	 * @param propertyId The property Id
-	 * @param propertyName The property Name
-	 */
-	private FontStyleAction(
-		IWorkbenchPage workbenchPage,
-		String propertyId,
-		String propertyName) {
-		super(workbenchPage, propertyId, propertyName);
-	}
-
-	/**
-	 * Creates a font style action that changes the font's BOLD property
-	 * 
-	 * @param workbenchPage The workbench page
-	 * @return An instance of font style action
-	 */
-	public static FontStyleAction createBoldFontStyleAction(IWorkbenchPage workbenchPage) {
-		FontStyleAction action = new FontStyleAction(workbenchPage, Properties.ID_FONTBOLD, DiagramUIActionsMessages.PropertyDescriptorFactory_FontStyle_Bold);
-		action.setId(ActionIds.ACTION_FONT_BOLD);
-		action.setText(DiagramUIActionsMessages.FontStyleAction_bold_text);
-		action
-			.setToolTipText(DiagramUIActionsMessages.FontStyleAction_bold_tooltip);
-		action.setImageDescriptor(DiagramUIActionsPluginImages.DESC_BOLD);
-		action.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_BOLD_DISABLED);
-		return action;
-	}
-
-	/**
-	 * Creates a font style action that changes the font's ITALIC property
-	 * 
-	 * @param workbenchPage The workbench page
-	 * @return An instance of font style action
-	 */
-	public static FontStyleAction createItalicFontStyleAction(IWorkbenchPage workbenchPage) {
-		FontStyleAction action = new FontStyleAction(workbenchPage,
-			Properties.ID_FONTITALIC,
-			DiagramUIActionsMessages.PropertyDescriptorFactory_FontStyle_Italic);
-		action.setId(ActionIds.ACTION_FONT_ITALIC);
-		action.setText(DiagramUIActionsMessages.FontStyleAction_italic_text);
-		action
-			.setToolTipText(DiagramUIActionsMessages.FontStyleAction_italic_tooltip);
-		action.setImageDescriptor(DiagramUIPluginImages.DESC_ITALIC);
-		action.setDisabledImageDescriptor(DiagramUIPluginImages.DESC_ITALIC_DISABLED);
-		return action;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/HideConnectionLabelsAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/HideConnectionLabelsAction.java
deleted file mode 100644
index 91b9857..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/HideConnectionLabelsAction.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ToggleConnectionLabelsRequest;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Action to hide all connection labels.
- * 
- * @author jcorchis
- */
-public class HideConnectionLabelsAction extends DiagramAction {
-
-	/**
-	 * @param workbenchPage
-	 */
-	public HideConnectionLabelsAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-	
-	/**
-	 * Add text and image descriptors.
-	 * @see org.eclipse.gef.ui.actions.WorkbenchPartAction#init()
-	 */
-	public void init() {
-		super.init();
-		setText(DiagramUIActionsMessages.HideConnectionLabelsAction_label);
-		setId(ActionIds.ACTION_HIDE_CONNECTION_LABELS);
-		setToolTipText(DiagramUIActionsMessages.HideConnectionLabelsAction_toolTip);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_HIDE_CONNECTION_LABELS);
-		setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_HIDE_CONNECTION_LABELS_DISABLED);
-	}	
-
-	/**
-	 * Returns an instance of <code>ToggleConnectionLabelsRequest</code>
-	 * 
-	 * @return the request
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new ToggleConnectionLabelsRequest(false);
-	}
-
-	/**
-	 * Registers this as a selection listener
-	 * @return true
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-	
-	/** 
-	 * Filters the selected objects and returns only ConnectionEditParts that understand
-	 * the property change request to hide labels.
-	 * @return the operation set 
-	 */
-	protected List createOperationSet() {
-		List selection = getSelectedObjects();
-		if (selection.isEmpty() || !(selection.get(0) instanceof EditPart)) {
-			return Collections.EMPTY_LIST;
-		} 		
-		
-		List connections = new ArrayList();
-		if (selection.get(0) instanceof ShapeCompartmentEditPart || selection.get(0) instanceof DiagramEditPart) {
-			List diagramConnections = getDiagramEditPart().getConnections();
-			if (diagramConnections != null && !diagramConnections.isEmpty())
-				connections.addAll(diagramConnections);
-		} else {
-			connections.addAll(selection);
-		}	
-		
-		Iterator selectedEPs = connections.iterator();
-		List targetedEPs = new ArrayList();
-		while (selectedEPs.hasNext()) {
-		    EditPart selectedEP = (EditPart)selectedEPs.next();
-	    	targetedEPs.addAll(getTargetEditParts(selectedEP));
-		}
-		return targetedEPs.isEmpty() ? Collections.EMPTY_LIST : targetedEPs;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/MakeSameSizeMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/MakeSameSizeMenuManager.java
deleted file mode 100644
index aef7178..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/MakeSameSizeMenuManager.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * The ZOrder menu manager. It contains all Order-related actions
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class MakeSameSizeMenuManager extends ActionMenuManager {
-
-	/**
-	 * The order menu action containing the UI for the zorder menu manager
-	 */
-	private static class MakeSameMenuAction extends Action {
-		public MakeSameMenuAction() {
-			setText(DiagramUIActionsMessages.SameSizeMenuManager_MakeSameSize_ActionLabelText);
-			setToolTipText(DiagramUIActionsMessages.SameSizeMenuManager_MakeSameSize_ActionToolTipText);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the arrange menu manager
-	 */
-	public MakeSameSizeMenuManager() {
-		super(ActionIds.MENU_MAKE_SAME_SIZE, new MakeSameMenuAction(), true);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/OpenWithMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/OpenWithMenuManager.java
deleted file mode 100644
index 268b2c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/OpenWithMenuManager.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * @author gsturov
- * @canBeSeenBy %level1
- */
-public class OpenWithMenuManager extends ActionMenuManager {
-	/**
-	 * The New menu action containing the UI for the new menu manager
-	 */
-	private static class OpenWithMenuAction extends Action {
-		public OpenWithMenuAction() {			
-			setText(DiagramUIActionsMessages.OpenWithMenu_OpenWithMenuText);
-			setToolTipText(DiagramUIActionsMessages.OpenWithMenu_OpenWithMenuTooltip);
-			//setImageDescriptor(Images.DESC_ACTION_SHOW_IN);
-			//setHoverImageDescriptor(Images.DESC_ACTION_SHOW_IN);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the filter menu manager
-	 */
-	public OpenWithMenuManager() {
-		super(ActionIds.MENU_OPEN_WITH, new OpenWithMenuAction(), true);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PageSetupAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PageSetupAction.java
deleted file mode 100644
index 1ce1399..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PageSetupAction.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.dialogs.PageSetupDialog;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This is the action for page setup.  It shows the page setup dialog.
- * 
- * @author Wayne Diu, wdiu
- * @canBeSeenBy %level1
- */
-public class PageSetupAction
-	extends Action
-	implements IWorkbenchWindowActionDelegate {
-
-	/**
-	 * ID for this page setup action
-	 */
-	public static final String ID = "pageSetupAction";//$NON-NLS-1$
-
-	/**
-	 * Constructor sets the id and label that is displayed in the
-	 * menu bar.
-	 */
-	public PageSetupAction() {
-		setId(ID);
-		setText(DiagramUIActionsMessages.PageSetupAction_Label);
-	}
-
-	/**
-	 * The run method does the real run action.
-	 * From IAction.
-	 */
-	public void run() {
-		//IPreferenceStore p = null;
-
-		//IWorkbenchPart page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		//if (page instanceof IDiagramWorkbenchPart) {
-		//	IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)page).getDiagramGraphicalViewer();
-		//	if (viewer instanceof DiagramGraphicalViewer) {
-		//		p = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-		//	}
-		//}
-		
-		//new PageSetupDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), p).open();
-		new PageSetupDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()).open();
-	}
-
-	/**
-	 * The run method does the real run action.
-	 * From IActionDelegate
-	 */
-	public void run(IAction action) {
-		run();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		//do nothing
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		//do nothing
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		//do nothing
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PropertyChangeContributionItem.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PropertyChangeContributionItem.java
deleted file mode 100644
index 674ddf1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PropertyChangeContributionItem.java
+++ /dev/null

@@ -1,226 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.CustomContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * An abstract implementation of a custom toolbar contribution item for reflecting
- * and changing properties of the selected objects in a workbench part
- * 
- * @author melaasar
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.actions.*
- *  
- */
-public abstract class PropertyChangeContributionItem
-	extends CustomContributionItem {
-
-	// id of the property this action will change
-	private String propertyId = null;
-
-	// name of the property this action will change
-	private String propertyName = null;
-
-	/**
-	 * Constructs a new property change contribution item
-	 * 
-	 * @param partService The part service
-	 * @param id The contribution id
-	 * @param propertyId The property id
-	 * @param propertyName The property name
-	 */
-	public PropertyChangeContributionItem(
-		IWorkbenchPage workbenchPage,
-		String id,
-		String propertyId,
-		String propertyName) {
-		super(workbenchPage, id);
-		Assert.isNotNull(propertyId);
-		Assert.isNotNull(propertyName);
-		setPropertyId(propertyId);
-		setPropertyName(propertyName);
-	}
-
-	/**
-	 * Returns the propertyId.
-	 * @return - property id
-	 */
-	protected String getPropertyId() {
-		return propertyId;
-	}
-
-	/**
-	 * Sets the propertyId.
-	 * @param - The propertyId to set
-	 */
-	protected void setPropertyId(String propertyId) {
-		this.propertyId = propertyId;
-	}
-
-	/**
-	 * Returns the propertyName.
-	 * @return - property name
-	 */
-	protected String getPropertyName() {
-		return propertyName;
-	}
-
-	/**
-	 * Sets the propertyName.
-	 * @param - The propertyName to set
-	 */
-	protected void setPropertyName(String string) {
-		propertyName = string;
-	}
-
-	/**
-	 * Creates a new target request
-	 * 
-	 * @return the new target request
-	 */
-	protected Request createTargetRequest() {
-		return new ChangePropertyValueRequest(
-			getPropertyName(),
-			getPropertyId());
-	}
-
-	/**
-	 * updates the target request. 
-	 * Clients should call this method whenever the request 
-	 * is expected to be changed
-	 */
-	protected void updateTargetRequest() {
-		ChangePropertyValueRequest request =
-			(ChangePropertyValueRequest) getTargetRequest();
-		request.setValue(getNewPropertyValue());
-	}
-
-	/**
-	 * Returns the property value of the given property id of the current operation set's
-	 * 
-	 * The default implementation returns the current property value of the 
-	 * primary object in the operation set if not empty and <code>null</code> otherwise
-	 *  
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getOperationSetPropertyValue(String id) {
-		List set = getOperationSet();
-		if (!set.isEmpty()) {
-			IGraphicalEditPart primaryEditPart =
-				(IGraphicalEditPart) set.get(set.size() - 1);
-			return getPropertyValue(primaryEditPart, id);
-		}
-		return null;
-	}
-    
-    /**
-     * Returns the property value of the given property id of the current operation set's
-     * 
-     * The default implementation returns the current property value of the 
-     * primary object in the operation set if not empty and <code>null</code> otherwise
-     *  
-     * @see org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction#getNewPropertyValue()
-     */
-    protected Object getOperationSetPropertyValue(String id,boolean useReadExeclusive) {
-        List set = getOperationSet();
-        if (!set.isEmpty()) {
-            IGraphicalEditPart primaryEditPart =
-                (IGraphicalEditPart) set.get(set.size() - 1);
-            return getPropertyValue(primaryEditPart, id,useReadExeclusive);
-        }
-        return null;
-    }
-
-	/**
-	 * A utility method to return the value of a given property for a given editpart
-	 * 
-	 * @param editPart The editpart
-	 * @return The current value of the editpart's given property
-	 */
-	protected Object getPropertyValue(
-		final IGraphicalEditPart editPart,
-		final String thePropertyId) {
-
-		try {
-			return editPart.getEditingDomain().runExclusive(
-				new RunnableWithResult.Impl() {
-
-					public void run() {
-						ENamedElement element = PackageUtil
-							.getElement(thePropertyId);
-						if (element instanceof EStructuralFeature)
-							setResult(editPart
-								.getStructuralFeatureValue((EStructuralFeature) element));
-					}
-				});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramActionsPlugin.getInstance(),
-				DiagramActionsDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getPropertyValue", e); //$NON-NLS-1$
-			Log.error(DiagramActionsPlugin.getInstance(),
-				DiagramActionsStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getPropertyValue", e); //$NON-NLS-1$
-			return null;
-		}
-	}
-    
-    /**
-     * A utility method to return the value of a given property for a given editpart
-     * 
-     * @param  editPart The editpart
-     * @param  useExclusiveRead indicates if the read process willl be run in a read execlusive 
-     *         operation or not
-     * @return The current value of the editpart's given property
-     */
-    protected Object getPropertyValue(
-        final IGraphicalEditPart editPart,
-        final String thePropertyId, boolean useExclusiveRead) {
-        if (useExclusiveRead){
-            return getPropertyValue(editPart,thePropertyId);
-        }
-        else {
-             ENamedElement element = PackageUtil.getElement(thePropertyId);
-             if (element instanceof EStructuralFeature){
-                 return editPart.getStructuralFeatureValue((EStructuralFeature) element);
-             }
-        }
-        return null;
-    }
-
-	/**
-	 * Gets the new property value (usualy from the item's control)
-	 * 
-	 * @return the new property value
-	 */
-	protected abstract Object getNewPropertyValue();
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RecalculatePageBreaksAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RecalculatePageBreaksAction.java
deleted file mode 100644
index d650e8b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RecalculatePageBreaksAction.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.RecalculatePageBreaksRequest;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Workspace Action to recalculate the page breaks.  This action is visible 
- * only when the pagebreaks are visible.
- * 
- * @author jcorchis
- * @canBeSeenBy %level1
- */
-public class RecalculatePageBreaksAction extends DiagramAction {
-
-	/**
-	 * @param workbenchPage
-	 */
-	public RecalculatePageBreaksAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);	
-	}
-	
-	public RecalculatePageBreaksAction(IWorkbenchPart part) {
-		super(part);
-	}	
-	
-	public void init() {
-		super.init();
-		setText(DiagramUIActionsMessages.RecalcPageBreaks_textLabel);
-		setId(ActionIds.ACTION_RECALC_PAGEBREAKS);
-		setToolTipText(DiagramUIActionsMessages.RecalcPageBreaks_toolTip);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_RECALCPAGEBREAKS);
-		setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_RECALCPAGEBREAKS_DISABLED);
-	}
-
-	/**
-	 *  (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new RecalculatePageBreaksRequest();
-	}
-	
-	/**
-	 * Calculates the enblement state of the action
-	 * 
-	 * @return <code>true</code> if PageBreaks are being viewed
-	 */
-	protected boolean calculateEnabled() {
-		if (getDiagramGraphicalViewer() instanceof DiagramGraphicalViewer) {
-			return ((DiagramGraphicalViewer) getDiagramGraphicalViewer())
-				.getWorkspaceViewerPreferenceStore().getBoolean(
-					WorkspaceViewerProperties.VIEWPAGEBREAKS);
-		}
-		return false;
-	}	
-	
-	/**
-	 * Execute the request via the preformRequest() call.  This action does
-	 * not modify the model and does not use the request/command infrastructure.
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		((DiagramRootEditPart)getDiagramEditPart().getRoot()).performRequest(getTargetRequest());
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterAction.java
deleted file mode 100644
index 5450bfd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterAction.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.CheckedPropertyAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Connection router action
- * 
- * @author melaasar
- * @canBeSeenBy %level1
- */
-public class RouterAction extends CheckedPropertyAction {
-
-	/**
-	 * @param workbenchPage
-	 * @param routerType
-	 */
-	protected RouterAction(IWorkbenchPage workbenchPage, Routing routerType) {
-		super(
-			workbenchPage,
-			Properties.ID_ROUTING,
-			DiagramUIActionsMessages.ChangeRouterAction_ChangePropertyValueRequest_label,
-			routerType);
-	}
-
-	/**
-	 * Creates the rectilinear router action
-	 * 
-	 * @param workbenchPage
-	 * @return
-	 */
-	public static RouterAction createRectilinearRouterAction(IWorkbenchPage workbenchPage) {
-		RouterAction action =
-			new RouterAction(workbenchPage, Routing.RECTILINEAR_LITERAL);
-		action.setId(ActionIds.ACTION_ROUTER_RECTILINEAR);
-		action
-			.setText(DiagramUIActionsMessages.ChangeRouterAction_Rectilinear_ActionLabelText);
-		action
-			.setToolTipText(DiagramUIActionsMessages.ChangeRouterAction_Rectilinear_ActionToolTipText);
-
-		action
-			.setImageDescriptor(DiagramUIActionsPluginImages.DESC_CHANGEROUTERACTION_RECTILINEAR);
-		action
-			.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_CHANGEROUTERACTION_RECTILINEAR_DISABLED);
-		action
-			.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_CHANGEROUTERACTION_RECTILINEAR);
-		return action;
-	}
-
-	/**
-	 * Creates the rectilinear router action
-	 * 
-	 * @param workbenchPage
-	 * @return
-	 */
-	public static RouterAction createObliqueRouterAction(IWorkbenchPage workbenchPage) {
-		RouterAction action =
-			new RouterAction(workbenchPage, Routing.MANUAL_LITERAL);
-		action.setId(ActionIds.ACTION_ROUTER_OBLIQUE);
-		action.setText(DiagramUIActionsMessages.ChangeRouterAction_Oblique_ActionLabelText);
-		action.setToolTipText(DiagramUIActionsMessages.ChangeRouterAction_Oblique_ActionToolTipText);
-
-		ImageDescriptor enabledImage = DiagramUIPluginImages.DESC_CHANGEROUTERACTION_OBLIQUE;
-		action.setImageDescriptor(enabledImage);
-		action
-			.setDisabledImageDescriptor(DiagramUIPluginImages.DESC_CHANGEROUTERACTION_OBLIQUE_DISABLED);
-		action.setHoverImageDescriptor(enabledImage);
-		return action;
-	}
-	
-	/**
-	 * Creates the tree router action
-	 * 
-	 * @param workbenchPage
-	 * @return
-	 */
-	public static RouterAction createTreeRouterAction(IWorkbenchPage workbenchPage) {
-		RouterAction action =
-			new RouterAction(workbenchPage, Routing.TREE_LITERAL);
-		action.setId(ActionIds.ACTION_ROUTER_TREE);
-		action.setText(DiagramUIActionsMessages.ChangeRouterAction_Tree_ActionLabelText);
-		action.setToolTipText(DiagramUIActionsMessages.ChangeRouterAction_Tree_ActionToolTipText);
-		
-		ImageDescriptor enabledImage = DiagramUIPluginImages.DESC_CHANGEROUTERACTION_TREE;
-		action.setImageDescriptor(enabledImage);
-		action
-			.setDisabledImageDescriptor(DiagramUIPluginImages.DESC_CHANGEROUTERACTION_TREE_DISABLED);
-		action.setHoverImageDescriptor(enabledImage);
-		return action;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		if (getId() == ActionIds.ACTION_ROUTER_TREE) {
-			List selected = getSelectedObjects();
-			if (selected.size() < 2) 
-				return false;
-			
-			ListIterator li = selected.listIterator();
-			while (li.hasNext()) {
-				if (!(li.next() instanceof ITreeBranchEditPart))
-					return false;
-			}
-		}
-		
-		return super.calculateEnabled();
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createOperationSet()
-	 */
-	protected List createOperationSet() {
-		List operationSet = super.createOperationSet();
-		List connectionSet = new ArrayList();
-		ListIterator iter = operationSet.listIterator();
-		while (iter.hasNext()) {
-			Object obj = iter.next();
-			if (obj instanceof ConnectionEditPart) {
-				connectionSet.add(obj);
-			}
-		}
-		
-		return connectionSet;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterMenuManager.java
deleted file mode 100644
index 02ab3eb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterMenuManager.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.jface.action.Action;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * The router menu manager. It contains all router-related actions
- */
-public class RouterMenuManager extends ActionMenuManager {
-
-	/**
-	 * The router menu action containing the UI for the router menu manager
-	 */
-	private static class RouterMenuAction extends Action {
-		public RouterMenuAction() {
-			setText(DiagramUIActionsMessages.RouterActionMenu_LineStyleDropDownText);
-			setToolTipText(DiagramUIActionsMessages.RouterActionMenu_LineStyleDropDownTooltip);
-			
-			setImageDescriptor(DiagramUIActionsPluginImages.DESC_CHANGEROUTER_GROUP);
-			setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_CHANGEROUTER_GROUP_DISABLED);
-			setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_CHANGEROUTER_GROUP);			
-		}
-	}
-
-	/**
-	 * Creates a new instance of the router menu manager
-	 */
-	public RouterMenuManager() {
-		super(ActionIds.MENU_ROUTER, new RouterMenuAction(), true);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectAllAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectAllAction.java
deleted file mode 100644
index aff669f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectAllAction.java
+++ /dev/null

@@ -1,349 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * 
- * @author melaasar
- * @canBeSeenBy %level1
- * 
- */
-public class SelectAllAction extends DiagramAction {
-	/** whether to select shapes */
-	private boolean selectShapes;
-	/** whether to select connections */
-	private boolean selectConnections;
-
-	/**
-	 * @param partService
-	 * @param selectShapes
-	 * @param selectConnections
-	 */
-	private SelectAllAction(
-		IWorkbenchPage partService,
-		boolean selectShapes,
-		boolean selectConnections) {
-		super(partService);
-		this.selectShapes = selectShapes;
-		this.selectConnections = selectConnections;
-	}
-
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	/**
-	 * The operation set is the shapes, connections or both on the diagrm edit part
-	 */
-	protected List createOperationSet() {
-		List selection = getSelectedObjects();
-		if (selection.isEmpty() || !(selection.get(0) instanceof IGraphicalEditPart))
-			return Collections.EMPTY_LIST;
-
-		List selectables = new ArrayList();
-
-		EditPart primaryEP = (EditPart) selection.get(selection.size() - 1);
-		List nodeEditParts = new ArrayList();
-		nodeEditParts.addAll(getSelectableNodes(primaryEP));
-
-		if (selectShapes)
-			selectables.addAll(nodeEditParts);
-		if (selectConnections)
-			selectables.addAll(addSelectableConnections(nodeEditParts));
-		return filterEditPartsMatching(selectables, getSelectionConditional());
-	}
-
-	/**
-	 * Determines the candidate list of node editparts for selection
-	 * 
-	 * @param editpart
-	 * @return
-	 */
-	protected List getSelectableNodes(EditPart editpart) {
-		if (editpart == null) {
-			return Collections.EMPTY_LIST;
-		}
-			
-		List retval = new ArrayList();
-		getSelectableNodesInside(editpart, true, retval);
-		return retval;
-	}
-			
-	/**
-	 * Determines the candidate list of node editparts for selection
-	 * 
-	 * @param editpart
-	 * @param topLevel <code>boolean</code> is this the initial entry point into the recursive method.
-	 * @param retval <code>List</code> to modify
-	 */
-	private void getSelectableNodesInside(EditPart editpart, boolean topLevel, List retval) {
-
-		if ( editpart instanceof ISurfaceEditPart) {
-			getSelectableChildrenNodes(editpart, retval);
-			}
-		else if (editpart instanceof IPrimaryEditPart) {
-			if (topLevel) {
-		if (editpart instanceof ConnectionEditPart) {
-			ConnectionEditPart connection = (ConnectionEditPart) editpart;
-			EditPart source = connection.getSource();
-			EditPart target = connection.getTarget();
-			if (source != null && target != null) {
-						getSelectableNodesInside(source, true, retval);
-				if (target.getParent() != source.getParent())
-							getSelectableNodesInside(target, true, retval);
-			}
-		}
-				else
-					getSelectableNodesInside(editpart.getParent(), true, retval);
-			}
-			else {
-				if (editpart.isSelectable())
-					retval.add(editpart);
-				getSelectableChildrenNodes(editpart, retval);
-			}
-		}
-	}
-
-	private void getSelectableChildrenNodes(EditPart editpart, List retval) {
-		Iterator iter = editpart.getChildren().iterator();
-		while( iter.hasNext() ) {
-			EditPart child = (EditPart)iter.next();
-			getSelectableNodesInside(child, false, retval);
-	}
-	}
-
-	/**
-	 * This method searches an edit part for a child that is a border item edit part
-	 * @param parent part needed to search
-	 * @param set to be modified of border item edit parts that are direct children of the parent
-	 */
-	private void getBorderItemEditParts(EditPart parent, Set retval) {
-		
-		Iterator iter = parent.getChildren().iterator();
-		while(iter.hasNext()) {
-			EditPart child = (EditPart)iter.next();
-			if( child instanceof IBorderItemEditPart ) {
-				retval.add(child);
-				retval.addAll(child.getChildren());
-			}
-			getBorderItemEditParts(child, retval);
-		}
-	}
-	
-	/**
-	 * Determines the candidate list of connection edit for selection
-	 * A connection is included if atleast the source or the target is
-	 * included in the given list
-	 * 
-	 * @param editparts
-	 */
-	protected List addSelectableConnections(List editparts) {
-		List selectableConnections = new ArrayList();
-
-		DiagramEditPart diagramEditPart = getDiagramEditPart();
-		Set connnectableEditParts = new HashSet(editparts);
-		ListIterator li = editparts.listIterator();
-		while (li.hasNext()) {
-			getBorderItemEditParts((EditPart)li.next(), connnectableEditParts);
-		}
-		
-		if (diagramEditPart != null) {
-			Iterator connections = diagramEditPart.getConnections().iterator();
-			while (connections.hasNext()) {
-				ConnectionEditPart connection =
-					(ConnectionEditPart) connections.next();
-				if (canSelectConnection(connection, connnectableEditParts))
-					selectableConnections.add(connection);
-			}
-		}
-		return selectableConnections;
-	}
-    
-    /**
-     * Determines whether the given connection can be selected.  First checks
-     * whether the source or target of the connection is in the given
-     * connetableEditPart list. If it isn't it checks recursively whether the source
-     * or target of the connection is another connection and if that connection's
-     * source or target is in the given connectableEditPart list.  This is in 
-     * response to Bugzilla #162083.
-     * 
-     * @param connection connection to check
-     * @param connectableEditParts 
-     */
-    private boolean canSelectConnection(ConnectionEditPart connection, Set connectableEditParts)
-    {
-        EditPart connectionSource = connection.getSource();
-        EditPart connectionTarget = connection.getTarget();
-        boolean sourceHasSelectable = false;
-        boolean targetHasSelectable = false;
-        
-        if (connectableEditParts.contains(connectionSource)
-                    || connectableEditParts.contains(connectionTarget))
-            return true;
-        
-        if (connectionSource instanceof ConnectionEditPart)
-            sourceHasSelectable = canSelectConnection((ConnectionEditPart)connectionSource, connectableEditParts);
-              
-        if (!sourceHasSelectable && connectionTarget instanceof ConnectionEditPart)
-            targetHasSelectable = canSelectConnection((ConnectionEditPart)connectionTarget, connectableEditParts);
-        
-        return sourceHasSelectable || targetHasSelectable;
-    }
-    
-	/**
-	 * @return The Selection Conditional which tests if the editpart is selectable
-	 */
-	protected EditPartViewer.Conditional getSelectionConditional() {
-		return new EditPartViewer.Conditional() {
-			public boolean evaluate(EditPart editpart) {
-				return editpart.isSelectable();
-			}
-		};
-	}
-
-	/**
-	 * Returns true if the operation set is not empty and only if the diagram is selected. 
-	 */
-	protected boolean calculateEnabled() {
-		return !getOperationSet().isEmpty();
-	}
-
-	protected void doRun(IProgressMonitor progressMonitor) {
-		getDiagramGraphicalViewer().setSelection(
-			new StructuredSelection(getOperationSet()));
-	}
-
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-    protected boolean isOperationHistoryListener() {
-        //certain undo/redo actions can cause selection to change. see bugzilla#156261
-        return true;
-    }
-
-	/**
-	 * Create the SelectAll action
-	 * 
-	 * @return The SelectAll action
-	 */
-	public static SelectAllAction createSelectAllAction(IWorkbenchPage partService) {
-		SelectAllAction action = new SelectAllAction(partService, true, true);
-		action.setId(ActionFactory.SELECT_ALL.getId());
-		action.setText(DiagramUIActionsMessages.SelectAllAction_SelectAll);
-		action.setToolTipText(DiagramUIActionsMessages.SelectAllAction_SelectAll);
-		action.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTALL);
-		action.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTALL_DISABLED);
-		return action;
-	}
-	
-	/**
-	 * Create the SelectAll toolbar action
-	 * 
-	 * @return The SelectAll toobar action
-	 */
-	public static SelectAllAction createToolbarSelectAllAction(IWorkbenchPage partService) {
-		SelectAllAction action = new SelectAllAction(partService, true, true);
-		action.setId(ActionIds.ACTION_TOOLBAR_SELECT_ALL);
-		action.setText(DiagramUIActionsMessages.SelectAllAction_toolbar_SelectAll);
-		action.setToolTipText(DiagramUIActionsMessages.SelectAllAction_toolbar_SelectAll);
-		action.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTALL);
-		action.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTALL_DISABLED);
-		return action;
-	}
-
-	/**
-	 * Create the SelectAllShapes action
-	 * 
-	 * @return The SelectAllShapes action
-	 */
-	public static SelectAllAction createSelectAllShapesAction(IWorkbenchPage partService) {
-		SelectAllAction action = new SelectAllAction(partService, true, false);
-		action.setId(ActionIds.ACTION_SELECT_ALL_SHAPES);
-		action.setText(DiagramUIActionsMessages.SelectAllAction_SelectShapes);
-		action.setToolTipText(DiagramUIActionsMessages.SelectAllAction_SelectShapes);
-		action.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTSHAPES);
-		action.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTSHAPES_DISABLED);
-		return action;
-	}
-	
-	/**
-	 * Create the SelectAllShapes toolbar action
-	 * 
-	 * @return The SelectAllShapes toolbar action
-	 */
-	public static SelectAllAction createToolbarSelectAllShapesAction(IWorkbenchPage partService) {
-		SelectAllAction action = new SelectAllAction(partService, true, false);
-		action.setId(ActionIds.ACTION_TOOLBAR_SELECT_ALL_SHAPES);
-		action.setText(DiagramUIActionsMessages.SelectAllAction_toolbar_SelectShapes);
-		action.setToolTipText(DiagramUIActionsMessages.SelectAllAction_toolbar_SelectShapes);
-		action.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTSHAPES);
-		action.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTSHAPES_DISABLED);
-		return action;
-	}
-
-	/**
-	 * Create the SelectAllConnections action
-	 * 
-	 * @return The SelectAllConnections action
-	 */
-	public static SelectAllAction createSelectAllConnectionsAction(IWorkbenchPage partService) {
-		SelectAllAction action = new SelectAllAction(partService, false, true);
-		action.setId(ActionIds.ACTION_SELECT_ALL_CONNECTIONS);
-		action.setText(DiagramUIActionsMessages.SelectAllAction_SelectConnections);
-		action.setToolTipText(DiagramUIActionsMessages.SelectAllAction_SelectConnections);
-		action.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTCONNECTIONS);
-		action.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTCONNECTIONS_DISABLED);
-		return action;
-	}
-	
-	/**
-	 * Create the SelectAllConnections toolbar action
-	 * 
-	 * @return The SelectAllConnections toolbar action
-	 */
-	public static SelectAllAction createToolbarSelectAllConnectionsAction(IWorkbenchPage partService) {
-		SelectAllAction action = new SelectAllAction(partService, false, true);
-		action.setId(ActionIds.ACTION_TOOLBAR_SELECT_ALL_CONNECTIONS);
-		action.setText(DiagramUIActionsMessages.SelectAllAction_toolbar_SelectConnections);
-		action.setToolTipText(DiagramUIActionsMessages.SelectAllAction_toolbar_SelectConnections);
-		action.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTCONNECTIONS);
-		action.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTCONNECTIONS_DISABLED);
-		return action;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectMenuManager.java
deleted file mode 100644
index bcfb0a7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectMenuManager.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler;
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author melaasar
- * @canBeSeenBy %level1
- *
- * The select menu manager. It contains all select-related actions
- */
-public class SelectMenuManager extends ActionMenuManager {
-
-	/**
-	 * The select menu action containing the UI for the select menu manager
-	 */
-	private static class SelectMenuAction extends Action {
-		public SelectMenuAction() {
-			setText(DiagramUIActionsMessages.SelectActionMenu_SelectDropDownText);
-			setToolTipText(DiagramUIActionsMessages.SelectActionMenu_SelectDropDownTooltip);
-
-			setImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTALL);
-			setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTALL_DISABLED);
-			setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_SELECTALL);			
-
-		}
-	}
-
-    /**
-     * Creates a new instance of the select menu manager
-     */
-    public SelectMenuManager() {
-        super(ActionIds.MENU_SELECT, new SelectMenuAction(), true);
-    }
-    
-	/**
-	 * Creates a new instance of the select menu manager
-	 * @param action default action associated with this menu manager (should not be null)
-	 */
-	public SelectMenuManager(IAction action) {
-        super(ActionIds.MENU_SELECT, action, true);
-
-        // If the action is null then use the original menu action
-        if (action == null) {
-            action = new SelectMenuAction();
-        }
-        
-        if (getDefaultAction() instanceof AbstractActionHandler) {
-            ((AbstractActionHandler) getDefaultAction()).setPartSelector(new IPartSelector() {
-                public boolean selects(IWorkbenchPart p) {
-                    return p instanceof IDiagramWorkbenchPart;
-                }
-            });
-        }
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowCompartmentTitleAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowCompartmentTitleAction.java
deleted file mode 100644
index 8228830..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowCompartmentTitleAction.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.BooleanPropertyAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.ui.IWorkbenchPage;
-
-
-/**
- * An action to show/hide compartment title
- * 
- * @author melaasar
- * @canBeSeenBy %level1
- */
-public class ShowCompartmentTitleAction
-	extends BooleanPropertyAction {
-
-	/**
-	 * @param workbenchPage
-	 * @param propertyId
-	 * @param propertyName
-	 */
-	public ShowCompartmentTitleAction(IWorkbenchPage workbenchPage) {
-		super(
-			workbenchPage,
-			Properties.ID_SHOWCOMPARTMENTTITLE,
-			DiagramUIActionsMessages.PropertyDescriptorFactory_ShowCompartmentTitle);
-		setId(ActionIds.ACTION_SHOW_COMPARTMENT_TITLE);
-		setText(DiagramUIActionsMessages.ShowCompartmentTitle_ActionLabelText);
-		setToolTipText(DiagramUIActionsMessages.ShowCompartmentTitle_ActionToolTipText);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowConnectionLabelsAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowConnectionLabelsAction.java
deleted file mode 100644
index cda062d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowConnectionLabelsAction.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ToggleConnectionLabelsRequest;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Action to show all connection labels.
- * 
- * @author jcorchis
- * @canBeSeenBy %level1
- */
-public class ShowConnectionLabelsAction extends DiagramAction {
-	
-	public ShowConnectionLabelsAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage); 
-	}
-	
-	/**
-	 * Add text and image descriptors
-	 * @see org.eclipse.gef.ui.actions.WorkbenchPartAction#init()
-	 */
-	public void init() {
-		super.init();
-		setText(DiagramUIActionsMessages.ShowConnectionLabelsAction_label);
-		setId(ActionIds.ACTION_SHOW_CONNECTION_LABELS);
-		setToolTipText(DiagramUIActionsMessages.ShowConnectionLabelsAction_toolTip);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_CONNECTION_LABELS);
-		setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SHOW_CONNECTION_LABELS_DISABLED);
-	}	
-	
-	/**
-	 * Returns an instance of <code>ToggleConnectionLabelsRequest</code>
-	 * @return the request
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {		
-		return new ToggleConnectionLabelsRequest(true);
-	}
-	
-	/**
-	 * Registers this action as a selection listener
-	 * @return true
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-	
-	/** 
-	 * Filters the selected objects and returns only ConnectionEditParts  
-	 * @return the operation set
-	 */
-	protected List createOperationSet() {
-		List selection = getSelectedObjects();
-		if (selection.isEmpty() || !(selection.get(0) instanceof EditPart)) {
-			return Collections.EMPTY_LIST;
-		} 
-		
-		List connections = new ArrayList();
-		if (selection.get(0) instanceof ShapeCompartmentEditPart || selection.get(0) instanceof DiagramEditPart) {
-			List diagramConnections = getDiagramEditPart().getConnections();
-			if (diagramConnections != null && !diagramConnections.isEmpty())
-				connections.addAll(diagramConnections);
-		} else {
-			connections.addAll(selection);
-		}
-				
-		Iterator selectedEPs = connections.iterator();
-		List targetedEPs = new ArrayList();
-		while (selectedEPs.hasNext()) {
-		    EditPart selectedEP = (EditPart)selectedEPs.next();
-		    targetedEPs.addAll(getTargetEditParts(selectedEP));
-		}
-		return targetedEPs.isEmpty() ? Collections.EMPTY_LIST : targetedEPs;
-	}	
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowInMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowInMenuManager.java
deleted file mode 100644
index f27e463..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowInMenuManager.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * @author gsturov
- * @canBeSeenBy %level1
- */
-public class ShowInMenuManager extends ActionMenuManager {
-	/**
-	 * The New menu action containing the UI for the new menu manager
-	 */
-	private static class ShowInMenuAction extends Action {
-		public ShowInMenuAction() {			
-			setText(DiagramUIActionsMessages.ShowInMenu_ShowInMenuText);
-			setToolTipText(DiagramUIActionsMessages.ShowInMenu_ShowInMenuTooltip);
-			//setImageDescriptor(Images.DESC_ACTION_SHOW_IN);
-			//setHoverImageDescriptor(Images.DESC_ACTION_SHOW_IN);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the filter menu manager
-	 */
-	public ShowInMenuManager() {
-		super(ActionIds.MENU_SHOW_IN, new ShowInMenuAction(), true);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeBothAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeBothAction.java
deleted file mode 100644
index 7c6fbd2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeBothAction.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * This action is used to change the size of the selected shapes
- */
-/*
- * @canBeSeenBy %level1
- */
-public class SizeBothAction extends DiagramAction {
-
-	/**
-	 * Creates the Make Same Size Both Action
-	 * @param workbenchPage
-	 */
-	public SizeBothAction(IWorkbenchPage workbenchPage) {
-
-		super(workbenchPage);
-	}
-
-	/**
-	 * Initializes this actions text and tooltip
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#init()
-	 */
-	public void init() {
-		super.init();
-		
-		setId(ActionIds.ACTION_MAKE_SAME_SIZE_BOTH);
-		setText(DiagramUIActionsMessages.SameSizeAction_MakeSameSizeBoth_ActionLabelText);
-		setToolTipText(DiagramUIActionsMessages.SameSizeAction_MakeSameSizeBoth_ActionToolTipText);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_MAKE_SAME_SIZE_BOTH);
-		setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_MAKE_SAME_SIZE_BOTH);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getCommand()
-	 */
-	protected Command getCommand() {
-		
-		// Create a compound command to hold the resize commands
-		CompoundCommand doResizeCmd = new CompoundCommand();
-
-		// Create an iterator for the selection
-		Iterator iter = getSelectedObjects().iterator();
-		
-		// Get the Primary Selection
-		int last = getSelectedObjects().size() - 1;
-		IGraphicalEditPart primary = (IGraphicalEditPart)getSelectedObjects().get(last);
-		View primaryView = (View)primary.getModel();
-		Integer width = (Integer) ViewUtil.getStructuralFeatureValue(
-			primaryView, NotationPackage.eINSTANCE.getSize_Width());
-		Integer height = (Integer) ViewUtil.getStructuralFeatureValue(
-			primaryView, NotationPackage.eINSTANCE.getSize_Height());
-		
-		Dimension primarySize;
-		if( width.intValue() == -1 || height.intValue() == -1 )
-			primarySize = primary.getFigure().getSize().getCopy();
-		else
-			primarySize = new Dimension(width.intValue(),height.intValue());
-		
-		while( iter.hasNext() ) {
-			IGraphicalEditPart toResize = (IGraphicalEditPart)iter.next();
-			View resizeView = (View)toResize.getModel();
-
-			doResizeCmd.add( 
-				new ICommandProxy(
-					new SetBoundsCommand(toResize.getEditingDomain(), "", new EObjectAdapter(resizeView), primarySize ) ) ); //$NON-NLS-1$
-		}
-
-		return doResizeCmd.unwrap();
-	}
-
-	/**
-	 * Action is enabled if the operation set's parent has XYLayout 
-	 * and they all share the same parent
-	 * @see org.eclipse.gef.ui.actions.EditorPartAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-
-		List selection = getSelectedObjects();
-		
-		// If the selection list must contain 2 or more
-		if( selection.size() < 2 ) {
-			
-			// disable this action
-			return false;
-		}
-
-		// Enable this action
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeHeightAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeHeightAction.java
deleted file mode 100644
index 1cffaa4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeHeightAction.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * This action is used to change the size of the selected shapes
- */
-/*
- * @canBeSeenBy %level1
- */
-public class SizeHeightAction extends DiagramAction {
-
-	/**
-	 * Creates the Make Same Size Both Action
-	 * @param workbenchPage
-	 */
-	public SizeHeightAction(IWorkbenchPage workbenchPage) {
-
-		super(workbenchPage);
-	}
-
-	/**
-	 * Initializes this actions text and tooltip
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#init()
-	 */
-	public void init() {
-		super.init();
-		
-		setId(ActionIds.ACTION_MAKE_SAME_SIZE_HEIGHT);
-		setText(DiagramUIActionsMessages.SameSizeAction_MakeSameSizeHeight_ActionLabelText);
-		setToolTipText(DiagramUIActionsMessages.SameSizeAction_MakeSameSizeHeight_ActionToolTipText);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_MAKE_SAME_SIZE_HEIGHT);
-		setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_MAKE_SAME_SIZE_HEIGHT);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getCommand()
-	 */
-	protected Command getCommand() {
-		
-		// Create a compound command to hold the resize commands
-		CompoundCommand doResizeCmd = new CompoundCommand();
-
-		// Create an iterator for the selection
-		Iterator iter = getSelectedObjects().iterator();
-		
-		// Get the Primary Selection
-		int last = getSelectedObjects().size() - 1;
-		IGraphicalEditPart primary = (IGraphicalEditPart)getSelectedObjects().get(last);
-		View primaryView = (View)primary.getModel();
-		Integer width = (Integer) ViewUtil.getStructuralFeatureValue(
-			primaryView, NotationPackage.eINSTANCE.getSize_Width());
-		Integer height = (Integer) ViewUtil.getStructuralFeatureValue(
-			primaryView, NotationPackage.eINSTANCE.getSize_Height());
-
-		Dimension primarySize;
-		if( width.intValue() == -1 || height.intValue() == -1 )
-			primarySize = primary.getFigure().getSize().getCopy();
-		else
-			primarySize = new Dimension(width.intValue(),height.intValue());
-		
-		while( iter.hasNext() ) {
-			IGraphicalEditPart toResize = (IGraphicalEditPart)iter.next();
-			View resizeView = (View)toResize.getModel();
-
-			// Make a copy of the primary view so the width doesn't change
-			Dimension size = primarySize.getCopy();
-			size.width = ((Integer) ViewUtil.getStructuralFeatureValue(
-				resizeView, NotationPackage.eINSTANCE.getSize_Width()))
-				.intValue();
-
-			doResizeCmd.add( 
-				new ICommandProxy(
-					new SetBoundsCommand(toResize.getEditingDomain(), "", new EObjectAdapter(resizeView), size ) ) ); //$NON-NLS-1$
-		}
-
-		return doResizeCmd.unwrap();
-	}
-
-	/**
-	 * Action is enabled if the operation set's parent has XYLayout 
-	 * and they all share the same parent
-	 * @see org.eclipse.gef.ui.actions.EditorPartAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-
-		List selection = getSelectedObjects();
-		
-		// If the selection list must contain 2 or more
-		if( selection.size() < 2 ) {
-			
-			// disable this action
-			return false;
-		}
-
-		// Enable this action
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeWidthAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeWidthAction.java
deleted file mode 100644
index 5301ef3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeWidthAction.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * This action is used to change the size of the selected shapes
- */
-/*
- * @canBeSeenBy %level1
- */
-public class SizeWidthAction extends DiagramAction {
-
-	/**
-	 * Creates the Make Same Size Both Action
-	 * @param workbenchPage
-	 */
-	public SizeWidthAction(IWorkbenchPage workbenchPage) {
-
-		super(workbenchPage);
-	}
-
-	/**
-	 * Initializes this actions text and tooltip
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#init()
-	 */
-	public void init() {
-		super.init();
-		
-		setId(ActionIds.ACTION_MAKE_SAME_SIZE_WIDTH);
-		setText(DiagramUIActionsMessages.SameSizeAction_MakeSameSizeWidth_ActionLabelText);
-		setToolTipText(DiagramUIActionsMessages.SameSizeAction_MakeSameSizeWidth_ActionToolTipText);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_MAKE_SAME_SIZE_WIDTH);
-		setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_MAKE_SAME_SIZE_WIDTH);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getCommand()
-	 */
-	protected Command getCommand() {
-		
-		// Create a compound command to hold the resize commands
-		CompoundCommand doResizeCmd = new CompoundCommand();
-
-		// Create an iterator for the selection
-		Iterator iter = getSelectedObjects().iterator();
-		
-		// Get the Primary Selection
-		int last = getSelectedObjects().size() - 1;
-		IGraphicalEditPart primary = (IGraphicalEditPart)getSelectedObjects().get(last);
-		View primaryView = (View)primary.getModel();
-		Integer width = (Integer) ViewUtil.getStructuralFeatureValue(
-			primaryView, NotationPackage.eINSTANCE.getSize_Width());
-		Integer height = (Integer) ViewUtil.getStructuralFeatureValue(
-			primaryView, NotationPackage.eINSTANCE.getSize_Height());
-
-		Dimension primarySize;
-		if( width.intValue() == -1 || height.intValue() == -1 )
-			primarySize = primary.getFigure().getSize().getCopy();
-		else
-			primarySize = new Dimension(width.intValue(),height.intValue());
-		
-		while( iter.hasNext() ) {
-			IGraphicalEditPart toResize = (IGraphicalEditPart)iter.next();
-			View resizeView = (View)toResize.getModel();
-
-			// Make a copy of the primary view so the width doesn't change
-			Dimension size = primarySize.getCopy();
-			size.height = ((Integer) ViewUtil.getStructuralFeatureValue(
-				resizeView, NotationPackage.eINSTANCE.getSize_Height()))
-				.intValue();
-
-			doResizeCmd.add( 
-				new ICommandProxy(
-					new SetBoundsCommand(toResize.getEditingDomain(), "", new EObjectAdapter(resizeView), size ) ) ); //$NON-NLS-1$
-
-
-		}
-
-		return doResizeCmd.unwrap();
-	}
-
-	/**
-	 * Action is enabled if the operation set's parent has XYLayout 
-	 * and they all share the same parent
-	 * @see org.eclipse.gef.ui.actions.EditorPartAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-
-		List selection = getSelectedObjects();
-		
-		// If the selection list must contain 2 or more
-		if( selection.size() < 2 ) {
-			
-			// disable this action
-			return false;
-		}
-
-		// Enable this action
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapBackAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapBackAction.java
deleted file mode 100644
index 4ceedf8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapBackAction.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Action that will permit a user to snap back a label of a connection back
- * to its orginal position relative to the connection.  Use when the label connection parent
- * can't be located.
- * 
- */
-/*
- * @canBeSeenBy %level1
- */
-public class SnapBackAction extends DiagramAction {
-
-	/**
-	 * @param page
-	 */
-	public SnapBackAction(IWorkbenchPage page) {
-		super(page);
-	}
-
-	/**
-	 * initializes the action with the correct action id ad image descriptors and tool text and text
-	 * 
-	 */
-	public void init() {
-		super.init();
-		setText(DiagramUIActionsMessages.SnapBackAction_ActionLabelText);
-		setId(ActionIds.ACTION_SNAP_BACK);
-		setToolTipText(DiagramUIActionsMessages.SnapBackAction_ActionToolTipText);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_SNAPBACK);
-		setHoverImageDescriptor(getImageDescriptor());
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new Request(RequestConstants.REQ_SNAP_BACK);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-    
-    protected boolean isOperationHistoryListener() {
-        return true;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapToGridAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapToGridAction.java
deleted file mode 100644
index 2d7a03e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapToGridAction.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * 
- * Checked action for the Snap to Grid workspace property
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class SnapToGridAction extends DiagramAction {
-	
-	/**
-	 * Create a Snap To Grid Action
-	 * @param workbenchPage
-	 */
-	public SnapToGridAction(IWorkbenchPage workbenchPage) {
-		
-		super(workbenchPage);
-		setText(DiagramUIActionsMessages.SnapToGrid_textLabel);
-		setId(ActionIds.ACTION_SNAP_TO_GRID);
-		setToolTipText(DiagramUIActionsMessages.SnapToGrid_toolTip);
-	}
-
-	/**
-	 * Returns null, this action modifies the user's workspace preference.
-	 * @returns null
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-	
-	/**
-	 * Sets the action style to AS_CHECK_BOX
-	 */
-	public int getStyle() {
-		return AS_CHECK_BOX;
-	}
-	
-	/**
-	 * Calculates the enablement state of the action.  This action  is
-	 * enabled if the diagram is selected. 
-	 * @return <code>true</code> if the diagram is selected
-	 */
-	protected boolean calculateEnabled() {
-
-		if ( getDiagramGraphicalViewer() == null ) {
-			return false;
-		}
-		return true; 
-	}
-	
-	/**
-	 * Does not execute a Command.  Updates the workspace preference store's
-	 * WorkspaceViewerProperties.SNAPTOGRID value.
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		((DiagramGraphicalViewer) getDiagramGraphicalViewer())
-					.getWorkspaceViewerPreferenceStore()
-					.setValue(WorkspaceViewerProperties.SNAPTOGRID, isChecked());		
-	}
-	 
-	/**
-	 * This action is interested in selection
-	 * @return true
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	public boolean isSelectionListener() {
-		return true;
-	}
-	
-	/**
-	 * Override setWorkbenchPart to reset checked value based on
-	 * preference store of currently selected IDiagramWorkbenchPart.
-	 * Sets the current workbencgPart
-	 * 
-	 * @param workbenchPart
-	 *            The current workbenchPart
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		super.setWorkbenchPart(workbenchPart);
-		
-		if ( (workbenchPart != null) && (isSelectionListener())){
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-				boolean shouldBeChecked = preferenceStore.getBoolean(WorkspaceViewerProperties.SNAPTOGRID);
-				this.setChecked(shouldBeChecked);
-			}			
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SortFilterAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SortFilterAction.java
deleted file mode 100644
index b0ad498..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SortFilterAction.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.SortFilterCompartmentItemsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.SortFilterContentRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Action to sort/filter list compartment items.
- * 
- * @author jcorchis
- * @canBeSeenBy %level1
- */
-public class SortFilterAction extends DiagramAction {
-	
-	public SortFilterAction(IWorkbenchPage workbenchpage) {		
-		super(workbenchpage);
-	}
-
-	/**
-	 * Returns an instance of <code>SortFilterCompartmentItemsRequest</code> 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new SortFilterCompartmentItemsRequest();
-	}
-
-	public void init() {
-		super.init();
-		setId(ActionIds.ACTION_SORT_FILTER);
-		setText(DiagramUIActionsMessages.SortFilterCompartmentsAction_ActionLabelText);
-		setToolTipText(DiagramUIActionsMessages.SortFilterCompartmentsAction_ActionToolTipText);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_SORT_FILTER);
-		setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_SORT_FILTER_DISABLED);	
-	}
-	/**
-	 * Enable this action if only one shape is selected and that 
-	 * shape supports has children that support the SortFilterContentRequest.
-	 * @returns boolean whether the action is enabled
-	 */
-	protected boolean calculateEnabled() {
-		// Return true if at least one items handles the request.
-		Iterator iter = getSelectedObjects().iterator();
-		while(iter.hasNext()) {
-			Object obj = iter.next();
-			if (obj instanceof IGraphicalEditPart) {
-				IGraphicalEditPart selectedEP = 
-					(IGraphicalEditPart) obj;
-				Object model = selectedEP.getModel();
-				if (!(model instanceof View) ||
-					ViewUtil.resolveSemanticElement((View)model)==null)
-					continue;
-				List childContributions = new ArrayList();			
-				List children = selectedEP.getChildren();
-				for (int i = 0; i < children.size(); i++) {
-					if (children.get(i) instanceof ListCompartmentEditPart) {
-						SortFilterContentRequest contentRequest =
-							new SortFilterContentRequest(childContributions);
-						ListCompartmentEditPart editPart =
-							(ListCompartmentEditPart) children.get(i);
-						editPart.getCommand(contentRequest);
-						if (childContributions.size() > 0)
-							return true;
-					}
-				}
-			}
-		}		
-		return false;
-	}
-	
-	
-	/**
-	 * Filters the selected objects and returns the first editparts that understands the request
-	 * @return a list of editparts selected.
-	 * 
-	 */
-	protected List createOperationSet() {
-		List selection = getSelectedObjects();
-		if (selection.isEmpty() || !(selection.get(0) instanceof IGraphicalEditPart))
-			return Collections.EMPTY_LIST;
-		Iterator selectedEPs = selection.iterator();
-		List targetedEPs = new ArrayList();
-		while (selectedEPs.hasNext()) {
-			EditPart selectedEP = (EditPart) selectedEPs.next();
-			targetedEPs.addAll(getTargetEditParts(selectedEP));
-			if (targetedEPs.size() > 0) {
-				EditPart ep = (EditPart)targetedEPs.get(0);
-				targetedEPs.clear();
-				targetedEPs.add(ep);
-				return targetedEPs;
-			}
-		}
-		return targetedEPs.isEmpty() ? Collections.EMPTY_LIST : targetedEPs;
-	}
-	
-
-	public boolean isSelectionListener() {
-		return true;
-	}
-	
-	/**
-	 * Updates the request with the selection.
-	 */
-	protected void updateTargetRequest() {
-		((SortFilterCompartmentItemsRequest)getTargetRequest()).setEditParts(getSelectedObjects());
-	}	
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewGridAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewGridAction.java
deleted file mode 100644
index 0490fb3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewGridAction.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * 
- * Checked action for the View Grid workspace property
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class ViewGridAction extends DiagramAction {
-
-			
-	/**
-	 * Create a View Grid Action
-	 * @param workbenchPage
-	 */
-	public ViewGridAction(IWorkbenchPage workbenchPage) {
-		
-		super(workbenchPage);
-		setText(DiagramUIActionsMessages.ViewGrid_textLabel);
-		setId(ActionIds.ACTION_VIEW_GRID);
-		setToolTipText(DiagramUIActionsMessages.ViewGrid_toolTip);
-		//setImageDescriptor(Images.DESC_ACTION_VIEWPAGEBREAKS);		
-		
-	}
-
-	/**
-	 * Returns null, this action modifies the user's workspace preference.
-	 * @returns null
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-	
-	/**
-	 * Sets the action style to AS_CHECK_BOX
-	 */
-	public int getStyle() {
-		return AS_CHECK_BOX;
-	}
-	
-	/**
-	 * Calculates the enablement state of the action.  This action  is
-	 * enabled if the diagram is selected. 
-	 * @return <code>true</code> if the diagram is selected
-	 */
-	protected boolean calculateEnabled() {
-
-		if( getDiagramGraphicalViewer() == null ) {
-			return false;
-		}
-		return true; 
-	}
-	
-	/**
-	 * Does not execute a Command.  Updates the workspace preference store's
-	 * WorkspaceViewerProperties.VIEWGRID value.
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		((DiagramGraphicalViewer) getDiagramGraphicalViewer())
-					.getWorkspaceViewerPreferenceStore()
-					.setValue(WorkspaceViewerProperties.VIEWGRID, isChecked());		
-	}
-	 
-	/**
-	 * This action is interested in selection
-	 * @return true
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	public boolean isSelectionListener() {
-		return true;
-	}
-	
-	/**
-	 * Override setWorkbenchPart to reset checked value based on
-	 * preference store of currently selected IDiagramWorkbenchPart.
-	 * Sets the current workbenchPart
-	 * 
-	 * @param workbenchPart
-	 *            The current workbenchPart
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		super.setWorkbenchPart(workbenchPart);
-		
-		if ( (workbenchPart != null) && (isSelectionListener())){
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-				boolean shouldBeChecked = preferenceStore.getBoolean(WorkspaceViewerProperties.VIEWGRID);
-				this.setChecked(shouldBeChecked);
-			}			
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewMenuManager.java
deleted file mode 100644
index a6db485..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewMenuManager.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * The View Menu Manager contains all View related actions
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class ViewMenuManager extends ActionMenuManager {
-
-	/**
-	 * The align menu action containing the UI for the align menu manager
-	 */
-	private static class ViewMenuAction extends Action {
-		public ViewMenuAction() {
-			setText(DiagramUIActionsMessages.ViewMenuManager_View_ActionLabelText);
-			setToolTipText(DiagramUIActionsMessages.ViewMenuManager_View_ActionToolTipText);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the align menu manager
-	 */
-	public ViewMenuManager() {
-		super(ActionIds.MENU_VIEW, new ViewMenuAction(), true);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewPageBreaksAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewPageBreaksAction.java
deleted file mode 100644
index 8e724a6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewPageBreaksAction.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Checked action for the View Page Breaks workspace property
- * 
- * @author jcorchis
- * @canBeSeenBy %level1
- */
-public class ViewPageBreaksAction extends DiagramAction {
-
-	/**
-	 * @param workbenchPage
-	 */
-	public ViewPageBreaksAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-		setText(DiagramUIActionsMessages.ViewPageBreaks_textLabel);
-		setId(ActionIds.ACTION_VIEW_PAGEBREAKS);
-		setToolTipText(DiagramUIActionsMessages.ViewPageBreaks_toolTip);
-		setImageDescriptor(DiagramUIActionsPluginImages.DESC_VIEWPAGEBREAKS);
-		setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_VIEWPAGEBREAKS_DISABLED);
-	}
-
-	/**
-	 * Returns null, this action modifies the user's workspace preference.
-	 * @returns null
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-	
-	/**
-	 * Sets the action style to AS_CHECK_BOX
-	 */
-	public int getStyle() {
-		return AS_CHECK_BOX;
-	}
-	
-	/**
-	 * Calculates the enblement state of the action.  This action  is
-	 * enabled of the diagram is selected. 
-	 * @return <code>true</code> if the diagram is selected
-	 */
-	protected boolean calculateEnabled() {
-		if ( getDiagramGraphicalViewer() == null ) {
-			return false;
-		}
-		return true; 
-	}
-	
-	/**
-	 * Does not execute a Command.  Updates the workspace preference store's
-	 * WorkspaceViewerProperties.VIEWPAGEBREAKS value.
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		((DiagramGraphicalViewer) getDiagramGraphicalViewer())
-					.getWorkspaceViewerPreferenceStore()
-					.setValue(WorkspaceViewerProperties.VIEWPAGEBREAKS, isChecked());		
-	}
-	 
-	/**
-	 * This action is interested in selection
-	 * @return true
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	public boolean isSelectionListener() {
-		return true;
-	}
-	
-	/**
-	 * Override setWorkbenchPart to reset checked value based on
-	 * preference store of currently selected IDiagramWorkbenchPart.
-	 * Sets the current workbencgPart
-	 * 
-	 * @param workbenchPart
-	 *            The current workbenchPart
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		super.setWorkbenchPart(workbenchPart);
-		
-		if ( (workbenchPart != null) && (isSelectionListener())){
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-				boolean shouldBeChecked = preferenceStore.getBoolean(WorkspaceViewerProperties.VIEWPAGEBREAKS);
-				this.setChecked(shouldBeChecked);
-			}			
-		}
-	}
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewRulersAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewRulersAction.java
deleted file mode 100644
index 0508735..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewRulersAction.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-/**
- * 
- * Checked action for the View Ruler workspace property
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class ViewRulersAction extends DiagramAction {
-
-	/**
-	 * Create a View Ruler Action
-	 * @param workbenchPage
-	 */
-	public ViewRulersAction(IWorkbenchPage workbenchPage) {
-		
-		super(workbenchPage);
-		setText(DiagramUIActionsMessages.ViewRuler_textLabel);
-		setId(ActionIds.ACTION_VIEW_RULERS);
-		setToolTipText(DiagramUIActionsMessages.ViewRuler_toolTip);
-	}
-
-	/**
-	 * Returns null, this action modifies the user's workspace preference.
-	 * @returns null
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-	
-	/**
-	 * Sets the action style to AS_CHECK_BOX
-	 */
-	public int getStyle() {
-		return AS_CHECK_BOX;
-	}
-	
-	/**
-	 * Calculates the enablement state of the action.  This action  is
-	 * enabled if the diagram is selected. 
-	 * @return <code>true</code> if the diagram is selected
-	 */
-	protected boolean calculateEnabled() {
-		if ( getDiagramGraphicalViewer() == null ) {
-			return false;
-		}
-		return true; 
-	}
-	
-	/**
-	 * Does not execute a Command.  Updates the workspace preference store's
-	 * WorkspaceViewerProperties.VIEWRULERS value.
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		((DiagramGraphicalViewer) getDiagramGraphicalViewer())
-					.getWorkspaceViewerPreferenceStore()
-					.setValue(WorkspaceViewerProperties.VIEWRULERS, isChecked());		
-	}
-	 
-	/**
-	 * This action is interested in selection
-	 * @return true
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	public boolean isSelectionListener() {
-		return true;
-	}
-	
-	/**
-	 * Override setWorkbenchPart to reset checked value based on
-	 * preference store of currently selected IDiagramWorkbenchPart.
-	 * Sets the current workbencgPart
-	 * 
-	 * @param workbenchPart
-	 *            The current workbenchPart
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		super.setWorkbenchPart(workbenchPart);
-		
-		if ( (workbenchPart != null) && (isSelectionListener())){
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-				boolean shouldBeChecked = preferenceStore.getBoolean(WorkspaceViewerProperties.VIEWRULERS);
-				this.setChecked(shouldBeChecked);
-			}			
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderAction.java
deleted file mode 100644
index 5a060ab..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderAction.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IEditableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ZOrderRequest;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * This action is used to change the order of views within it's parent container
- */
-/*
- * @canBeSeenBy %level1
- */
-public class ZOrderAction
-	extends DiagramAction {
-
-	/**
-	 * Protected constructor so that object can not be instantiated directly the
-	 * client should call the create methods
-	 * 
-	 * @param workbenchPage
-	 */
-	protected ZOrderAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Creates the Bring to Front Action
-	 * 
-	 * @param workbenchPage
-	 * @return ZOrderAction for Bring to Front
-	 */
-	public static ZOrderAction createBringToFrontAction(
-			IWorkbenchPage workbenchPage) {
-		ZOrderAction theAction = new ZOrderAction(workbenchPage);
-		theAction.setId(ActionIds.ACTION_BRING_TO_FRONT);
-		theAction.setText(DiagramUIActionsMessages.ZOrderAction_BringToFront_ActionLabelText);
-		theAction.setToolTipText(DiagramUIActionsMessages.ZOrderAction_BringToFront_ActionToolTipText);
-
-		theAction.setImageDescriptor(DiagramUIActionsPluginImages.DESC_BRING_TO_FRONT);
-		theAction.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_BRING_TO_FRONT);
-		return theAction;
-	}
-
-	/**
-	 * Creates the Bring Forward Action
-	 * 
-	 * @param workbenchPage
-	 * @return ZOrderAction for Bring Forward
-	 */
-	public static ZOrderAction createBringForwardAction(
-			IWorkbenchPage workbenchPage) {
-		ZOrderAction theAction = new ZOrderAction(workbenchPage);
-		theAction.setId(ActionIds.ACTION_BRING_FORWARD);
-		theAction.setText(DiagramUIActionsMessages.ZOrderAction_BringForward_ActionLabelText);
-		theAction.setToolTipText(DiagramUIActionsMessages.ZOrderAction_BringForward_ActionToolTipText);
-		
-		theAction.setImageDescriptor(DiagramUIActionsPluginImages.DESC_BRING_FORWARD);
-		theAction.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_BRING_FORWARD);
-		return theAction;
-	}
-
-	/**
-	 * Creates the Send to Back Action
-	 * 
-	 * @param workbenchPage
-	 * @return ZOrderAction for Send to Back
-	 */
-	public static ZOrderAction createSendToBackAction(
-			IWorkbenchPage workbenchPage) {
-		ZOrderAction theAction = new ZOrderAction(workbenchPage);
-		theAction.setId(ActionIds.ACTION_SEND_TO_BACK);
-		theAction.setText(DiagramUIActionsMessages.ZOrderAction_SendToBack_ActionLabelText);
-		theAction.setToolTipText(DiagramUIActionsMessages.ZOrderAction_SendToBack_ActionToolTipText);
-		theAction.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SEND_TO_BACK);
-		theAction.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_SEND_TO_BACK);
-		return theAction;
-	}
-
-	/**
-	 * Creates the Send Backward Action
-	 * 
-	 * @param workbenchPage
-	 * @return ZOrderAction for Send Backward
-	 */
-	public static ZOrderAction createSendBackwardAction(
-			IWorkbenchPage workbenchPage) {
-		ZOrderAction theAction = new ZOrderAction(workbenchPage);
-		theAction.setId(ActionIds.ACTION_SEND_BACKWARD);
-		theAction.setText(DiagramUIActionsMessages.ZOrderAction_SendBackward_ActionLabelText);
-		theAction.setToolTipText(DiagramUIActionsMessages.ZOrderAction_SendBackward_ActionToolTipText);
-		theAction.setImageDescriptor(DiagramUIActionsPluginImages.DESC_SEND_BACWARD);
-		theAction.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_SEND_BACWARD);
-		return theAction;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new ZOrderRequest(getId());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#updateTargetRequest()
-	 */
-	protected void updateTargetRequest() {
-		ZOrderRequest theRequest = (ZOrderRequest) getTargetRequest();
-		theRequest.setPartsToOrder(getOperationSet());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getCommand()
-	 */
-	protected Command getCommand() {
-
-		if (getOperationSet().isEmpty()) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EditPart editPart = (EditPart) getOperationSet().get(0);
-		return editPart.getParent().getCommand(getTargetRequest());
-	}
-
-	/**
-	 * Action is enabled if the operation set's parent has XYLayout and they all
-	 * share the same parent
-	 * 
-	 * @see org.eclipse.gef.ui.actions.EditorPartAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-
-		// If the selection list is empty
-		if (getOperationSet().isEmpty()) {
-
-			// disable this action
-			return false;
-		}
-
-		// Get the first selected editpart
-		EditPart editPart = (EditPart) getOperationSet().get(0);
-
-		// Get the parent of the first selected editpart
-		GraphicalEditPart parentEditPart = (GraphicalEditPart) editPart
-			.getParent();
-
-		if (parentEditPart == null)
-			return false;
-
-		// bugzilla 156733: disable this action if the parent is not editable
-		if ((parentEditPart instanceof IEditableEditPart)
-				&& !((IEditableEditPart) parentEditPart).isEditModeEnabled()) {
-			return false;
-		}
-		
-		// disable this action if the parent doesn't have an XYLayout
-		if (!(parentEditPart.getContentPane().getLayoutManager() instanceof XYLayout))
-			return false;
-
-		// Iterate over all the selected edit parts
-		for (Iterator iter = getOperationSet().iterator(); iter.hasNext();) {
-
-			// Get the next selected editpart
-			EditPart selectedEditPart = (EditPart) iter.next();
-
-			// Verify that the editparts share the same parent
-			if (parentEditPart != selectedEditPart.getParent()) {
-				return false;
-			}
-			
-			// bugzilla 156733: disable this action if the selected edit part is not editable
-			if ((selectedEditPart instanceof IEditableEditPart)
-					&& !((IEditableEditPart) selectedEditPart)
-							.isEditModeEnabled()) {
-				return false;
-			}
-		}
-
-		// Enable this action
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderMenuManager.java
deleted file mode 100644
index 1ae0c47..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderMenuManager.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
-import org.eclipse.jface.action.Action;
-
-/**
- * The ZOrder menu manager. It contains all Order-related actions
- * 
- * @author jschofie
- * @canBeSeenBy %level1
- */
-public class ZOrderMenuManager extends ActionMenuManager {
-
-	/**
-	 * The order menu action containing the UI for the zorder menu manager
-	 */
-	private static class ZOrderMenuAction extends Action {
-		public ZOrderMenuAction() {
-			setText(DiagramUIActionsMessages.ZOrderMenuManager_Order_ActionLabelText);
-			setToolTipText(DiagramUIActionsMessages.ZOrderMenuManager_Order_ActionToolTipText);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the arrange menu manager
-	 */
-	public ZOrderMenuManager() {
-		super(ActionIds.MENU_ZORDER, new ZOrderMenuAction(), true);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.java
deleted file mode 100644
index 8f75f61..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramUIActionsMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages";//$NON-NLS-1$
-
-	private DiagramUIActionsMessages() {
-		// Do not instantiate
-	}
-
-	public static String AlignActionMenu_AlignDropDownText;
-	public static String AlignActionMenu_AlignDropDownTooltip;
-	public static String AlignLeft;
-	public static String AlignRight;
-	public static String AlignTop;
-	public static String AlignBottom;
-	public static String AlignMiddle;
-	public static String AlignCenter;
-	public static String AlignLeftToolbarAction_Tooltip;
-	public static String AlignLeftToolbarAction_Label;
-	public static String AlignRightToolbarAction_Tooltip;
-	public static String AlignRightToolbarAction_Label;
-	public static String AlignTopToolbarAction_Tooltip;
-	public static String AlignTopToolbarAction_Label;
-	public static String AlignBottomToolbarAction_Tooltip;
-	public static String AlignBottomToolbarAction_Label;
-	public static String AlignCenterToolbarAction_Tooltip;
-	public static String AlignCenterToolbarAction_Label;
-	public static String AlignMiddleToolbarAction_Tooltip;
-	public static String AlignMiddleToolbarAction_Label;
-	public static String ShowAllResizableCompartmentsAction_ShowAllText;
-	public static String ShowAllResizableCompartmentsAction_ShowAllTooltip;
-	public static String ShowAllResizableCompartmentsAction_HideAllText;
-	public static String ShowAllResizableCompartmentsAction_HideAllTooltip;
-	public static String ShowResizableCompartmentActionMenu_ShowResizeableCompartmentsText;
-	public static String ShowResizableCompartmentActionMenu_ShowResizeableCompartmentsTooltip;
-	public static String ConstrainedFlowLayoutEditPolicy_changeVisibilityCommand_label;
-	public static String ArrangeAction_ArrangeSelection_ActionLabelText;
-	public static String ArrangeAction_ArrangeSelection_ActionToolTipText;
-	public static String ArrangeAction_ArrangeAll_ActionLabelText;
-	public static String ArrangeAction_ArrangeAll_ActionToolTipText;
-    public static String GroupAction_Group_ActionLabelText;
-    public static String GroupAction_Group_ActionToolTipText;
-    public static String GroupAction_Ungroup_ActionLabelText;
-    public static String GroupAction_Ungroup_ActionToolTipText;
-	public static String ArrangeAction_toolbar_ArrangeSelection_ActionLabelText;
-	public static String ArrangeAction_toolbar_ArrangeSelection_ActionToolTipText;
-	public static String ArrangeAction_toolbar_ArrangeAll_ActionLabelText;
-	public static String ArrangeAction_toolbar_ArrangeAll_ActionToolTipText;
-	public static String ArrangeMenuManager_Arrange_ActionLabelText;
-	public static String ArrangeMenuManager_Arrange_ActionToolTipText;
-	public static String AutoSizeAction_ActionLabelText;
-	public static String AutoSizeAction_ActionToolTipText;
-	public static String ShowConnectionLabelsActionMenu_ShowConnectionLabelsText;
-	public static String ShowConnectionLabelsActionMenu_ShowConnectionLabelsTooltip;
-	public static String ShowConnectionLabelsAction_label;
-	public static String ShowConnectionLabelsAction_toolTip;
-	public static String HideConnectionLabelsAction_label;
-	public static String HideConnectionLabelsAction_toolTip;
-	public static String CopyAction_Copy;
-	public static String CopyAction_ErrorDialogTitle;
-	public static String CopyAction_UnableToCopyImageMessage;
-	public static String VisualizeMenuManager_Visualize_ActionLabelText;
-	public static String VisualizeMenuManager_Visualize_ActionToolTipText;
-	public static String NavigateMenuManager_Navigate_ActionLabelText;
-	public static String FileMenuManager_File_ActionLabelText;
-	public static String FileMenuManager_File_ActionToolTipText;
-	public static String EditMenuManager_Edit_ActionLabelText;
-	public static String EditMenuManager_Edit_ActionToolTipText;
-	public static String FiltersMenuManager_Filters_ActionLabelText;
-	public static String FiltersMenuManager_Filters_ActionToolTipText;
-	public static String ViewMenuManager_View_ActionLabelText;
-	public static String ViewMenuManager_View_ActionToolTipText;
-	public static String FormatMenuManager_Format_ActionLabelText;
-	public static String PropertyDescriptorFactory_Autosize;
-	public static String PropertyDescriptorFactory_ShowCompartmentTitle;
-	public static String PropertyDescriptorFactory_FillColor;
-	public static String PropertyDescriptorFactory_LineColor;
-	public static String PropertyDescriptorFactory_FontColor;
-	public static String PropertyDescriptorFactory_Router;
-	public static String PropertyDescriptorFactory_Smoothness;
-	public static String PropertyDescriptorFactory_AvoidObstructions;
-	public static String PropertyDescriptorFactory_ClosestDistance;
-	public static String PropertyDescriptorFactory_Font;
-	public static String PropertyDescriptorFactory_FontName;
-	public static String PropertyDescriptorFactory_FontSize;
-	public static String PropertyDescriptorFactory_FontStyle_Bold;
-	public static String PropertyDescriptorFactory_FontStyle_Italic;
-	public static String PropertyDescriptorFactory_Router_Manual;
-	public static String PropertyDescriptorFactory_Router_Rectilinear;
-	public static String PropertyDescriptorFactory_JumplinksStatus;
-	public static String PropertyDescriptorFactory_JumplinksStatus_None;
-	public static String PropertyDescriptorFactory_JumplinksStatus_Above;
-	public static String PropertyDescriptorFactory_JumplinksStatus_Below;
-	public static String PropertyDescriptorFactory_JumplinksStatus_All;
-	public static String PropertyDescriptorFactory_JumplinksType;
-	public static String PropertyDescriptorFactory_JumplinksType_Square;
-	public static String PropertyDescriptorFactory_JumplinksType_SemiCircle;
-	public static String PropertyDescriptorFactory_JumplinksType_Chamfered;
-	public static String PropertyDescriptorFactory_JumplinksReverse;
-	public static String PropertyDescriptorFactory_Smoothness_SmoothNone;
-	public static String PropertyDescriptorFactory_Smoothness_SmoothLess;
-	public static String PropertyDescriptorFactory_Smoothness_SmoothNormal;
-	public static String PropertyDescriptorFactory_Smoothness_SmoothMore;
-	public static String PropertyDescriptorFactory_SortCompartment;
-	public static String PropertyDescriptorFactory_FilterCompartment;
-	public static String PropertyDescriptorFactory_CollapseCompartment;
-	public static String FontAction_text;
-	public static String FontAction_tooltip;
-	public static String FontStyleAction_bold_text;
-	public static String FontStyleAction_bold_tooltip;
-	public static String FontStyleAction_italic_text;
-	public static String FontStyleAction_italic_tooltip;
-	public static String FontNameContributionItem_tooltip;
-	public static String FontSizeContributionItem_tooltip;
-	public static String SameSizeMenuManager_MakeSameSize_ActionLabelText;
-	public static String SameSizeMenuManager_MakeSameSize_ActionToolTipText;
-	public static String SameSizeAction_MakeSameSizeBoth_ActionLabelText;
-	public static String SameSizeAction_MakeSameSizeBoth_ActionToolTipText;
-	public static String SameSizeAction_MakeSameSizeHeight_ActionLabelText;
-	public static String SameSizeAction_MakeSameSizeHeight_ActionToolTipText;
-	public static String SameSizeAction_MakeSameSizeWidth_ActionLabelText;
-	public static String SameSizeAction_MakeSameSizeWidth_ActionToolTipText;
-	public static String OpenWithMenu_OpenWithMenuText;
-	public static String OpenWithMenu_OpenWithMenuTooltip;
-	public static String ChangeRouterAction_Rectilinear_ActionLabelText;
-	public static String ChangeRouterAction_Rectilinear_ActionToolTipText;
-	public static String ChangeRouterAction_Oblique_ActionLabelText;
-	public static String ChangeRouterAction_Oblique_ActionToolTipText;
-	public static String ChangeRouterAction_Tree_ActionLabelText;
-	public static String ChangeRouterAction_Tree_ActionToolTipText;
-	public static String ChangeRouterAction_ChangePropertyValueRequest_label;
-	public static String RouterActionMenu_LineStyleDropDownText;
-	public static String RouterActionMenu_LineStyleDropDownTooltip;
-	public static String SelectActionMenu_SelectDropDownText;
-	public static String SelectActionMenu_SelectDropDownTooltip;
-	public static String SelectAllAction_toolbar_SelectAll;
-	public static String SelectAllAction_toolbar_SelectShapes;
-	public static String SelectAllAction_toolbar_SelectConnections;
-	public static String SelectAllAction_SelectAll;
-	public static String SelectAllAction_SelectShapes;
-	public static String SelectAllAction_SelectConnections;
-	public static String ShowInMenu_ShowInMenuText;
-	public static String ShowInMenu_ShowInMenuTooltip;
-	public static String ZOrderAction_BringToFront_ActionLabelText;
-	public static String ZOrderAction_BringToFront_ActionToolTipText;
-	public static String ZOrderAction_BringForward_ActionLabelText;
-	public static String ZOrderAction_BringForward_ActionToolTipText;
-	public static String ZOrderAction_SendToBack_ActionLabelText;
-	public static String ZOrderAction_SendToBack_ActionToolTipText;
-	public static String ZOrderAction_SendBackward_ActionLabelText;
-	public static String ZOrderAction_SendBackward_ActionToolTipText;
-	public static String ZOrderMenuManager_Order_ActionLabelText;
-	public static String ZOrderMenuManager_Order_ActionToolTipText;
-	public static String AddNoteAction_ActionLabelText;
-	public static String AddNoteAction_ActionToolTipText;
-	public static String Add_menuItem;
-	public static String CopyAppearancePropertiesAction_text;
-	public static String CopyAppearancePropertiesAction_toolTip;
-	public static String DeleteFromDiagram_ActionLabelText;
-	public static String DeleteFromDiagram_ActionToolTipText;
-	public static String PageSetupAction_Label;
-	public static String ViewPageBreaks_textLabel;
-	public static String ViewPageBreaks_toolTip;
-	public static String RecalcPageBreaks_textLabel;
-	public static String RecalcPageBreaks_toolTip;
-	public static String ShowCompartmentTitle_ActionLabelText;
-	public static String ShowCompartmentTitle_ActionToolTipText;
-	public static String SnapBackAction_ActionLabelText;
-	public static String SnapBackAction_ActionToolTipText;
-	public static String ViewGrid_textLabel;
-	public static String ViewGrid_toolTip;
-	public static String SnapToGrid_textLabel;
-	public static String SnapToGrid_toolTip;
-	public static String SortFilterCompartmentsAction_ActionLabelText;
-	public static String SortFilterCompartmentsAction_ActionToolTipText;
-	public static String ViewRuler_textLabel;
-	public static String ViewRuler_toolTip;
-	public static String ColorChangeActionMenu_fontColor;
-	public static String ColorChangeActionMenu_lineColor;
-	public static String ColorChangeActionMenu_fillColor;
-	public static String ColorPropertyChangeAction_white;
-	public static String ColorPropertyChangeAction_lightGray;
-	public static String ColorPropertyChangeAction_gray;
-	public static String ColorPropertyChangeAction_darkGray;
-	public static String ColorPropertyChangeAction_black;
-	public static String ColorPropertyChangeAction_red;
-	public static String ColorPropertyChangeAction_pink;
-	public static String ColorPropertyChangeAction_orange;
-	public static String ColorPropertyChangeAction_yellow;
-	public static String ColorPropertyChangeAction_green;
-	public static String ColorPropertyChangeAction_magenta;
-	public static String ColorPropertyChangeAction_cyan;
-	public static String ColorPropertyChangeAction_blue;
-	public static String ColorPropertyChangeAction_default;
-	public static String ColorPropertyChangeAction_moreColors;
-	public static String ColorPropertyChangeAction_clearColors;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIActionsMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.properties
deleted file mode 100644
index 86b84f2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.properties
+++ /dev/null

@@ -1,287 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2004, 2007  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Diagram Actions General - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- align action menu ---
-# Align: Align the selected shapes in a particular format.  For example, align
-# all the shapes in a vertical line so that their left sides are lined up.
-AlignActionMenu_AlignDropDownText=Ali&gn
-AlignActionMenu_AlignDropDownTooltip=Align
-AlignLeft=&Left
-AlignRight=&Right
-AlignTop=&Top
-AlignBottom=&Bottom
-AlignMiddle=&Middle
-AlignCenter=&Center
-
-# align toolbar action
-# Align: Align the selected shapes in a particular format.  For example, align
-# all the shapes in a vertical line so that their left sides are lined up.
-AlignLeftToolbarAction_Tooltip=Align Left
-AlignLeftToolbarAction_Label=Align &Left
-AlignRightToolbarAction_Tooltip=Align Right
-AlignRightToolbarAction_Label=Align &Right
-AlignTopToolbarAction_Tooltip=Align Top
-AlignTopToolbarAction_Label=Align &Top
-AlignBottomToolbarAction_Tooltip=Align Bottom
-AlignBottomToolbarAction_Label=Align &Bottom
-AlignCenterToolbarAction_Tooltip=Align Center
-AlignCenterToolbarAction_Label=Align &Center
-AlignMiddleToolbarAction_Tooltip=Align Middle
-AlignMiddleToolbarAction_Label=Align &Middle
-
-
-# --- show resizable compartments action menu and actions ---
-ShowAllResizableCompartmentsAction_ShowAllText=A&ll Compartments
-ShowAllResizableCompartmentsAction_ShowAllTooltip=All Compartments
-ShowAllResizableCompartmentsAction_HideAllText=&Name Compartment Only
-ShowAllResizableCompartmentsAction_HideAllTooltip=Name Compartment Only
-ShowResizableCompartmentActionMenu_ShowResizeableCompartmentsText = Show/Hide &Compartment
-ShowResizableCompartmentActionMenu_ShowResizeableCompartmentsTooltip = Show/Hide Compartment
-
-
-ConstrainedFlowLayoutEditPolicy_changeVisibilityCommand_label=Visibility
-
-# --- arrange action and menu ---
-# Arrange: Automatically arranges the selection in such a way so that that
-# all the shapes and connections are spaced out and not overlapping.
-ArrangeAction_ArrangeSelection_ActionLabelText=&Selection
-ArrangeAction_ArrangeSelection_ActionToolTipText=Selection
-ArrangeAction_ArrangeAll_ActionLabelText=&All
-ArrangeAction_ArrangeAll_ActionToolTipText=All
-
-GroupAction_Group_ActionLabelText=&Group Shapes
-GroupAction_Group_ActionToolTipText=Group Shapes
-GroupAction_Ungroup_ActionLabelText=&Ungroup Shapes
-GroupAction_Ungroup_ActionToolTipText=Ungroup Shapes
-
-ArrangeAction_toolbar_ArrangeSelection_ActionLabelText=Arrange &Selection
-ArrangeAction_toolbar_ArrangeSelection_ActionToolTipText=Arrange Selection
-ArrangeAction_toolbar_ArrangeAll_ActionLabelText=Arran&ge All
-ArrangeAction_toolbar_ArrangeAll_ActionToolTipText=Arrange All
-
-ArrangeMenuManager_Arrange_ActionLabelText=A&rrange
-ArrangeMenuManager_Arrange_ActionToolTipText=Arrange
-
-# --- auto size action ---
-AutoSizeAction_ActionLabelText=&Auto Size
-AutoSizeAction_ActionToolTipText=Auto Size
-
-# --- Show/Hide Connection Labels Action ---
-ShowConnectionLabelsActionMenu_ShowConnectionLabelsText = Show/Hide &Connector Labels
-ShowConnectionLabelsActionMenu_ShowConnectionLabelsTooltip = Show/Hide Connector Labels
-ShowConnectionLabelsAction_label = &All Connector Labels
-ShowConnectionLabelsAction_toolTip = All Connector Labels
-HideConnectionLabelsAction_label = N&o Connector Labels
-HideConnectionLabelsAction_toolTip = No Connector Labels
-
-
-# --- copy action, used to copy diagram to bitmap file ---
-CopyAction_Copy=&Copy Bitmap
-CopyAction_ErrorDialogTitle=Out of memory error
-CopyAction_UnableToCopyImageMessage=Unable to copy the image.
-
-# --- context menu submenus
-VisualizeMenuManager_Visualize_ActionLabelText=&Visualize
-VisualizeMenuManager_Visualize_ActionToolTipText=Visualize Menu
-NavigateMenuManager_Navigate_ActionLabelText=&Navigate
-
-FileMenuManager_File_ActionLabelText=&File
-FileMenuManager_File_ActionToolTipText=File Menu
-EditMenuManager_Edit_ActionLabelText=&Edit
-EditMenuManager_Edit_ActionToolTipText=Edit Menu
-FiltersMenuManager_Filters_ActionLabelText=F&ilters
-FiltersMenuManager_Filters_ActionToolTipText=Filters Menu
-ViewMenuManager_View_ActionLabelText=&View
-ViewMenuManager_View_ActionToolTipText=View Menu
-FormatMenuManager_Format_ActionLabelText=For&mat
-
-# --- property descriptor ---
-PropertyDescriptorFactory_Autosize=Autosize
-PropertyDescriptorFactory_ShowCompartmentTitle=Show Compartment Titles
-PropertyDescriptorFactory_FillColor=Fill Color
-PropertyDescriptorFactory_LineColor=Line Color
-PropertyDescriptorFactory_FontColor=Font Color
-PropertyDescriptorFactory_Router=Line Router
-PropertyDescriptorFactory_Smoothness=Smoothness
-PropertyDescriptorFactory_AvoidObstructions=Avoid Obstacles
-PropertyDescriptorFactory_ClosestDistance=Closest Distance
-PropertyDescriptorFactory_Font=Font
-PropertyDescriptorFactory_FontName=Font Name
-PropertyDescriptorFactory_FontSize=Font Size
-PropertyDescriptorFactory_FontStyle_Bold=Bold Font Style
-PropertyDescriptorFactory_FontStyle_Italic=Italic Font Style
-PropertyDescriptorFactory_Router_Manual=Oblique Style
-PropertyDescriptorFactory_Router_Rectilinear=Rectilinear Style
-PropertyDescriptorFactory_JumplinksStatus = Jump-links
-PropertyDescriptorFactory_JumplinksStatus_None = None
-PropertyDescriptorFactory_JumplinksStatus_Above = Above
-PropertyDescriptorFactory_JumplinksStatus_Below = Below
-PropertyDescriptorFactory_JumplinksStatus_All = All
-PropertyDescriptorFactory_JumplinksType = Jump-link type
-PropertyDescriptorFactory_JumplinksType_Square = Square
-PropertyDescriptorFactory_JumplinksType_SemiCircle = Semi-Circle
-PropertyDescriptorFactory_JumplinksType_Chamfered = Chamfered
-PropertyDescriptorFactory_JumplinksReverse = Reverse Jump-link orientation
-PropertyDescriptorFactory_Smoothness_SmoothNone=None
-PropertyDescriptorFactory_Smoothness_SmoothLess=Less
-PropertyDescriptorFactory_Smoothness_SmoothNormal=Normal
-PropertyDescriptorFactory_Smoothness_SmoothMore=More
-PropertyDescriptorFactory_SortCompartment=Sort Compartment
-PropertyDescriptorFactory_FilterCompartment=Filter Compartment
-PropertyDescriptorFactory_CollapseCompartment= Collapse Compartment
-PropertyDescriptorFactory_ShowCompartmentTitle= Show Compartment Title
-
-
-# --- font actions/contribution items
-FontAction_text=&Font...
-FontAction_tooltip=Font
-FontStyleAction_bold_text=Bold
-FontStyleAction_bold_tooltip=Bold Font Style
-FontStyleAction_italic_text=Italic
-FontStyleAction_italic_tooltip=Italic Font Style
-FontNameContributionItem_tooltip=Font Name
-FontSizeContributionItem_tooltip=Font Size
-
-# --- make same size actions and menu
-SameSizeMenuManager_MakeSameSize_ActionLabelText=&Make Same Size
-SameSizeMenuManager_MakeSameSize_ActionToolTipText=Makes selected shapes the same size
-SameSizeAction_MakeSameSizeBoth_ActionLabelText=&Both
-SameSizeAction_MakeSameSizeBoth_ActionToolTipText=Make height and width same size
-SameSizeAction_MakeSameSizeHeight_ActionLabelText=&Height
-SameSizeAction_MakeSameSizeHeight_ActionToolTipText=Make height same size
-SameSizeAction_MakeSameSizeWidth_ActionLabelText=&Width
-SameSizeAction_MakeSameSizeWidth_ActionToolTipText=Make width same size
-
-# --- open with action menu ---
-OpenWithMenu_OpenWithMenuText=Open &With
-OpenWithMenu_OpenWithMenuTooltip=Open With
-
-# --- change router action for connections ---
-ChangeRouterAction_Rectilinear_ActionLabelText=&Rectilinear Style Routing
-ChangeRouterAction_Rectilinear_ActionToolTipText=Change routing to rectilinear style for connectors
-ChangeRouterAction_Oblique_ActionLabelText=&Oblique Style Routing
-ChangeRouterAction_Oblique_ActionToolTipText=Change routing to oblique style for connectors
-ChangeRouterAction_Tree_ActionLabelText=&Tree Style Routing
-ChangeRouterAction_Tree_ActionToolTipText=Change routing to tree style for connectors
-ChangeRouterAction_ChangePropertyValueRequest_label=Routing
-
-# --- router action menu ---
-RouterActionMenu_LineStyleDropDownText=Line &Style
-RouterActionMenu_LineStyleDropDownTooltip=Line Style
-
-# --- select action menu and select all action ---
-SelectActionMenu_SelectDropDownText=Se&lect
-SelectActionMenu_SelectDropDownTooltip=Select
-SelectAllAction_toolbar_SelectAll=Select &All
-SelectAllAction_toolbar_SelectShapes=Select All &Shapes
-SelectAllAction_toolbar_SelectConnections=Select All &Connectors
-SelectAllAction_SelectAll=&All
-SelectAllAction_SelectShapes=All &Shapes
-SelectAllAction_SelectConnections=All &Connectors
-
-# --- showIn action menu ---
-ShowInMenu_ShowInMenuText=&Show in
-ShowInMenu_ShowInMenuTooltip=Show in
-
-
-# --- z order actions and menu ---
-ZOrderAction_BringToFront_ActionLabelText=Bring to &Front
-ZOrderAction_BringToFront_ActionToolTipText=Bring To Front
-ZOrderAction_BringForward_ActionLabelText=Bring F&orward
-ZOrderAction_BringForward_ActionToolTipText=Bring Forward
-ZOrderAction_SendToBack_ActionLabelText=Send to &Back
-ZOrderAction_SendToBack_ActionToolTipText=Send To Back
-ZOrderAction_SendBackward_ActionLabelText=Send B&ackward
-ZOrderAction_SendBackward_ActionToolTipText=Send Backward
-# Order: Change the overlay order of the selected shapes with respect to each other,
-# e.g., when one shape is over top of another you move the top one to the bottom.
-ZOrderMenuManager_Order_ActionLabelText=&Order
-ZOrderMenuManager_Order_ActionToolTipText=Order
-
-
-# --- add note action ---
-AddNoteAction_ActionLabelText=Add N&ote
-AddNoteAction_ActionToolTipText=Add Note
-
-
-Add_menuItem = &Add
-
-
-
-# --- copy appearance properties action ---
-CopyAppearancePropertiesAction_text=Apply Appearance &Properties
-CopyAppearancePropertiesAction_toolTip=Apply the applicable appearance properties of the first selected shape to the other \nselected shapes.
-
-
-# --- Global Actions
-DeleteFromDiagram_ActionLabelText = &Delete from Diagram
-DeleteFromDiagram_ActionToolTipText = Delete from Diagram
-
-PageSetupAction_Label=Page Setup...
-
-# --- Page Breaks actions ---
-ViewPageBreaks_textLabel=&Page Breaks
-ViewPageBreaks_toolTip=Show the page breaks on the diagram
-RecalcPageBreaks_textLabel=&Recalculate Page Breaks
-RecalcPageBreaks_toolTip=Recalculate Page Breaks
-
-#-- show compartment title action ---
-ShowCompartmentTitle_ActionLabelText=Show Compartment Title
-ShowCompartmentTitle_ActionToolTipText=Show/Hide Compartment Title
-
-
-# --- snap back action ---
-SnapBackAction_ActionLabelText=Snap &Back
-SnapBackAction_ActionToolTipText=Snap Back
-
-# --- Grid actions ---
-ViewGrid_textLabel=&Grid
-ViewGrid_toolTip=Toggle the grid lines on the diagram
-SnapToGrid_textLabel=&Snap to Grid
-SnapToGrid_toolTip=Toggle Snap to Grid
-
-
-# --- Sort Filter action ---
-SortFilterCompartmentsAction_ActionLabelText = Sort/&Filter Compartment Items...
-SortFilterCompartmentsAction_ActionToolTipText = Sort or Filter Compartments Items for this shape
-
-# --- Ruler actions ---
-ViewRuler_textLabel=&Rulers
-ViewRuler_toolTip=Toggle the rulers on the diagram
-
-
-# --- color change action menu and actions ---
-ColorChangeActionMenu_fontColor=Font Color
-ColorChangeActionMenu_lineColor=Li&ne Color
-ColorChangeActionMenu_fillColor=Fill &Color
-
-ColorPropertyChangeAction_white=White
-ColorPropertyChangeAction_lightGray=Light Gray
-ColorPropertyChangeAction_gray=Gray
-ColorPropertyChangeAction_darkGray=Dark Gray
-ColorPropertyChangeAction_black=Black
-ColorPropertyChangeAction_red=Red
-ColorPropertyChangeAction_pink=Pink
-ColorPropertyChangeAction_orange=Orange
-ColorPropertyChangeAction_yellow=Yellow
-ColorPropertyChangeAction_green=Green
-ColorPropertyChangeAction_magenta=Magenta
-ColorPropertyChangeAction_cyan=Cyan
-ColorPropertyChangeAction_blue=Blue
-ColorPropertyChangeAction_default=Default Color
-ColorPropertyChangeAction_moreColors=More Colors ...
-ColorPropertyChangeAction_clearColors=Clear Custom Colors

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsPluginImages.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsPluginImages.java
deleted file mode 100644
index 193f681..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsPluginImages.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionsPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly. The public
- * strings represent images that will be cached and can be retrieved using
- * {@link #get(String)} which should <b>not</b> be disposed by the client.
- *
- * @author cmahoney
- */
-public class DiagramUIActionsPluginImages {
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "icons/"; //$NON-NLS-1$
-
-	/**
-	 * Enabled subdirectory off of root icon directory
-	 */
-	private static final String PREFIX_ENABLED = PREFIX_ROOT + "elcl16/"; //$NON-NLS-1$
-
-	/**
-	 * Disabled subdirectory off of root icon directory
-	 */
-	private static final String PREFIX_DISABLED = PREFIX_ROOT + "dlcl16/"; //$NON-NLS-1$
-
-	// Image descriptors.
-
-	public static final ImageDescriptor DESC_NOTE_ATTACHMENT = create(PREFIX_ROOT + "noteattachment.gif");//$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_ARRANGE_SELECTED = create(PREFIX_ENABLED
-		+ "arrangeselected.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARRANGE_SELECTED_DISABLED = create(PREFIX_DISABLED
-		+ "arrangeselected.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_ARRANGE_ALL = create(PREFIX_ENABLED
-		+ "arrangeall.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARRANGE_ALL_DISABLED = create(PREFIX_DISABLED
-		+ "arrangeall.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SHOW_HIDE_COMPARTMENTS_GROUP = create(PREFIX_ENABLED
-		+ "show_compartments_group.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHOW_HIDE_COMPARTMENTS_GROUP_DISABLED = create(PREFIX_DISABLED
-		+ "show_compartments_group.gif"); //$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_SHOW_ALL_RESIZABLE_COMPARTMENTS = create(PREFIX_ROOT + "all_comp_vis.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_HIDE_ALL_RESIZABLE_COMPARTMENTS = create(PREFIX_ROOT + "none_comp_vis.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SHOW_HIDE_CONNECTION_LABELS_GROUP = create(PREFIX_ENABLED
-		+ "show_connector_group.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHOW_HIDE_CONNECTION_LABELS_GROUP_DISABLED = create(PREFIX_DISABLED
-		+ "show_connector_group.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_CHANGEROUTER_GROUP = create(PREFIX_ENABLED
-		+ "line_style_group.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CHANGEROUTER_GROUP_DISABLED = create(PREFIX_DISABLED
-		+ "line_style_group.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_CHANGEROUTERACTION_RECTILINEAR = create(PREFIX_ENABLED
-		+ "rectilinear.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CHANGEROUTERACTION_RECTILINEAR_DISABLED = create(PREFIX_DISABLED
-		+ "rectilinear.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_CHANGEROUTERACTION_OBLIQUE = create(PREFIX_ENABLED
-		+ "oblique.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CHANGEROUTERACTION_OBLIQUE_DISABLED = create(PREFIX_DISABLED
-		+ "oblique.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_CHANGEROUTERACTION_TREE = create(PREFIX_ENABLED
-		+ "tree.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CHANGEROUTERACTION_TREE_DISABLED = create(PREFIX_DISABLED
-		+ "tree.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_AUTOSIZE = create(PREFIX_ENABLED + "autosize.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_AUTOSIZE_DISABLED = create(PREFIX_DISABLED
-		+ "autosize.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SELECTALL = create(PREFIX_ENABLED
-		+ "selectall.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SELECTALL_DISABLED = create(PREFIX_DISABLED
-		+ "selectall.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SELECTSHAPES = create(PREFIX_ENABLED
-		+ "selectshapes.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SELECTSHAPES_DISABLED = create(PREFIX_DISABLED
-		+ "selectshapes.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SELECTCONNECTIONS = create(PREFIX_ENABLED
-		+ "selectconnectors.gif"); //$NON-NLS-1$	
-	public static final ImageDescriptor DESC_SELECTCONNECTIONS_DISABLED = create(PREFIX_DISABLED
-		+ "selectconnectors.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_ALIGN = create(PREFIX_ROOT + "aleft.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_BOLD = create(PREFIX_ENABLED + "bold.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_BOLD_DISABLED = create(PREFIX_DISABLED
-		+ "bold.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_ITALIC = create(PREFIX_ENABLED + "italic.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ITALIC_DISABLED = create(PREFIX_DISABLED
-		+ "italic.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_FONT_COLOR = create(PREFIX_ENABLED
-		+ "font_color.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FONT_COLOR_DISABLED = create(PREFIX_DISABLED
-		+ "font_color.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_FILL_COLOR = create(PREFIX_ENABLED
-		+ "fill_color.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FILL_COLOR_DISABLED = create(PREFIX_DISABLED
-		+ "fill_color.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_LINE_COLOR = create(PREFIX_ENABLED
-		+ "line_color.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_COLOR_DISABLED = create(PREFIX_DISABLED
-		+ "line_color.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_VIEWPAGEBREAKS = create(PREFIX_ENABLED
-		+ "viewpagebreaks.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_VIEWPAGEBREAKS_DISABLED = create(PREFIX_DISABLED
-		+ "viewpagebreaks.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RECALCPAGEBREAKS = create(PREFIX_ENABLED
-		+ "recalcpagebreaks.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_RECALCPAGEBREAKS_DISABLED = create(PREFIX_DISABLED
-		+ "recalcpagebreaks.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SNAPBACK = create(PREFIX_ROOT + "snapback.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SHOW_CONNECTION_LABELS = create(PREFIX_ENABLED
-		+ "showconnector.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHOW_CONNECTION_LABELS_DISABLED = create(PREFIX_DISABLED
-		+ "showconnector.gif"); //$NON-NLS-1$			
-	public static final ImageDescriptor DESC_HIDE_CONNECTION_LABELS = create(PREFIX_ENABLED
-		+ "hideconnector.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HIDE_CONNECTION_LABELS_DISABLED = create(PREFIX_DISABLED
-		+ "hideconnector.gif"); //$NON-NLS-1$		
-
-	public static final ImageDescriptor DESC_SORT_FILTER = create(PREFIX_ENABLED
-		+ "sortfilter.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SORT_FILTER_DISABLED = create(PREFIX_DISABLED
-		+ "sortfilter.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_BRING_TO_FRONT = create(PREFIX_ENABLED + "bring_to_front.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_BRING_FORWARD = create(PREFIX_ENABLED + "bring_forward.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SEND_TO_BACK = create(PREFIX_ENABLED + "send_to_back.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SEND_BACWARD = create(PREFIX_ENABLED + "send_backward.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_MAKE_SAME_SIZE_BOTH = create(PREFIX_ROOT + "size_to_control.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_MAKE_SAME_SIZE_HEIGHT = create(PREFIX_ROOT + "size_to_control_height.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_MAKE_SAME_SIZE_WIDTH = create(PREFIX_ROOT + "size_to_control_width.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_COPY_APPEARANCE = create(PREFIX_ENABLED
-		+ "copy_appearance_properties.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COPY_APPEARANCE_DISABLED = create(PREFIX_DISABLED
-		+ "copy_appearance_properties.gif"); //$NON-NLS-1$	
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(DiagramActionsPlugin
-			.getPluginId(), imageName);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/package.html
deleted file mode 100644
index 8ce1ae8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.actions.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/package.html
deleted file mode 100644
index f1340de..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/package.html b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/package.html
deleted file mode 100644
index 4ac37a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/.classpath b/org.eclipse.gmf.runtime.diagram.ui.dnd/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.dnd/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.dnd/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/.project b/org.eclipse.gmf.runtime.diagram.ui.dnd/.project
deleted file mode 100644
index ee31a12..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.dnd</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/org.eclipse.gmf.runtime.diagram.ui.dnd/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.dnd/META-INF/MANIFEST.MF
deleted file mode 100644
index bfe4e0a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.dnd
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.dnd.internal.DiagramDnDPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.dnd.internal;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.dnd.parts
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.dnd;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/about.html b/org.eclipse.gmf.runtime.diagram.ui.dnd/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/build.properties b/org.eclipse.gmf.runtime.diagram.ui.dnd/build.properties
deleted file mode 100644
index a876a33..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.dnd/plugin.properties
deleted file mode 100644
index 991966d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram Browse - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram Browse
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDDebugOptions.java
deleted file mode 100644
index 8b6cc55..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDDebugOptions.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.dnd.internal;
-
-/**
- * A list of debug options for this plug-in.
- *
- * @author tmacdoug
- *
- */
-public final class DiagramDnDDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *
-	 */
-	private DiagramDnDDebugOptions() {
-		// Do nothing
-	}
-
-	public static final String DEBUG = DiagramDnDPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDPlugin.java
deleted file mode 100644
index d33b7ae..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDPlugin.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
- package org.eclipse.gmf.runtime.diagram.ui.dnd.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DiagramDnDPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static DiagramDnDPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramDnDPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the plugin instance
-	 */
-	public static DiagramDnDPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 *
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDStatusCodes.java
deleted file mode 100644
index 5d774f8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/DiagramDnDStatusCodes.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.dnd.internal;
-
-/**
- * A list of status codes for this plug-in.
- *
- * @author tmacdoug
- *
- */
-public final class DiagramDnDStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *
-	 */
-	private DiagramDnDStatusCodes() {
-		// Do nothing
-	}
-
-	public static final int OK = 0;
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/package.html
deleted file mode 100644
index 6500364..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.dnd.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/DiagramGraphicalViewerWithDnD.java b/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/DiagramGraphicalViewerWithDnD.java
deleted file mode 100644
index 1b10848..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/DiagramGraphicalViewerWithDnD.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.dnd.parts;
-
-import org.eclipse.gef.dnd.DelegatingDropAdapter;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTarget;
-
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-
-
-/**
- * @author tmacdoug
- *
- * Extension of the diagram graphical viewer to include drag and drop 
- * functionality
- * 
- */
-public class DiagramGraphicalViewerWithDnD extends DiagramGraphicalViewer {
-
-    /* 
-     * Attribute for the drop adapter
-     */
-    private final DiagramViewerDropAdapter dropAdapter;	
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param dropAdapter
-	 *            The dropAdapter to set.
-	 */
-	public DiagramGraphicalViewerWithDnD(DiagramViewerDropAdapter dropAdapter) {
-		super();
-		this.dropAdapter = dropAdapter;
-	}
-
-    /* 
-     * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#getDelegatingDropAdapter()
-     */
-    protected DelegatingDropAdapter getDelegatingDropAdapter() {
-    	if ( this.dropAdapter == null ) {
-    		return super.getDelegatingDropAdapter();
-    	}
-    	
-    	return this.dropAdapter;
-    }
-
-	/* 
-	 * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#refreshDropTargetAdapter()
-	 */
-	protected void refreshDropTargetAdapter() {
-		if (getControl() == null)
-			return;
-		if (getDelegatingDropAdapter() == null)
-			setDropTarget(null);
-		else {
-			if (getDropTarget() == null)
-				setDropTarget(
-					new DropTarget(
-						getControl(),
-						DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK));
-			
-			if (this.dropAdapter != null && !this.dropAdapter.isInitialized())
-				this.dropAdapter.initialize(getControl());		
-
-			getDropTarget().setTransfer(getDelegatingDropAdapter().getTransfers());
-		}
-	}  
-	
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/DiagramViewerDropAdapter.java b/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/DiagramViewerDropAdapter.java
deleted file mode 100644
index 2414411..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/DiagramViewerDropAdapter.java
+++ /dev/null

@@ -1,279 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.dnd.parts;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.gef.dnd.DelegatingDropAdapter;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.DelegatingDropTargetAdapter;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.DropTargetContext;
-import org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetContext;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-
-/**
- * This class extends the GEF drop target adapter. It delgates all the drop
- * events to the
- * <code>org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DelegatingDropTargetAdapter</code>
- * If there are no drop target listeners registered with the common
- * infrastructure, then the drop events are delegated to the parent adpater
- * 
- * @author Vishy Ramaswamy
- * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.DelegatingDropTargetAdapter
- */
-public class DiagramViewerDropAdapter
-	extends DelegatingDropAdapter {
-
-	/**
-	 * Inner class that extends the drop target context to provide graphical
-	 * viewer specific behaviour
-	 * 
-	 * @author Vishy Ramaswamy
-	 */
-	private final class DiagramViewerDropTargetContext
-		extends DropTargetContext {
-
-		/**
-		 * Constructor for DiagramViewerDropTargetContext
-		 * 
-		 * @param activePart
-		 * @param viewerControl
-		 */
-		public DiagramViewerDropTargetContext(IWorkbenchPart activePart,
-				Control viewerControl) {
-			super(activePart, viewerControl);
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DropTargetContext#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		protected void dragEnter(DropTargetEvent event) {
-			DiagramViewerDropAdapter.super.dragEnter(event);
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DropTargetContext#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		protected void dragLeave(DropTargetEvent event) {
-			DiagramViewerDropAdapter.super.dragLeave(event);
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DropTargetContext#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		protected void dragOperationChanged(DropTargetEvent event) {
-			DiagramViewerDropAdapter.super.dragOperationChanged(event);
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DropTargetContext#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		protected void dragOver(DropTargetEvent event) {
-			DiagramViewerDropAdapter.super.dragOver(event);
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DropTargetContext#drop(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		protected void drop(DropTargetEvent event) {
-			DiagramViewerDropAdapter.super.drop(event);
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DropTargetContext#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		protected void dropAccept(DropTargetEvent event) {
-			DiagramViewerDropAdapter.super.dropAccept(event);
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.internal.dnd.drop.DropTargetContext#setCurrentTargetAndLocation(org.eclipse.swt.dnd.DropTargetEvent)
-		 */
-		protected void setCurrentTargetAndLocation(DropTargetEvent event) {
-			/* Set the location */
-			location = getViewerControl()
-				.toControl(new Point(event.x, event.y));
-
-			/* Set the target */
-			org.eclipse.draw2d.geometry.Point gefPoint = new org.eclipse.draw2d.geometry.Point(
-				location.x, location.y);
-
-			target = DiagramViewerDropAdapter.this.getWorkbenchPart()
-				.getDiagramGraphicalViewer().findObjectAt(gefPoint);
-
-			/* Set the relative location */
-			relativeLocation = IDropTargetContext.LOCATION_NONE;
-		}
-	}
-
-	/**
-	 * Attribute for the diagram workbench part.
-	 */
-	private final IDiagramWorkbenchPart workbenchPart;
-
-	/**
-	 * Attribute for the delegating drop target adapter
-	 */
-	private DelegatingDropTargetAdapter internalDropAdapter;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param workbenchPart
-	 *            the diagram workbench part
-	 */
-	public DiagramViewerDropAdapter(IDiagramWorkbenchPart workbenchPart) {
-		Assert.isNotNull(workbenchPart);
-
-		/* Set the part */
-		this.workbenchPart = workbenchPart;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.DelegatingDropAdapter#getTransfers()
-	 */
-	public Transfer[] getTransfers() {
-		if (getInternalDropAdapter() == null) {
-			return super.getTransfers();
-		}
-
-		/* Get all the transfers */
-		Transfer[] allTransferAgents = getInternalDropAdapter()
-			.getAllTransferAgents();
-		Transfer[] superTransferTypes = super.getTransfers();
-
-		/* Combine the transfers */
-		List myTransfers = null;
-		List superTransfers = null;
-
-		if (allTransferAgents != null)
-			myTransfers = Arrays.asList(allTransferAgents);
-
-		if (superTransferTypes != null)
-			superTransfers = Arrays.asList(superTransferTypes);
-
-		ArrayList allTransfers = new ArrayList();
-		if (superTransfers != null)
-			allTransfers.addAll(superTransfers);
-		if (myTransfers != null)
-			allTransfers.addAll(myTransfers);
-
-		Transfer[] arrTransfers = new Transfer[allTransfers.size()];
-		arrTransfers = (Transfer[]) allTransfers.toArray(arrTransfers);
-		return arrTransfers;
-	}
-
-	/**
-	 * Return the delegating drop adapter
-	 * 
-	 * @return DelegatingDropTargetAdapter
-	 */
-	private DelegatingDropTargetAdapter getInternalDropAdapter() {
-		return internalDropAdapter;
-	}
-
-	/**
-	 * Initializes the delegating drop adapter
-	 * 
-	 * @param control
-	 *            the viewer's control
-	 */
-	protected final void initialize(Control control) {
-		if (this.internalDropAdapter == null) {
-			Assert.isNotNull(control);
-			/* Create the drop adapter */
-			DiagramViewerDropTargetContext context = new DiagramViewerDropTargetContext(
-				getWorkbenchPart(), control);
-			this.internalDropAdapter = new DelegatingDropTargetAdapter(context);
-		}
-	}
-
-	/*
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragEnter(DropTargetEvent event) {
-		getInternalDropAdapter().dragEnter(event);
-	}
-
-	/*
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragLeave(DropTargetEvent event) {
-		getInternalDropAdapter().dragLeave(event);
-	}
-
-	/*
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOperationChanged(DropTargetEvent event) {
-		getInternalDropAdapter().dragOperationChanged(event);
-	}
-
-	/*
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dragOver(DropTargetEvent event) {
-		getInternalDropAdapter().dragOver(event);
-	}
-
-	/*
-	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void drop(DropTargetEvent event) {
-		getInternalDropAdapter().drop(event);
-	}
-
-	/*
-	 * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void dropAccept(DropTargetEvent event) {
-		getInternalDropAdapter().dropAccept(event);
-	}
-
-	/**
-	 * Returns the diagram workbenchPart.
-	 * 
-	 * @return the workbenchPart.
-	 */
-	private IDiagramWorkbenchPart getWorkbenchPart() {
-		return this.workbenchPart;
-	}
-
-	/*
-	 * @see org.eclipse.jface.util.DelegatingDropAdapter#isEmpty()
-	 */
-	public boolean isEmpty() {
-		Transfer[] transfers = getTransfers();
-		if (transfers != null && transfers.length > 0) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns the isInitialized.
-	 * 
-	 * @return the isInitialized.
-	 */
-	protected final boolean isInitialized() {
-		return getInternalDropAdapter() != null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/package.html b/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/package.html
deleted file mode 100644
index a8e4069..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.classpath b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.project b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.project
deleted file mode 100644
index 230d0a8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.geoshapes</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.template b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/META-INF/MANIFEST.MF
deleted file mode 100644
index 0d32530..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.geoshapes; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.GeoshapesPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.ui.actions;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.views.factories;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.gef.ui;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/about.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/build.properties b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/build.properties
deleted file mode 100644
index 25ff950..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/Icon3DRectangle.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/Icon3DRectangle.gif
deleted file mode 100644
index e613b02..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/Icon3DRectangle.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/Icon3DRectangle24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/Icon3DRectangle24.gif
deleted file mode 100644
index 6af4dbe..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/Icon3DRectangle24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCircle.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCircle.gif
deleted file mode 100644
index 76e200b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCircle.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCircle24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCircle24.gif
deleted file mode 100644
index 4046304..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCircle24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCylinder.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCylinder.gif
deleted file mode 100644
index d3b326a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCylinder.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCylinder24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCylinder24.gif
deleted file mode 100644
index fc23f11..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCylinder24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconDiamond.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconDiamond.gif
deleted file mode 100644
index 5f64996..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconDiamond.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconDiamond24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconDiamond24.gif
deleted file mode 100644
index 4ff3840..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconDiamond24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconEllipse.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconEllipse.gif
deleted file mode 100644
index de91a16..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconEllipse.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconEllipse24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconEllipse24.gif
deleted file mode 100644
index ab95dae..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconEllipse24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconHexagon.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconHexagon.gif
deleted file mode 100644
index 40b7df1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconHexagon.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconHexagon24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconHexagon24.gif
deleted file mode 100644
index 8ea531c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconHexagon24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconLine.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconLine.gif
deleted file mode 100644
index 8fa9f60..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconLine.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconLine24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconLine24.gif
deleted file mode 100644
index 6b41613..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconLine24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconOctagon.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconOctagon.gif
deleted file mode 100644
index c310ccc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconOctagon.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconOctagon24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconOctagon24.gif
deleted file mode 100644
index 98bf44c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconOctagon24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconPentagon.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconPentagon.gif
deleted file mode 100644
index aeb2eeb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconPentagon.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconPentagon24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconPentagon24.gif
deleted file mode 100644
index 5745852..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconPentagon24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRectangle.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRectangle.gif
deleted file mode 100644
index f0f9cb1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRectangle.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRectangle24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRectangle24.gif
deleted file mode 100644
index 272899e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRectangle24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRoundRectangle.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRoundRectangle.gif
deleted file mode 100644
index 4f88635..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRoundRectangle.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRoundRectangle24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRoundRectangle24.gif
deleted file mode 100644
index 02048d7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconRoundRectangle24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconShadowRectangle.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconShadowRectangle.gif
deleted file mode 100644
index fc3134d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconShadowRectangle.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconShadowRectangle24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconShadowRectangle24.gif
deleted file mode 100644
index b398c46..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconShadowRectangle24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconSquare.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconSquare.gif
deleted file mode 100644
index 673afec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconSquare.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconSquare24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconSquare24.gif
deleted file mode 100644
index 128fcc1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconSquare24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconTriangle.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconTriangle.gif
deleted file mode 100644
index f255d6c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconTriangle.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconTriangle24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconTriangle24.gif
deleted file mode 100644
index 67f69f5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconTriangle24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/polygon_multitype.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/polygon_multitype.gif
deleted file mode 100644
index a3b2f56..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/polygon_multitype.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/polygon_multitype24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/polygon_multitype24.gif
deleted file mode 100644
index 6986197..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/polygon_multitype24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/rectangle_multitype.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/rectangle_multitype.gif
deleted file mode 100644
index a76b4aa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/rectangle_multitype.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/rectangle_multitype24.gif b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/rectangle_multitype24.gif
deleted file mode 100644
index 2c89965..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/rectangle_multitype24.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/plugin.properties
deleted file mode 100644
index f607b2e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/plugin.properties
+++ /dev/null

@@ -1,75 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram Clazz - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Geometric Shapes
-Plugin.providerName = Eclipse.org
-
-ext.modelingAssistantProvider = Geoshape Modeling Assistant Provider
-
-# ==============================================================================
-# Geometric Shapes - Palette -  Translation Instruction:  section to be 
-# translated
-# ==============================================================================
-GeoshapeDrawer.Label = Geometric Shapes
-GeoshapeDrawer.Description = Geometric Shapes Drawer
-
-RectangleStack.Label = Rectangle Shapes
-RectangleStack.Description = Rectangle Shapes Stack
-
-RectangleMultiTool.Label = Rectangle Types
-RectangleMultiTool.Description = Create various types of rectangles
-
-PolygonStack.Label = Polygon Shapes
-PolygonStack.Description = Polygon Shapes Stack
-
-LineTool.Label = Line
-LineTool.Description = Create a Line
-
-OvalTool.Label = Oval
-OvalTool.Description = Create an Oval Shape
-
-TriangleTool.Label = Triangle
-TriangleTool.Description = Create a Triangle Shape
-
-RectangleTool.Label = Rectangle
-RectangleTool.Description = Create a Rectangle Shape
-
-ShadowRectangleTool.Label = Shadow Rectangle
-ShadowRectangleTool.Description = Create a Shadow Rectangle Shape
-
-3DRectangleTool.Label = 3D Rectangle
-3DRectangleTool.Description = Create a 3D Rectangle Shape
-
-RoundRectangleTool.Label = Rounded Rectangle
-RoundRectangleTool.Description = Create a Rounded Rectangle Shape
-
-HexagonTool.Label = Hexagon
-HexagonTool.Description = Create a Hexagon Shape
-
-OctagonTool.Label = Octagon
-OctagonTool.Description = Create an Octagon Shape
-
-PentagonTool.Label = Pentagon
-PentagonTool.Description = Create a Pentagon Shape
-
-DiamondTool.Label = Diamond
-DiamondTool.Description = Create a Diamond Shape
-
-CylinderTool.Label = Cylinder
-CylinderTool.Description = Create a Cylinder Shape
-
-PolygonTool.Label = Polygon
-PolygonTool.Description = Create a Polygon Shape

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/plugin.xml
deleted file mode 100644
index 9a0551f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/plugin.xml
+++ /dev/null

@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-    
-<!-- Icon Provider -->
-   <extension
-         id="iconProviders"
-         name="%ext.iconProviders"
-         point="org.eclipse.gmf.runtime.common.ui.services.iconProviders">
-      <IconProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoShapeIconProvider">
-         <Priority
-               name="Medium">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.notation.View(org.eclipse.gmf.runtime.notation)" id="GeoShape">
-        	 <method name="getType()" value="oval,triangle,rectangle,shadowRectangle,rectangle3D,roundRectangle,hexagon,octagon,pentagon,diamond,cylinder,line"/>
-	     </object>
-         <context elements="GeoShape">
-         </context>
-      </IconProvider>
-   </extension>
-
-<!-- View Provider -->
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-      <viewProvider
-            class=" org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapeViewProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <context
-               viewClass="org.eclipse.gmf.runtime.notation.Node"
-               semanticHints="oval, triangle, rectangle, shadowRectangle, rectangle3D, roundRectangle, hexagon, octagon, pentagon, diamond, cylinder, polygon">
-         </context>
-         <context
-               viewClass="org.eclipse.gmf.runtime.notation.Edge"
-               semanticHints="line">
-         </context>
-      </viewProvider>
-   </extension>
-<!-- EditPart Provider -->
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapeEditPartProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="GeoShapeLine">
-        	 <method name="getType()" value="oval,triangle,rectangle,shadowRectangle,rectangle3D,roundRectangle,hexagon,octagon,pentagon,diamond,cylinder"/>
-	     </object>
-	     <object class="org.eclipse.gmf.runtime.notation.Edge" id="GeoShape">
-        	 <method name="getType()" value="line"/>
-	     </object>
-         <context
-               views="GeoShape, GeoShapeLine">
-         </context>
-      </editpartProvider>
-   </extension>
-<!-- Pop-up Action Contributions -->
-   <extension
-         id="GeoshapeContributionItemProvider"
-         name="%ext.contributionItemProvider"
-         point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapeContributionItemProvider"
-            checkPluginLoaded="false">
-         <Priority
-               name="High">
-         </Priority>
-<!--  Add the Add Geometric Shapes menu to the popup menu -->
-         <popupContribution
-               class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria
-                  objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-            </popupStructuredContributionCriteria>
-                                   
-             <popupMenuGroup
-                  path="/diagramAddMenu/"
-                  separator="true"
-                  id="addGeoShapesGroup">
-            </popupMenuGroup>
-            <popupMenuGroup
-                  path="/diagramAddMenu/"
-                  separator="true"
-                  id="addGeoShapes2Group">
-            </popupMenuGroup>            
-            
-			<!--  Insert the Add Oval menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapesGroup"
-                  id="addOvalAction">
-            </popupAction>
-			<!--  Insert the Add Triangle menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapesGroup"
-                  id="addTriangleAction">
-            </popupAction>
-			<!--  Insert the Add Rectangle menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapesGroup"
-                  id="addRectangleAction">
-            </popupAction>
-			<!--  Insert the Add Diamond menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapesGroup"
-                  id="addDiamondAction">
-            </popupAction>
-			<!--  Insert the Add Pentagon menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapesGroup"
-                  id="addPentagonAction">
-            </popupAction>          
-			<!--  Insert the Add Hexagon menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapesGroup"
-                  id="addHexagonAction">
-            </popupAction>
-			<!--  Insert the Add Octagon menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapesGroup"
-                  id="addOctagonAction">
-            </popupAction>            
-            
-			<!--  Insert the Add Shadow Rectangle menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapes2Group"
-                  id="addShadowRectangleAction">
-            </popupAction>
-			<!--  Insert the Add Rounded Rectangle menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapes2Group"
-                  id="addRoundRectangleAction">
-            </popupAction>
-			<!--  Insert the Add 3d Rectangle menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapes2Group"
-                  id="add3DRectangleAction">
-            </popupAction>
-			<!--  Insert the Add Cylinder menu item -->
-            <popupAction
-                  path="/diagramAddMenu/addGeoShapes2Group"
-                  id="addCylinderAction">
-            </popupAction>
-         </popupContribution>
-      </contributionItemProvider>
-   </extension>
-<!-- Palette Provider -->
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Low">
-         </Priority>
-         <editor
-               class="org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart">
-         </editor>
-         <contribution
-               factoryClass="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapePaletteFactory">
-            <entry
-                  defineOnly="true"
-                  label="%GeoshapeDrawer.Label"
-                  kind="drawer"
-                  description="%GeoshapeDrawer.Description"
-                  path="/"
-                  id="geoshapeDrawer">
-            </entry>
-            <entry
-                  label="%OvalTool.Label"
-                  kind="tool"
-                  description="%OvalTool.Description"
-                  large_icon="icons/IconEllipse24.gif"
-                  path="/geoshapeDrawer/"
-                  small_icon="icons/IconEllipse.gif"
-                  id="oval">
-            </entry>
-            <entry
-                  label="%CylinderTool.Label"
-                  kind="tool"
-                  description="%CylinderTool.Description"
-                  large_icon="icons/IconCylinder24.gif"
-                  path="/geoshapeDrawer/"
-                  small_icon="icons/IconCylinder.gif"
-                  id="cylinder">
-            </entry>
-            <entry
-                  label="%RectangleStack.Label"
-                  kind="stack"
-                  description="%RectangleStack.Description"
-                  large_icon="icons/IconRectangle24.gif"
-                  small_icon="icons/IconRectangle.gif"
-                  path="/geoshapeDrawer/"
-                  id="rectangleStack">
-            </entry>
-            <entry
-                  label="%RectangleMultiTool.Label"
-                  kind="tool"
-                  description="%RectangleMultiTool.Description"
-                  large_icon="icons/rectangle_multitype24.gif"
-                  path="/geoshapeDrawer/rectangleStack"
-                  small_icon="icons/rectangle_multitype.gif"
-                  id="rectangleMultiTool">
-            </entry>
-            <entry
-                  label="%RectangleTool.Label"
-                  kind="tool"
-                  description="%RectangleTool.Description"
-                  large_icon="icons/IconRectangle24.gif"
-                  path="/geoshapeDrawer/rectangleStack"
-                  small_icon="icons/IconRectangle.gif"
-                  id="rectangle">
-            </entry>
-            <entry
-                  label="%ShadowRectangleTool.Label"
-                  kind="tool"
-                  description="%ShadowRectangleTool.Description"
-                  large_icon="icons/IconShadowRectangle24.gif"
-                  path="/geoshapeDrawer/rectangleStack"
-                  small_icon="icons/IconShadowRectangle.gif"
-                  id="shadowRectangle">
-            </entry>
-            <entry
-                  label="%3DRectangleTool.Label"
-                  kind="tool"
-                  description="%3DRectangleTool.Description"
-                  large_icon="icons/Icon3DRectangle24.gif"
-                  path="/geoshapeDrawer/rectangleStack"
-                  small_icon="icons/Icon3DRectangle.gif"
-                  id="rectangle3D">
-            </entry>
-            <entry
-                  label="%RoundRectangleTool.Label"
-                  kind="tool"
-                  description="%RoundRectangleTool.Description"
-                  large_icon="icons/IconRoundRectangle24.gif"
-                  path="/geoshapeDrawer/rectangleStack"
-                  small_icon="icons/IconRoundRectangle.gif"
-                  id="roundRectangle">
-            </entry>
-            <entry
-                  label="%PolygonStack.Label"
-                  kind="stack"
-                  description="%PolygonStack.Description"
-                  large_icon="icons/IconPentagon24.gif"
-                  small_icon="icons/IconPentagon.gif"
-                  path="/geoshapeDrawer/"
-                  id="polygonStack">
-            </entry>
-            <entry
-                  label="%PolygonTool.Label"
-                  kind="tool"
-                  description="%PolygonTool.Description"
-                  large_icon="icons/polygon_multitype24.gif"
-                  path="/geoshapeDrawer/polygonStack"
-                  small_icon="icons/polygon_multitype.gif"
-                  id="polygon">
-            </entry>
-            <entry
-                  label="%TriangleTool.Label"
-                  kind="tool"
-                  description="%TriangleTool.Description"
-                  large_icon="icons/IconTriangle24.gif"
-                  path="/geoshapeDrawer/polygonStack"
-                  small_icon="icons/IconTriangle.gif"
-                  id="triangle">
-            </entry>
-            <entry
-                  label="%HexagonTool.Label"
-                  kind="tool"
-                  description="%HexagonTool.Description"
-                  large_icon="icons/IconHexagon24.gif"
-                  path="/geoshapeDrawer/polygonStack"
-                  small_icon="icons/IconHexagon.gif"
-                  id="hexagon">
-            </entry>
-            <entry
-                  label="%OctagonTool.Label"
-                  kind="tool"
-                  description="%OctagonTool.Description"
-                  large_icon="icons/IconOctagon24.gif"
-                  path="/geoshapeDrawer/polygonStack"
-                  small_icon="icons/IconOctagon.gif"
-                  id="octagon">
-            </entry>
-            <entry
-                  label="%PentagonTool.Label"
-                  kind="tool"
-                  description="%PentagonTool.Description"
-                  large_icon="icons/IconPentagon24.gif"
-                  path="/geoshapeDrawer/polygonStack"
-                  small_icon="icons/IconPentagon.gif"
-                  id="pentagon">
-            </entry>
-            <entry
-                  label="%DiamondTool.Label"
-                  kind="tool"
-                  description="%DiamondTool.Description"
-                  large_icon="icons/IconDiamond24.gif"
-                  path="/geoshapeDrawer/polygonStack"
-                  small_icon="icons/IconDiamond.gif"
-                  id="diamond">
-            </entry>
-            <entry
-                  label="%LineTool.Label"
-                  kind="tool"
-                  description="%LineTool.Description"
-                  large_icon="icons/IconLine24.gif"
-                  path="/geoshapeDrawer/"
-                  small_icon="icons/IconLine.gif"
-                  id="line">
-            </entry>
-         </contribution>
-      </paletteProvider>
-   </extension>
-
-   <extension
-         id="GeoshapeModelingAssistantProvider"
-         name="%ext.modelingAssistantProvider"
-         point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
-      <modelingAssistantProvider class="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapeModelingAssistantProvider">
-         <Priority name="Lowest"/>
-         <object
-         	class="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart(org.eclipse.gmf.runtime.diagram.ui.geoshapes)"
-         	id="GEOSHAPE">
-         </object>
-         <context 
-         	elements="GEOSHAPE">
-         </context>
-      </modelingAssistantProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.oval"     
-                icon="icons/IconEllipse.gif"
-                name="%OvalTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="oval"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.triangle"     
-                icon="icons/IconTriangle.gif"
-                name="%TriangleTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="triangle"/>  
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.rectangle"     
-                icon="icons/IconRectangle.gif"
-                name="%RectangleTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="rectangle"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.shadowRectangle"     
-                icon="icons/IconShadowRectangle.gif"
-                name="%ShadowRectangleTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="shadowRectangle"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.3DRectangle"     
-                icon="icons/Icon3DRectangle.gif"
-                name="%3DRectangleTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="rectangle3D"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.roundRectangle"     
-                icon="icons/IconRoundRectangle.gif"
-                name="%RoundRectangleTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="roundRectangle"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.hexagon"     
-                icon="icons/IconHexagon.gif"
-                name="%HexagonTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="hexagon"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.octagon"     
-                icon="icons/IconOctagon.gif"
-                name="%OctagonTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="octagon"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.pentagon"     
-                icon="icons/IconPentagon.gif"
-                name="%PentagonTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="pentagon"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.diamond"     
-                icon="icons/IconDiamond.gif"
-                name="%DiamondTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="diamond"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.cylinder"     
-                icon="icons/IconCylinder.gif"
-                name="%CylinderTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="cylinder"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.geoshapes.line"     
-                icon="icons/IconLine.gif"
-                name="%LineTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="line"/> 
-        </specializationType>
-    </extension>
-</plugin>

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/GeoshapesPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/GeoshapesPlugin.java
deleted file mode 100644
index c03f368..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/GeoshapesPlugin.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class GeoshapesPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static GeoshapesPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public GeoshapesPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static GeoshapesPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShape3DRectangleFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShape3DRectangleFigure.java
deleted file mode 100644
index 07daef2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShape3DRectangleFigure.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-
-/**
- * @author jschofie
- *
- * This Figure represents a 3D Rectangle Figure
- */
-public class GeoShape3DRectangleFigure extends GeoShapeFigure 
-	implements IPolygonAnchorableFigure {
-
-	/**
-	 * Constructor - Creates a 3D Rectangle with a Default size
-	 * 
-	 * @param width initial or preferred width of the figure
-	 * @param height initial or preferred height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShape3DRectangleFigure(int width, int height, int spacing) {
-		super(width, height, spacing);
-	}
-				
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-
-		List points = computePoints( getBounds() );
-
-		PointList outline = new PointList();
-		for( int index = 0; index < 6; index++ ) {
-			outline.addPoint( (Point)points.get( index ) );
-		}
-		
-		Point p2 = (Point) points.get( 1 );
-		Point p4 = (Point) points.get( 3 );
-		Point p6 = (Point) points.get( 5 );
-		Point p7 = (Point) points.get( 6 );
-
-		// Draw the shape with the fill color
-		g.fillPolygon( outline );
-		
-		// Draw the shapes outline
-		g.drawPolygon( outline );
-		
-		// Draw the remaining lines
-		g.drawLine( p6, p7 );
-		g.drawLine( p7, p4 );
-		g.drawLine( p7, p2 );
-	}
-
-	private List computePoints( Rectangle rect ) {
-	
-		List toReturn = new ArrayList();
-		
-		int scaleWidth  = (int) (rect.width * 0.25);
-		int scaleHeight = (int) (rect.height * 0.25);
-		
-		Rectangle r1 = new Rectangle( rect.x, rect.y, rect.width - scaleWidth, rect.height - scaleHeight );
-		Rectangle r2 = new Rectangle( r1.x + scaleWidth, r1.y + scaleHeight, r1.width, r1.height );
-				
-		Point p1 = new Point( r1.x, r1.y );
-		Point p2 = new Point( r1.x + r1.width, r1.y );
-		Point p3 = new Point( r2.x + r2.width - 1, r2.y );
-		Point p4 = new Point( p3.x, r2.y + r2.height - 1 );
-		Point p5 = new Point( r2.x, p4.y );
-		Point p6 = new Point( r1.x, r1.y + r1.height );
-		Point p7 = new Point( p2.x, p6.y );
-
-		toReturn.add( p1 );
-		toReturn.add( p2 );
-		toReturn.add( p3 );
-		toReturn.add( p4 );
-		toReturn.add( p5 );
-		toReturn.add( p6 );
-		toReturn.add( p7 );
-
-		return toReturn;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.IPolygonAnchorableFigure#getPolygonPoints()
-	 */
-	public PointList getPolygonPoints() {
-		
-		List points = computePoints( getBounds() );
-
-		PointList outline = new PointList();
-		for( int index = 0; index < 6; index++ ) {
-			outline.addPoint( (Point)points.get( index ) );
-		}
-
-		// Close the polygon
-		outline.addPoint( (Point)points.get( 0 ) );
-
-		return outline;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeCylinderFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeCylinderFigure.java
deleted file mode 100644
index abb594c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeCylinderFigure.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Cylinder Figure
- */
-public class GeoShapeCylinderFigure extends GeoShapeFigure {
-
-	/**
-	 * Constructor - Creates a cylinder with a given Default size
-	 *
-	 * @param width initial width of figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeCylinderFigure(int width, int height, int spacing) {
-		super(width, height, spacing);
-	}
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		
-		Rectangle r = getBounds();
-
-		int height = (int) (r.height * 0.25);
-		
-		Rectangle ellipse = new Rectangle( r.x, r.y, r.width, height );
-		Rectangle middle = new Rectangle( r.x, r.y + ( height / 2 ), r.width, r.height - height + 1 ); 
-		Rectangle lowerArc = new Rectangle( r.x, r.y + r.height - height - 1, r.width, height );
-
-		// Draw the ellipse with the fill color
-		g.fillOval( ellipse );
-		
-		// Draw the middle section with the fill color
-		g.fillRectangle( middle );
-		
-		// Draw the lower arc with the fill color
-		g.fillArc( lowerArc, 180, 180 );
-	
-		// Draw the ellipse outline
-		g.drawOval( ellipse.x, ellipse.y, ellipse.width - 1, ellipse.height - 1 );
-		
-		// Draw the middle section
-		g.drawLine( middle.x, middle.y, middle.x, middle.y + middle.height );
-		g.drawLine( middle.x + middle.width - 1, middle.y, middle.x + middle.width - 1, middle.y + middle.height );
-		
-		// Draw the lower arc outline
-		g.drawArc( lowerArc, 180, 180 );
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeDiamondFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeDiamondFigure.java
deleted file mode 100644
index af751c9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeDiamondFigure.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Diamond Figure
- */
-public class GeoShapeDiamondFigure extends GeoShapePolygonFigure { 
-
-	/**
-	 * Constructor - Creates a diamond with a given Default size
-	 * 
-	 * @param width initial width of the figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeDiamondFigure(int width, int height, int spacing) {
-		super(width, height, spacing);
-	}
-		
-		
-	/**
-	 * This method is used to compute the shapes polygon points.
-	 * This is currently based on the shapes bounding box.
-	 * 
-	 * @param rect the rectangle that the shape will fit in
-	 */
-	protected PointList calculatePoints(Rectangle rect) {
-		PointList points = new PointList();
-		
-		int halfX = rect.x + (rect.width / 2);
-		int halfY = rect.y + (rect.height / 2);
-		
-		Point p1 = new Point( halfX, rect.y );
-		Point p2 = new Point( rect.x + rect.width - 1, halfY );
-		Point p3 = new Point( halfX, rect.y + rect.height - 1 );
-		Point p4 = new Point( rect.x, halfY );
-		
-		points.addPoint( p1 );
-		points.addPoint( p2 );
-		points.addPoint( p3 );
-		points.addPoint( p4 );
-		points.addPoint( p1 );	
-		
-		return points;
-	}
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeEllipseFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeEllipseFigure.java
deleted file mode 100644
index 75ab1e2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeEllipseFigure.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IOvalAnchorableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.SlidableOvalAnchor;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Ellipse Figure
- */
-public class GeoShapeEllipseFigure extends GeoShapeFigure
-	implements IOvalAnchorableFigure {
-
-	/**
-	 * Constructor - Creates a ellipse with a given Default size
-	 * @param width initial width of the figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */	
-	public GeoShapeEllipseFigure(int width, int height, int spacing ) {
-		super(width, height, spacing);
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-	
-		Rectangle r = getBounds();
-
-		// Draw the ellipse with the fill color
-		g.fillOval(r);
-		
-		// Draw the ellipse outline
-		g.drawOval(r.x, r.y, r.width - 1, r.height - 1);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figures.IOvalAnchorableFigure#getOvalBounds()
-	 */
-	public Rectangle getOvalBounds() {
-		return getBounds();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createAnchor(org.eclipse.draw2d.geometry.PrecisionPoint)
-	 */
-	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
-		if (p==null)
-			return createDefaultAnchor();
-		return new SlidableOvalAnchor(this, p);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createDefaultAnchor()
-	 */
-	protected ConnectionAnchor createDefaultAnchor() {
-		return new SlidableOvalAnchor(this);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeFigure.java
deleted file mode 100644
index 2b6998f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeFigure.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-/*
- * Created on Jun 22, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-
-
-/**
- * @author melaasar
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GeoShapeFigure extends DefaultSizeNodeFigure {
-	
-	/**
-	 * Creates a new GeoShapeFigure
-	 */
-	public GeoShapeFigure(int defWidth, int defHeight, int spacing) {
-		super(defWidth, defHeight);
-		setOpaque(true);
-		setLayoutManager(new StackLayout() {
-			public void layout(IFigure figure) {
-				Rectangle r = figure.getClientArea();
-				List children = figure.getChildren();
-				IFigure child;
-				Dimension d;
-				for (int i = 0; i < children.size(); i++) {
-					child = (IFigure)children.get(i);
-					d = child.getPreferredSize(r.width, r.height);
-					d.width = Math.min(d.width, r.width);
-					d.height = Math.min(d.height, r.height);
-					Rectangle childRect = new Rectangle(
-						r.x + (r.width - d.width)/2,
-						r.y + (r.height - d.height)/2,
-						d.width,
-						d.height);
-					child.setBounds(childRect);
-				}
-			}
-		});
-		
-		IFigure f = new Figure();
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-		layout.setSpacing(spacing);
-		f.setLayoutManager(layout);
-		add(f);
-	}
-	
-	public IFigure getContentPane() {
-		return (IFigure) getChildren().get(0);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeHexagonFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeHexagonFigure.java
deleted file mode 100644
index 883fc5f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeHexagonFigure.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Hexagon Figure
- */
-public class GeoShapeHexagonFigure extends GeoShapePolygonFigure {
-
-	/**
-	 * Constructor - Creates a hexagon with a given Default size
-	 * @param width initial width of the figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeHexagonFigure( int width, int height, int spacing ) {
-		super(width, height, spacing);
-	}
-	
-	/**
-	 * This method is used to compute the shapes polygon points.
-	 * This is currently based on the shapes bounding box.
-	 * 
-	 * @param rect the rectangle that the shape will fit in
-	 */
-	protected PointList calculatePoints(Rectangle rect) {
-
-		PointList points = new PointList();
-		
-		Point p1 = new Point( rect.x + rect.width - 1, rect.y + ( rect.height / 2 ) );
-		Point p2 = new Point( rect.x + rect.width - (rect.width * 0.225 ), rect.y );
-		Point p3 = new Point( rect.x + (rect.width * 0.225 ), rect.y );
-		Point p4 = new Point( rect.x, rect.y + (rect.height / 2 ) );
-		Point p5 = new Point( p3.x, rect.y + rect.height - 1 );
-		Point p6 = new Point( p2.x, p5.y );
-
-		points.addPoint( p1 );
-		points.addPoint( p2 );
-		points.addPoint( p3 );
-		points.addPoint( p4 );
-		points.addPoint( p5 );
-		points.addPoint( p6 );
-		points.addPoint( p1 );
-
-		return points;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeOctagonFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeOctagonFigure.java
deleted file mode 100644
index 8cb02a0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeOctagonFigure.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Octagon Figure
- */
-public class GeoShapeOctagonFigure extends GeoShapePolygonFigure {
-
-	/**
-	 * Constructor - Creates a octagon with a given Default size
-	 * 
-	 * @param width initial width of the figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeOctagonFigure( int width, int height, int spacing ) {
-		super(width, height, spacing);
-	}
-		
-
-	/**
-	 * This method is used to compute the shapes polygon points.
-	 * This is currently based on the shapes bounding box.
-	 * 
-	 * @param rect the rectangle that the shape will fit in
-	 */
-	protected PointList calculatePoints(Rectangle rect) {
-
-		int xOffset = (int) (rect.width * 0.275);
-		int yOffset = (int) (rect.height * 0.275);
-		
-		PointList points = new PointList();
-
-		Point p1 = new Point( rect.x, rect.y + yOffset );
-		Point p2 = new Point( rect.x + xOffset, rect.y );
-		Point p3 = new Point( rect.x + rect.width - xOffset, rect.y );
-		Point p4 = new Point( rect.x + rect.width - 1, rect.y + yOffset );
-		Point p5 = new Point( rect.x + rect.width - 1, rect.y + rect.height - yOffset );
-		Point p6 = new Point( rect.x + rect.width - xOffset, rect.y + rect.height - 1 );
-		Point p7 = new Point( rect.x + xOffset, rect.y + rect.height -1 );
-		Point p8 = new Point( rect.x, rect.y + rect.height - yOffset );
-	
-		points.addPoint( p1 );
-		points.addPoint( p2 );
-		points.addPoint( p3 );
-		points.addPoint( p4 );
-		points.addPoint( p5 );
-		points.addPoint( p6 );
-		points.addPoint( p7 );
-		points.addPoint( p8 );
-		points.addPoint( p1 );
-			
-		return points;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapePentagonFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapePentagonFigure.java
deleted file mode 100644
index d475f18..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapePentagonFigure.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Pentagon Figure
- */
-public class GeoShapePentagonFigure extends GeoShapePolygonFigure {
-
-	/**
-	 * Constructor - Creates a pentagon with a given Default size
-	 * 
-	 * @param width inital width of the figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapePentagonFigure( int width, int height, int spacing ) {
-		super(width, height, spacing);
-	}
-			
-
-	/**
-	 * This method is used to compute the shapes polygon points.
-	 * This is currently based on the shapes bounding box.
-	 * 
-	 * @param rect the rectangle that the shape will fit in
-	 */
-	protected PointList calculatePoints(Rectangle rect) {
-
-		PointList points = new PointList();
-		
-		int xOffset = (int)(rect.width * 0.20);
-		int yOffset = (int)(rect.height * 0.40);
-		
-		Point p1 = new Point( rect.x + (rect.width / 2), rect.y );
-		Point p2 = new Point( rect.x + rect.width - 1, rect.y + yOffset );
-		Point p3 = new Point( rect.x + rect.width - xOffset, rect.y + rect.height - 1 );
-		Point p4 = new Point( rect.x + xOffset, rect.y + rect.height - 1 );
-		Point p5 = new Point( rect.x, rect.y + yOffset );
-		
-		points.addPoint( p1 );
-		points.addPoint( p2 );
-		points.addPoint( p3 );
-		points.addPoint( p4 );
-		points.addPoint( p5 );
-		points.addPoint( p1 );
-
-		return points;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapePolygonFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapePolygonFigure.java
deleted file mode 100644
index 7339a3f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapePolygonFigure.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-
-/**
- * Base class for polygons in the Geometric shapes palette
- * 
- * @author jschofie
- */
-public abstract class GeoShapePolygonFigure
-	extends GeoShapeFigure
-	implements IPolygonAnchorableFigure {
-
-	/**
-	 * sub-class must return their list of points based on the object size
-	 */
-	abstract protected PointList calculatePoints(Rectangle rect);
-
-	public GeoShapePolygonFigure(int width, int height, int spacing) {
-		super(width, height, spacing);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		PointList points = calculatePoints(getBounds().getCopy());
-		g.fillPolygon(points);
-		g.drawPolygon(points);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.IPolygonAnchorableFigure#getPolygonPoints()
-	 */
-	public PointList getPolygonPoints() {
-		return calculatePoints(getBounds().getCopy());
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeRectangleFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeRectangleFigure.java
deleted file mode 100644
index d6901ea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeRectangleFigure.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Rectangle Figure
- */
-public class GeoShapeRectangleFigure extends GeoShapeFigure {
-
-	/**
-	 * Constructor - Creates a rectangle with a given Default size
-	 * 
-	 * @param width inital width of the figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeRectangleFigure( int width, int height, int spacing ) {
-		super(width, height, spacing);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-
-		Rectangle r = getBounds().getCopy();
-		
-		// IF this figure has a border...
-		if( isOpaque() && getBorder() != null ) {
-
-			// Crop the rectangle to the insets
-			r.crop( getBorder().getInsets( this ) );
-			
-			// Draw the rectangle with the fill color
-			g.fillRectangle(r);
-			
-		} else {	
-			// Otherwise draw and fill the rectangle
-
-			// Draw the rectangle with the fill color
-			g.fillRectangle(r);
-		
-			// Draw the rectangle outline
-			g.drawRectangle(r.x, r.y, r.width - 1, r.height - 1);
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeRoundedRectangleFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeRoundedRectangleFigure.java
deleted file mode 100644
index a09a2ec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeRoundedRectangleFigure.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-/**
- * @author jschofie
- *
- * This Figure represents a Rounded Rectangle Figure
- */
-public class GeoShapeRoundedRectangleFigure extends GeoShapeFigure {
-
-	private int radius = 0;
-	
-	/**
-	 * Constructor - Creates a rounded rectangle with a given Default size
-	 * 
-	 * @param width inital width of the figure
-	 * @param height initial height of the figure
-	 * @param spacing <code>int<code> the spacing between children in logical units
-	 * @param radius <code>int</code> the radius size of the corner roundness in logical units
-	 */
-	public GeoShapeRoundedRectangleFigure( int width, int height, int spacing, int radius ) {
-		super(width, height, spacing);
-		this.radius = radius; 
-	}
-
-	/** Return the corner radius. */
-	protected int getCornerRadius() {
-		return radius;
-	}
-	
-
-	/**
-	 * Draw the state object.
-	 * @see org.eclipse.draw2d.Figure#paintBorder(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-	
-		Rectangle r = getBounds();
-		
-		Rectangle insideRect = new Rectangle( r.x, r.y, r.width - 1, r.height - 1 );
-		
-		int cornerRadius = getCornerRadius();
-
-		// Draw the rectangle with the fill color
-		g.fillRoundRectangle( r, cornerRadius, cornerRadius );
-			
-		// Draw the rectangle outline
-		g.drawRoundRectangle( insideRect, cornerRadius, cornerRadius );
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeTriangleFigure.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeTriangleFigure.java
deleted file mode 100644
index 8e7cbb7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeTriangleFigure.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Triangle Figure
- */
-public class GeoShapeTriangleFigure extends GeoShapePolygonFigure {
-
-	/**
-	 * Constructor - Creates a Triangle with a given Default size
-	 * 
-	 * @param base inital length of the squares base
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeTriangleFigure( int base, int spacing ) {
-		super(base, base, spacing);
-	}
-	
-	/**
-	 * This method is used to compute the shapes polygon points.
-	 * This is currently based on the shapes bounding box.
-	 * 
-	 * @param rect the rectangle that the shape will fit in
-	 */
-	protected PointList calculatePoints(Rectangle rect) {
-
-		PointList points = new PointList();
-		
-		Point p1 = new Point( rect.x + ( rect.width / 2 ), rect.y );
-		Point p2 = new Point( rect.x, rect.y + rect.height - 1 );
-		Point p3 = new Point( rect.x + rect.width - 1, rect.y + rect.height - 1 );
-
-		points.addPoint( p1 );
-		points.addPoint( p2 );
-		points.addPoint( p3 );
-		points.addPoint( p1 );
-		
-		return points;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/package.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/package.html
deleted file mode 100644
index 0236a9d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/CylinderEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/CylinderEditPart.java
deleted file mode 100644
index 58fa3c7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/CylinderEditPart.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeCylinderFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class CylinderEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */
-	public CylinderEditPart(View shapeView) {
-		
-		super(shapeView);
-	}
-		
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeCylinderFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/DiamondEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/DiamondEditPart.java
deleted file mode 100644
index c356621..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/DiamondEditPart.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeDiamondFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class DiamondEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */
-	public DiamondEditPart(View shapeView) {
-		
-		super(shapeView);
-	}
-		
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeDiamondFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/EllipseEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/EllipseEditPart.java
deleted file mode 100644
index 4db945f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/EllipseEditPart.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeEllipseFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class EllipseEditPart extends GeoShapeEditPart {
-	
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */
-	public EllipseEditPart(View shapeView) {
-	
-		super(shapeView);
-	}
-	
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeEllipseFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/GeoShapeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/GeoShapeEditPart.java
deleted file mode 100644
index c4f7b21..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/GeoShapeEditPart.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenDiagramEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapeConstants;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.DiagramLinkDragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.NonSemanticEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-
-/**
- * This is a base class for all Geometric Shapes
- * 
- * @author jschofie
- */
-public abstract class GeoShapeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @param view
-	 */
-	public GeoShapeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * Implement to return the NodeFigre.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#createNodeFigure()
-	 */
-	protected abstract NodeFigure createNodeFigure();
-
-	/**
-	 * Adds support for diagram links.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		
-		// Remove semantic edit policy and install a non-semantic edit policy
-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-			new NonSemanticEditPolicy());
-
-		// Add diagram link support to all Geo shapes
-		// The following two edit policies support the links.
-		installEditPolicy(
-			EditPolicyRoles.DRAG_DROP_ROLE,
-			new DiagramLinkDragDropEditPolicy());
-		
-		installEditPolicy(
-			EditPolicyRoles.OPEN_ROLE,
-			new OpenDiagramEditPolicy());
-
-		// This View doesn't have semantic elements so use a component edit
-		// policy that only gets a command to delete the view
-		installEditPolicy(EditPolicy.COMPONENT_ROLE,
-			new ViewComponentEditPolicy());
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getAccessibleEditPart()
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-
-		if (accessibleEP == null)
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				public void getName(AccessibleEvent e) {
-					View view = (View)getModel();
-					e.result =
-						GeoshapeConstants.getShapeLocalizedType(view.getType());
-				}
-			};
-			
-		return accessibleEP;
-	}
-	
-	/**
-	 * this method will return the primary child EditPart  inside this edit part
-	 * @return the primary child view inside this edit part
-	 */
-	public EditPart getPrimaryChildEditPart(){
-		return getChildBySemanticHint(CommonParserHint.DESCRIPTION);
-	}
-    
-    public Object getPreferredValue(EStructuralFeature feature) {
-        Object preferenceStore = getDiagramPreferencesHint()
-            .getPreferenceStore();
-        if (preferenceStore instanceof IPreferenceStore) {
-            if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-
-                return FigureUtilities.RGBToInteger(PreferenceConverter
-                    .getColor((IPreferenceStore) preferenceStore,
-                        IPreferenceConstants.PREF_NOTE_LINE_COLOR));
-
-            } else if (feature == NotationPackage.eINSTANCE
-                .getFillStyle_FillColor()) {
-
-                return FigureUtilities.RGBToInteger(PreferenceConverter
-                    .getColor((IPreferenceStore) preferenceStore,
-                        IPreferenceConstants.PREF_NOTE_FILL_COLOR));
-
-            }
-        }
-
-        return super.getPreferredValue(feature);
-    } 
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/HexagonEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/HexagonEditPart.java
deleted file mode 100644
index 918c838..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/HexagonEditPart.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeHexagonFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class HexagonEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */
-	public HexagonEditPart(View shapeView) {
-			
-		super(shapeView);
-	}
-			
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeHexagonFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/LineEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/LineEditPart.java
deleted file mode 100644
index ffcfc33..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/LineEditPart.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.NonSemanticEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the Line and its underlying view 
- */
-public class LineEditPart extends ConnectionNodeEditPart {
-
-	public LineEditPart(View view) {
-		super(view);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#createConnectionFigure()
-	 */
-	protected Connection createConnectionFigure() {
-		
-		PolylineConnectionEx conn = new PolylineConnectionEx();
-		
-		return conn;
-	}
-	
-	/**
-	 * Adds support for diagram links.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-
-		// Remove semantic edit policy and install a non-semantic edit policy
-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-			new NonSemanticEditPolicy());
-
-		// This View doesn't have semantic elements so use a component edit
-		// policy that only gets a command to delete the view
-		installEditPolicy(EditPolicy.COMPONENT_ROLE,
-			new ViewComponentEditPolicy());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/OctagonEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/OctagonEditPart.java
deleted file mode 100644
index 45eff91..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/OctagonEditPart.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeOctagonFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class OctagonEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */	
-	public OctagonEditPart(View shapeView) {
-				
-		super(shapeView);
-	}
-				
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeOctagonFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/PentagonEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/PentagonEditPart.java
deleted file mode 100644
index e998a5d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/PentagonEditPart.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapePentagonFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class PentagonEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */		
-	public PentagonEditPart(View shapeView) {
-					
-		super(shapeView);
-	}
-					
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapePentagonFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/Rectangle3DEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/Rectangle3DEditPart.java
deleted file mode 100644
index cdf3090..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/Rectangle3DEditPart.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShape3DRectangleFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class Rectangle3DEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */	
-	public Rectangle3DEditPart(View shapeView) {
-		
-		super(shapeView);
-	}
-		
-	protected NodeFigure createNodeFigure() {
-		return new GeoShape3DRectangleFigure( getMapMode().DPtoLP(100), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RectangleEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RectangleEditPart.java
deleted file mode 100644
index bcef0b6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RectangleEditPart.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeRectangleFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class RectangleEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */	
-	public RectangleEditPart(View shapeView) {
-			
-		super(shapeView);
-	}
-			
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeRectangleFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RoundedRectangleEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RoundedRectangleEditPart.java
deleted file mode 100644
index 59a836a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RoundedRectangleEditPart.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeRoundedRectangleFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class RoundedRectangleEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */	
-	public RoundedRectangleEditPart(View shapeView) {
-				
-		super(shapeView);
-	}
-				
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeRoundedRectangleFigure( getMapMode().DPtoLP(100), getMapMode().DPtoLP(50),
-					getMapMode().DPtoLP(5), getMapMode().DPtoLP(20));
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java
deleted file mode 100644
index 9f14201..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeRectangleFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.RectangularDropShadowLineBorder;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class ShadowRectangleEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */	
-	public ShadowRectangleEditPart(View shapeView) {
-				
-		super(shapeView);
-	}
-				
-	protected NodeFigure createNodeFigure() {
-		NodeFigure f = new GeoShapeRectangleFigure( getMapMode().DPtoLP(100), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-		f.setBorder( new RectangularDropShadowLineBorder() );		
-		return f;
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/TriangleEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/TriangleEditPart.java
deleted file mode 100644
index 7aee326..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/TriangleEditPart.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeTriangleFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- *
- * Controls the interactions between the figure and
- * its underlying view 
- */
-public class TriangleEditPart extends GeoShapeEditPart {
-
-	/**
-	 * Constructor - Create an EditPart for a given model object (View)
-	 * 
-	 * @param shapeView model object that represents the associated figure
-	 */	
-	public TriangleEditPart(View shapeView) {
-	
-		super(shapeView);
-	}
-	
-	protected NodeFigure createNodeFigure() {
-		return new GeoShapeTriangleFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-	}
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/package.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/package.html
deleted file mode 100644
index 39a76a6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the <i>edit part</i> classes.
-An edit part is a controller that specifies how model elements are mapped to visual figures and coordinates the editing behavior of the model.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesMessages.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesMessages.java
deleted file mode 100644
index e14cabb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesMessages.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramUIGeoshapesMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n.DiagramUIGeoshapesMessages";//$NON-NLS-1$
-
-	private DiagramUIGeoshapesMessages() {
-		// Do not instantiate
-	}
-
-	public static String geoshape_addShapes_menuItem;
-	public static String geoshape_addShapes_menuItem_tooltip;
-	public static String geoshape_LineTool_Label;
-	public static String geoshape_LineTool_Description;
-	public static String geoshape_OvalTool_Label;
-	public static String geoshape_OvalTool_Description;
-	public static String geoshape_TriangleTool_Label;
-	public static String geoshape_TriangleTool_Description;
-	public static String geoshape_RectangleTool_Label;
-	public static String geoshape_RectangleTool_Description;
-	public static String geoshape_ShadowRectangleTool_Label;
-	public static String geoshape_ShadowRectangleTool_Description;
-	public static String geoshape_3DRectangleTool_Label;
-	public static String geoshape_3DRectangleTool_Description;
-	public static String geoshape_RoundRectangleTool_Label;
-	public static String geoshape_RoundRectangleTool_Description;
-	public static String geoshape_HexagonTool_Label;
-	public static String geoshape_HexagonTool_Description;
-	public static String geoshape_OctagonTool_Label;
-	public static String geoshape_OctagonTool_Description;
-	public static String geoshape_PentagonTool_Label;
-	public static String geoshape_PentagonTool_Description;
-	public static String geoshape_DiamondTool_Label;
-	public static String geoshape_DiamondTool_Description;
-	public static String geoshape_CylinderTool_Label;
-	public static String geoshape_CylinderTool_Description;
-	public static String geoshape_PolygonTool_Label;
-	public static String geoshape_PolygonTool_Description;
-	public static String geoshape_GeometricShapeTool_Label;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIGeoshapesMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesMessages.properties
deleted file mode 100644
index ce22a8f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesMessages.properties
+++ /dev/null

@@ -1,65 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2003,2004  IBM Corporation and others.                   |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-#
-# This Resource Bundle contains localizable strings for the GeoShapes plug-in
-#
-# ==============================================================================
-
-#
-# Menu Contribution properties
-#
-geoshape_addShapes_menuItem: Add Geometric Shape
-geoshape_addShapes_menuItem_tooltip: Add a Geometric Shape to the current diagram
-
-geoshape_LineTool_Label: Line
-geoshape_LineTool_Description: Create a line
-
-geoshape_OvalTool_Label: &Oval
-geoshape_OvalTool_Description: Create a oval shape
-
-geoshape_TriangleTool_Label: Tri&angle
-geoshape_TriangleTool_Description: Create a triangle shape
-
-geoshape_RectangleTool_Label: &Rectangle
-geoshape_RectangleTool_Description: Create a rectangle shape
-
-geoshape_ShadowRectangleTool_Label: &Shadow Rectangle
-geoshape_ShadowRectangleTool_Description: Create a shadow rectangle shape
-
-geoshape_3DRectangleTool_Label: 3D R&ectangle
-geoshape_3DRectangleTool_Description: Create a 3D rectangle shape
-
-geoshape_RoundRectangleTool_Label: Ro&unded Rectangle
-geoshape_RoundRectangleTool_Description: Create a rounded rectangle shape
-
-geoshape_HexagonTool_Label: &Hexagon
-geoshape_HexagonTool_Description: Create a hexagon shape
-
-geoshape_OctagonTool_Label: O&ctagon
-geoshape_OctagonTool_Description: Create a octagon shape
-
-geoshape_PentagonTool_Label: &Pentagon
-geoshape_PentagonTool_Description: Create a pentagon shape
-
-geoshape_DiamondTool_Label: &Diamond
-geoshape_DiamondTool_Description: Create a diamond shape
-
-geoshape_CylinderTool_Label: C&ylinder
-geoshape_CylinderTool_Description: Create a cylinder shape
-
-geoshape_PolygonTool_Label: Polygon
-geoshape_PolygonTool_Description: Create a polygon shape
-
-geoshape_GeometricShapeTool_Label: &Geometric Shape
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesPluginImages.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesPluginImages.java
deleted file mode 100644
index f9ee096..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/DiagramUIGeoshapesPluginImages.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.GeoshapesPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly. The public
- * strings represent images that will be cached and can be retrieved using
- * {@link #get(String)} which should <b>not</b> be disposed by the client.
- * 
- * @author cmahoney
- */
-public class DiagramUIGeoshapesPluginImages {
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "icons/"; //$NON-NLS-1$
-
-	// Cached images that can be retrieved using the get method. The
-	// corresponding image descriptor must be initialized using the
-	// createAndCache() method.
-	
-	// Geometric Shape Icons
-	public static final String IMG_OVAL = PREFIX_ROOT + "IconEllipse.gif"; //$NON-NLS-1$
-
-	public static final String IMG_TRIANGLE = PREFIX_ROOT + "IconTriangle.gif"; //$NON-NLS-1$
-
-	public static final String IMG_RECTANGLE = PREFIX_ROOT
-		+ "IconRectangle.gif"; //$NON-NLS-1$
-
-	public static final String IMG_SHADOWRECTANGLE = PREFIX_ROOT
-		+ "IconShadowRectangle.gif"; //$NON-NLS-1$
-
-	public static final String IMG_3DRECTANGLE = PREFIX_ROOT
-		+ "Icon3DRectangle.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ROUNDRECTANGLE = PREFIX_ROOT
-		+ "IconRoundRectangle.gif"; //$NON-NLS-1$
-
-	public static final String IMG_HEXAGON = PREFIX_ROOT + "IconHexagon.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OCTAGON = PREFIX_ROOT + "IconOctagon.gif"; //$NON-NLS-1$
-
-	public static final String IMG_PENTAGON = PREFIX_ROOT + "IconPentagon.gif"; //$NON-NLS-1$
-
-	public static final String IMG_DIAMOND = PREFIX_ROOT + "IconDiamond.gif"; //$NON-NLS-1$
-
-	public static final String IMG_CYLINDER = PREFIX_ROOT + "IconCylinder.gif"; //$NON-NLS-1$
-
-	// Connection Icons
-	public static final String IMG_LINE = PREFIX_ROOT + "IconLine.gif"; //$NON-NLS-1$
-
-	// Image descriptors.
-
-	// Geometric Shape Icons
-	public static final ImageDescriptor DESC_OVAL = createAndCache(IMG_OVAL);
-
-	public static final ImageDescriptor DESC_TRIANGLE = createAndCache(IMG_TRIANGLE);
-
-	public static final ImageDescriptor DESC_RECTANGLE = createAndCache(IMG_RECTANGLE);
-
-	public static final ImageDescriptor DESC_SHADOWRECTANGLE = createAndCache(IMG_SHADOWRECTANGLE);
-
-	public static final ImageDescriptor DESC_3DRECTANGLE = createAndCache(IMG_3DRECTANGLE);
-
-	public static final ImageDescriptor DESC_ROUNDRECTANGLE = createAndCache(IMG_ROUNDRECTANGLE);
-
-	public static final ImageDescriptor DESC_HEXAGON = createAndCache(IMG_HEXAGON);
-
-	public static final ImageDescriptor DESC_OCTAGON = createAndCache(IMG_OCTAGON);
-
-	public static final ImageDescriptor DESC_PENTAGON = createAndCache(IMG_PENTAGON);
-
-	public static final ImageDescriptor DESC_DIAMOND = createAndCache(IMG_DIAMOND);
-
-	public static final ImageDescriptor DESC_CYLINDER = createAndCache(IMG_CYLINDER);
-
-	// Connection Icons
-	public static final ImageDescriptor DESC_LINE = createAndCache(IMG_LINE);
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(GeoshapesPlugin
-			.getPluginId(), imageName);
-	}
-
-	/**
-	 * Creates the image descriptor from the filename given and caches it in the
-	 * plugin's image registry.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor createAndCache(String imageName) {
-		ImageDescriptor result = create(imageName);
-		GeoshapesPlugin.getDefault().getImageRegistry().put(imageName, result);
-		return result;
-	}
-
-	/**
-	 * Gets an image from the image registry. This image should not be disposed
-	 * of, that is handled in the image registry. The image descriptor must have
-	 * previously been cached in the image registry. The cached images for the
-	 * public image names defined in this file can be retrieved using this
-	 * method.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the image or null if it has not been cached in the registry
-	 */
-	public static Image get(String imageName) {
-		return GeoshapesPlugin.getDefault().getImageRegistry().get(imageName);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/package.html
deleted file mode 100644
index d4a7b4a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/package.html
deleted file mode 100644
index 9ef6d9b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoShapeIconProvider.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoShapeIconProvider.java
deleted file mode 100644
index bb74386..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoShapeIconProvider.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n.DiagramUIGeoshapesPluginImages;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Provides Geoshape Icons
- * 
- * @author jschofie
- */
-public class GeoShapeIconProvider
-	extends AbstractProvider
-	implements IIconProvider {
-
-	/** map for storing icon images based on semantic hint */
-	private static HashMap semanticHintIconMap = new HashMap();
-	static {
-
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_OVAL,
-			DiagramUIGeoshapesPluginImages.IMG_OVAL);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_TRIANGLE,
-			DiagramUIGeoshapesPluginImages.IMG_TRIANGLE);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_RECTANGLE,
-			DiagramUIGeoshapesPluginImages.IMG_RECTANGLE);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_SHADOWRECTANGLE,
-			DiagramUIGeoshapesPluginImages.IMG_SHADOWRECTANGLE);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_3DRECTANGLE,
-			DiagramUIGeoshapesPluginImages.IMG_3DRECTANGLE);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_ROUNDRECTANGLE,
-			DiagramUIGeoshapesPluginImages.IMG_ROUNDRECTANGLE);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_HEXAGON,
-			DiagramUIGeoshapesPluginImages.IMG_HEXAGON);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_OCTAGON,
-			DiagramUIGeoshapesPluginImages.IMG_OCTAGON);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_PENTAGON,
-			DiagramUIGeoshapesPluginImages.IMG_PENTAGON);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_DIAMOND,
-			DiagramUIGeoshapesPluginImages.IMG_DIAMOND);
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_CYLINDER,
-			DiagramUIGeoshapesPluginImages.IMG_CYLINDER);
-
-		semanticHintIconMap.put(GeoshapeConstants.TOOL_LINE,
-			DiagramUIGeoshapesPluginImages.IMG_LINE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider#getIcon(org.eclipse.core.runtime.IAdaptable,
-	 *      int)
-	 */
-	public Image getIcon(IAdaptable hint, int flags) {
-
-        View view = (View) hint.getAdapter(View.class);
-        if (view != null) {
-            String semanticHint = view.getType();
-            return getIcon(semanticHint);
-        } 
-        return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * return an icon based on the geo shape's semantic hint (e.g. "oval") 
-	 * this code was refactored from the previous method so that the compare merge
-	 * extended notation item provider had a way to render the appropriate icons for
-	 * its display
-	 * 
-	 */
-	public Image getIcon(String semanticHint) {
-		String fileName = (String) semanticHintIconMap.get(semanticHint);
-
-		if (fileName != null) {
-			return DiagramUIGeoshapesPluginImages.get(fileName);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-
-		IAdaptable hint = ((IIconOperation) operation).getHint();
-
-		if (hint != null) {
-            View view = (View) hint.getAdapter(View.class);
-            if (view != null) {
-				String semanticHint = view.getType();
-				return (getIcon(semanticHint)!=null);
-			}
-		}
-
-		return false;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeConstants.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeConstants.java
deleted file mode 100644
index 997c2c5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeConstants.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-/*
- * Created on Nov 14, 2003
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n.DiagramUIGeoshapesMessages;
-
-/**
- * @author jschofie
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class GeoshapeConstants {
-
-	// Tool Creation Groups
-	public static final String GROUP_RECTANGLES     = "rectangleMultiTool"; //$NON-NLS-1$
-	public static final String GROUP_POLYGONS       = "polygon"; //$NON-NLS-1$
-
-	// Supported Shapes
-	public static final String TOOL_OVAL            = "oval"; //$NON-NLS-1$
-	public static final String TOOL_TRIANGLE        = "triangle"; //$NON-NLS-1$
-	public static final String TOOL_RECTANGLE       = "rectangle"; //$NON-NLS-1$
-	public static final String TOOL_SHADOWRECTANGLE = "shadowRectangle"; //$NON-NLS-1$
-	public static final String TOOL_3DRECTANGLE     = "rectangle3D"; //$NON-NLS-1$
-	public static final String TOOL_ROUNDRECTANGLE  = "roundRectangle"; //$NON-NLS-1$
-	public static final String TOOL_HEXAGON         = "hexagon"; //$NON-NLS-1$
-	public static final String TOOL_OCTAGON         = "octagon"; //$NON-NLS-1$
-	public static final String TOOL_PENTAGON        = "pentagon"; //$NON-NLS-1$
-	public static final String TOOL_DIAMOND         = "diamond"; //$NON-NLS-1$
-	public static final String TOOL_CYLINDER        = "cylinder"; //$NON-NLS-1$
-//	public static final String TOOL_POLYGON         = "polygon"; //$NON-NLS-1$
-
-	// Supported Connections
-	public static final String TOOL_LINE = "line"; //$NON-NLS-1$
-
-	public static List getSupportedShapes() {
-		
-		List toReturn = new ArrayList();
-		
-		toReturn.add( TOOL_OVAL );
-		toReturn.add( TOOL_TRIANGLE );
-		toReturn.add( TOOL_RECTANGLE );
-		toReturn.add( TOOL_SHADOWRECTANGLE );
-		toReturn.add( TOOL_3DRECTANGLE );
-		toReturn.add( TOOL_ROUNDRECTANGLE );
-		toReturn.add( TOOL_HEXAGON );
-		toReturn.add( TOOL_OCTAGON );
-		toReturn.add( TOOL_PENTAGON );
-		toReturn.add( TOOL_DIAMOND );
-		toReturn.add( TOOL_CYLINDER );
-			
-		return toReturn;
-	}
-
-	public static List getSupportedConnections() {
-		
-		List toReturn = new ArrayList();
-		
-		toReturn.add( TOOL_LINE );
-			
-		return toReturn;
-	}
-	
-	public static String getShapeLocalizedType(String typeName) {
-		return getShapeLabel(typeName).replaceFirst("&", "");//$NON-NLS-2$//$NON-NLS-1$
-	}
-	
-	public static String getDisplayName(String label) {
-		return label.replaceFirst("&", "");//$NON-NLS-2$//$NON-NLS-1$
-	}
-	
-	public static String getShapeLabel(String toGet) {
-
-		if (toGet.equals(TOOL_OVAL))
-			return DiagramUIGeoshapesMessages.geoshape_OvalTool_Label;
-		else if (toGet.equals(TOOL_TRIANGLE))
-			return DiagramUIGeoshapesMessages.geoshape_TriangleTool_Label;
-		else if (toGet.equals(TOOL_RECTANGLE))
-			return DiagramUIGeoshapesMessages.geoshape_RectangleTool_Label;
-		else if (toGet.equals(TOOL_SHADOWRECTANGLE))
-			return DiagramUIGeoshapesMessages.geoshape_ShadowRectangleTool_Label;
-		else if (toGet.equals(TOOL_3DRECTANGLE))
-			return DiagramUIGeoshapesMessages.geoshape_3DRectangleTool_Label;
-		else if (toGet.equals(TOOL_ROUNDRECTANGLE))
-			return DiagramUIGeoshapesMessages.geoshape_RoundRectangleTool_Label;
-		else if (toGet.equals(TOOL_HEXAGON))
-			return DiagramUIGeoshapesMessages.geoshape_HexagonTool_Label;
-		else if (toGet.equals(TOOL_OCTAGON))
-			return DiagramUIGeoshapesMessages.geoshape_OctagonTool_Label;
-		else if (toGet.equals(TOOL_PENTAGON))
-			return DiagramUIGeoshapesMessages.geoshape_PentagonTool_Label;
-		else if (toGet.equals(TOOL_DIAMOND))
-			return DiagramUIGeoshapesMessages.geoshape_DiamondTool_Label;
-		else if (toGet.equals(TOOL_CYLINDER))
-			return DiagramUIGeoshapesMessages.geoshape_CylinderTool_Label;
-
-		return DiagramUIGeoshapesMessages.geoshape_GeometricShapeTool_Label;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeContributionItemProvider.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeContributionItemProvider.java
deleted file mode 100644
index 0c1ebb8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeContributionItemProvider.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CreateConnectionViewAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CreateShapeViewAction;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n.DiagramUIGeoshapesMessages;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.l10n.DiagramUIGeoshapesPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.ui.actions.ActionIds;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author jschofie
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
- * 
- * Creates the actions that can be performed on the various Geometric Shapes
- */
-public class GeoshapeContributionItemProvider
-	extends AbstractContributionItemProvider {
-
-	/**
-	 * The constructor
-	 */
-	public GeoshapeContributionItemProvider() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider#createAction(java.lang.String,
-	 *      org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	protected IAction createAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-
-		IWorkbenchPage workbenchPage = partDescriptor.getPartPage();
-
-		if (actionId.equals(ActionIds.ACTION_ADD_LINE)) {
-			return new CreateConnectionViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_LINE, GeoshapeConstants.TOOL_LINE,
-				DiagramUIGeoshapesMessages.geoshape_LineTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_LINE);
-
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_OVAL)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_OVAL, GeoshapeConstants.TOOL_OVAL,
-				DiagramUIGeoshapesMessages.geoshape_OvalTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_OVAL);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_TRIANGLE)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_TRIANGLE, GeoshapeConstants.TOOL_TRIANGLE,
-				DiagramUIGeoshapesMessages.geoshape_TriangleTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_TRIANGLE);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_RECTANGLE)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_RECTANGLE,
-				GeoshapeConstants.TOOL_RECTANGLE,
-				DiagramUIGeoshapesMessages.geoshape_RectangleTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_RECTANGLE);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_SHADOWRECTANGLE)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_SHADOWRECTANGLE,
-				GeoshapeConstants.TOOL_SHADOWRECTANGLE,
-				DiagramUIGeoshapesMessages.geoshape_ShadowRectangleTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_SHADOWRECTANGLE);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_3DRECTANGLE)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_3DRECTANGLE,
-				GeoshapeConstants.TOOL_3DRECTANGLE,
-				DiagramUIGeoshapesMessages.geoshape_3DRectangleTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_3DRECTANGLE);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_ROUNDRECTANGLE)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_ROUNDRECTANGLE,
-				GeoshapeConstants.TOOL_ROUNDRECTANGLE,
-				DiagramUIGeoshapesMessages.geoshape_RoundRectangleTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_ROUNDRECTANGLE);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_HEXAGON)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_HEXAGON, GeoshapeConstants.TOOL_HEXAGON,
-				DiagramUIGeoshapesMessages.geoshape_HexagonTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_HEXAGON);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_OCTAGON)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_OCTAGON, GeoshapeConstants.TOOL_OCTAGON,
-				DiagramUIGeoshapesMessages.geoshape_OctagonTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_OCTAGON);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_PENTAGON)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_PENTAGON, GeoshapeConstants.TOOL_PENTAGON,
-				DiagramUIGeoshapesMessages.geoshape_PentagonTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_PENTAGON);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_DIAMOND)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_DIAMOND, GeoshapeConstants.TOOL_DIAMOND,
-				DiagramUIGeoshapesMessages.geoshape_DiamondTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_DIAMOND);
-		}
-
-		if (actionId.equals(ActionIds.ACTION_ADD_CYLINDER)) {
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_CYLINDER, GeoshapeConstants.TOOL_CYLINDER,
-				DiagramUIGeoshapesMessages.geoshape_CylinderTool_Label,
-				DiagramUIGeoshapesPluginImages.DESC_CYLINDER);
-		}
-
-		return super.createAction(actionId, partDescriptor);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeEditPartProvider.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeEditPartProvider.java
deleted file mode 100644
index 235e249..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeEditPartProvider.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.CylinderEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.DiamondEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.EllipseEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.HexagonEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.LineEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.OctagonEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.PentagonEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.Rectangle3DEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.RectangleEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.RoundedRectangleEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.ShadowRectangleEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.TriangleEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
- *
- * Geoshape Edit Part provider
- */
-public class GeoshapeEditPartProvider extends AbstractEditPartProvider {
-
-	/** list of supported shape editparts. */
-	private Map shapeMap = new HashMap();
-	{
-		shapeMap.put( GeoshapeConstants.TOOL_OVAL, EllipseEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_TRIANGLE, TriangleEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_RECTANGLE, RectangleEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_SHADOWRECTANGLE, ShadowRectangleEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_3DRECTANGLE, Rectangle3DEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_ROUNDRECTANGLE, RoundedRectangleEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_HEXAGON, HexagonEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_OCTAGON, OctagonEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_PENTAGON, PentagonEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_DIAMOND, DiamondEditPart.class);
-		shapeMap.put( GeoshapeConstants.TOOL_CYLINDER, CylinderEditPart.class);
-//		shapeMap.put( GeoshapeConstants.TOOL_POLYGON, PolygonEditPart.class);
-	}
-	
-	/** list of supported connection editparts. */
-	private Map connectionMap = new HashMap();
-	{
-		connectionMap.put( GeoshapeConstants.TOOL_LINE, LineEditPart.class);
-	}
-	
-	
-	/**
-	 * Gets a Node's editpart class.
-	 * This method should be overridden by a provider if it wants to provide this service. 
-	 * @param view the view to be <i>controlled</code> by the created editpart
-	 */
-	protected Class getNodeEditPartClass(View view ) {
-		String semanticHint = view.getType();
-		if(semanticHint!=null && semanticHint.length()>0)
-			return ((Class)shapeMap.get(semanticHint));
-		return null;
-		
-	}
-	
-	/**
-	 * Set the editpart class to the editpart mapped to the supplied view's semantic hint.
-	 */
-	protected Class getEdgeEditPartClass(View view) {
-		String semanticHint = view.getType();
-		if(semanticHint!=null && semanticHint.length()>0)
-			return ((Class)connectionMap.get(semanticHint));
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeModelingAssistantProvider.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeModelingAssistantProvider.java
deleted file mode 100644
index 6b82069..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeModelingAssistantProvider.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetRelTypesOnSourceAndTargetOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetRelTypesOnSourceOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetRelTypesOnTargetOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetTypesForSourceOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetTypesForTargetOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Provides modeling assistant functionality for geoshapes (i.e. connection
- * handles, connection creation to a new geoshape).
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
- */
-public class GeoshapeModelingAssistantProvider
-	extends ModelingAssistantProvider {
-
-	/** List containing the connection types. */
-	private static List connectionTypes = null;
-
-	/** List containing the geoshape types. */
-	private static List shapeTypes = null;
-
-	/**
-	 * Gets the list of connection types initialized lazily.
-	 * 
-	 * @return the list of connection types
-	 */
-	private static List getConnectionTypes() {
-		if (connectionTypes == null) {
-			connectionTypes = Collections.singletonList(GeoshapeType.LINE);
-		}
-		return connectionTypes;
-	}
-
-	/**
-	 * Gets the list of shape types initialized lazily.
-	 * 
-	 * @return the list of shape types
-	 */
-	private static List getShapeTypes() {
-		if (shapeTypes == null) {
-			shapeTypes = GeoshapeType.getShapeTypes();
-		}
-		return shapeTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetRelTypesOnSourceOperation
-			|| operation instanceof GetRelTypesOnTargetOperation
-			|| operation instanceof GetRelTypesOnSourceAndTargetOperation
-			|| operation instanceof GetTypesForTargetOperation
-			|| operation instanceof GetTypesForSourceOperation) {
-			return super.provides(operation);
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnSource(org.eclipse.core.runtime.IAdaptable)
-	 */
-	public List getRelTypesOnSource(IAdaptable source) {
-		return getConnectionTypes();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnTarget(org.eclipse.core.runtime.IAdaptable)
-	 */
-	public List getRelTypesOnTarget(IAdaptable target) {
-		return getConnectionTypes();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnSourceAndTarget(org.eclipse.core.runtime.IAdaptable,
-	 *      org.eclipse.core.runtime.IAdaptable)
-	 */
-	public List getRelTypesOnSourceAndTarget(IAdaptable source,
-			IAdaptable target) {
-		return getConnectionTypes();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForSource(org.eclipse.core.runtime.IAdaptable,
-	 *      org.eclipse.gmf.runtime.emf.core.internal.util.IElementType)
-	 */
-	public List getTypesForSource(IAdaptable target,
-			IElementType relationshipType) {
-
-		if (relationshipType.equals(GeoshapeType.LINE)) {
-			return getShapeTypes();
-		}
-
-		return Collections.EMPTY_LIST;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForTarget(org.eclipse.core.runtime.IAdaptable,
-	 *      org.eclipse.gmf.runtime.emf.core.internal.util.IElementType)
-	 */
-	public List getTypesForTarget(IAdaptable source,
-			IElementType relationshipType) {
-
-		if (relationshipType.equals(GeoshapeType.LINE)) {
-			return getShapeTypes();
-		}
-
-		return Collections.EMPTY_LIST;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapePaletteFactory.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapePaletteFactory.java
deleted file mode 100644
index 0486ac1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapePaletteFactory.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Tool;
-
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.diagram.ui.tools.ConnectionCreationTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-
-/**
- * A palette factory for Geoshapes Entries
- * 
- * @author jschofie
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
- */
-public class GeoshapePaletteFactory
-	extends PaletteFactory.Adapter {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory.Adapter#createTool(java.lang.String)
-	 */
-	public Tool createTool(String toolId) {
-
-		if (toolId.equals(GeoshapeConstants.GROUP_POLYGONS)) {
-			List polygons = new ArrayList();
-
-			polygons.add(GeoshapeType.TRIANGLE);
-			polygons.add(GeoshapeType.HEXAGON);
-			polygons.add(GeoshapeType.OCTAGON);
-			polygons.add(GeoshapeType.PENTAGON);
-			polygons.add(GeoshapeType.DIAMOND);
-			return new UnspecifiedTypeCreationTool(polygons);
-		}
-
-		if (toolId.equals(GeoshapeConstants.GROUP_RECTANGLES)) {
-			List rectangles = new ArrayList();
-			
-			rectangles.add(GeoshapeType.RECTANGLE);
-			rectangles.add(GeoshapeType.SHADOWRECTANGLE);
-			rectangles.add(GeoshapeType.THREEDRECTANGLE);
-			rectangles.add(GeoshapeType.ROUNDRECTANGLE);
-			return new UnspecifiedTypeCreationTool(rectangles);
-		}
-
-		if (toolId.equals(GeoshapeConstants.TOOL_LINE)) {
-			return new ConnectionCreationTool(GeoshapeType.LINE);
-		}
-
-		if (toolId.equals(GeoshapeConstants.TOOL_OVAL)) {
-			return new CreationTool(GeoshapeType.OVAL);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_TRIANGLE)) {
-			return new CreationTool(GeoshapeType.TRIANGLE);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_RECTANGLE)) {
-			return new CreationTool(GeoshapeType.RECTANGLE);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_SHADOWRECTANGLE)) {
-			return new CreationTool(GeoshapeType.SHADOWRECTANGLE);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_3DRECTANGLE)) {
-			return new CreationTool(GeoshapeType.THREEDRECTANGLE);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_ROUNDRECTANGLE)) {
-			return new CreationTool(GeoshapeType.ROUNDRECTANGLE);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_HEXAGON)) {
-			return new CreationTool(GeoshapeType.HEXAGON);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_OCTAGON)) {
-			return new CreationTool(GeoshapeType.OCTAGON);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_PENTAGON)) {
-			return new CreationTool(GeoshapeType.PENTAGON);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_DIAMOND)) {
-			return new CreationTool(GeoshapeType.DIAMOND);
-		}
-		if (toolId.equals(GeoshapeConstants.TOOL_CYLINDER)) {
-			return new CreationTool(GeoshapeType.CYLINDER);
-		}
-
-		return null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeType.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeType.java
deleted file mode 100644
index 2cc588d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeType.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Element types for the notation elements defined in the Geoshape plugin.
- * 
- * <p>
- * If a new shape type is added, it should also be added to the list returned in
- * <code>getShapeTypes()</code>.
- * </p>
- * 
- * @author cmahoney, ldamus
- */
-public class GeoshapeType
-	extends AbstractElementTypeEnumerator {
-
-	public static final IElementType OVAL = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.oval"); //$NON-NLS-1$
-
-	public static final IElementType TRIANGLE = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.triangle"); //$NON-NLS-1$
-
-	public static final IElementType RECTANGLE = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.rectangle"); //$NON-NLS-1$
-
-	public static final IElementType SHADOWRECTANGLE = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.shadowRectangle"); //$NON-NLS-1$
-
-	public static final IElementType THREEDRECTANGLE = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.3DRectangle"); //$NON-NLS-1$
-
-	public static final IElementType ROUNDRECTANGLE = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.roundRectangle"); //$NON-NLS-1$
-
-	public static final IElementType HEXAGON = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.hexagon"); //$NON-NLS-1$
-
-	public static final IElementType OCTAGON = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.octagon"); //$NON-NLS-1$
-
-	public static final IElementType PENTAGON = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.pentagon"); //$NON-NLS-1$
-
-	public static final IElementType DIAMOND = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.diamond"); //$NON-NLS-1$
-
-	public static final IElementType CYLINDER = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.cylinder"); //$NON-NLS-1$
-
-	public static final IElementType LINE = getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.line"); //$NON-NLS-1$
-
-	/**
-	 * Gets a list of all the possible shape types. This is used by the
-	 * connection handles.
-	 * 
-	 * @return a list of shape types
-	 */
-	public static List getShapeTypes() {
-		List shapes = new ArrayList();
-
-		shapes.add(OVAL);
-		shapes.add(TRIANGLE);
-		shapes.add(RECTANGLE);
-		shapes.add(SHADOWRECTANGLE);
-		shapes.add(THREEDRECTANGLE);
-		shapes.add(ROUNDRECTANGLE);
-		shapes.add(HEXAGON);
-		shapes.add(OCTAGON);
-		shapes.add(PENTAGON);
-		shapes.add(DIAMOND);
-		shapes.add(CYLINDER);
-
-		return shapes;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeViewProvider.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeViewProvider.java
deleted file mode 100644
index bdf9834..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeViewProvider.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.views.factories.GeoShapeViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
- * 
- * Notation Provider that registers all the specific Geometric Shapes
- */
-public class GeoshapeViewProvider
-	extends AbstractViewProvider {
-
-	// Map to hold the Shape Views
-	private Map shapeMap = new HashMap();
-	{
-		shapeMap.put(GeoshapeConstants.TOOL_OVAL, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_TRIANGLE, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_RECTANGLE, GeoShapeViewFactory.class);
-		shapeMap
-			.put(GeoshapeConstants.TOOL_SHADOWRECTANGLE, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_3DRECTANGLE, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_ROUNDRECTANGLE, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_HEXAGON, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_OCTAGON, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_PENTAGON, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_DIAMOND, GeoShapeViewFactory.class);
-		shapeMap.put(GeoshapeConstants.TOOL_CYLINDER, GeoShapeViewFactory.class);
-		//		shapeMap.put( GeoshapeConstants.TOOL_POLYGON, GeoShapeViewFactory.class);
-	}
-	
-	//	 Map to hold the Line/Connection Views
-	private Map connectionMap = new HashMap();
-	{
-		connectionMap.put(GeoshapeConstants.TOOL_LINE, ConnectionViewFactory.class);
-	}
-	/**
-	 * Returns the shape view class to instantiate based on the passed params
-	 * 
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getNodeViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-
-		return (Class) shapeMap.get(semanticHint);
-	}
-
-	/**
-	 * Returns the connection view class to instantiate based on the passed
-	 * params
-	 * 
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getEdgeViewClass(IAdaptable semanticAdapter,
-			View containerView, String semanticHint) {
-		return (Class) connectionMap.get(semanticHint);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/package.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/package.html
deleted file mode 100644
index d8908e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the service provider classes for this plugin.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/ui/actions/ActionIds.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/ui/actions/ActionIds.java
deleted file mode 100644
index 4797c4f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/ui/actions/ActionIds.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.ui.actions;
-
-/**
- * @author jschofie
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class ActionIds {
-
-	public static String ACTION_ADD_LINE			=  "addLineAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_OVAL            =  "addOvalAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_TRIANGLE        =  "addTriangleAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_RECTANGLE		=  "addRectangleAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_SHADOWRECTANGLE =  "addShadowRectangleAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_3DRECTANGLE		=  "add3DRectangleAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_ROUNDRECTANGLE	=  "addRoundRectangleAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_HEXAGON			=  "addHexagonAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_OCTAGON			=  "addOctagonAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_PENTAGON		=  "addPentagonAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_DIAMOND			=  "addDiamondAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_CYLINDER		=  "addCylinderAction" ; //$NON-NLS-1$
-	public static String ACTION_ADD_POLYGON			=  "addPolygonAction" ;  //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/ui/actions/package.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/ui/actions/package.html
deleted file mode 100644
index 000db79..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/ui/actions/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains a set of classes for defining <i>Actions</i> which are run
-in order to carry out application behaviour that the user has requested
-through the user-interface.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/GeoShapeViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/GeoShapeViewFactory.java
deleted file mode 100644
index 76c35e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/GeoShapeViewFactory.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.views.factories;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.TextShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * The GeoShapeView Factory class
- * 
- * @author mmostafa
- */
-public class GeoShapeViewFactory
-	extends TextShapeViewFactory {
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.view.AbstractView#initializeFromPreferences(org.eclipse.jface.preference.IPreferenceStore)
-	 */
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-
-		// fill color
-		RGB fillRGB = PreferenceConverter.getColor(store,
-			IPreferenceConstants.PREF_NOTE_FILL_COLOR);
-		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(),
-			FigureUtilities.RGBToInteger(fillRGB));
-
-		//line color
-		RGB lineRGB = PreferenceConverter.getColor(store,
-			IPreferenceConstants.PREF_NOTE_LINE_COLOR);
-		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
-			FigureUtilities.RGBToInteger(lineRGB));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/package.html b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/package.html
deleted file mode 100644
index 0236a9d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.geoshapes.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.classpath b/org.eclipse.gmf.runtime.diagram.ui.printing.render/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.printing.render/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.printing.render/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.project b/org.eclipse.gmf.runtime.diagram.ui.printing.render/.project
deleted file mode 100644
index 8a8e76f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.printing.render</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/org.eclipse.gmf.runtime.diagram.ui.printing.render/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.printing.render/META-INF/MANIFEST.MF
deleted file mode 100644
index 009ac47..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.printing.render
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.DiagramUIPrintingRenderPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.printing.render.actions,
- org.eclipse.gmf.runtime.diagram.ui.printing.render.internal;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.printpreview;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.printing.render.providers,
- org.eclipse.gmf.runtime.diagram.ui.printing.render.util
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/about.html b/org.eclipse.gmf.runtime.diagram.ui.printing.render/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/build.properties b/org.eclipse.gmf.runtime.diagram.ui.printing.render/build.properties
deleted file mode 100644
index a876a33..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.printing.render/plugin.properties
deleted file mode 100644
index 3a81de3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/plugin.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram UI Printing Render Plug-In
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/EnhancedPrintActionHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/EnhancedPrintActionHelper.java
deleted file mode 100644
index af816b9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/EnhancedPrintActionHelper.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.actions;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper;
-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.printing.actions.DefaultPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.DiagramUIPrintingRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.DiagramUIPrintingRenderPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.util.RenderedDiagramPrinter;
-import org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Enhanced printing.  The doPrint() method will invoke a dialog prompting the
- * user to choose options for printing.  The user will be able to choose from
- * printing diagrams of the current type.  If possible, the IFile path of the
- * appicable diagrams will be displayed to the user, when prompting the user
- * to select a diagram for printing.  If the diagram does not correspond to an
- * IFile, its part name will be used as the next choice.
- * 
- * This class implements the IPrintActionHelper interface that can be passed
- * into Print Preview, enabling the print action from there.
- * 
- * @author Wayne Diu, wdiu
- */
-public class EnhancedPrintActionHelper implements IPrintActionHelper {
-	
-	/**
-	 * Show the print dialog and print
-	 * 
-	 * @param IWorkbenchPart the workbenchPart containing the diagram to print
-	 */
-	public void doPrint(IWorkbenchPart workbenchPart) {
-		DiagramEditor diagramEditor = null;
-
-		if (workbenchPart instanceof DiagramEditor) {
-			diagramEditor = (DiagramEditor) workbenchPart;
-		}
-		else {
-			Log.error(DiagramUIPrintingRenderPlugin.getInstance(), IStatus.ERROR, "Invalid IWorkbenchPart"); //$NON-NLS-1$
-			IllegalArgumentException e = new IllegalArgumentException("Invalid IWorkbenchPart."); //$NON-NLS-1$
-			Trace.throwing(DiagramUIPrintingRenderPlugin.getInstance(), DiagramUIPrintingRenderDebugOptions.EXCEPTIONS_THROWING,  EnhancedPrintActionHelper.class, "doPrint()", e); //$NON-NLS-1$
-			throw e;
-		}
-		
-		IDiagramGraphicalViewer viewer = diagramEditor.getDiagramGraphicalViewer(); 
-		RootEditPart rootEP = (viewer == null)?  null : viewer.getRootEditPart();
-		
-		//splitting the instanceof checks for readability, DiagramRootEditPart implements IDiagramPreferenceSupport 
-		
-		//try to get actual preferences, if not then use default of PreferencesHint.USE_DEFAULTS
-		PreferencesHint preferencesHint = (rootEP instanceof IDiagramPreferenceSupport) ? ((IDiagramPreferenceSupport) rootEP)
-			.getPreferencesHint()
-			: PreferencesHint.USE_DEFAULTS;
-		
-		//get actual map mode, default is MapModeUtil.getMapMode()
-		IMapMode mapMode = (rootEP instanceof DiagramRootEditPart) ? ((DiagramRootEditPart) rootEP)
-			.getMapMode()
-			: MapModeUtil.getMapMode();
-		
-		if (!System.getProperty("os.name").toUpperCase().startsWith("WIN")) { //$NON-NLS-1$ //$NON-NLS-2$
-			//do default action when not Windows and this action is enabled
-			DefaultPrintActionHelper.doRun(diagramEditor,
-				new RenderedDiagramPrinter(preferencesHint, mapMode));
-			return;
-		}
-		
-		DiagramPrinterUtil.printWithSettings(diagramEditor, createDiagramMap(),
-			new RenderedDiagramPrinter(preferencesHint, mapMode));
-	}
-
-	/**
-	 * Return a Map with diagram name String as key and Diagram as value
-	 * All entries in the map correspond to open editors.
-	 * 
-	 * @return Map with diagram name String as key and Diagram as value
-	 * All entries in the map correspond to open editors with the
-	 * diagramEditor's id. 
-	 */
-	private Map createDiagramMap() {
-		
-		Map diagramMap = new HashMap();
-		
-		//get all diagram editors with the matching id 
-		List diagramEditors = EditorService.getInstance().getRegisteredEditorParts();
-
-		Iterator it = diagramEditors.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			
-			if (obj instanceof DiagramEditor) { //DiagramDocumentEditor
-				DiagramEditor dEditor = (DiagramEditor) obj;
-				
-				String diagramName = null;
-				
-				IEditorInput editorInput = dEditor.getEditorInput();
-				
-                
-                
-				//try to be more descriptive and get the IFile path which includes the project
-				IFile file = (IFile)(editorInput.getAdapter(IFile.class));
-				if (file != null) {
-					diagramName = file.getFullPath().toOSString();
-				}
-				else {
-					//otherwise we can only get the editor title or part name
-					diagramName = dEditor.getPartName();
-					
-					if (diagramName == null) {
-						diagramName = dEditor.getTitle();
-					}
-				}
-				
-				if (diagramName == null) {
-					//the last choice is to use the actual name of the diagram
-                    //this has to exist!
-					diagramName = dEditor.getDiagram().getName();
-				}
-                
-				diagramMap.put(diagramName, dEditor.getDiagram());
-				
-			}
-		}
-		return diagramMap;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/RenderedPrintPreviewAction.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/RenderedPrintPreviewAction.java
deleted file mode 100644
index 0302988..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/RenderedPrintPreviewAction.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.actions;
-
-import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.actions.PrintPreviewAction;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.printpreview.RenderedPrintPreviewHelper;
-
-/**
- * This is the action for rendered print preview. It opens a dialog showing how
- * the diagram will look when printed. The <code>PrintPreviewHelper</code>
- * passed into the constructor does the actual work of the print preview. The
- * <code>IPrintActionHelper</code> passed into the constructor does the actual
- * work of showing the print settings dialog and doing the print if the user
- * were to initiate a print from within the print preview dialog.
- * 
- * @author Wayne Diu, wdiu
- */
-public class RenderedPrintPreviewAction extends PrintPreviewAction {
-	
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param printActionHelper
-	 *            the helper class used to show the print settings dialog and
-	 *            perform the actual printing if the user were to print from
-	 *            within the print preview dialog.
-	 */
-	public RenderedPrintPreviewAction(IPrintActionHelper printActionHelper) {
-		super(printActionHelper, new RenderedPrintPreviewHelper());
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/package.html
deleted file mode 100644
index d825d34..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/actions/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>This package contains printing actions or action helpers.  The
-EnhancedPrintActionHelper contains a method to invoke an enhanced dialog
-for printing, which supports what diagrams the user wants to print and
-a user specified scaling amount.</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderDebugOptions.java
deleted file mode 100644
index 155f57e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderDebugOptions.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.printing.render.*
- *  
- */
-public final class DiagramUIPrintingRenderDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private DiagramUIPrintingRenderDebugOptions() {
-		// empty constructor
-	}
-
-	public static final String DEBUG = DiagramUIPrintingRenderPlugin.getPluginId()
-		+ "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-	public static final String DND = DEBUG + "/dnd/tracing"; //$NON-NLS-1$  
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderPlugin.java
deleted file mode 100644
index 9225bb7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderPlugin.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The Diagram UI Printing Render plug-in.
- * 
- * @author cmahoney
- */
-public class DiagramUIPrintingRenderPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared instance.
-	 */
-	private static DiagramUIPrintingRenderPlugin plugin;
-
-	/**
-	 * The constructor.
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#Plugin()
-	 */
-	public DiagramUIPrintingRenderPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the plugin instance
-	 */
-	public static DiagramUIPrintingRenderPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderStatusCodes.java
deleted file mode 100644
index dfdd9b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/DiagramUIPrintingRenderStatusCodes.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.printing.render.*
- *  
- */
-public final class DiagramUIPrintingRenderStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private DiagramUIPrintingRenderStatusCodes() {
-		// empty constructor
-	}
-
-	public static final int OK = 0;
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/package.html
deleted file mode 100644
index f1b8727..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.printing.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/printpreview/RenderedPrintPreviewHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/printpreview/RenderedPrintPreviewHelper.java
deleted file mode 100644
index 3b45dea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/printpreview/RenderedPrintPreviewHelper.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.printpreview;
-
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.printpreview.PrintPreviewHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
-
-/**
- * A specialized <code>PrintPreviewHelper</code> that supports printing of
- * images.
- * 
- * @author cmahoney
- */
-public class RenderedPrintPreviewHelper
-	extends PrintPreviewHelper {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.printing.internal.printpreview.PrintPreviewHelper#createMapModeGraphics(org.eclipse.gmf.runtime.draw2d.ui.graphics.ScaledGraphics)
-	 */
-	protected MapModeGraphics createMapModeGraphics(
-			ScaledGraphics scaledGraphics) {
-		return new RenderedMapModeGraphics(scaledGraphics, getMapMode());
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/DiagramWithPrintGlobalActionHandler.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/DiagramWithPrintGlobalActionHandler.java
deleted file mode 100644
index 7ffbc9b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/DiagramWithPrintGlobalActionHandler.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.providers;
-
-import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.EnhancedPrintActionHelper;
-
-/**
- * A specialized <code>DiagramWithPrintGlobalActionHandler</code> that
- * supports printing of images.
- * 
- * @author cmahoney
- */
-public class DiagramWithPrintGlobalActionHandler
-	extends org.eclipse.gmf.runtime.diagram.ui.printing.providers.DiagramWithPrintGlobalActionHandler {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.printing.providers.DiagramWithPrintGlobalActionHandler#doPrint(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	protected void doPrint(IGlobalActionContext cntxt) {
-		IPrintActionHelper helper = new EnhancedPrintActionHelper();
-		helper.doPrint(cntxt.getActivePart());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/DiagramWithPrintGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/DiagramWithPrintGlobalActionHandlerProvider.java
deleted file mode 100644
index 83ea643..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/DiagramWithPrintGlobalActionHandlerProvider.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.providers;
-
-import java.util.Hashtable;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Concrete class that implements the <code>IGlobalActionHandlerProvider</code>
- * providing <code>IGlobalActionHandler</code> for all diagram ui based
- * diagrams. This provider supports printing of images.
- * 
- * @author cmahoney
- */
-public class DiagramWithPrintGlobalActionHandlerProvider
-	extends AbstractGlobalActionHandlerProvider {
-
-	private Hashtable handlerList = new Hashtable();
-
-	/**
-	 * Constructor for DiagramWithPrintGlobalActionHandlerProvider.
-	 */
-	public DiagramWithPrintGlobalActionHandlerProvider() {
-		super();
-	}
-
-	public IGlobalActionHandler getGlobalActionHandler(
-			final IGlobalActionHandlerContext context) {
-		/* Create the handler */
-		if (!getHandlerList().containsKey(context.getActivePart())) {
-			getHandlerList().put(context.getActivePart(),
-				new DiagramWithPrintGlobalActionHandler());
-
-			/*
-			 * Register as a part listener so that the cache can be cleared when
-			 * the part is disposed
-			 */
-			context.getActivePart().getSite().getPage().addPartListener(
-				new IPartListener() {
-
-					private IWorkbenchPart localPart = context.getActivePart();
-
-					public void partActivated(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					public void partBroughtToTop(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					public void partClosed(IWorkbenchPart part) {
-						/* Remove the cache associated with the part */
-						if (part != null && part == localPart
-							&& getHandlerList().containsKey(part)) {
-							getHandlerList().remove(part);
-							localPart.getSite().getPage().removePartListener(
-								this);
-							localPart = null;
-						}
-					}
-
-					public void partDeactivated(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					public void partOpened(IWorkbenchPart part) {
-						// Do nothing
-					}
-				});
-		}
-
-		return (DiagramWithPrintGlobalActionHandler) getHandlerList().get(
-			context.getActivePart());
-	}
-
-	/**
-	 * Returns the handlerList.
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getHandlerList() {
-		return handlerList;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/package.html
deleted file mode 100644
index 40b7ebd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/providers/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-This package contains the service provider classes for this plugin.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/RenderedDiagramPrinter.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/RenderedDiagramPrinter.java
deleted file mode 100644
index 00d9f19..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/RenderedDiagramPrinter.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.render.util;
-
-import org.eclipse.draw2d.Graphics;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.PrinterGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedPrinterGraphics;
-
-/**
- * A specialized <code>DiagramPrinter</code> that supports rendering of
- * images.
- * 
- * @author cmahoney
- */
-public class RenderedDiagramPrinter
-	extends DiagramPrinter {
-
-	/**
-	 * Creates a new instance.
-	 * @param preferencesHint
-	 * @param mm <code>IMapMode</code> to do the coordinate mapping
-	 */
-	public RenderedDiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {
-		super(preferencesHint, mm);
-	}
-	
-	/**
-	 * Creates a new instance.
-	 * @param preferencesHint
-	 */
-	public RenderedDiagramPrinter(PreferencesHint preferencesHint) {
-		super(preferencesHint);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter#createMapModeGraphics(org.eclipse.draw2d.Graphics)
-	 */
-	protected MapModeGraphics createMapModeGraphics(Graphics theGraphics) {
-		return new RenderedMapModeGraphics(theGraphics, getMapMode());
-	}
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter#createPrinterGraphics(org.eclipse.draw2d.Graphics)
-     */
-    protected PrinterGraphics createPrinterGraphics(Graphics theGraphics) {
-        return new RenderedPrinterGraphics(theGraphics, printer, true);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/package.html
deleted file mode 100644
index 862b089..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/package.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/.classpath b/org.eclipse.gmf.runtime.diagram.ui.printing/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.printing/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.printing/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/.project b/org.eclipse.gmf.runtime.diagram.ui.printing/.project
deleted file mode 100644
index 70b4327..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.printing</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/org.eclipse.gmf.runtime.diagram.ui.printing/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.printing/META-INF/MANIFEST.MF
deleted file mode 100644
index 9c2e9f0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.printing
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.printing.actions,
- org.eclipse.gmf.runtime.diagram.ui.printing.internal;x-friends:="org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n;x-friends:="org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.diagram.ui.printing.internal.printpreview;x-friends:="org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.diagram.ui.printing.internal.util;x-friends:="org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.diagram.ui.printing.providers,
- org.eclipse.gmf.runtime.diagram.ui.printing.util
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.printing;bundle-version="[1.0.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/about.html b/org.eclipse.gmf.runtime.diagram.ui.printing/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/build.properties b/org.eclipse.gmf.runtime.diagram.ui.printing/build.properties
deleted file mode 100644
index 94803dd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               icons/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_down.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_down.gif
deleted file mode 100644
index 49b7000..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_down.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_left.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_left.gif
deleted file mode 100644
index bcccedc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_left.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_print.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_print.gif
deleted file mode 100644
index 89793e2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_print.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_right.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_right.gif
deleted file mode 100644
index 0999cb3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_right.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_up.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_up.gif
deleted file mode 100644
index f02d3c9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/dtool16/print_preview_up.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_close.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_close.gif
deleted file mode 100644
index 91195ff..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_close.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_down.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_down.gif
deleted file mode 100644
index dd9780b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_down.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_left.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_left.gif
deleted file mode 100644
index 6c6504d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_left.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_pages.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_pages.gif
deleted file mode 100644
index 7ce00cc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_pages.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_print.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_print.gif
deleted file mode 100644
index 045de75..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_print.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_right.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_right.gif
deleted file mode 100644
index 38ec267..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_right.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_up.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_up.gif
deleted file mode 100644
index cee2f2c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/print_preview_up.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.printing/plugin.properties
deleted file mode 100644
index ce1c9ba..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram Printing - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram Printing
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/DefaultPrintActionHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/DefaultPrintActionHelper.java
deleted file mode 100644
index f6d45ba..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/DefaultPrintActionHelper.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.actions;
-
-import java.util.Collections;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.printing.PrintDialog;
-import org.eclipse.swt.printing.Printer;
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Provides basic printing functionality. This does a print from a default print
- * dialog.
- * 
- * @author wdiu
- */
-public class DefaultPrintActionHelper {
-
-	/**
-	 * Prints the diagram after a default print dialog is opened for the user.
-	 * 
-	 * @param editorPart
-	 *            the IEditorPart containing the diagram to print
-	 * @param diagramPrinter
-	 *            the diagram printer that does the work of actually printing
-	 *            the diagrams
-	 */
-	public static void doRun(IEditorPart editorPart, DiagramPrinter diagramPrinter) {
-		// print the editor contents.
-		final PrintDialog dialog =
-			new PrintDialog(editorPart.getSite().getShell(), SWT.NULL);
-		final PrinterData data = dialog.open();
-
-		if (data == null) {
-			return;
-		}
-
-		boolean isPrintToFit = MessageDialog.openQuestion(null,
-			DiagramUIPrintingMessages.Print_MessageDialogTitle, 
-			DiagramUIPrintingMessages.Print_MessageDialogMessage); 
-
-		final Printer printer = new Printer(data);
-
-		diagramPrinter.setPrinter(printer);
-		diagramPrinter.setDisplayDPI(Display.getDefault().getDPI());
-		DiagramEditPart dgrmEP = ((IDiagramWorkbenchPart) editorPart)
-			.getDiagramEditPart();
-		if (dgrmEP == null) {
-			return;
-		}
-		diagramPrinter.setDiagrams(Collections.singletonList(dgrmEP
-			.getDiagramView().getDiagram()));
-
-		if (isPrintToFit) {
-			diagramPrinter.setColumns(1);
-			diagramPrinter.setRows(1);
-		} else {
-			diagramPrinter.setScaledPercent(100);
-		}
-
-		diagramPrinter.run();
-		printer.dispose();
-	}
-
-	/**
-	 * Private constructor prevents instantiation
-	 */
-	private DefaultPrintActionHelper() {
-		//utility class
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/PrintPreviewAction.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/PrintPreviewAction.java
deleted file mode 100644
index 2033b8a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/PrintPreviewAction.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.actions;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.printpreview.PrintPreviewHelper;
-import org.eclipse.jface.action.Action;
-
-/**
- * This is the action for print preview. It opens a dialog showing how the
- * diagram will look when printed. The <code>PrintPreviewHelper</code> passed
- * into the constructor does the actual work of the print preview. The
- * <code>IPrintActionHelper</code> passed into the constructor does the actual
- * work of showing the print settings dialog and doing the print if the user
- * were to initiate a print from within the print preview dialog.
- * 
- * @author Wayne Diu, wdiu
- */
-public class PrintPreviewAction
-	extends Action {
-
-	/**
-	 * ID of the print preview action.
-	 */
-	public static final String ID = "printPreviewAction"; //$NON-NLS-1$
-
-	/**
-	 * Print action helper used if the user does a print from within the print preview dialog.
-	 */
-	private IPrintActionHelper printActionHelper;
-	
-	/**
-	 * The <code>PrintPreviewHelper</code> on which <code>doPrintPreview()</code> is called.
-	 */
-	private PrintPreviewHelper printPreviewHelper;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param printActionHelper
-	 *            the helper class used to show the print settings dialog and do
-	 *            a print if the user were to try to print from within the print
-	 *            preview dialog.
-	 * @param printPreviewHelper
-	 *            the helper class that creates that creates the print preview
-	 *            dialog
-	 */
-	protected PrintPreviewAction(IPrintActionHelper printActionHelper, PrintPreviewHelper printPreviewHelper) {
-		setId(ID);
-		setText(DiagramUIPrintingMessages.PrintPreview_ActionLabel);
-		setPrintActionHelper(printActionHelper);
-		setPrintPreviewHelper(printPreviewHelper);
-	}
-	
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param printActionHelper
-	 *            the helper class used to show the print settings dialog and
-	 *            perform the actual printing if the user were to print from
-	 *            within the print preview dialog.
-	 */
-	public PrintPreviewAction(IPrintActionHelper printActionHelper) {
-		this(printActionHelper, new PrintPreviewHelper());
-	}
-	
-	/**
-	 * Opens a dialog showing how the diagram will look when printed. Uses the
-	 * print preview helper and optionally the print action helper.
-	 */
-	public void run() {
-		getPrintPreviewHelper().doPrintPreview(getPrintActionHelper());
-	}
-
-	/**
-	 * Return the print action helper that helps perform the print action in
-	 * the print preview dialog.
-	 * @return IPrintActionHelper the print action helper.
-	 */
-	private IPrintActionHelper getPrintActionHelper() {
-		return printActionHelper;
-	}
-
-	/**
-	 * Set the print action helper that helps perform the print action in the
-	 * print preview dialog.
-	 * @param printActionHelper the IPrintActionHelper
-	 */
-	protected void setPrintActionHelper(IPrintActionHelper printActionHelper) {
-		this.printActionHelper = printActionHelper;
-	}
-
-	/**
-	 * Return the print preview helper responsible for performing the print
-	 * preview.
-	 * @return PrintPreviewHelper the print preview helper.
-	 */
-	private PrintPreviewHelper getPrintPreviewHelper() {
-		return printPreviewHelper;
-	}
-
-	/**
-	 * Set the print preview helper responsible for performing the print
-	 * preview.
-	 * @return printPreviewHelper the PrintPreviewHelper
-	 */
-	protected void setPrintPreviewHelper(PrintPreviewHelper printPreviewHelper) {
-		this.printPreviewHelper = printPreviewHelper;
-	}
-    
-    
-    //TODO: remove the following two methods when printing on
-    //other platforms is supported.
-
-    /**
-     * Enable the menu item if Platform is running on Windows.
-     */
-    public boolean isEnabled() {
-        return isWindows();
-    }
-    
-    private boolean isWindows() {
-        if (Platform.getOS() != null) 
-            if (Platform.getOS().startsWith(Platform.OS_WIN32))
-                return true;
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/package.html
deleted file mode 100644
index 483dd0f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-This package contains a set of classes for defining <i>Actions</i> which are run
-in order to carry out application behaviour that the user has requested
-through the user-interface.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingDebugOptions.java
deleted file mode 100644
index 1462ce4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingDebugOptions.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal;
-
-/**
- * A list of debug options for this plug-in.
- *
- * @author tmacdoug
- *
- */
-public final class DiagramPrintingDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *
-	 */
-	private DiagramPrintingDebugOptions() {
-		// Do nothing
-	}
-
-	public static final String DEBUG = DiagramPrintingPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingPlugin.java
deleted file mode 100644
index be532ef..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingPlugin.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DiagramPrintingPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static DiagramPrintingPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramPrintingPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the plugin instance
-	 */
-	public static DiagramPrintingPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 *
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingStatusCodes.java
deleted file mode 100644
index 079a454..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/DiagramPrintingStatusCodes.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal;
-
-/**
- * A list of status codes for this plug-in.
- *
- * @author tmacdoug
- *
- */
-public final class DiagramPrintingStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *
-	 */
-	private DiagramPrintingStatusCodes() {
-		// Do nothing
-	}
-
-	public static final int OK = 0;
-    /**
-     * Status code indicating that an error occurred with the drop action.
-     */
-    public static final int DROP_ACTION_FAILURE = 1;    
-
-    /**
-	 * Status code indicating that an error occurred with a command.
-	 */
-	public static final int COMMAND_FAILURE = 4;
-	
-	/**
-	 * Status code indicating that an error occurred with a resource, such as
-	 * loading an image file.
-	 * Set to 5 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int RESOURCE_FAILURE = 5;
-
-	/**
-	 * Status code indicating that a UI error occurred.
-	 * Set to 6 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int GENERAL_UI_FAILURE = 6;
-	
-	/**
-	 * Status code warning that an exception was ignored.
-	 * Set to 9 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int SERVICE_FAILURE = 7;
-
-	/**
-	 * Status code warning that an exception was ignored.
-	 * Set to 9 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 9;
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.java
deleted file mode 100644
index 2d47226..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramUIPrintingMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages";//$NON-NLS-1$
-
-	private DiagramUIPrintingMessages() {
-		// Do not instantiate
-	}
-
-	public static String PrintPreview_Title;
-	public static String PrintPreview_NotEnabled;
-	public static String PrintPreview_PagesToolItem;
-	public static String PrintPreview_PrintToolItem;
-	public static String PrintPreview_LeftToolItem;
-	public static String PrintPreview_RightToolItem;
-	public static String PrintPreview_UpToolItem;
-	public static String PrintPreview_DownToolItem;
-	public static String PrintPreview_CloseToolItem;
-	public static String PrintPreview_1Up;
-	public static String PrintPreview_2Up;
-	public static String PrintPreview_4Up;
-	public static String PrintPreview_ActionLabel;
-	public static String PrintPreview_NoPrinterInstalled;
-	public static String Print_MessageDialogTitle;
-	public static String Print_MessageDialogMessage;
-	public static String DiagramPrinterUtil_DLLErrorTitle;
-	public static String DiagramPrinterUtil_DLLErrorMessage_part1;
-	public static String DiagramPrinterUtil_DLLErrorMessage_part2;
-	public static String DiagramPrinterUtil_DLLErrorMessage_part3;
-	public static String DiagramPrinterUtil_DLLErrorMessage_part4;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIPrintingMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.properties
deleted file mode 100644
index 56c5af3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.properties
+++ /dev/null

@@ -1,45 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Print Preview - Translation Instruction : section to be translated
-# ==============================================================================
-
-PrintPreview_Title=Print Preview
-PrintPreview_NotEnabled=The chosen operation is not currently enabled
-PrintPreview_PagesToolItem=Pages
-PrintPreview_PrintToolItem=Print
-PrintPreview_LeftToolItem=Left
-PrintPreview_RightToolItem=Right
-PrintPreview_UpToolItem=Up
-PrintPreview_DownToolItem=Down
-PrintPreview_CloseToolItem=Close
-PrintPreview_1Up=1 up
-PrintPreview_2Up=2 up
-PrintPreview_4Up=4 up
-PrintPreview_ActionLabel=Print Pre&view
-PrintPreview_NoPrinterInstalled=Please install a printer before selecting Print Preview.
-
-Print_MessageDialogTitle=Print Diagram
-Print_MessageDialogMessage=Print to fit the diagram?
-
-# DiagramPrinterUtil related resource strings
-# ================================ BEGIN ==================================================
-DiagramPrinterUtil_DLLErrorTitle=Error loading printing library
-# Fragmenting the following message so as to not use hard return characters in
-# translatable strings
-DiagramPrinterUtil_DLLErrorMessage_part1=An error has occurred while loading the printing library.
-DiagramPrinterUtil_DLLErrorMessage_part2=For full printing functionality, please make sure that the printing library file is in the path and restart the application before printing again.
-DiagramPrinterUtil_DLLErrorMessage_part3=This problem can be fixed by reinstalling the product.
-DiagramPrinterUtil_DLLErrorMessage_part4=Would you like to continue printing with reduced functionality anyway?
-# ==================================== END ================================================

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingPluginImages.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingPluginImages.java
deleted file mode 100644
index fbd76df..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingPluginImages.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n;
-
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly.
- * 
- * @author cmahoney
- */
-public class DiagramUIPrintingPluginImages {
-
-	// prefixes
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "icons/"; //$NON-NLS-1$
-
-	/**
-	 * Enabled subdirectory off of root icon directory
-	 */
-	private static final String PREFIX_ENABLED = PREFIX_ROOT + "etool16/"; //$NON-NLS-1$
-
-	/**
-	 * Disabled subdirectory off of root icon directory
-	 */
-	private static final String PREFIX_DISABLED = PREFIX_ROOT + "dtool16/"; //$NON-NLS-1$	
-
-	// Image descriptors.
-
-	public static final ImageDescriptor DESC_PRINT = create(PREFIX_ENABLED
-		+ "print_preview_print.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_PRINT_DISABLED = create(PREFIX_DISABLED
-		+ "print_preview_print.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_PAGE = create(PREFIX_ENABLED
-		+ "print_preview_pages.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_LEFT = create(PREFIX_ENABLED
-		+ "print_preview_left.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_LEFT_DISABLED = create(PREFIX_DISABLED
-		+ "print_preview_left.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RIGHT = create(PREFIX_ENABLED
-		+ "print_preview_right.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RIGHT_DISABLED = create(PREFIX_DISABLED
-		+ "print_preview_right.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_UP = create(PREFIX_ENABLED
-		+ "print_preview_up.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_UP_DISABLED = create(PREFIX_DISABLED
-		+ "print_preview_up.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_DOWN = create(PREFIX_ENABLED
-		+ "print_preview_down.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_DOWN_DISABLED = create(PREFIX_DISABLED
-		+ "print_preview_down.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_CLOSE = create(PREFIX_ENABLED
-		+ "print_preview_close.gif"); //$NON-NLS-1$
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(DiagramPrintingPlugin
-			.getPluginId(), imageName);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/package.html
deleted file mode 100644
index 25049c4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.printing.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/package.html
deleted file mode 100644
index 4049e9e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.printing.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/printpreview/PrintPreviewHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/printpreview/PrintPreviewHelper.java
deleted file mode 100644
index 1195988..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/printpreview/PrintPreviewHelper.java
+++ /dev/null

@@ -1,1266 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal.printpreview;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.actions.IPrintActionHelper;
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper.PageMargins;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.HeaderAndFooterHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.PrintHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.DiagramMapModeUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.printing.Printer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Print Preview Action to display the Print Preview dialog. There are no static
- * methods, so you must create an instance of this class.
- * 
- * Call doPrintPreview() after you've made an instance.
- * 
- * @author Wayne Diu, wdiu
- */
-public class PrintPreviewHelper {
-
-	/**
-	 * Action helper for print. This must be passed in to have something happen
-	 * when print is pressed
-	 */
-	protected IPrintActionHelper printActionHelper;
-
-	/**
-	 * Increment userX everytime the user moves right, decrement userX everytime
-	 * the user moves left.
-	 * 
-	 * userX >= 0
-	 */
-	protected int userX = 0;
-
-	/**
-	 * Increment userY everytime the user moves down, decrement userY everytime
-	 * the user moves up.
-	 * 
-	 * userY >= 0
-	 */
-	protected int userY = 0;
-
-	/**
-	 * Number of rows, initialized with initial number of rows of pages to
-	 * display
-	 */
-	protected int numberOfRowsToDisplay = 2;
-
-	/**
-	 * Number of columns, initialized with initial number of columns of pages to
-	 * display
-	 */
-	protected int numberOfColumnsToDisplay = 2;
-
-	/**
-	 * The diagram edit part
-	 */
-	protected DiagramEditPart diagramEditPart;
-
-	/**
-	 * Max bounds of a page for no page break
-	 */
-	protected Rectangle pageBreakBounds;
-
-	/* SWT interface variables */
-
-	/**
-	 * Body of the shell.
-	 */
-	protected Composite body;
-
-	/**
-	 * Composite for the pages
-	 */
-	protected Composite composite;
-
-	/**
-	 * Height of the button bar, initialized right before the button bar is
-	 * created.
-	 */
-	protected int buttonBarHeight;
-
-	/**
-	 * Shell for the new pop up
-	 */
-	protected Shell shell;
-    
-    /**
-     * Temporary shell to be used when creating the diagram editpart.
-     */
-    private Shell tempShell;
-
-	/* Toolbar items are in left to right order */
-
-	/**
-	 * Print item on toolbar
-	 */
-	protected ToolItem printTool;
-
-	/**
-	 * Pages item on toolbar
-	 */
-	protected ToolItem pagesTool;
-
-	/**
-	 * Left item on toolbar
-	 */
-	protected ToolItem leftTool;
-
-	/**
-	 * Right item on toolbar
-	 */
-	protected ToolItem rightTool;
-
-	/**
-	 * Up item on toolbar
-	 */
-	protected ToolItem upTool;
-
-	/**
-	 * Down item on toolbar
-	 */
-	protected ToolItem downTool;
-
-	/**
-	 * Close item on toolbar
-	 */
-	protected ToolItem closeTool;
-
-	/**
-	 * It's easiest to keep track of the page images using an image list, but I
-	 * could also have done getImage on the labels
-	 */
-	private List imageList = new ArrayList();
-
-	/**
-	 * Border size
-	 */
-	protected static final int BORDER_SIZE = 20;
-
-	/**
-	 * the background color
-	 */
-	private static final Color BACKGROUND_COLOR = new Color(Display
-		.getDefault(), 124, 124, 124);
-
-	/* Images */
-	/**
-	 * Enabled print image
-	 */
-	protected Image printImage;
-
-	/**
-	 * Disabled Print image
-	 */
-	protected Image disabledPrintImage;
-
-	/**
-	 * Page image, unlikely to ever be disabled
-	 */
-	protected Image pageImage;
-
-	/**
-	 * Enabled left image
-	 */
-	protected Image leftImage;
-
-	/**
-	 * Disabled left image
-	 */
-	protected Image disabledLeftImage;
-
-	/**
-	 * Enabled right image
-	 */
-	protected Image rightImage;
-
-	/**
-	 * Disabled right image
-	 */
-	protected Image disabledRightImage;
-
-	/**
-	 * Enabled up image
-	 */
-	protected Image upImage;
-
-	/**
-	 * Diabled up image
-	 */
-	protected Image disabledUpImage;
-
-	/**
-	 * Enabled down image
-	 */
-	protected Image downImage;
-
-	/**
-	 * Disabled down image
-	 */
-	protected Image disabledDownImage;
-
-	/**
-	 * Close image, unlikely to ever be disabled
-	 */
-	protected Image closeImage;
-
-	/**
-	 * Initialize all toolbar images
-	 */
-	protected void initializeToolbarImages() {
-		printImage = DiagramUIPrintingPluginImages.DESC_PRINT.createImage();
-
-		disabledPrintImage = DiagramUIPrintingPluginImages.DESC_PRINT_DISABLED
-			.createImage();
-
-		pageImage = DiagramUIPrintingPluginImages.DESC_PAGE.createImage();
-
-		leftImage = DiagramUIPrintingPluginImages.DESC_LEFT.createImage();
-
-		disabledLeftImage = DiagramUIPrintingPluginImages.DESC_LEFT_DISABLED
-			.createImage();
-
-		rightImage = DiagramUIPrintingPluginImages.DESC_RIGHT.createImage();
-
-		disabledRightImage = DiagramUIPrintingPluginImages.DESC_RIGHT_DISABLED
-			.createImage();
-
-		upImage = DiagramUIPrintingPluginImages.DESC_UP.createImage();
-		disabledUpImage = DiagramUIPrintingPluginImages.DESC_UP_DISABLED
-			.createImage();
-
-		downImage = DiagramUIPrintingPluginImages.DESC_DOWN.createImage();
-
-		disabledDownImage = DiagramUIPrintingPluginImages.DESC_DOWN_DISABLED
-			.createImage();
-
-		closeImage = DiagramUIPrintingPluginImages.DESC_CLOSE.createImage();
-	}
-
-	/**
-	 * Do the print preview.
-	 * 
-	 * @param printActionHelper,
-	 *            an IPrintActionHelper with a doPrint method that will be
-	 *            called when the print button is pressed. I use this parameter
-	 *            so that this class can be extensible, e.g.
-	 *            ModelerPrintActionHelper will implement it for Modeler and
-	 *            something else will implement it for a different editor.
-	 */
-	public void doPrintPreview(IPrintActionHelper prActionHelper) {
-		this.printActionHelper = prActionHelper;
-
-		if (getDiagramEditorPart() == null) {
-			MessageDialog
-				.openInformation(PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getShell(),
-					DiagramUIPrintingMessages.PrintPreview_Title, 
-					DiagramUIPrintingMessages.PrintPreview_NotEnabled); 
-			return;
-		}
-
-		if (!isPrinterInstalled()) {
-			WindowUtil
-				.doMessageBox(DiagramUIPrintingMessages.PrintPreview_NoPrinterInstalled, 
-					DiagramUIPrintingMessages.PrintPreview_Title, 
-					SWT.ICON_ERROR, PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow().getShell());
-			return;
-		}
-
-		initializeToolbarImages();
-
-		initializeMapMode();
-
-		diagramEditPart = null;
-		pageBreakBounds = null;
-		
-		userX = 0;
-		userY = 0;
-		
-		if (getTotalNumberOfRows() == 1 && getTotalNumberOfColumns() == 1) {
-			numberOfRowsToDisplay = 1;
-			numberOfColumnsToDisplay = 1;
-		}
-		else if (getTotalNumberOfRows() == 1) {
-			numberOfRowsToDisplay = 1;
-			numberOfColumnsToDisplay = 2;
-		}
-		else {
-		numberOfRowsToDisplay = 2;
-		numberOfColumnsToDisplay = 2;
-		}
-
-		Display display = Display.getDefault();
-		
-        //check for rtl orientation...
-        int style = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().getStyle();
-        if ((style & SWT.MIRRORED) != 0) {
-            shell = new Shell(display, SWT.APPLICATION_MODAL | SWT.TITLE
-                | SWT.CLOSE | SWT.BORDER | SWT.RIGHT_TO_LEFT);
-        }
-        else
-            shell = new Shell(display, SWT.APPLICATION_MODAL | SWT.TITLE
-                | SWT.CLOSE | SWT.BORDER);
-        
-		
-
-		shell.setSize(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-			.getShell().getSize());
-		shell.setText(DiagramUIPrintingMessages.PrintPreview_Title);
-		shell.setLocation(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-			.getShell().getLocation());
-		shell.setLayout(new GridLayout(1, true));
-
-		ToolBar bar = new ToolBar(shell, SWT.FLAT | SWT.HORIZONTAL);
-
-		printTool = new ToolItem(bar, SWT.NULL);
-		printTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_PrintToolItem);
-		printTool.setImage(printImage);
-		printTool.setDisabledImage(disabledPrintImage);
-		printTool.addSelectionListener(new SelectionListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				//should not be enabled
-				Assert.isNotNull(printActionHelper);
-				printActionHelper
-					.doPrint(PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage()
-						.getActivePart());
-				shell.setActive();
-				
-			}
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		if (printActionHelper == null) {
-			printTool.setEnabled(false);
-		}
-
-		new ToolItem(bar, SWT.SEPARATOR);
-
-		pagesTool = new ToolItem(bar, SWT.DROP_DOWN);
-		pagesTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_PagesToolItem);
-		pagesTool.setImage(pageImage);
-
-		pagesTool.addSelectionListener(new SelectionAdapter() {
-
-			private Menu menu = null;
-
-			//also update userX, userY, numberOfRowsToDisplay,
-			// numberOfColumnsToDisplay
-			private void updatePreview(int newNumberOfColumnsToDisplay,
-					int newNumberOfRowsToDisplay) {
-				numberOfRowsToDisplay = newNumberOfRowsToDisplay;
-				numberOfColumnsToDisplay = newNumberOfColumnsToDisplay;
-
-				//When switching the number of pages to display to a bigger
-				//number, you can get an extra blank page on the right or on
-				//the bottom. This check prevents the extra blank page.
-
-				if (userX + numberOfColumnsToDisplay > getTotalNumberOfColumns()) {
-					//move it left
-					userX = getTotalNumberOfColumns()
-						- numberOfColumnsToDisplay;
-					//be safe, check for 0
-					if (userX < 0)
-						userX = 0;
-				}
-
-				if (userY + numberOfRowsToDisplay > getTotalNumberOfRows()) {
-					//move it up
-					userY = getTotalNumberOfRows() - numberOfRowsToDisplay;
-					//be safe, check for 0
-					if (userY < 0)
-						userY = 0;
-				}
-
-				updateLeftRightUpDownButtonsForToolbar();
-
-				updateCompositeForNumberOfColumns(numberOfRowsToDisplay,
-					numberOfColumnsToDisplay);
-
-			}
-
-			public void widgetSelected(SelectionEvent event) {
-				// Create the menu if it has not already been created
-
-				if (menu == null) {
-					// Lazy create the menu.
-					menu = new Menu(shell);
-					MenuItem menuItem = new MenuItem(menu, SWT.NONE);
-					menuItem.setText(DiagramUIPrintingMessages.PrintPreview_1Up);
-					menuItem.addSelectionListener(new SelectionAdapter() {
-
-						public void widgetSelected(SelectionEvent e) {
-							updatePreview(1, 1);
-						}
-					});
-
-					menuItem = new MenuItem(menu, SWT.NONE);
-					menuItem.setText(DiagramUIPrintingMessages.PrintPreview_2Up);
-					menuItem.addSelectionListener(new SelectionAdapter() {
-
-						public void widgetSelected(SelectionEvent e) {
-							updatePreview(2, 1);
-						}
-					});
-
-					menuItem = new MenuItem(menu, SWT.NONE);
-					menuItem.setText(DiagramUIPrintingMessages.PrintPreview_4Up);
-					menuItem.addSelectionListener(new SelectionAdapter() {
-
-						public void widgetSelected(SelectionEvent e) {
-							updatePreview(2, 2);
-						}
-					});
-				}
-
-				final ToolItem toolItem = (ToolItem) event.widget;
-				final ToolBar toolBar = toolItem.getParent();
-				org.eclipse.swt.graphics.Rectangle toolItemBounds = toolItem
-					.getBounds();
-				//left aligned under the pages button
-				Point point = toolBar.toDisplay(new Point(toolItemBounds.x,
-					toolItemBounds.y));
-				menu.setLocation(point.x, point.y + toolItemBounds.height);
-				setMenuVisible(true);
-
-			}
-
-			private void setMenuVisible(boolean visible) {
-				menu.setVisible(visible);
-			}
-
-		});
-
-		new ToolItem(bar, SWT.SEPARATOR);
-
-		leftTool = new ToolItem(bar, SWT.NULL);
-        if ((style & SWT.MIRRORED) != 0) {
-            //switch left and right for RTL...
-            leftTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_RightToolItem);
-            leftTool.setImage(rightImage);
-            leftTool.setDisabledImage(disabledRightImage);
-        }
-        else { 
-            leftTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_LeftToolItem);
-            leftTool.setImage(leftImage);
-            leftTool.setDisabledImage(disabledLeftImage);
-        }
-		
-		leftTool.addSelectionListener(new SelectionListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				if (userX > 0) {
-					userX--;
-					updateCompositeForNumberOfColumns(numberOfRowsToDisplay,
-						numberOfColumnsToDisplay);
-					updateLeftRightUpDownButtonsForToolbar();
-				}
-			}
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-        rightTool = new ToolItem(bar, SWT.NULL);
-        if ((style & SWT.MIRRORED) != 0) {
-            //switch left and right for RTL
-            rightTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_LeftToolItem);
-            rightTool.setImage(leftImage);
-            rightTool.setDisabledImage(disabledLeftImage);
-        }
-        else { 
-            rightTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_RightToolItem);
-            rightTool.setImage(rightImage);
-            rightTool.setDisabledImage(disabledRightImage);    
-        }
-		
-		rightTool.addSelectionListener(new SelectionListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				//check for max pages to be safe
-				if (!(userX + numberOfColumnsToDisplay + 1 > getTotalNumberOfColumns())) {
-					userX++;
-					updateCompositeForNumberOfColumns(numberOfRowsToDisplay,
-						numberOfColumnsToDisplay);
-					updateLeftRightUpDownButtonsForToolbar();
-				}
-			}
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		upTool = new ToolItem(bar, SWT.NULL);
-		upTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_UpToolItem);
-		upTool.setImage(upImage);
-		upTool.setDisabledImage(disabledUpImage);
-		upTool.addSelectionListener(new SelectionListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				if (userY > 0) {
-					userY--;
-					updateCompositeForNumberOfColumns(numberOfRowsToDisplay,
-						numberOfColumnsToDisplay);
-					updateLeftRightUpDownButtonsForToolbar();
-				}
-			}
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		downTool = new ToolItem(bar, SWT.NULL);
-		downTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_DownToolItem);
-		downTool.setImage(downImage);
-		downTool.setDisabledImage(disabledDownImage);
-		downTool.addSelectionListener(new SelectionListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				if (!(userY + numberOfRowsToDisplay + 1 > getTotalNumberOfRows())) {
-					userY++;
-					updateCompositeForNumberOfColumns(numberOfRowsToDisplay,
-						numberOfColumnsToDisplay);
-					updateLeftRightUpDownButtonsForToolbar();
-				}
-			}
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		new ToolItem(bar, SWT.SEPARATOR);
-		closeTool = new ToolItem(bar, SWT.NULL);
-		closeTool.setToolTipText(DiagramUIPrintingMessages.PrintPreview_CloseToolItem);
-		closeTool.setImage(closeImage);
-		closeTool.addSelectionListener(new SelectionListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				dispose();
-				shell.close();
-				shell.dispose();
-			}
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		buttonBarHeight = bar.getBounds().height - bar.getBounds().y;
-
-		bar.setBounds(0, 0, shell.getSize().x, buttonBarHeight);
-
-		//do the body in the middle
-		body = new Composite(shell, SWT.NULL);
-		body.setLayout(new GridLayout(1, true));
-		body.setLayoutData(new GridData(GridData.FILL_BOTH));
-		body.setBackground(BACKGROUND_COLOR);
-
-		composite = new Composite(body, SWT.NULL);
-		composite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
-
-		updateCompositeForNumberOfColumns(numberOfRowsToDisplay, numberOfColumnsToDisplay);
-
-		updateLeftRightUpDownButtonsForToolbar();
-
-		shell.open();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
-
-		shell.dispose();
-
-	}
-
-	private IMapMode mm;
-	
-	/**
-	 * The constructor.
-	 */
-	public PrintPreviewHelper() {
-		//do nothing
-	}
-	
-	/**
-	 * @return <code>IMapMode</code> to do the coordinate mapping
-	 */
-	protected IMapMode getMapMode() {
-		return mm;
-	}
-
-	/**
-	 * Initialize the map mode variable
-	 */
-	private void initializeMapMode() {
-		DiagramEditor diagramEditor = getDiagramEditorPart();
-		
-		assert diagramEditor != null;
-		
-		IDiagramGraphicalViewer viewer = diagramEditor.getDiagramGraphicalViewer();
-		
-		if (viewer != null) {
-			RootEditPart rootEP = viewer.getRootEditPart();
-			
-			if (rootEP instanceof DiagramRootEditPart) {
-				this.mm = ((DiagramRootEditPart) rootEP).getMapMode();;
-				return;
-				
-			}
-		}
-		
-		this.mm = MapModeUtil.getMapMode();
-	}
-	
-	/**
-	 * Return and cache the total number of rows used by the diagram
-	 * 
-	 * @return int total number of rows used by the diagram
-	 */
-	private int getTotalNumberOfRows() {
-		float numRows = ((float) getBounds().height)
-			/ PageInfoHelper
-				.getPageSize(getPreferenceStore(), true, getMapMode()).y;
-		return Math.max(1, (int) Math.ceil(numRows));
-	}
-
-	/**
-	 * Return the diagram editor part that we are doing the print preview for
-	 * 
-	 * @return DiagramEditor, diagram editor part that we are doing the print
-	 *         preview for. I do not return IDiagramWorkbenchPart because
-	 *         DiagramEditorPart contains some extra methods for the page break
-	 *         checks.
-	 */
-	private DiagramEditor getDiagramEditorPart() {
-		//more explicit than using window
-		IEditorPart editorPart = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
-		if (!(editorPart instanceof DiagramEditor)) {
-			return null;
-		}
-
-		DiagramEditor diagramEditorPart = (DiagramEditor) editorPart;
-
-		return diagramEditorPart;
-	}
-
-	/**
-	 * Return the diagram bounds of the diagram we are doing the print preview
-	 * for.
-	 * 
-	 * @return Rectangle with diagram bounds of the diagram we are doing the
-	 *         print preview for.
-	 */
-	protected Rectangle getDiagramBounds() {
-		return PageInfoHelper.getChildrenBounds(getDiagramEditPart(), null);
-		//null because we are not ignoring anything
-	}
-
-	/**
-	 * Return and cache the page break bounds of the diagram we are doing the
-	 * print preview for.
-	 * 
-	 * @return Rectangle with page break bounds of the diagram we are doing the
-	 *         print preview for.
-	 */
-	protected Rectangle getPageBreakBounds() {
-		if (pageBreakBounds == null) {
-			pageBreakBounds = PrintHelper.getPageBreakBounds(getDiagramEditPart(), true);
-		}
-		return pageBreakBounds;
-	}
-
-	/**
-	 * Return the pageBreakBounds if possible. If not, return the diagram
-	 * bounds.
-	 * 
-	 * @return Rectangle with page break bounds if possible. If not possible,
-	 *         just return the diagram bounds.
-	 */
-	protected Rectangle getBounds() {
-		//don't worry about storing it, it's cached
-		return (getPageBreakBounds() == null) ? getDiagramBounds()
-			: getPageBreakBounds();
-	}
-
-	/**
-	 * Return the diagram edit part that we are doing the print preview for.
-	 * Uses getDiagramEditorPart().
-	 * 
-	 * @return DiagramEditPart, diagram edit part that we are doing the print
-	 *         preview for
-	 */
-	protected DiagramEditPart getDiagramEditPart() {
-		if (diagramEditPart == null) {
-			Diagram diagram = getDiagramEditorPart().getDiagram(); //do not getDiagramEditPart
-			PreferencesHint preferencesHint = getPreferencesHint(getDiagramEditorPart());
-			diagramEditPart = PrintHelper.createDiagramEditPart(diagram, preferencesHint, getTempShell());
-			PrintHelper.initializePreferences(diagramEditPart, preferencesHint);
-		}
-		return diagramEditPart;
-	}
-	
-    /**
-     * Lazily creates a new shell.
-     * @return
-     */
-    private Shell getTempShell() {
-        if (tempShell == null) {
-            tempShell = new Shell();
-        }
-        return tempShell;
-    }
-
-    protected PreferencesHint getPreferencesHint(IEditorPart editorPart) {
-		if (editorPart instanceof IDiagramWorkbenchPart) {
-			RootEditPart rootEP = ((IDiagramWorkbenchPart) editorPart)
-				.getDiagramGraphicalViewer().getRootEditPart();
-			if (rootEP instanceof IDiagramPreferenceSupport) {
-				return ((IDiagramPreferenceSupport) rootEP)
-					.getPreferencesHint();
-			}
-		}
-		return PreferencesHint.USE_DEFAULTS;
-	}
-	
-
-	/**
-	 * Return and cache the total number of columns used by the diagram
-	 * 
-	 * @return int total number of columns used by the diagram
-	 */
-	private int getTotalNumberOfColumns() {
-		float numCols = ((float) getBounds().width)
-			/ PageInfoHelper
-				.getPageSize(getPreferenceStore(), true, getMapMode()).x;
-		return Math.max(1, (int) Math.ceil(numCols));
-	}
-
-	/**
-	 * Make sure printer is installed. Should not be able to print preview if no
-	 * printer is installed, even though technically it will work.
-	 * 
-	 * Call this immediately with the rest of the initialization.
-	 */
-	protected boolean isPrinterInstalled() {
-		Printer printer = null;
-		try {
-			printer = new Printer();
-		} catch (SWTError e) {
-			//I cannot printer.dispose(); because it may not have been
-			//initialized
-			Trace.catching(DiagramPrintingPlugin.getInstance(),
-				DiagramPrintingDebugOptions.EXCEPTIONS_CATCHING,
-				PrintPreviewHelper.class, "isPrinterInstalled", //$NON-NLS-1$
-				e);
-
-			if (e.code == SWT.ERROR_NO_HANDLES) {
-				//it might have really been ERROR_NO_HANDLES, but there's
-				//no way for me to really know
-				return false;
-			}
-
-			//if (e.code != SWT.ERROR_NO_HANDLES)
-			Log.error(DiagramPrintingPlugin.getInstance(),
-				DiagramPrintingStatusCodes.GENERAL_UI_FAILURE,
-				"Failed to make instance of Printer object", e); //$NON-NLS-1$
-
-			//else if another swt error
-			Trace.throwing(DiagramPrintingPlugin.getInstance(),
-				DiagramPrintingDebugOptions.EXCEPTIONS_CATCHING,
-				PrintPreviewHelper.class, "isPrinterInstalled", //$NON-NLS-1$
-				e);
-			throw e;
-		}
-
-		printer.dispose();
-
-		return true;
-	}
-
-	/**
-	 * Clean up by deleting the images in the image list
-	 */
-	private void disposeImages() {
-		while (imageList.size() > 0) {
-			Assert.isTrue(imageList.get(0) instanceof Image);
-			if (!((Image) imageList.get(0)).isDisposed())
-				((Image) imageList.get(0)).dispose();
-			imageList.remove(0);
-		}
-	}
-
-	/**
-	 * Draw the composite centered on the body based on the number of columns.
-	 * Also calls the method to make the images and insert them into the
-	 * composite.
-	 * 
-	 * @param numberOfRows
-	 *            the number of rows that the composite should contain. I need
-	 *            this to figure out the height of the image.
-	 * @param numberOfColumns
-	 *            the number of columns that the composite should contain. I
-	 *            need this to figure out the width of the image.
-	 */
-	private void updateCompositeForNumberOfColumns(int numberOfRows,
-			int numberOfColumns) {
-		Assert.isNotNull(shell);
-		Assert.isNotNull(composite);
-
-		WindowUtil.disposeChildren(composite);
-		disposeImages();
-
-		//the next two lines of code are intentional
-		composite.setLayout(null);
-		composite.pack();
-
-		composite.setLayout(new GridLayout(numberOfColumns, true));
-
-		//(shell height - toolbar height - top border - bottom border - title -
-		// ((# of rows - 1) x vertical border between images)) / # of rows
-		int imageHeight = (shell.getSize().y - buttonBarHeight - BORDER_SIZE
-			- BORDER_SIZE - BORDER_SIZE - ((numberOfRows - 1) * BORDER_SIZE))
-			/ numberOfRows;
-
-		//(shell width - left border - right border - ((# of columns - 1) x
-		// horizontal border between images)) / # of columns
-		int imageWidth = (shell.getSize().x - BORDER_SIZE - BORDER_SIZE - ((numberOfColumns - 1) * BORDER_SIZE))
-			/ numberOfColumns;
-
-		//now adjust to the limiting one based on aspect ratio
-
-		//to make this conform to the page breaks, RATLC00247228
-		//get printer ratio from the page, not the real printer
-
-		org.eclipse.draw2d.geometry.Point pageSize = PageInfoHelper
-			.getPageSize(getPreferenceStore(), false, getMapMode());
-		Assert.isNotNull(pageSize);
-		
-		//width / height
-		float printerRatio = ((float) pageSize.x) / ((float) pageSize.y);
-
-		if (imageHeight * printerRatio < imageWidth) {
-			//round down
-			imageWidth = (int) (imageHeight * printerRatio);
-		} else if (imageWidth * (1 / printerRatio) < imageHeight) {
-			//round down
-			imageHeight = (int) (imageWidth * (1.0f / printerRatio));
-		}
-		
-		PageMargins margins = PageInfoHelper.getPageMargins(getPreferenceStore(), getMapMode());
-
-		//make sure height and width are not 0, if too small <4, don't bother
-		if (!(imageHeight <= 4 || imageWidth <= 4)) {
-
-			//or imageWidth / pageSize.x
-			float scale = ((float) imageHeight / (float) pageSize.y)
-				/ (float) DiagramMapModeUtil.getScale(getMapMode());
-
-			for (int i = 0; i < numberOfRows; i++) {
-				for (int j = 0; j < numberOfColumns; j++) {
-					Label label = new Label(composite, SWT.NULL);
-					Image pageImg = makeImage(imageWidth, imageHeight, i, j,
-						scale, margins);
-					label.setImage(pageImg);
-					imageList.add(pageImg);
-				}
-			}
-
-		}
-
-		composite.pack();
-
-		//GridData.VERTICAL_ALIGN_CENTER | GridData.HORIZONTAL_ALIGN_CENTER
-		// won't do it for you
-		org.eclipse.swt.graphics.Rectangle compositeBounds = composite
-			.getBounds();
-
-		//this approximation is OK
-		compositeBounds.x = (shell.getSize().x - BORDER_SIZE - compositeBounds.width) / 2;
-		compositeBounds.y = (shell.getSize().y - buttonBarHeight - BORDER_SIZE
-			- BORDER_SIZE - BORDER_SIZE - compositeBounds.height) / 2;
-		composite.setBounds(compositeBounds);
-	}
-
-	/**
-	 * Update the enabled and disabled states for the toolbar
-	 */
-	protected void updateLeftRightUpDownButtonsForToolbar() {
-		if (userX == 0) {
-			leftTool.setEnabled(false);
-		} else {
-			leftTool.setEnabled(true);
-		}
-
-		//should be (user + 1) + (display - 1), the +1 and -1 can be taken out
-		if (userX + numberOfColumnsToDisplay + 1 > getTotalNumberOfColumns()) {
-			rightTool.setEnabled(false);
-		} else {
-			rightTool.setEnabled(true);
-		}
-
-		if (userY == 0) {
-			upTool.setEnabled(false);
-		} else {
-			upTool.setEnabled(true);
-		}
-
-		if (userY + numberOfRowsToDisplay + 1 > getTotalNumberOfRows()) {
-			downTool.setEnabled(false);
-		} else {
-			downTool.setEnabled(true);
-		}
-	}
-
-	/**
-	 * Makes the image for the location at row, col. row and col start from 0.
-	 * The image will have a size of imageWidth x imageHeight.
-	 * 
-	 * @param imageWidth
-	 *            int of pixels of width of image
-	 * @param imageWidth
-	 *            int of pixels of height of image
-	 * @param row
-	 *            int of row to make image at, starting at 0
-	 * @param col
-	 *            int of column to make image at, starting at 0
-	 * @return Image of size imageWidth * imageHeight
-	 */
-	protected Image makeImage(int imageWidth, int imageHeight, int row,
-			int col, float scale, PageMargins margins) {
-
-		Image image = new Image(Display.getDefault(), imageWidth, imageHeight);
-
-        GC gc = null;
-        
-        //check for rtl orientation...
-        if ((shell.getStyle() & SWT.MIRRORED) != 0) {
-            gc = new GC(image, SWT.RIGHT_TO_LEFT);
-        }
-        else
-            gc = new GC(image);
-
-		SWTGraphics sg = new SWTGraphics(gc);
-		//for scaling
-		ScaledGraphics g1 = new ScaledGraphics(sg);
-	
-		//for himetrics and svg
-		MapModeGraphics mmg = createMapModeGraphics(g1);
-		
-		//if mmg's font is null, gc.setFont will use a default font
-		gc.setFont(mmg.getFont());
-		drawPage(mmg, gc, scale, row, col, margins);
-
-		gc.dispose();
-
-		return image;
-
-	}
-	
-	/**
-	 * Convenience method to determine if a page at row y and
-	 * column x exists.
-	 * Pages start at 1.
-	 * 
-	 * For example, the first page is 1-1.
-	 * 
-	 * @param x, column number of the page to check
-	 * @param y, row number of the page to check
-	 * 
-	 * @return boolean true if the page exists, false if it doesn't
-	 */
-	private boolean doesPageExist(int x, int y) {
-		return x > 0 && y > 0 && x <= getTotalNumberOfColumns() && y <= getTotalNumberOfRows();
-	}
-	
-	/**
-	 * Draw page to ScaledSWTGraphics which should have been initialized on a gc
-	 * from an image.
-	 * 
-	 * @param g
-	 *            the ScaledSWTGraphics we are drawing to.
-	 * @param gc
-	 *            the GC that has a font set in it.
-	 * @param scale
-	 *            how much we should scale by to fit a page in the image
-	 * @param row
-	 *            using this value, we calculate how much to translate by. This
-	 *            is not the row according to the page breaks on the diagram,
-	 *            but it is the row according to the number of pages we are
-	 *            displaying in the print preview.
-	 * @param col
-	 *            using this value, we calculate how much to translate by. This
-	 *            is not the col according to the page breaks on the diagram,
-	 *            but it is the col according to the number of pages we are
-	 *            displaying in the print preview.
-	 */
-	protected void drawPage(Graphics g, GC gc, float scale, int row, int col, PageMargins margins) {
-		org.eclipse.draw2d.geometry.Point pageSize = PageInfoHelper
-		.getPageSize(getPreferenceStore(), false, getMapMode());
-		
-		g.pushState();
-
-		Rectangle bounds = getBounds();
-
-		int translateX = (int) (0f
-				- bounds.x
-				* scale
-				+ ((float) getTotalNumberOfColumns()
-					* pageSize.x - bounds.width)
-				* scale / 2f
-				- (((float) pageSize.x)
-				* ((float) (col + userX)) * scale)),
-		translateY = (int) (0f
-				- bounds.y
-				* scale
-				+ ((float) getTotalNumberOfRows()
-					* pageSize.y - bounds.height)
-				* scale / 2f
-				- (((float) pageSize.y)
-				* ((float) (row + userY)) * scale));
-		
-		
-		//offset by page break figure bounds, then offset by the row or column we're at, and then take margins into account
-		translateX = - bounds.x - (pageSize.x * (col + userX)) + (margins.left * (col + userX + 1)) + (margins.right * (col + userX));
-		translateY = - bounds.y - (pageSize.y * (row + userY)) + (margins.top * (row + userY + 1)) + (margins.bottom * (row + userY));
-		
-		//To set a specific font, we could do this
-		//For a completely accurate print preview, the font is printer specific
-		//and may not be supported by the screen, so it is pointless
-		//FontData fontData = JFaceResources.getDefaultFont().getFontData()[0];
-		//Font font = new Font(device, fontData);
-		//g.setFont(font);
-		
-		if (doesPageExist(1 + userX + col, 1 + userY + row)) {
-			g.pushState(); //draw text, don't make it too small or big
-			g.scale(scale);
-
-			String headerOrFooter =
-				HeaderAndFooterHelper.makeHeaderOrFooterString(
-					WorkspaceViewerProperties.HEADER_PREFIX,
-					1 + userY + row,
-					1 + userX + col,
-					getDiagramEditPart());
-			
-			g.drawText(
-				headerOrFooter,				
-				(pageSize.x - getMapMode().DPtoLP(gc.textExtent(headerOrFooter).x)) / 2,
-				getMapMode().DPtoLP(HeaderAndFooterHelper.TOP_MARGIN_DP));
-
-			headerOrFooter =
-				HeaderAndFooterHelper.makeHeaderOrFooterString(
-					WorkspaceViewerProperties.FOOTER_PREFIX,
-					1 + userY + row,
-					1 + userX + col,
-					getDiagramEditPart());
-
-			g.drawText(
-				headerOrFooter,
-				(pageSize.x - getMapMode().DPtoLP(gc.textExtent(headerOrFooter).x)) / 2,
-				pageSize.y - getMapMode().DPtoLP(HeaderAndFooterHelper.BOTTOM_MARGIN_DP));
-
-			g.popState(); //for drawing the text				
-		}
-
-		g.scale(scale);
-
-		g.translate(translateX, translateY);
-		
-        Rectangle clip = new Rectangle((pageSize.x - margins.left - margins.right)
-    			* (col + userX) + bounds.x, (pageSize.y - margins.top - margins.bottom)
-    			* (row + userY) + bounds.y, pageSize.x - margins.left - margins.right,
-    			pageSize.y - margins.top - margins.bottom);
-		g.clipRect(clip);		
-		
-		//should be from printer and screen ratio and image size
-		getDiagramEditPart().getLayer(LayerConstants.PRINTABLE_LAYERS).paint(g);
-		
-		g.popState();
-	}
-
-	/**
-	 * Safely dispose an image
-	 * 
-	 * @param image, the Image to dispose.
-	 */
-	private void safeDisposeImage(Image image) {
-		if (image != null && !image.isDisposed())
-			image.dispose();
-	}
-
-	/**
-	 * Dispose resources.
-	 */
-	protected void dispose() {
-		disposeImages();
-		safeDisposeImage(printImage);
-		safeDisposeImage(disabledPrintImage);
-		safeDisposeImage(pageImage);
-		safeDisposeImage(leftImage);
-		safeDisposeImage(disabledLeftImage);
-		safeDisposeImage(rightImage);
-		safeDisposeImage(disabledRightImage);
-		safeDisposeImage(upImage);
-		safeDisposeImage(disabledUpImage);
-		safeDisposeImage(downImage);
-		safeDisposeImage(disabledDownImage);
-		safeDisposeImage(closeImage);
-        tempShell.dispose();
-        tempShell = null;
-	}
-
-	/**
-	 * Convience method to get the workspcae preference store.
-	 * 
-	 * @return IPreferenceStore
-	 */
-	private IPreferenceStore getWorkspaceViewerPreferenceStore() {
-		assert getDiagramEditPart().getViewer() instanceof DiagramGraphicalViewer;
-		return ((DiagramGraphicalViewer) getDiagramEditPart().getViewer()).getWorkspaceViewerPreferenceStore();
-	}
-	
-	private IPreferenceStore getGlobalPreferenceStore() {
-		return (IPreferenceStore) getDiagramEditPart()
-				.getDiagramPreferencesHint().getPreferenceStore();
-	}
-	
-	private IPreferenceStore getPreferenceStore() {
-		if (getWorkspaceViewerPreferenceStore().getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS))
-			return getGlobalPreferenceStore();
-		else
-			return getWorkspaceViewerPreferenceStore();
-	}
-	
-	/**
-	 * Creates the <code>MapModeGraphics</code>.
-	 * 
-	 * @param scaledGraphics
-	 * @return the <code>MapModeGraphics</code>
-	 */
-	protected MapModeGraphics createMapModeGraphics(
-			ScaledGraphics scaledGraphics) {
-		return new MapModeGraphics(scaledGraphics, getMapMode());
-	}
-	
-	
-	
-
-	
-	
-	
-	
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/printpreview/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/printpreview/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/printpreview/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/DiagramPrinter.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/DiagramPrinter.java
deleted file mode 100644
index 1b57c24..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/DiagramPrinter.java
+++ /dev/null

@@ -1,939 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal.util;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.PageBreakEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.PageBreaksFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper.PageMargins;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.PrinterGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.printing.Printer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/*
- * @canBeSeenBy %level1
- */
-public class DiagramPrinter
-    implements Runnable {
-
-    protected Printer printer;
-
-    private Point display_dpi;
-
-    private boolean isScaledPercent = false;
-
-    private int rows = 1;
-
-    private int columns = 1;
-    
-    private boolean printRangePageSelection = false;
-    
-    private int pageFrom = 1, pageTo = 1;
-
-    private GC gc;
-    
-    private Graphics swtGraphics;
-    
-    private Graphics graphics;
-    
-    private PrinterGraphics printerGraphics;
-    
-    protected Point printerOffset;
-
-    protected Rectangle logicalClientArea;
-
-    private float userScale;
-
-    /**
-     * Used when a Collection of Diagram objects are passed in instead of an
-     * IEditorPart.
-     */
-    protected Collection diagrams;
-
-    /**
-     * The initial amount that the diagram should be translated, set by
-     * printToScale or printToPages which calls drawToFitRowsColumns.
-     */
-    private Point translated = null;
-    
-    /**
-     * The hint used to find the appropriate preference store from which general
-     * diagramming preference values for properties of shapes, connections, and
-     * diagrams can be retrieved. This hint is mapped to a preference store in
-     * the {@link DiagramPreferencesRegistry}.
-     */
-    private PreferencesHint preferencesHint;
-    private IMapMode mm;
-    
-    private boolean fitToPage = false;
-    
-    /**
-     * change the fit to page state
-     * @param fitToPage the new fit to page state
-     */
-    public void setFitToPage(boolean fitToPage){
-        this.fitToPage = fitToPage;
-    }
-
-    /**
-     * Creates a new instance. The following variables must be initialized
-     * before calling <code>run()</code>:
-     * <li><code>printer</code></li>
-     * <li><code>display_dpi</code></li>
-     * <li><code>diagrams</code></li>
-     * @param mm <code>IMapMode</code> to do the coordinate mapping
-     */
-    public DiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {
-        super();
-        this.preferencesHint = preferencesHint;
-        this.mm = mm;
-    }
-    
-    /**
-     * Creates a new instance. The following variables must be initialized
-     * before calling <code>run()</code>:
-     * <li><code>printer</code></li>
-     * <li><code>display_dpi</code></li>
-     * <li><code>diagrams</code></li>
-     * @param mm <code>IMapMode</code> to do the coordinate mapping
-     */
-    public DiagramPrinter(PreferencesHint preferencesHint) {
-        this(preferencesHint, MapModeUtil.getMapMode());
-    }
-    
-    /**
-     * @return <code>IMapMode</code> to do the coordinate mapping
-     */
-    protected IMapMode getMapMode() {
-        return mm;
-    }
-    
-    /**
-     * Sets the columns.
-     * 
-     * @param columns
-     *            The columns to set.
-     */
-    public void setColumns(int columns) {
-        this.columns = columns;
-    }
-
-    /**
-     * Sets the diagrams.
-     * 
-     * @param diagrams
-     *            a Collection of Diagram objects
-     */
-    public void setDiagrams(Collection diagrams) {
-        this.diagrams = diagrams;
-    }
-
-    /**
-     * Sets the display DPI.
-     * 
-     * @param display_dpi
-     *            The display_dpi to set.
-     */
-    public void setDisplayDPI(Point display_dpi) {
-        this.display_dpi = new Point(display_dpi.x, display_dpi.y);
-    }
-
-    /**
-     * Sets the printer.
-     * 
-     * @param printer
-     *            The printer to set.
-     */
-    public void setPrinter(Printer printer) {
-        this.printer = printer;
-    }
-    
-    public void setPrintRangePageSelection(boolean isPrintRangePageSelected) {
-        this.printRangePageSelection = isPrintRangePageSelected;
-    }
-    
-    public void setPrintRangePages(int pageFrom, int pageTo) {
-        assert pageFrom > 0 : "From page in print range page selection must be bigger than zero."; //$NON-NLS-1$
-        assert (pageTo > 0 && pageTo >= pageFrom) : "To page in print range page selection must be bigger than zero and from page.";  //$NON-NLS-1$
-        this.pageFrom = pageFrom;
-        this.pageTo = pageTo;
-    }
-
-    /**
-     * Sets the rows.
-     * 
-     * @param rows
-     *            The rows to set.
-     */
-    public void setRows(int rows) {
-        this.rows = rows;
-    }
-
-    /**
-     * Sets the scaled percent.
-     * 
-     * @param scalePercent
-     */
-    public void setScaledPercent(int scalePercent) {
-        this.isScaledPercent = true;
-        this.userScale = (scalePercent) / 100.0f;
-
-    }
-
-    /**
-     * Prints the contents of the diagram editor part.
-     */
-    public void run() {
-        assert null != printer : "printer must be set"; //$NON-NLS-1$
-        if (!(printer.startJob("Printing"))) { //$NON-NLS-1$
-          return;
-        }
-        
-        assert diagrams != null;
-        Iterator it = diagrams.iterator();
-
-        Shell shell = new Shell();
-        try {
-            while (it.hasNext()) {
-                Object obj = it.next();
-                //the diagrams List is only supposed to have Diagram objects
-                Assert.isTrue(obj instanceof Diagram);
-                DiagramEditPart dgrmEP = PrintHelper.createDiagramEditPart((Diagram) obj, preferencesHint, shell);
-                
-                RootEditPart rep = dgrmEP.getRoot();
-                if (rep instanceof DiagramRootEditPart) 
-                    this.mm = ((DiagramRootEditPart)rep).getMapMode();
-                
-                initialize();
-                
-                boolean loadedPreferences = PrintHelper.initializePreferences(dgrmEP, preferencesHint);
-                
-                IPreferenceStore pref = null;
-                
-                assert dgrmEP.getViewer() instanceof DiagramGraphicalViewer;
-        
-                pref = ((DiagramGraphicalViewer)dgrmEP.getViewer()).getWorkspaceViewerPreferenceStore();
-                
-                if (pref.getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS)) {
-                    
-                    //get workspace settings...
-                    if (dgrmEP.getDiagramPreferencesHint().getPreferenceStore() != null)
-                        pref = (IPreferenceStore)dgrmEP.getDiagramPreferencesHint().getPreferenceStore(); 
-                }
-                
-                doPrintDiagram(dgrmEP, loadedPreferences, pref);
-                
-                dispose();
-            }
-            printer.endJob();
-        } finally {
-            shell.dispose();
-        }        
-    }
-    
-    /**
-     * Calculates the row in a grid, given a page number.
-     * | 1 | 2 | 3 |
-     * | 4 | 5 | 6 |
-     * | 7 | 8 | 9 |
-     * 
-     * Given pageNum=5 and totalNumColumns=3, will return 2
-     * (2nd row).
-     * 
-     * @param pageNum the page number in the grid.
-     * @param totalNumColumns total number of columns of the grid.
-     * @return row number corresponding to the page number.
-     */
-    private int calculateRowFromPage(int pageNum, int totalNumColumns) {
-        int row = pageNum / totalNumColumns;
-        if (pageNum % totalNumColumns != 0)
-            row++;
-        return row;
-    }
-    
-    /**
-     * Calculates the column in a grid, given a page number.
-     * | 1 | 2 | 3 |
-     * | 4 | 5 | 6 |
-     * | 7 | 8 | 9 |
-     * 
-     * Given pageNum=5 and totalNumColumns=3, will return 2
-     * (2nd column).
-     *  
-     * @param pageNum the page number in the grid.
-     * @param totalNumColumns total number of columns of the grid.
-     * @param cRow the corresponding row of the page number.
-     * @return row number corresponding to the page number.
-     */
-    private int calculateColumnFromPage(int pageNum, int totalNumColumns, int cRow) {
-        int col = pageNum - ((cRow - 1) * totalNumColumns);
-        return col;
-    }
-    
-    /**
-     * Obtains the total number of pages that span columns and rows
-     * @param dgrmEP
-     * @return Point.x contains the total number of pages that span in a column
-     *         Point.y contains the total number of pages that span in a row
-     */
-    private org.eclipse.draw2d.geometry.Point getPageCount(DiagramEditPart dgrmEP, Rectangle figureBounds, org.eclipse.draw2d.geometry.Point pageSize, boolean applyUserScale) {
-        RootEditPart rootEditPart = dgrmEP.getRoot();
-        if (rootEditPart instanceof DiagramRootEditPart) {
-            //this is the most accurate way to obtain total rows and columns...
-            
-            DiagramRootEditPart diagramRootEditPart = (DiagramRootEditPart) rootEditPart;
-            PageBreakEditPart pageBreakEditPart = diagramRootEditPart
-                .getPageBreakEditPart();
-            float fNumCols = ((PageBreaksFigure)pageBreakEditPart.getFigure()).getPageCount().y * 
-                (applyUserScale ? userScale : 1);
-            float fNumRows = ((PageBreaksFigure)pageBreakEditPart.getFigure()).getPageCount().x * 
-                (applyUserScale ? userScale : 1);
-            
-            int numCols = (int) Math.ceil(fNumCols);
-            int numRows = (int) Math.ceil(fNumRows);
-            
-            return new org.eclipse.draw2d.geometry.Point(numCols,numRows);
-        }
-        else {
-            //otherwise, calculate manually...
-            
-            float fNumRows = (figureBounds.height * (applyUserScale ? userScale : 1))
-                / pageSize.y;
-            int numRows = (int) Math.ceil(fNumRows);
-
-            float fNumCols = (figureBounds.width * (applyUserScale ? userScale : 1))
-                / pageSize.x;
-            int numCols = (int) Math.ceil(fNumCols);
-            
-            return new org.eclipse.draw2d.geometry.Point(numCols, numRows);
-        }
-    }
-
-    /**
-     * Prints to scale or prints to rows x columns pages
-     */
-    private void doPrintDiagram(DiagramEditPart dgrmEP, boolean loadedPreferences, IPreferenceStore fPreferences) {
-        this.graphics.pushState();
-        if (isScaledPercent) {
-            printToScale(dgrmEP, loadedPreferences, fPreferences);
-        } else {
-            printToPages(dgrmEP, loadedPreferences, fPreferences);
-        }
-        this.graphics.popState();
-    }
-
-    private void initialize() {
-
-        assert null != printer : "printer must be set"; //$NON-NLS-1$
-        
-        //check for rtl orientation...
-        int style = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().getStyle();
-        if ((style & SWT.MIRRORED) != 0)
-            this.gc = new GC(printer, SWT.RIGHT_TO_LEFT);
-        else
-            this.gc = new GC(printer);
-
-        gc.setXORMode(false);
-
-        this.swtGraphics = new SWTGraphics(gc);
-        this.printerGraphics = createPrinterGraphics(swtGraphics);
-        this.graphics = createMapModeGraphics(printerGraphics);
-        this.graphics.scale(computePrinterDisplayScale());
-        
-        this.logicalClientArea = this.graphics.getClip(new Rectangle(
-            this.printer.getClientArea()));
-        
-    }
-    
-    /**
-     * Usually, the printable area is less than the page.
-     * This method returns the offset for each x margin and each y margin.
-     * x margins are left and right
-     * y margins are top and bottom
-     * 
-     * We'll assume the left and right offsets are the same and the
-     * top and bottom offsets are the same.
-     * 
-     * @return Point with x and y offsets
-     */
-    protected Point getPrinterOffset() {
-        if (printerOffset == null) {
-            int offsetX = this.printer.getBounds().width
-            - this.printer.getClientArea().width;
-            int offsetY = this.printer.getBounds().height
-            - this.printer.getClientArea().height;
-        
-            // assume half on each side
-            offsetX = (int) (getMapMode()
-                .DPtoLP((int) (offsetX / 2.0f * display_dpi.x / printer.getDPI().x)) / userScale);
-            offsetY = (int) (getMapMode()
-                .DPtoLP((int) (offsetY / 2.0f * display_dpi.y / printer.getDPI().y)) / userScale);
-            
-            printerOffset = new Point(offsetX, offsetY);
-        }
-        
-        return printerOffset;
-    }
-
-    /**
-     * Print the diagram figure using specified scale factor.
-     * 
-     * @param dgrmEP the DiagramEditPart that will be printed
-     * @param loadedPreferences true if existing prefs could be loaded
-     * successfully, false if not and defaults are being used.  This parameter
-     * is important to obtain the correct page break bounds.
-     * @param fPreferences the preferenceStore that could either contain
-     * existing preferences or defaults
-     */
-    protected void printToScale(DiagramEditPart dgrmEP, boolean loadedPreferences, IPreferenceStore fPreferences) {
-
-        assert null != printer : "printer must be set"; //$NON-NLS-1$
-        Rectangle figureBounds = PrintHelper.getPageBreakBounds(dgrmEP, loadedPreferences);
-        org.eclipse.draw2d.geometry.Point pageBounds = PageInfoHelper.getPageSize(fPreferences, getMapMode());
-
-        //translate to offset initial figure position
-        translated = new Point((int) (-figureBounds.x * userScale), (int) (-figureBounds.y * userScale));
-        
-        //calculate the number of page rows and columns
-        int numRows = 0, numCols = 0;
-        
-        PageMargins margins = PageInfoHelper.getPageMargins(fPreferences, getMapMode());
-        adjustMargins(margins, userScale, getPrinterOffset());
-
-        GC gc_ = new GC(Display.getDefault(),this.gc.getStyle());
-        gc_.setAntialias(this.gc.getAntialias());
-
-        FontData fontData = JFaceResources.getDefaultFont().getFontData()[0];
-        Font font = new Font(printer, fontData);
-        
-        org.eclipse.draw2d.geometry.Point pageCount = getPageCount(dgrmEP, figureBounds, pageBounds, true);
-        numCols = pageCount.x;
-        numRows = pageCount.y;
-
-        //finalRow and finalColumn will be used if we are printing within a page range...
-        int row = 1, col = 1, finalRow = 0, finalColumn = 0;
-        
-        if (this.printRangePageSelection) {
-            //print only the pages specified in the page range...
-            row = calculateRowFromPage(this.pageFrom, numCols);
-            col = calculateColumnFromPage(this.pageFrom, numCols, row);
-            
-            finalRow = calculateRowFromPage(this.pageTo, numCols);
-            finalColumn = calculateColumnFromPage(this.pageTo, numCols, finalRow);
-        }
-        
-        try {
-            //print the pages in row, column order
-            for (; row <= numRows; row++) {
-                for (; col <= numCols; col++) {
-                    printer.startPage();
-                    drawPage(gc_, dgrmEP, fPreferences, figureBounds, margins, font, row, col);
-                    printer.endPage();
-                    
-                    if (row == finalRow && col == finalColumn && this.printRangePageSelection == true)
-                        break;
-                }
-                
-                if (row == finalRow && col == finalColumn && this.printRangePageSelection == true)
-                    break;
-                
-                col = 1;
-            }
-        } finally {
-            //must dispose resources
-            font.dispose();
-            gc_.dispose();
-        }
-    }
-
-    /**
-     * Draw the header and footer
-     * 
-     * @param gc_,
-     *            a graphics context that is not null which this method will use
-     *            for figuring ouyt the font's extent
-     * @param figureBounds,
-     *            Rectangle with the bounds of the figure
-     * @param rowIndex,
-     *            int
-     * @param colIndex,
-     *            int
-     */
-    protected void drawHeaderAndFooter(GC gc_, DiagramEditPart dgrmEP, Rectangle figureBounds,
-            Font font, int rowIndex, int colIndex) {
-
-        int width = this.logicalClientArea.width;
-        int height = this.logicalClientArea.height;
-
-        this.graphics.pushState(); //draw text, don't make it too small or big
-        this.graphics.setFont(font);
-
-        this.graphics.scale(1.0f / userScale);
-        this.graphics.translate(-translated.x, -translated.y);
-
-        String headerOrFooter = HeaderAndFooterHelper.makeHeaderOrFooterString(
-            WorkspaceViewerProperties.HEADER_PREFIX, rowIndex, colIndex,
-            dgrmEP);
-
-        this.graphics.drawText(headerOrFooter,
-            getMapMode().DPtoLP(HeaderAndFooterHelper.LEFT_MARGIN_DP)
-                + (width - getMapMode().DPtoLP(gc_.textExtent(headerOrFooter).x))
-                / 2, getMapMode().DPtoLP(HeaderAndFooterHelper.TOP_MARGIN_DP));
-
-        headerOrFooter = HeaderAndFooterHelper.makeHeaderOrFooterString(
-            WorkspaceViewerProperties.FOOTER_PREFIX, rowIndex, colIndex,
-            dgrmEP);
-
-        this.graphics.drawText(headerOrFooter,
-            getMapMode().DPtoLP(HeaderAndFooterHelper.LEFT_MARGIN_DP)
-                + (width - getMapMode().DPtoLP(gc_.textExtent(headerOrFooter).x))
-                / 2, height - getMapMode().DPtoLP(HeaderAndFooterHelper.BOTTOM_MARGIN_DP));
-
-        this.graphics.popState(); //for drawing the text
-
-    }
-    
-    /**
-     * This method paints a portion of the diagram. (The area painted
-     * representing one page.)
-     * 
-     * @param gc_ a graphics context that is not null which this method will use
-     * for figuring out the font's extent
-     * @param dgrmEP the DiagramEditPart that will be printed
-     * @param fPreferences the preferenceStore that could either contain
-     * existing preferences or defaults
-     * @param figureBounds the page break bounds we'll have to offset by
-     * @param font the Font to print the header or footer with
-     * @param rowIndex index of row we're printing
-     * @param colIndex index of column we're priniting
-     * to check if it is the first time the method is getting called for the current
-     * print.
-     */
-    protected void drawPage(GC gc_, DiagramEditPart dgrmEP,
-            IPreferenceStore fPreferences, Rectangle figureBounds,
-            PageMargins margins, Font font, int rowIndex, int colIndex) {
-
-        org.eclipse.draw2d.geometry.Point pageSize = PageInfoHelper
-            .getPageSize(fPreferences, false, getMapMode());
-        boolean rtlEnabled = ((this.gc.getStyle() & SWT.MIRRORED) != 0);
-        if (rtlEnabled) 
-        {
-            // draw everything on an offscreen image first and then draw that image
-            // onto the printer gc...this takes care of certain drawing bugs.
-            // This causes issues with printing resolution as it uses a display image
-            // which is typically 72dpi
-            // This code should be removed when a resolution to Bugzilla 162459 is found
-
-            Image image = new Image(Display.getDefault(), getMapMode().LPtoDP(pageSize.x), getMapMode().LPtoDP(pageSize.y));
-
-            GC imgGC = new GC(image, (rtlEnabled) ? SWT.RIGHT_TO_LEFT : SWT.LEFT_TO_RIGHT);
-            imgGC.setXORMode(false);
-      
-            SWTGraphics sg = new SWTGraphics(imgGC);
-              
-            //for scaling
-            ScaledGraphics g1 = new ScaledGraphics(sg);
-          
-            //for himetrics and svg
-            MapModeGraphics mmg = createMapModeGraphics(g1);
-              
-            //if mmg's font is null, gc.setFont will use a default font
-            imgGC.setFont(mmg.getFont());
-              
-            internalDrawPage(dgrmEP,figureBounds,fPreferences,margins,mmg,rowIndex, colIndex,true);
-            
-            this.graphics.pushState();
-        
-            this.graphics.drawImage(image, 0, 0);
-              
-            this.graphics.popState();
-
-            //draw the header and footer after drawing the image to avoid getting the image getting drawn over them
-            drawHeaderAndFooter(gc_, dgrmEP, figureBounds, font, rowIndex, colIndex);
-            disposeImageVars(imgGC, image, sg, g1, mmg);
-        } else {
-            internalDrawPage(dgrmEP,figureBounds,fPreferences,margins,this.graphics,rowIndex, colIndex,false);
-            //draw the header and footer after drawing the image to avoid getting the image getting drawn over them
-            drawHeaderAndFooter(gc_, dgrmEP, figureBounds, font, rowIndex, colIndex);
-        }
-    }
-    
-    private void internalDrawPage(DiagramEditPart dgrmEP,
-            Rectangle figureBounds, IPreferenceStore fPreferences,
-            PageMargins margins, Graphics g, int rowIndex, int colIndex,
-            boolean RTL_ENABLED) {
-        org.eclipse.draw2d.geometry.Point pageSize = PageInfoHelper
-            .getPageSize(fPreferences, false, getMapMode());
-
-        int width = pageSize.x, height = pageSize.y;
-
-        g.pushState();
-
-        g.translate(translated.x, translated.y);
-        g.scale(userScale);
-
-        int translateX = -(width * (colIndex - 1));
-        int translateY = -(height * (rowIndex - 1));
-
-        int scaledTranslateX = (int) (translateX / userScale);
-        int scaledTranslateY = (int) (translateY / userScale);
-
-        int scaledWidth = (int) (width / userScale);
-        int scaledHeight = (int) (height / userScale);
-
-        if (RTL_ENABLED) {
-            scaledTranslateX += (margins.left * (colIndex - 1))
-                + (margins.right * (colIndex));
-            scaledTranslateY += ((margins.top * rowIndex) + (margins.bottom * (rowIndex - 1)));
-        } else {
-            scaledTranslateX += ((margins.left * colIndex) + (margins.right * (colIndex - 1)));
-            scaledTranslateY += ((margins.top * rowIndex) + (margins.bottom * (rowIndex - 1)));
-        }
-
-        g.translate(scaledTranslateX, scaledTranslateY);
-
-        Rectangle clip = new Rectangle(
-            (scaledWidth - margins.left - margins.right) * (colIndex - 1)
-                + figureBounds.x, (scaledHeight - margins.bottom - margins.top)
-                * (rowIndex - 1) + figureBounds.y, scaledWidth - margins.right
-                - margins.left, scaledHeight - margins.top - margins.bottom);
-        g.clipRect(clip);
-
-        dgrmEP.getLayer(LayerConstants.PRINTABLE_LAYERS).paint(g);
-
-        g.popState();
-    }
-
-    /**
-     * Print the diagram figure to fit the number and rows and columns
-     * specified by the user.
-     * 
-     * @param dgrmEP the DiagramEditPart that will be printed
-     * @param loadedPreferences true if existing prefs could be loaded
-     * successfully, false if not and defaults are being used.  This parameter
-     * is important to obtain the correct page break bounds.
-     * @param fPreferences the preferenceStore that could either contain
-     * existing preferences or defaults
-     */
-    protected void printToPages(DiagramEditPart dgrmEP,
-            boolean loadedPreferences, IPreferenceStore fPreferences) {
-        assert null != printer : "printer must be set"; //$NON-NLS-1$
-
-        Rectangle figureBounds = PrintHelper.getPageBreakBounds(dgrmEP,
-            loadedPreferences);
-        
-        PageMargins margins = PageInfoHelper.getPageMargins(fPreferences, getMapMode());
-        //do not include margins
-        org.eclipse.draw2d.geometry.Point pageBounds = PageInfoHelper
-            .getPageSize(fPreferences, getMapMode());
-        org.eclipse.draw2d.geometry.Point pageCount = getPageCount(dgrmEP, figureBounds, pageBounds, false);
-        int numCols = pageCount.x;
-        int numRows = pageCount.y;
-        
-        float actualWidth = 0;
-        float actualHeight = 0;
-        if (this.rows==1 && this.columns==1 && fitToPage){
-        	figureBounds = dgrmEP.getChildrenBounds();
-            actualWidth = figureBounds.width;
-            actualHeight = figureBounds.height;
-        }else {
-            actualWidth = numCols * pageBounds.x;
-            actualHeight = numRows * pageBounds.y;
-        }
-
-        int totalHeight = (this.rows * pageBounds.y);
-        int totalWidth  = (this.columns * pageBounds.x);
-
-        float vScale =  totalHeight / actualHeight;
-        float hScale = totalWidth / actualWidth;
-
-        this.userScale = Math.min(hScale, vScale);
-
-        // translate to offset figure position
-        translated = new Point((int) (-figureBounds.x * userScale),
-            (int) (-figureBounds.y * userScale));
-
-        adjustMargins(margins, userScale, getPrinterOffset());
-
-        GC gc_ = new GC(Display.getDefault());
-
-        FontData fontData = JFaceResources.getDefaultFont().getFontData()[0];
-        Font font = new Font(printer, fontData);
-
-        int row = 1, col = 1, finalRow = 0, finalColumn = 0;
-        
-        if (this.printRangePageSelection) {
-            //print only the pages specified in the page range
-            //this corresponds to the physical pages, not the print range of pages on one physical page.
-            row = calculateRowFromPage(this.pageFrom, this.columns);
-            col = calculateColumnFromPage(this.pageFrom, this.columns, row);
-            
-            finalRow = calculateRowFromPage(this.pageTo, this.columns);
-            finalColumn = calculateColumnFromPage(this.pageTo, this.columns, finalRow);
-        }
-        
-        try {
-            // print the pages in row, column order
-            for (; row <= rows; row++) {
-                for (; col <= columns; col++) {
-                    printer.startPage();
-                    drawPage(gc_, dgrmEP, fPreferences, figureBounds, margins,
-                        font, row, col);
-                    printer.endPage();
-                    
-                    if (row == finalRow && col == finalColumn && this.printRangePageSelection == true)
-                        break;
-                }
-                
-                if (row == finalRow && col == finalColumn && this.printRangePageSelection == true)
-                    break;
-                
-                col = 1;
-            }
-        } finally {
-            // must dispose resources
-            font.dispose();
-            gc_.dispose();
-        }
-    }
-
-    /**
-     * Return scale factor between printer and display.
-     * 
-     * @return float
-     */
-    private float computePrinterDisplayScale() {
-        assert null != printer : "printer must be set"; //$NON-NLS-1$
-        assert null != display_dpi : "display_dpi must be set"; //$NON-NLS-1$
-
-        Point dpi = printer.getDPI();
-        float scale = dpi.x / (float) display_dpi.x;
-        
-        return scale;
-    }
-
-    /**
-     * Disposes of the resources.
-     */
-    private void dispose() {
-        if (this.graphics != null) {
-            try {
-                this.graphics.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                this.graphics = null;                
-            }
-        }
-        
-        if (this.printerGraphics != null) {
-            try {
-                this.printerGraphics.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                this.printerGraphics = null;
-            }
-        }
-        
-        if (this.swtGraphics != null) {
-            try {
-                this.swtGraphics.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                this.swtGraphics = null;
-            }
-        }
-        
-        if (this.gc != null) {
-            try {
-                this.gc.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                this.gc = null;
-            }
-        }
-        
-        //reset the printer offset, just in case the next diagram to be printed 
-        //uses a different map mode.
-        printerOffset = null;
-        
-    }
-    
-    private void disposeImageVars(GC imgGC, Image image, SWTGraphics sg, 
-            ScaledGraphics g1, MapModeGraphics mmg) {
-        
-        if (mmg != null) {
-            try {
-                mmg.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                mmg = null;                
-            }
-        }
-        
-        if (g1 != null) {
-            try {
-                g1.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                g1 = null;                
-            }
-        }
-        
-        if (sg != null) {
-            try {
-                sg.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                sg = null;                
-            }
-        }
-        
-        if (imgGC != null) {
-            try {
-                imgGC.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                imgGC = null;                
-            }
-        }
-        
-        if (image != null) {
-            try {
-                image.dispose();
-            }
-            catch (NullPointerException e) {
-                //do nothing
-            }
-            finally {
-                image = null;                
-            }
-        }
-    }
-
-    /**
-     * Creates the <code>MapModeGraphics</code>.
-     * 
-     * @param theGraphics
-     *            the <code>PrinterGraphics</code> object
-     * @return the new <code>MapModeGraphics</code>
-     */
-    protected MapModeGraphics createMapModeGraphics(Graphics theGraphics) {
-        return new MapModeGraphics(theGraphics, getMapMode());
-    }
-    
-    /**
-     * Creates the <code>PrinterGraphics</code>.
-     * 
-     * @param theGraphics
-     *          the <code>Graphics</code> object
-     * @return the new <code>PrinterGraphics</code>
-     */
-    protected PrinterGraphics createPrinterGraphics(Graphics theGraphics) {
-        return new PrinterGraphics(theGraphics, printer, true);
-    }
-    
-    /**
-     * Gets the preferences hint that is to be used to find the appropriate
-     * preference store from which to retrieve diagram preference values. The
-     * preference hint is mapped to a preference store in the preference
-     * registry <@link DiagramPreferencesRegistry>.
-     * 
-     * @return the preferences hint
-     */
-    protected PreferencesHint getPreferencesHint() {
-        return preferencesHint;
-    }
-    
-    /**
-     * Adjust the given PageMargins by the scale and offset
-     * 
-     * @param margins PageMargins to adjust
-     * @param scale margins will be scaled by this amount
-     * @param offset to adjust margins by
-     */
-    protected void adjustMargins(PageMargins margins, float scale, Point offset) {
-        //scale
-        margins.left /= scale;
-        margins.top /= scale;
-        margins.right /= scale;
-        margins.bottom /= scale;
-        
-        //offsets
-        margins.left -= offset.x; 
-        margins.right += offset.x;
-        margins.top -= offset.y;
-        margins.bottom += offset.y;
-        
-        // this is more readable than doing Math.min for all the above
-        if (margins.left < 0)
-            margins.left = 0;
-        if (margins.right < 0)
-            margins.right = 0;
-        if (margins.top < 0)
-            margins.top = 0;
-        if (margins.bottom < 0)
-            margins.bottom = 0;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/HeaderAndFooterHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/HeaderAndFooterHelper.java
deleted file mode 100644
index 3273420..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/HeaderAndFooterHelper.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal.util;
-
-
-import java.util.GregorianCalendar;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import com.ibm.icu.text.DateFormat;
-
-/**
- * Helper for header and footers. 
- * 
- * @author wdiu, Wayne Diu
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.printing.*
- */
-public class HeaderAndFooterHelper {
-	
-	/**
-	 * Header margin from top of page in device units
-	 */
-	public static final int TOP_MARGIN_DP = 5;
-
-	/**
-	 * Header and footer Margin from left of page in device units
-	 */
-	public static final int LEFT_MARGIN_DP = 5;
-
-	/**
-	 * Footer Margin from bottom of page in device units
-	 */
-	public static final int BOTTOM_MARGIN_DP = 20;
-	
-	/**
-	 * Separator
-	 */
-	private static final String HEADER_AND_FOOTER_SPACES =
-		StringStatics.SPACE + StringStatics.SPACE + StringStatics.SPACE;
-	
-	/**
-	 * Returns a string for the header or footer.  It will vary depending on 
-	 * the user's page setup preferences.
-	 * @param prefix, pass in IDialogSettingsConstants.FOOTER_PREFIX or
-	 * IDialogSettingsConstants.HEADER_PREFIX
-	 * @param rowIndex, an integer starting from 1
-	 * @param colIndex, an integer starting from 1
-	 * @return a string for the header or footer
-	 */
-	public static String makeHeaderOrFooterString(
-		String prefix,
-		int rowIndex,
-		int colIndex,
-		DiagramEditPart dgrmEP) {
-		//the string may have a trailing space, this is OK
-
-		IPreferenceStore preferences; 
-		preferences =
-			((DiagramGraphicalViewer) dgrmEP.getViewer())
-				.getWorkspaceViewerPreferenceStore();
-		String string =
-			preferences.getString(
-				prefix + WorkspaceViewerProperties.PRINT_TEXT_SUFFIX);
-		if (string == null) {
-			string = StringStatics.BLANK;
-		}
-
-		if (!string.equals(StringStatics.BLANK)) {
-			string += HEADER_AND_FOOTER_SPACES;
-		}
-
-		if (preferences
-			.getBoolean(prefix + WorkspaceViewerProperties.PRINT_TITLE_SUFFIX)) {
-			String name = dgrmEP.getDiagramView().getDiagram().getName(); 
-			string += (name == null ? StringStatics.BLANK : name) + HEADER_AND_FOOTER_SPACES;
-		}
-
-		//format according to locale
-		if (preferences
-			.getBoolean(prefix + WorkspaceViewerProperties.PRINT_DATE_SUFFIX)) {
-			string
-				+= DateFormat.getDateInstance().format(
-					new GregorianCalendar().getTime())
-				+ HEADER_AND_FOOTER_SPACES;
-		}
-
-		if (preferences
-			.getBoolean(prefix + WorkspaceViewerProperties.PRINT_PAGE_SUFFIX)) {
-			string += rowIndex + "-" + colIndex; //$NON-NLS-1$
-		}
-		return string;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/PrintHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/PrintHelper.java
deleted file mode 100644
index 18cb215..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/PrintHelper.java
+++ /dev/null

@@ -1,310 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.internal.util;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.PageBreakEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.PageBreaksFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Helper to assist in making an offscreen diagram suitable for printing or
- * previewing.
- * 
- * @author wdiu, Wayne Diu
- */
-public class PrintHelper {
-	/**
-     * Creates a <code>DiagramEditPart</code> given the <code>Diagram</code>
-     * without opening an editor.
-     * 
-	 * @param diagram the <code>Diagram</code>
-	 * @param preferencesHint the preferences hint to use for intiializing the
-	 * preferences of the root edit part
-	 * @return the new populated <code>DiagramEditPart</code>
-     * @deprecated Please use
-     *             {@link #createDiagramEditPart(Diagram, PreferencesHint, Shell)}
-     *             instead as this method does not dispose the new Shell that it
-     *             creates.
-     */
-	public static DiagramEditPart createDiagramEditPart(Diagram diagram,
-            PreferencesHint preferencesHint) {
-            DiagramEditPart diagramEditPart =  OffscreenEditPartFactory.getInstance().createDiagramEditPart(
-            diagram, new Shell(), preferencesHint);
-            // since some of the diagram updates are ASync we need to give the 
-            // inter-thread messages a chance to get processed processed before we
-            // continue; check bugzilla 170332
-            while (Display.getDefault().readAndDispatch ()){
-                // nothing special to do 
-            }
-             return diagramEditPart;
-        }
-    
-    /**
-     * Creates a <code>DiagramEditPart</code> given the <code>Diagram</code>
-     * without opening an editor.
-     * 
-     * @param diagram the <code>Diagram</code>
-     * @param preferencesHint the preferences hint to use for intiializing the
-     * preferences of the root edit part
-     * @return the new populated <code>DiagramEditPart</code>
-     */
-    public static DiagramEditPart createDiagramEditPart(Diagram diagram,
-        PreferencesHint preferencesHint, Shell shell) {
-        DiagramEditPart diagramEditPart =  OffscreenEditPartFactory.getInstance().createDiagramEditPart(
-            diagram, shell, preferencesHint);
-        // since some of the diagram updates are ASync we need to give the 
-        // inter-thread messages a chance to get processed processed before we
-        // continue; check bugzilla 170332
-        while (Display.getDefault().readAndDispatch ()){
-            // nothing special to do 
-        }
-         return diagramEditPart;
-    }
-	
-	/**
-	 * Initialize the preferences for a diagram edit part, specifically
-	 * including page breaks and margins.
-	 * 
-	 * Typically, the diagram edit part is created using
-	 * createDiagramEditPart() and the diagram edit part is passed in as the
-	 * first parameter of this method.
-	 * 
-	 * @param diagramEditPart the DiagramEditPart to pass in 
-	 * @param preferencesHint the preferences hint to use for intiializing the preferences
-	 * 
-	 * @return true if the preferences could be loaded, false if they weren't
-	 * loaded and defaults had to be used instead
-	 */
-	public static boolean initializePreferences(DiagramEditPart diagramEditPart, PreferencesHint preferencesHint) {
-		assert diagramEditPart.getViewer() instanceof DiagramGraphicalViewer;
-		
-		DiagramGraphicalViewer viewer = (DiagramGraphicalViewer)diagramEditPart.getViewer();
-
-		boolean loadedPreferences = true;
-
-		IPreferenceStore fPreferences = getPreferenceStoreForDiagram(diagramEditPart);
-		
-		if (fPreferences == null) {
-			loadedPreferences = false;
-			//leave at default x and y
-			PreferenceStore defaults = new PreferenceStore();
-			DiagramEditor.addDefaultPreferences(defaults, preferencesHint);
-
-			fPreferences = getWorkspacePreferenceStore(preferencesHint);
-		} else if (!fPreferences
-			.getBoolean(WorkspaceViewerProperties.PREF_USE_DIAGRAM_SETTINGS)) {
-			//if we aren't supposed to use the diagram settings, switch to the
-			//workspace settings
-
-			//we have to use the page break x and y settings from the diagram
-			int x = fPreferences.getInt(WorkspaceViewerProperties.PAGEBREAK_X), y = fPreferences
-				.getInt(WorkspaceViewerProperties.PAGEBREAK_Y);
-
-			//minor performance optimization, use the existing
-			//preferences from the workspace instead of making a new one
-			fPreferences = getWorkspacePreferenceStore(preferencesHint);
-			fPreferences.setValue(WorkspaceViewerProperties.PAGEBREAK_X, x);
-			fPreferences.setValue(WorkspaceViewerProperties.PAGEBREAK_Y, y);
-		}
-
-		viewer.hookWorkspacePreferenceStore(fPreferences);
-
-		diagramEditPart.refreshPageBreaks();
-		
-		return loadedPreferences;
-	}
-
-	/**
-	 * Returns the workspace viewer <code>PreferenceStore</code> for a given diagram edit part.
-	 * 
-	 * @param diagramEP the DiagramEditPart to obtain the preference store for
-	 * 
-	 * @return the <code>PreferenceStore</code> for the given diagram edit part
-	 * Could return null if it couldn't be loaded 
-	 */
-	private static IPreferenceStore getPreferenceStoreForDiagram(DiagramEditPart diagramEP) {
-		// Try to load it
-		String id = ViewUtil.getIdStr(diagramEP.getDiagramView());
-
-		//try and get preferences from the open diagrams first
-		//loadedPreferences will be set to true only if the preferences could
-		// be
-		//successfully loaded
-		IPreferenceStore fPreferences = loadPreferencesFromOpenDiagram(id);
-		if (fPreferences != null) {
-			//loadPreferencesFromOpenDiagram will have set preferences
-			return fPreferences;
-		}
-
-		IPath path = DiagramUIPlugin.getInstance().getStateLocation();
-
-		String fileName = path.toString() + "/" + id;//$NON-NLS-1$
-		java.io.File file = new File(fileName);
-		fPreferences = new PreferenceStore(fileName);
-		if (file.exists()) {
-			// Load it
-			try {
-				((PreferenceStore) fPreferences).load();
-
-				return fPreferences;
-			} catch (Exception e) {
-				return null;
-			}
-		}
-		return null; //fPreferences couldn't be loaded
-	}
-	
-	/**
-	 * Load the preferences from an open diagram that has the given guid.
-	 * 
-	 * @param id guid of the open diagram to load the preferences for 
-	 */
-	private static IPreferenceStore loadPreferencesFromOpenDiagram(String id) {
-
-		List diagramEditors = EditorService.getInstance()
-			.getRegisteredEditorParts();
-		Iterator it = diagramEditors.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (obj instanceof DiagramEditor) {
-				DiagramEditor diagramEditor = (DiagramEditor) obj;
-
-				//diagram edit part and view should not be null for an open
-				// diagram
-				if (id.equals(ViewUtil.getIdStr(diagramEditor
-					.getDiagramEditPart().getDiagramView()))) {
-					IDiagramGraphicalViewer viewer = diagramEditor
-						.getDiagramGraphicalViewer();
-					if (diagramEditor.getDiagramEditPart().getRoot() instanceof DiagramRootEditPart) {
-						PageBreakEditPart pageBreakEditPart = ((DiagramRootEditPart)diagramEditor.getDiagramEditPart().getRoot()).getPageBreakEditPart();
-						pageBreakEditPart.resize(diagramEditor.getDiagramEditPart().getChildrenBounds());
-						pageBreakEditPart.updatePreferenceStore();
-					}
-					if (viewer instanceof DiagramGraphicalViewer) {
-						DiagramGraphicalViewer diagramGraphicalViewer = (DiagramGraphicalViewer) viewer;
-
-						//preferences loaded
-						return diagramGraphicalViewer
-							.getWorkspaceViewerPreferenceStore();
-					}
-
-					//id was equal, but we couldn't load it, so don't continue
-					return null;
-				}
-			}
-		}
-
-		//no matching guid found
-		return null;
-	}
-
-	/**
-	 * Return the preference store for the given PreferenceHint
-	 * @param preferencesHint to return the preference store for.
-	 * 
-	 * @return preference store for the given PreferenceHint
-	 */
-	private static IPreferenceStore getWorkspacePreferenceStore(PreferencesHint preferencesHint) {
-		return (IPreferenceStore) preferencesHint.getPreferenceStore();
-	}
-	
-	/**
-	 * Returns the page break bounds on the diagram. If the bounds cannot be
-	 * found the diagram bounds is returned.
-	 * 
-	 * @param dgrmEP the diagram edit part to return the page break bounds for
-	 * @param loadedPreferences true if preferences were previously loaded,
-	 * false if they couldn't be.  For consistency when printing, we have to
-	 * treat page breaks differently depending on whether preferences were
-	 * successfully loaded or not.
-	 * 
-	 * @return Rectangle with the page break bounds for the given diagram edit
-	 * part. If the page break bounds cannot be found the diagram bounds
-	 * Rectangle is returned.
-	 */
-	public static Rectangle getPageBreakBounds(DiagramEditPart dgrmEP, boolean loadedPreferences) {
-		
-		Rectangle pageBreakBounds = null;
-		assert dgrmEP.getViewer() instanceof DiagramGraphicalViewer;
-        
-        
-        //get the preferences in use...
-        IPreferenceStore fPreferences = ((DiagramGraphicalViewer)dgrmEP.getViewer()).getWorkspaceViewerPreferenceStore();
-        
-        if (fPreferences.getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS)) {
-            
-            //get workspace settings...
-            if (dgrmEP.getDiagramPreferencesHint().getPreferenceStore() != null)
-                fPreferences = (IPreferenceStore)dgrmEP.getDiagramPreferencesHint().getPreferenceStore(); 
-        }
-        
-		RootEditPart rootEditPart = dgrmEP.getRoot();
-		if (rootEditPart instanceof DiagramRootEditPart) {
-			DiagramRootEditPart diagramRootEditPart = (DiagramRootEditPart) rootEditPart;
-			PageBreakEditPart pageBreakEditPart = diagramRootEditPart
-				.getPageBreakEditPart();
-
-			if (pageBreakEditPart != null) {
-				//resize must be called. Otherwise you get the 64 x 32 default
-				pageBreakEditPart.resize(dgrmEP.getChildrenBounds());
-
-				if (loadedPreferences) {
-					//if preferences were loaded, we'll always do this for
-					//consistency when printing.
-					//this is necessary when printing using workspace
-					//preferences, which is "if (getWorkspacePreferenceStore()
-					//== fPreferences)"
-
-					//if preferences were not loaded, we do not set the figure
-					//location. we'll just leave them at defaults.
-					org.eclipse.draw2d.geometry.Point p = new org.eclipse.draw2d.geometry.Point(
-						fPreferences
-							.getInt(WorkspaceViewerProperties.PAGEBREAK_X),
-						fPreferences
-							.getInt(WorkspaceViewerProperties.PAGEBREAK_Y));
-					pageBreakEditPart.set(p, PageInfoHelper.getChildrenBounds(
-						(DiagramEditPart) diagramRootEditPart.getContents(),
-						PageBreaksFigure.class));
-				}
-
-				pageBreakBounds = pageBreakEditPart.getFigure().getBounds();
-			} else {
-				pageBreakBounds = dgrmEP.getFigure().getBounds();
-			}
-		}
-
-		return pageBreakBounds;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/package.html
deleted file mode 100644
index 0cd4662..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains <i>utility</i> classes used by this plugin.
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/providers/DiagramWithPrintGlobalActionHandler.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/providers/DiagramWithPrintGlobalActionHandler.java
deleted file mode 100644
index cf4ecb3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/providers/DiagramWithPrintGlobalActionHandler.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.providers;
-
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.printing.actions.DefaultPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Concrete class that implements the <code>IGlobalActionHandler</code>
- * interface and provides a command for <code>GlobalActionId.PRINT</code>.
- * 
- * @author tmacdoug
- */
-public class DiagramWithPrintGlobalActionHandler
-	extends DiagramGlobalActionHandler {
-
-	/**
-	 * Constructor for DiagramWithPrintGlobalActionHandler.
-	 */
-	public DiagramWithPrintGlobalActionHandler() {
-		super();
-	}
-
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		ICommand command = null;
-
-		/* Check the action id and create the command */
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.PRINT)) {
-			doPrint(cntxt);
-		} else {
-			command = super.getCommand(cntxt);
-		}
-
-		return command;
-	}
-
-	/**
-	 * @param cntxt
-	 */
-	protected void doPrint(IGlobalActionContext cntxt) {
-		DefaultPrintActionHelper.doRun((IEditorPart) cntxt.getActivePart(),
-			new DiagramPrinter(getPreferencesHint((IEditorPart) cntxt
-				.getActivePart()), getMapMode(cntxt)));
-	}
-
-	/**
-	 * Checks if we will allow a print
-	 * 
-	 * @return boolean true
-	 */
-	private boolean canPrint() {
-		return true;
-	}
-
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		boolean result = false;
-
-		/* Check the action id */
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.PRINT)) {
-			result = canPrint();
-		} else {
-			result = super.canHandle(cntxt);
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the preferences hint that is to be used to find the appropriate
-	 * preference store from which to retrieve diagram preference values. The
-	 * preference hint is mapped to a preference store in the preference
-	 * registry <@link DiagramPreferencesRegistry>.
-	 * 
-	 * @return the preferences hint
-	 */
-	protected PreferencesHint getPreferencesHint(IEditorPart editorPart) {
-		if (editorPart instanceof IDiagramWorkbenchPart) {
-			RootEditPart rootEP = ((IDiagramWorkbenchPart) editorPart)
-				.getDiagramGraphicalViewer().getRootEditPart();
-			if (rootEP instanceof IDiagramPreferenceSupport) {
-				return ((IDiagramPreferenceSupport) rootEP)
-					.getPreferencesHint();
-			}
-		}
-		return PreferencesHint.USE_DEFAULTS;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/providers/DiagramWithPrintGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/providers/DiagramWithPrintGlobalActionHandlerProvider.java
deleted file mode 100644
index 7d5c104..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/providers/DiagramWithPrintGlobalActionHandlerProvider.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.providers;
-
-import java.util.Hashtable;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Concrete class that implements the <code>IGlobalActionHandlerProvider</code>
- * providing <code>IGlobalActionHandler</code> for all diagram ui based
- * diagrams. This provider is installed with a lowest priority.
- * <p>
- * Returns
- * {@link org.eclipse.gmf.runtime.diagram.ui.printing.providers.DiagramWithPrintGlobalActionHandler}
- * when queried for global action handler.
- * 
- * @author tmacdoug
- */
-public final class DiagramWithPrintGlobalActionHandlerProvider
-	extends AbstractGlobalActionHandlerProvider {
-
-	private Hashtable handlerList = new Hashtable();
-
-	/**
-	 * Constructor for DiagramWithPrintGlobalActionHandlerProvider.
-	 */
-	public DiagramWithPrintGlobalActionHandlerProvider() {
-		super();
-	}
-
-	public IGlobalActionHandler getGlobalActionHandler(
-			final IGlobalActionHandlerContext context) {
-		/* Create the handler */
-		if (!getHandlerList().containsKey(context.getActivePart())) {
-			getHandlerList().put(context.getActivePart(),
-				new DiagramWithPrintGlobalActionHandler());
-
-			/*
-			 * Register as a part listener so that the cache can be cleared when
-			 * the part is disposed
-			 */
-			context.getActivePart().getSite().getPage().addPartListener(
-				new IPartListener() {
-
-					private IWorkbenchPart localPart = context.getActivePart();
-
-					public void partActivated(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					public void partBroughtToTop(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					public void partClosed(IWorkbenchPart part) {
-						/* Remove the cache associated with the part */
-						if (part != null && part == localPart
-							&& getHandlerList().containsKey(part)) {
-							getHandlerList().remove(part);
-							localPart.getSite().getPage().removePartListener(
-								this);
-							localPart = null;
-						}
-					}
-
-					public void partDeactivated(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					public void partOpened(IWorkbenchPart part) {
-						// Do nothing
-					}
-				});
-		}
-
-		return (DiagramWithPrintGlobalActionHandler) getHandlerList().get(
-			context.getActivePart());
-	}
-
-	/**
-	 * Returns the handlerList.
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getHandlerList() {
-		return handlerList;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/util/DiagramPrinterUtil.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/util/DiagramPrinterUtil.java
deleted file mode 100644
index 11f3ddb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/util/DiagramPrinterUtil.java
+++ /dev/null

@@ -1,288 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004,2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.printing.util;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.printing.IPrintHelper;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupPageType;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.printing.actions.DefaultPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.DiagramPrinter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.printing.Printer;
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-
-import com.ibm.icu.text.NumberFormat;
-
-/**
- * Utility for using the DiagramPrinter to print diagrams after displaying
- * a print dialog box to the user.  Diagrams are printed using the
- * DiagramPrinter and respect the settings chosen by the user in the print
- * dialog. 
- * 
- * @author wdiu, Wayne Diu
- */
-public class DiagramPrinterUtil {
-
-	/**
-	 * Prints a diagram with the settings from the helper onto the printer
-	 * 
-	 * @param diagramPrinter
-	 *            the diagram printer that does the work of actually printing the diagrams
-	 * @param helper
-	 *            IPrintHelper with the user's choice of settings
-	 */
-	private static void printDiagrams(DiagramPrinter diagramPrinter,
-			IPrintHelper helper) {
-        
-        if (helper.getDlgPrintRangePages()) {
-            diagramPrinter.setPrintRangePageSelection(true);
-            diagramPrinter.setPrintRangePages(helper.getDlgPagesFrom(), helper.getDlgPagesTo());
-            diagramPrinter.setFitToPage(false);
-        }
-        
-		if (helper.getDlgScalePercent() == -1) {
-            diagramPrinter.setColumns(helper.getDlgScaleFitToM());
-			diagramPrinter.setRows(helper.getDlgScaleFitToN());
-            diagramPrinter.setFitToPage(true);
-		} else {
-			diagramPrinter.setScaledPercent(helper.getDlgScalePercent());
-            diagramPrinter.setFitToPage(false);
-		}
-
-		diagramPrinter.run();
-	}
-
-	/**
-	 * Opens up the print diagrams dialog, allows the user to choose the
-	 * settings, and prints.
-	 * 
-	 * @param editorPart
-	 *            current editor part
-	 * @param diagramMap
-	 *            map of String names to Diagram objects. Should be initialized
-	 *            by caller of this method. String names will show up in the
-	 *            print dialog that allows the user to choose which diagrams to
-	 *            print from a list.
-	 * @param diagramPrinter
-	 *            the diagram printer that does the work of actually printing the diagrams
-	 */
-	public static void printWithSettings(IEditorPart editorPart,
-			Map diagramMap, DiagramPrinter diagramPrinter) {
-		
-		List diagramNames;
-		PrinterData printerData;
-		IPrintHelper helper;
-        IPreferenceStore pref = null;
-
-		try {
-			Class printhelperClass = Class
-				.forName(IPrintHelper.PRINT_HELPER_CLASS_NAME);
-			helper = (IPrintHelper) printhelperClass.newInstance();
-			diagramNames = new ArrayList(diagramMap.keySet());
-            
-            //get the preferences store currently in use...
-            
-            if (editorPart instanceof IDiagramWorkbenchPart) {
-                
-                IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)editorPart).getDiagramGraphicalViewer();
-                if (viewer instanceof DiagramGraphicalViewer) {
-                    
-                    //default to diagram settings...
-                    pref = ((DiagramGraphicalViewer) viewer)
-                        .getWorkspaceViewerPreferenceStore();
-                    
-                    if (pref.getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS)) {
-                        
-                        //get workspace settings...
-                        if (((IDiagramWorkbenchPart)editorPart).getDiagramEditPart().
-                                getDiagramPreferencesHint().getPreferenceStore() != null)
-                            pref = (IPreferenceStore)((IDiagramWorkbenchPart)editorPart).getDiagramEditPart().
-                                getDiagramPreferencesHint().getPreferenceStore(); 
-                    }
-                }
-            }
-            
-            //set the preferences for the print dialog...
-            if (pref != null) {
-                
-                //the orientation...
-                helper.setDlgOrientation(pref.getBoolean(WorkspaceViewerProperties.PREF_USE_LANDSCAPE));
-                
-                //the paper size...
-                PageSetupPageType storedPageType = PageSetupPageType.LETTER; //default value
-                String strPageType = pref.getString(WorkspaceViewerProperties.PREF_PAGE_SIZE);
-                for (int i=0; i<PageSetupPageType.pages.length; i++) {
-                    if (strPageType.startsWith(PageSetupPageType.pages[i].getName())) {
-                        storedPageType = PageSetupPageType.pages[i];
-                        break;
-                    }
-                }
-                
-                if (storedPageType.getIndex() == PageSetupPageType.USER_DEFINED.getIndex()) { //user defined size
-                    //get the width and height...
-                    
-                    NumberFormat fNumberFormat = NumberFormat.getNumberInstance();;
-                    String strWidth = pref.getString(WorkspaceViewerProperties.PREF_PAGE_WIDTH);
-                    String strHeight= pref.getString(WorkspaceViewerProperties.PREF_PAGE_HEIGHT);
-                    double width = 0, height = 0;
-                    
-                    try {
-                        Number num = fNumberFormat.parse(strWidth);
-                        width = num.doubleValue() / 0.0394d; //convert from inches to mm
-                        
-                        num = fNumberFormat.parse(strHeight);
-                        height = num.doubleValue() / 0.0394d;
-                        
-                        helper.setDlgPaperSize(PageSetupPageType.USER_DEFINED.getIndex(), width, height);
-                    } 
-                    catch (ParseException e) {
-                        Log.warning(
-                            DiagramPrintingPlugin.getInstance(),
-                            DiagramPrintingStatusCodes.IGNORED_EXCEPTION_WARNING,
-                            e.getMessage(),
-                            e);
-                    }
-                }
-                else
-                    helper.setDlgPaperSize(storedPageType.getIndex(), 0, 0);
-
-            }
-            
-			printerData = helper.openPrintDlg(diagramNames);
-		}
-		catch (Throwable e) {
-			//if there's a problem with the fragment, try doing the default
-			//this is better than nothing
-			Trace.catching(
-				DiagramPrintingPlugin.getInstance(),
-				DiagramPrintingDebugOptions.EXCEPTIONS_CATCHING,
-				DiagramPrinterUtil.class,
-				e.getMessage(),
-				e);
-			Log.warning(
-				DiagramPrintingPlugin.getInstance(),
-				DiagramPrintingStatusCodes.RESOURCE_FAILURE,
-				e.getMessage(),
-				e);
-
-			if (MessageDialog.openQuestion(Display.getDefault().getActiveShell(), DiagramUIPrintingMessages.DiagramPrinterUtil_DLLErrorTitle, 
-				DiagramUIPrintingMessages.DiagramPrinterUtil_DLLErrorMessage_part1
-				+"\n" //$NON-NLS-1$
-				+DiagramUIPrintingMessages.DiagramPrinterUtil_DLLErrorMessage_part2
-				+"\n" //$NON-NLS-1$
-				+DiagramUIPrintingMessages.DiagramPrinterUtil_DLLErrorMessage_part3
-				+"\n\n" //$NON-NLS-1$
-				+DiagramUIPrintingMessages.DiagramPrinterUtil_DLLErrorMessage_part4)) { 
-					DefaultPrintActionHelper.doRun(editorPart, diagramPrinter);
-				}
-
-			//do not continue
-			return;
-		}
-		
-		Assert.isNotNull(diagramNames);
-		Assert.isNotNull(helper);
-
-		if (printerData != null) { //ok pressed
-
-			//uncomment this code for debug information
-			/*if (helper.getDlgDiagramPrintRangeAll()) {
-			    Trace.trace(ModelerPlugin.getInstance(), "All diagrams");
-			} else if (helper.getDlgDiagramPrintRangeCurrent()) {
-			    Trace.trace(ModelerPlugin.getInstance(), "Current diagram");
-			} else if (helper.getDlgDiagramPrintRangeSelection()) {
-			    Trace.trace(ModelerPlugin.getInstance(), "Selected diagrams");
-			}
-			
-			if (helper.getDlgScalePercent() != -1) {
-			    Trace.trace(ModelerPlugin.getInstance(), 
-			        "Scale to " + helper.getDlgScalePercent() + " percent");
-			} else {
-			    Trace.trace(ModelerPlugin.getInstance(), 
-			        "Scale to "
-			            + helper.getDlgScaleFitToM()
-			            + "x"
-			            + helper.getDlgScaleFitToN()
-			            + " pages");
-			}
-			
-			if (helper.getDlgPrintRangeAll()) {
-			    Trace.trace(ModelerPlugin.getInstance(), "All");
-			}
-			if (helper.getDlgPrintRangePages()) {
-			    Trace.trace(ModelerPlugin.getInstance(), 
-			        "Pages " + helper.getDlgPagesFrom() + " to " + helper.getDlgPagesTo());
-			}
-			
-			Trace.trace(ModelerPlugin.getInstance(), helper.getDlgNumberOfCopies() + " copies");
-			
-			if (helper.getDlgCollate()) {
-			    Trace.trace(ModelerPlugin.getInstance(), "Collate");
-			} else {
-			    Trace.trace(ModelerPlugin.getInstance(), "Do not collate");
-			}*/
-			
-			final Printer printer = new Printer(printerData);
-			
-			diagramPrinter.setPrinter(printer);
-			diagramPrinter.setDisplayDPI(Display.getDefault().getDPI());
-
-			if (helper.getDlgDiagramPrintRangeCurrent()) {
-				DiagramEditPart dgrmEP = ((IDiagramWorkbenchPart) editorPart).getDiagramEditPart();
-				assert dgrmEP != null;
-				diagramPrinter.setDiagrams(Collections.singletonList(dgrmEP.getDiagramView().getDiagram()));
-			} else if (helper.getDlgDiagramPrintRangeAll()) {
-				diagramPrinter.setDiagrams(diagramMap.values());
-			} else if (helper.getDlgDiagramPrintRangeSelection()) {
-				Object obj;
-				List list = new ArrayList();
-				for (int i = 0; i < diagramNames.size(); i++) {
-					//is the diagram selected?
-					//we are only printing the selected ones
-					if (helper.isDlgDiagramSelected(i)) {
-						obj = diagramMap.get(diagramNames.get(i));
-						Assert.isTrue(obj instanceof Diagram);
-
-						list.add(obj);
-					}
-				}
-				diagramPrinter.setDiagrams(list);
-			}
-				
-			printDiagrams(diagramPrinter, helper);
-
-			printer.dispose();
-		}
-
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/util/package.html b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/util/package.html
deleted file mode 100644
index 7fb47db..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/util/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-This package contains <i>utility</i> classes used by this plugin.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/.classpath b/org.eclipse.gmf.runtime.diagram.ui.properties/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.properties/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.properties/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/.project b/org.eclipse.gmf.runtime.diagram.ui.properties/.project
deleted file mode 100644
index 6faf7f4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.properties</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.diagram.ui.properties/.template b/org.eclipse.gmf.runtime.diagram.ui.properties/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.properties/META-INF/MANIFEST.MF
deleted file mode 100644
index 851e863..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.properties; singleton:=true
-Bundle-Version: 1.0.3.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.properties.internal.DiagramPropertiesPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.properties.descriptors,
- org.eclipse.gmf.runtime.diagram.ui.properties.filters,
- org.eclipse.gmf.runtime.diagram.ui.properties.internal;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.properties.providers,
- org.eclipse.gmf.runtime.diagram.ui.properties.sections,
- org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance,
- org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid,
- org.eclipse.gmf.runtime.diagram.ui.properties.util,
- org.eclipse.gmf.runtime.diagram.ui.properties.views
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.ui.properties;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.properties;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/about.html b/org.eclipse.gmf.runtime.diagram.ui.properties/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/build.properties b/org.eclipse.gmf.runtime.diagram.ui.properties/build.properties
deleted file mode 100644
index d074c52..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               META-INF/,\
-               plugin.properties,\
-               icons/,\
-               .,\
-               about.html
-
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif
deleted file mode 100644
index ca8f423..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/fill_color.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/fill_color.gif
deleted file mode 100644
index 93d2da1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/fill_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/font_color.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/font_color.gif
deleted file mode 100644
index 291a7e3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/font_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/italic.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/italic.gif
deleted file mode 100644
index c4f7b39..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/italic.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_color.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_color.gif
deleted file mode 100644
index 9dfa28c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_color.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.properties/plugin.properties
deleted file mode 100644
index bc96c43..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/plugin.properties
+++ /dev/null

@@ -1,34 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram UI Properties - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram UI Properties
-Plugin.providerName = Eclipse.org
-
-# ===============================================================================
-# Diagram UI Properties Internal - Translation Instruction : do not translate this section 
-# ===============================================================================
-
-# The extension names
-ext.readOnlyPropertiesModifier = Read Only Properties Modifier
-
-
-# ==============================================================================
-#  Diagram UI Properties - section to be translated
-# ==============================================================================
-Appearance=Appearance
-RulersAndGrid=Rulers & Grid
-Advanced= Advanced
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui.properties/plugin.xml
deleted file mode 100644
index f42b8fd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/plugin.xml
+++ /dev/null

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2006  IBM Corporation and others.                 -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-      <propertyContributor
-            typeMapper="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ModelElementTypeMapper"
-            contributorId="org.eclipse.gmf.runtime.diagram.ui.properties"
-            labelProvider="org.eclipse.gmf.runtime.common.ui.services.util.CommonLabelProvider">
-         <propertyCategory
-               category="Core">
-         </propertyCategory>
-         <propertyCategory
-               category="Appearance">
-         </propertyCategory>
-          <propertyCategory
-               category="Grid">
-         </propertyCategory>
-         <propertyCategory
-               category="Advanced">
-         </propertyCategory>
-      </propertyContributor>
-   </extension>
- 
- <extension 
-    	point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-      <propertyTabs 
-      		contributorId="org.eclipse.gmf.runtime.diagram.ui.properties">   
- 	     <propertyTab
-             category="Appearance"
-             id="property.tab.AppearancePropertySection"
-             label="%Appearance"/>           
-          <propertyTab
-             category="Grid"
-             id="property.tab.RulerGridPropertySection"
-             label="%RulersAndGrid"/>           
-          <propertyTab
-             category="Advanced"
-             id="property.tab.AdvancedPropertySection"
-             label="%Advanced"/>           
-    </propertyTabs>
- </extension>
- 
- <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-   <propertySections contributorId="org.eclipse.gmf.runtime.diagram.ui.properties">
-	 <propertySection tab="property.tab.AppearancePropertySection" 
-	 	filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
-	 	class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
-	 	id="property.section.ConnectorAppearancePropertySection">
-	 </propertySection>
-	 <propertySection tab="property.tab.AppearancePropertySection" 
-	 	filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
-	 	class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
-	 	id="property.section.ShapeColorAndFontPropertySection">
-	 </propertySection> 
-	 <propertySection tab="property.tab.AppearancePropertySection" 
-	 	filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-	 	class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
-	 	id="property.section.DiagramColorsAndFontsPropertySection">
-	 </propertySection>     
-	 <propertySection
-        class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.AdvancedPropertySection"
-        filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.EditPartPropertySectionFilter"
-        id="property.section.AdvancedPropertySection"
-        tab="property.tab.AdvancedPropertySection">
-         </propertySection>            
-	 <propertySection tab="property.tab.RulerGridPropertySection" 
-	 	filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-	 	class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
-	 	id="property.section.RulerGridPropertySection">
-	 </propertySection>     
-  </propertySections>
-</extension>
- 
- 
-   <extension id="org.eclipse.gmf.runtime.diagram.ui.properties.providers.ReadOnlyDiagramPropertiesModifier" name="%ext.readOnlyPropertiesModifier" point="org.eclipse.gmf.runtime.common.ui.services.properties.propertyModifiers">
-      <PropertyModifier class="org.eclipse.gmf.runtime.diagram.ui.properties.providers.ReadOnlyDiagramPropertiesModifier">
-         <Priority name="Highest">
-         </Priority>
-		<Provider class="*">
-         </Provider>                  
-      </PropertyModifier>
-   </extension>    
-
-</plugin>

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/FlattenedContainmentListPropertyValue.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/FlattenedContainmentListPropertyValue.java
deleted file mode 100644
index 9f437e4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/FlattenedContainmentListPropertyValue.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.descriptors;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-import org.eclipse.gmf.runtime.emf.ui.properties.descriptors.EObjectContainmentListPropertyValue;
-
-/**
- * Property source object for containment lists, which flattens the presentation of the propeties.
- * It does not display each individual object as a property, but rather takes properties of all
- * the objects on the list and displays them all as if they were properties of one object (the list).
- * 
- * Use for Styles containment list.
- * 
- * @author nbalaba
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.properties.*
- */
-public class FlattenedContainmentListPropertyValue
-	extends EObjectContainmentListPropertyValue {
-	
-	// local cache of property id vs property source object it belongs to
-	private Map sources; 
-
-	/**
-	 * Create an instance of the <code>FlattenedContainmentListPropertyValue</code>
-	 * 
-	 * @param target - contaiment list 
-	 */
-
-	public FlattenedContainmentListPropertyValue(
-			EObjectContainmentEList target) {
-		super(target);
-
-	}
-	
-	/*
-	 * @return - Returns local cache of property id vs property source object it belongs to
-	 */
-	private Map getSources() {
-		if(sources == null)
-			sources = new HashMap();
-		return sources;
-	}
-
-	/**
-	 * Create and cache property descriptors for the object on the list
-	 * 
-	 * @param object - object on the containment list
-	 */
-	protected void createDescriptor(EObject object) {
-		IPropertySource propertySource = propertiesProvider
-			.getPropertySource(object);
-
-		IPropertyDescriptor[] object_descriptors = propertySource
-			.getPropertyDescriptors();
-		for (int i = 0; i < object_descriptors.length; i++) {
-			descriptors.put(object_descriptors[i].getId(), object_descriptors[i]);
-			getSources().put(object_descriptors[i].getId(), propertySource);
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object)
-	 */
-	public Object getPropertyValue(Object id) {
-
-		IPropertySource propertySource = (IPropertySource) sources.get(id);
-		return propertySource.getPropertyValue(id);
-	}	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object,
-	 *      java.lang.Object)
-	 */
-	public void setPropertyValue(Object id, Object value) {
-		IPropertySource propertySource = (IPropertySource) sources.get(id);
-		propertySource.setPropertyValue(id,value);
-
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationItemLabelProvider.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationItemLabelProvider.java
deleted file mode 100644
index dc05cbe..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationItemLabelProvider.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.descriptors;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * A label provider object used by the notation property descriptors.
- * 
- * @author nbalaba
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.properties.*
- */
-class NotationItemLabelProvider
-	extends LabelProvider {
-
-	/*
-	 * IItemPropertyDescriptor label provider. We override some functionality - the rest will be
-	 * forwarded back to the original provider.
-	 */
-	private ILabelProvider itemLabelProvider;
-
-	/*
-	 *  The feature that the descriptor is describing
-	 */
-	private EStructuralFeature feature;
-
-	/**
-	 * Create a new label provider given the IItemPropertyDescriptor label provider and
-	 * structural feature for descriptor .
-	 *  
-	 * @param provider - the IItemPropertyDescriptor label provider 
-	 * @param feature - descriptors feature
-	 */
-	public NotationItemLabelProvider(ILabelProvider provider,
-			EStructuralFeature feature) {
-		this.itemLabelProvider = provider;
-		this.feature = feature;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object anObject) {
-		if (getFeature().isMany())
-			return ""; //$NON-NLS-1$
-		if (getFeature() == NotationPackage.eINSTANCE
-			.getNode_LayoutConstraint())
-			return ""; //$NON-NLS-1$
-		if (anObject instanceof RGB) {
-			RGB rgb = (RGB) anObject;
-			return "(" + rgb.red + "," + rgb.green + "," + rgb.blue + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		}
-		return itemLabelProvider.getText(anObject);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object anObject) {
-		if (anObject instanceof RGB) {
-			ImageData id = createColorImage((RGB) anObject);
-			ImageData mask = id.getTransparencyMask();
-			return new Image(Display.getCurrent(), id, mask);
-		}
-		return itemLabelProvider.getImage(anObject);
-	}
-
-	/**
-	 * Creates and returns the color image data for the given control and RGB
-	 * value. The image's size is either the control's item extent or the cell
-	 * editor's default extent, which is 16 pixels square.
-	 * 
-	 * @param w
-	 *            the control
-	 * @param color
-	 *            the color
-	 */
-	private ImageData createColorImage(RGB color) {
-
-		int size = 10;
-		int indent = 6;
-		int extent = 16;
-
-		if (size > extent)
-			size = extent;
-		
-		int width = indent + size;
-		int height = extent;
-
-		int xoffset = indent;
-		int yoffset = (height - size) / 2;
-
-		RGB black = new RGB(0, 0, 0);
-		PaletteData dataPalette = new PaletteData(new RGB[] {black, black,
-			color});
-		ImageData data = new ImageData(width, height, 4, dataPalette);
-		data.transparentPixel = 0;
-
-		int end = size - 1;
-		for (int y = 0; y < size; y++) {
-			for (int x = 0; x < size; x++) {
-				if (x == 0 || y == 0 || x == end || y == end)
-					data.setPixel(x + xoffset, y + yoffset, 1);
-				else
-					data.setPixel(x + xoffset, y + yoffset, 2);
-			}
-		}
-
-		return data;
-	}
-
-	/**
-	 * @return Returns the feature.
-	 */
-	protected EStructuralFeature getFeature() {
-		return feature;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertyDescriptor.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertyDescriptor.java
deleted file mode 100644
index 37a6c21..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertyDescriptor.java
+++ /dev/null

@@ -1,214 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.descriptors;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.common.ui.celleditor.ExtendedComboBoxCellEditor;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColorCellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.FontHelper;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.emf.ui.properties.descriptors.EMFCompositeSourcePropertyDescriptor;
-import org.eclipse.gmf.runtime.emf.ui.properties.descriptors.EObjectContainmentListPropertyValue;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * A property descriptor for notation elements (graphical edit parts, views and
- * styles), wrapper aroubd an EMF property descriptor.
- * 
- * @author nbalaba
- */
-public class NotationPropertyDescriptor extends
-        EMFCompositeSourcePropertyDescriptor {
-
-    /**
-     * Create and instance of the <code>NotationPropertyDescriptor</code>.
-     * 
-     * @param object -
-     *            notation element (graphical edit part, view or style)
-     * @param itemPropertyDescriptor -
-     *            EMF property descriptor
-     * @param category -
-     *            property category
-     */
-    public NotationPropertyDescriptor(Object object,
-            IItemPropertyDescriptor itemPropertyDescriptor, String category) {
-        super(object, itemPropertyDescriptor, category);
-
-    }
-
-    /**
-     * Create a cell editor for a data value.
-     * 
-     * @param composite - parent composite @return - cell editor to edit
-     * property value
-     * 
-     * @see <code> createPropertyEditor </code>
-     */  
-    protected CellEditor createDataTypeCellEditor(Composite composite) {
-
-        if (isColor())
-            return new ColorCellEditor(composite);
-        
-        CellEditor cellEditor = super.createDataTypeCellEditor(composite);
-        
-        if (isFontHeight()) {
-        	cellEditor.setValidator(getPositiveIntegerValidator());
-        }
-        	
-        return cellEditor;
-    }
-
-    /**
-     * Create a cell validator that ensures positive integers
-     * @return positive integer cell editor validator
-     */
-    private ICellEditorValidator getPositiveIntegerValidator() {
-		ICellEditorValidator cellValidator = new ICellEditorValidator() {
-			public String isValid(Object value) {
-				String error = null;
-				if (value instanceof String) {
-					String strValue = (String) value;
-					try {
-						if (Integer.parseInt(strValue) <= 0) {
-								throw new NumberFormatException();
-						}
-					} catch (NumberFormatException e) {
-							error = DiagramUIPropertiesMessages.Positive_Number_Error;
-					}
-				}
-				return error;
-			}
-		};
-		return cellValidator;
-    }
-    
-    private boolean isFontHeight() {
-        return getFeature() == NotationPackage.eINSTANCE.getFontStyle_FontHeight();
-	}
-
-	/**
-     * Create combo box cell editor
-     * 
-     * @param composite - parent composite @return - cell editor to edit
-     * property value
-     * 
-     * @see <code> createPropertyEditor </code>
-     */
-    protected CellEditor createComboBoxCellEditor(Composite composite) {
-
-        propertyEditor = new ExtendedComboBoxCellEditor(composite,
-                getChoiceOfValues(), getLabelProvider(), false, SWT.NONE);
-
-        propertyEditor.setValidator(getValidator());
-
-        return propertyEditor;
-
-    }
-
-    /**
-     * Gets this property value
-     * @return - value of the property stored in the EMF descriptor
-     */
-    public Object getPropertyValue() {
-
-        if (getFeature() == NotationPackage.eINSTANCE.getView_Styles()) {
-            EObjectContainmentEList list = (EObjectContainmentEList) getEditableValue();
-            EObjectContainmentListPropertyValue value = new FlattenedContainmentListPropertyValue(
-                    list);
-            //value.setLabelProvider(getLabelProvider());
-            return value;
-
-        }
-
-        if (isColor()) {
-            Integer color = (Integer) getEditableValue();
-            return FigureUtilities.integerToRGB(color);
-        }
-
-        return getEditableValue();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertyDescriptor#getLabelProvider()
-     */
-    public ILabelProvider getLabelProvider() {
-
-        return new NotationItemLabelProvider(super.getLabelProvider(),
-                (EStructuralFeature) getFeature());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.internal.properties.emf.EMFCompositeSourcePropertyDescriptor#setPropertyValue(java.lang.Object)
-     */
-    public void setPropertyValue(Object value) {
-        if (value instanceof EObjectContainmentListPropertyValue) {
-            super
-                    .setPropertyValue(((EObjectContainmentListPropertyValue) value)
-                            .getTarget());
-            return;
-        }
-
-        if (isColor()) {
-            RGB rgb = (RGB) value;
-            super.setPropertyValue(FigureUtilities.colorToInteger(new Color(
-                    Display.getCurrent(), rgb)));
-            return;
-        }
-
-        super.setPropertyValue(value);
-    }
-
-    /*
-     * Test if the descriptor describes a color @return - true if the descriptor
-     * describes a color, false otherwise
-     */
-    private boolean isColor() {
-
-        return (getFeature() == NotationPackage.eINSTANCE
-                .getFillStyle_FillColor()
-                || getFeature() == NotationPackage.eINSTANCE
-                        .getLineStyle_LineColor() || getFeature() == NotationPackage.eINSTANCE
-                .getFontStyle_FontColor());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.emf.ui.properties.descriptors.EMFCompositeSourcePropertyDescriptor#getChoiceOfValues()
-     */
-    public List getChoiceOfValues() {
-        if (getFeature() == NotationPackage.eINSTANCE.getFontStyle_FontName()) {
-            return Arrays.asList(FontHelper.getFontNames());
-
-        }
-        return super.getChoiceOfValues();
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertySource.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertySource.java
deleted file mode 100644
index 9a42a11..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertySource.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.descriptors;
-
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-import org.eclipse.gmf.runtime.emf.ui.properties.descriptors.EMFCompositePropertySource;
-
-
-/**
- * <code>NotationPropertySource</code> a property source object wrapper around 
- * EMF based property source object for the notation elements - graphical edit parts,
- * views and styles.
- * 
- * @author nbalaba
- * @canBeSeenBy %level1
- */
-public class NotationPropertySource
-	extends EMFCompositePropertySource {
-
-	/**
-	 * Create an instance of the <code>NotationPropertySource</code>
-	 *  
-	 * @param object - a notation element: graphical edit parts, views and styles.
-	 * @param itemPropertySource - emf property source object
-	 */
-	public NotationPropertySource(Object object,
-			IItemPropertySource itemPropertySource) {
-		super(object, itemPropertySource);
-
-	}
-
-	/**
-	 * Create an instance of the <code>NotationPropertySource</code>
-	 *  
-	 * @param object - a notation element: graphical edit parts, views and styles.
-	 * @param itemPropertySource - emf property source object
-	 * @param category - property category (usually a 'View')
-	 */
-	public NotationPropertySource(Object object,
-			IItemPropertySource itemPropertySource, String category) {
-		super(object, itemPropertySource, category);
-
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.properties.descriptors.EMFCompositePropertySource#newPropertyDescriptor(org.eclipse.emf.edit.provider.IItemPropertyDescriptor)
-	 */
-	protected IPropertyDescriptor newPropertyDescriptor(
-		IItemPropertyDescriptor itemPropertyDescriptor) {
-		return new NotationPropertyDescriptor(object,
-			itemPropertyDescriptor, getCategory());
-
-	}	
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/package.html
deleted file mode 100644
index a8e4069..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ConnectionEditPartPropertySectionFilter.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ConnectionEditPartPropertySectionFilter.java
deleted file mode 100644
index ca16c41..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ConnectionEditPartPropertySectionFilter.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.filters;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Filter to display a property section if the selection is a connection edit part.
- * 
- * @author Anthony Hunter
- */
-public class ConnectionEditPartPropertySectionFilter
-	implements IFilter {
-
-    public boolean select(Object object) {
-        if (object instanceof ConnectionEditPart)
-            return true;
-
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/DiagramEditPartPropertySectionFilter.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/DiagramEditPartPropertySectionFilter.java
deleted file mode 100644
index caa26ab..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/DiagramEditPartPropertySectionFilter.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.filters;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Filter to display a property section if the selection is a diagram edit part.
- * 
- * @author Anthony Hunter
- */
-public class DiagramEditPartPropertySectionFilter
-	implements IFilter {
-
-    public boolean select(Object object) {
-        if (object instanceof DiagramEditPart)
-            return true;
-
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/EditPartPropertySectionFilter.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/EditPartPropertySectionFilter.java
deleted file mode 100644
index d624151..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/EditPartPropertySectionFilter.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.filters;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Filter to retain edit part properties
- * 
- * @author Natalia Balaba
- */
-public class EditPartPropertySectionFilter
-	implements IFilter {
-
-    public boolean select(Object object) {
-        if (object instanceof IGraphicalEditPart)
-            return true;
-
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ModelElementTypeMapper.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ModelElementTypeMapper.java
deleted file mode 100644
index e02e54a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ModelElementTypeMapper.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.filters;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.ui.views.properties.tabbed.AbstractTypeMapper;
-
-/**
- * Create a filter that is used assist in input filtering for the
- * propertySection extension point.
- * 
- * @author Anthony Hunter <a
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.properties.*
- *         href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com </a>
- */
-public class ModelElementTypeMapper
-	extends AbstractTypeMapper {
-
-	/**
-	 * Constructor for ModelElementTypeMapper.
-	 */
-	public ModelElementTypeMapper() {
-		super();
-	}
-
-
-    /**
-     * @inheritDoc
-     */
-    public Class mapType(Object input) {
-        Class type = super.mapType(input);
-        if (input instanceof EditPart) {
-            Object tmpObj = ((EditPart) input).getModel();
-            if (tmpObj instanceof EObject) {
-                type = getEObjectType((EObject) tmpObj);
-            } else {
-                type = tmpObj.getClass();
-            }
-        } else if (input instanceof EObject) {
-            return getEObjectType((EObject) input);
-        }
-
-        return type;
-    }
-
-	/**
-	 * Returns the type of the EObject. Subclasses may override.
-	 * 
-	 * @param eObj
-	 *            EObject whose type is being examined
-	 * @return Type of the EObject
-	 */
-	protected Class getEObjectType(EObject eObj) {
-		return eObj.getClass();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ShapeEditPartPropertySectionFilter.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ShapeEditPartPropertySectionFilter.java
deleted file mode 100644
index ce7f87f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ShapeEditPartPropertySectionFilter.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.filters;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Filter to display a property section if the selection is a shape edit part.
- * 
- * @author Anthony Hunter
- */
-public class ShapeEditPartPropertySectionFilter
-	implements IFilter {
-
-    public boolean select(Object object) {
-        if (object instanceof ShapeEditPart)
-            return true;
-
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/package.html
deleted file mode 100644
index 02366bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesDebugOptions.java
deleted file mode 100644
index d699f7f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesDebugOptions.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author nbalaba
- */
-public class DiagramPropertiesDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramPropertiesDebugOptions() {
-		// Private constructor.
-	}
-
-	/** Debug option. */
-	public static final String DEBUG = DiagramPropertiesPlugin.getPluginId()
-		+ "/debug"; //$NON-NLS-1$
-
-	/** Debug option to trace exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	/** Debug option to trace exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	/** Debug option to trace method entering. */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	/** Debug option to trace method exiting. */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesPlugin.java
deleted file mode 100644
index 30dbf0f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesPlugin.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.properties.internal;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.ui.services.properties.PropertiesServiceAdapterFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.util.SectionUpdateRequestCollapser;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DiagramPropertiesPlugin
-	extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static DiagramPropertiesPlugin plugin;
-
-	/*
-	 * The event collapser. Used to collapse mutiple update requests when
-	 * multi-deleting or multi-selecting
-	 */
-	private SectionUpdateRequestCollapser updateRequestCollapser;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramPropertiesPlugin() {
-		super();
-		plugin = this;
-
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the shared instance of <code>DiagramPropertiesPlugin</code>
-	 */
-	public static DiagramPropertiesPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Starts up this plug-in.
-	 */
-	public void start(BundleContext context)
-		throws Exception {
-		super.start(context);
-		configurePropertiesAdapter();
-		updateRequestCollapser = new SectionUpdateRequestCollapser();
-		updateRequestCollapser.start();
-
-	}
-
-	/**
-	 * Shuts down this plug-in and discards all plug-in state.
-	 */
-	public void stop(BundleContext context)
-		throws Exception {
-		super.stop(context);
-		updateRequestCollapser.stop();
-
-	}
-
-	/**
-	 * @return Returns the updateRequestCollapser.
-	 */
-	public SectionUpdateRequestCollapser getUpdateRequestCollapser() {
-		return updateRequestCollapser;
-	}
-
-	/**
-	 * Configures properties providers based on properties provider extension
-	 * configurations.
-	 * 
-	 */
-	private void configurePropertiesAdapter() {
-		Platform.getAdapterManager().registerAdapters(
-			new PropertiesServiceAdapterFactory(), IGraphicalEditPart.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesStatusCodes.java
deleted file mode 100644
index 43ba388..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/DiagramPropertiesStatusCodes.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author nbalaba
- */
-public class DiagramPropertiesStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramPropertiesStatusCodes() {
-		// Private constructor.
-	}
-
-	/** Status code indicating that an operation was performed succesfully. */
-	public static final int OK = 0;
-
-	/** Status code indicating that an operation was cancelled. */
-	public static final int CANCELLED = 6;
-
-	/** Status code indicating that operation ignored exception. */
-	public static final int IGNORED_EXCEPTION_WARNING = 10;
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesImages.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesImages.java
deleted file mode 100644
index b65ad9b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesImages.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n;
-
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.DiagramPropertiesPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly. The public
- * strings represent images that will be cached and can be retrieved using
- * {@link #get(String)}.
- *
- * @author cmahoney
- */
-public class DiagramUIPropertiesImages {
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "icons/"; //$NON-NLS-1$
-	
-	/**
-	 * Images that will be cached and can be retrieved using
-	 * {@link #get(String)}.
-	 */
-	public static final String IMG_FILL_COLOR = PREFIX_ROOT + "fill_color.gif"; //$NON-NLS-1$
-
-	public static final String IMG_BOLD = PREFIX_ROOT + "bold.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ITALIC = PREFIX_ROOT + "italic.gif"; //$NON-NLS-1$
-
-	public static final String IMG_FONT_COLOR = PREFIX_ROOT + "font_color.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_COLOR = PREFIX_ROOT + "line_color.gif"; //$NON-NLS-1$
-
-	/**
-	 * Image descriptors.
-	 */
-	public static final ImageDescriptor DESC_FILL_COLOR = createAndCache(IMG_FILL_COLOR);
-
-	public static final ImageDescriptor DESC_BOLD = createAndCache(IMG_BOLD);
-
-	public static final ImageDescriptor DESC_ITALIC = createAndCache(IMG_ITALIC);
-
-	public static final ImageDescriptor DESC_FONT_COLOR = createAndCache(IMG_FONT_COLOR);
-
-	public static final ImageDescriptor DESC_LINE_COLOR = createAndCache(IMG_LINE_COLOR);
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(DiagramPropertiesPlugin
-			.getPluginId(), imageName);
-	}
-
-	/**
-	 * Creates the image descriptor from the filename given and caches it in the
-	 * plugin's image registry.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor createAndCache(String imageName) {
-		ImageDescriptor result = create(imageName);
-		DiagramPropertiesPlugin.getDefault().getImageRegistry().put(imageName, result);
-		return result;
-	}
-
-	/**
-	 * Gets an image from the image registry. This image should not be disposed
-	 * of, that is handled in the image registry. The image descriptor must have
-	 * previously been cached in the image registry. The cached images for the
-	 * public image names defined in this file can be retrieved using this
-	 * method.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the image or null if it has not been cached in the registry
-	 */
-	public static Image get(String imageName) {
-		return DiagramPropertiesPlugin.getDefault().getImageRegistry().get(imageName);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.java
deleted file mode 100644
index f5044a1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramUIPropertiesMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages";//$NON-NLS-1$
-
-	private DiagramUIPropertiesMessages() {
-		// Do not instantiate
-	}
-
-	public static String DiagramGeneralDetails_nameLabel_text;
-	public static String DiagramGeneralDetails_diagramTypeLabel_text;
-	public static String DiagramGeneralDetails_diagramDescriptionLabel_text;
-	public static String DiagramGeneralDetails_nameChangeCommand_text;
-	public static String DiagramGeneralDetails_diagramDescriptionChangeCommand_text;
-	public static String FontAndColor_nameLabel;
-	public static String FontColor_commandText;
-	public static String FillColor_commandText;
-	public static String LineColor_commandText;
-	public static String Font_commandText;
-	public static String ConnectionAppearanceDetails_AvoidObstaclesLabel_Text;
-	public static String AppearanceDetails_AvoidObstaclesCommand_Text;
-	public static String ConnectionAppearanceDetails_ClosestDistanceLabel_Text;
-	public static String AppearanceDetails_ClosestDistanceCommand_Text;
-	public static String ConnectionAppearanceDetails_RouterOptionsLabel_Text;
-	public static String ConnectionAppearanceDetails_JumpLinksLabel_Text;
-	public static String AppearanceDetails_JumpLinksCommand_Text;
-	public static String ConnectionAppearanceDetails_JumpLinkTypeLabel_Text;
-	public static String ConnectionAppearanceDetails_JumpLinkGroupLabel_Text;
-	public static String AppearanceDetails_JumpLinkTypeCommand_Text;
-	public static String ConnectionAppearanceDetails_LineRouterLabel_Text;
-	public static String AppearanceDetails_LineRouterCommand_Text;
-	public static String ConnectionAppearanceDetails_ReverseJumpLinksLabel_Text;
-	public static String AppearanceDetails_ReverseJumpLinksCommand_Text;
-	public static String ConnectionAppearanceDetails_SmoothnessLabel_Text;
-	public static String AppearanceDetails_SmoothnessCommand_Text;
-	public static String ColorPalettePopup_default;
-	public static String ColorPalettePopup_custom;
-	public static String Grid_On_Label_Text;
-	public static String Grid_Level_Label_Text;
-	public static String Snap_To_Grid_Label_Text;
-	public static String Grid_Spacing_Label_Text;
-	public static String Ruler_On_Label_Text;
-	public static String Ruler_Units_Label_Text;
-	public static String Display_Group_Label_Text;
-	public static String Measurement_Group_Label_Text;
-	public static String Gridline_Group_Label_Text;
-	public static String Line_Color_Label_Text;
-	public static String Line_Style_Label_Text;
-	public static String Inches_Label_Text;
-	public static String Centimeters_Label_Text;
-	public static String Pixel_Label_Text;
-	public static String Solid_Label_Text;
-	public static String Dash_Label_Text;
-	public static String Dot_Label_Text;
-	public static String Dash_Dot_Label_Text;
-	public static String Dash_Dot_Dot_Label_Text;
-	public static String Spaced_Dot_Label_Text;
-	public static String Restore_Defaults_Label_Text;	
-	public static String Positive_Number_Error;
-    public static String AbstractPropertySection_UndoIntervalPropertyString;
-	
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIPropertiesMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.properties
deleted file mode 100644
index 6b08c84..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.properties
+++ /dev/null

@@ -1,91 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# Property Sections related resource strings
-# ================================ BEGIN ==================================================
-DiagramGeneralDetails_nameLabel_text=Name:
-DiagramGeneralDetails_diagramTypeLabel_text=Type:
-DiagramGeneralDetails_diagramDescriptionLabel_text=Description:
-DiagramGeneralDetails_nameChangeCommand_text=Name
-DiagramGeneralDetails_diagramDescriptionChangeCommand_text=Description
-
-AbstractPropertySection_UndoIntervalPropertyString = Change
-
-# ===============================================================================
-# Property Sections related resource strings  Appearance Section
-# ================================ BEGIN ========================================
-
-FontAndColor_nameLabel=Fonts and Colors:
-
-FontColor_commandText=Font Color
-FillColor_commandText=Fill Color
-LineColor_commandText=Line Color
-Font_commandText=Font
-
-
-# ConnectionAppearancePropertySection related resource strings
-# ================================ BEGIN ==================================================
-ConnectionAppearanceDetails_AvoidObstaclesLabel_Text=Avoid obstructions
-AppearanceDetails_AvoidObstaclesCommand_Text=Set avoid obstructions
-ConnectionAppearanceDetails_ClosestDistanceLabel_Text=Closest distance
-AppearanceDetails_ClosestDistanceCommand_Text=Set closest distance
-ConnectionAppearanceDetails_RouterOptionsLabel_Text=Routing
-ConnectionAppearanceDetails_JumpLinksLabel_Text=Status:
-AppearanceDetails_JumpLinksCommand_Text=Set Jump links status
-ConnectionAppearanceDetails_JumpLinkTypeLabel_Text=Type:
-ConnectionAppearanceDetails_JumpLinkGroupLabel_Text=Jump links
-AppearanceDetails_JumpLinkTypeCommand_Text=Set Jump link type
-ConnectionAppearanceDetails_LineRouterLabel_Text=Styles:
-AppearanceDetails_LineRouterCommand_Text=Set routing
-ConnectionAppearanceDetails_ReverseJumpLinksLabel_Text=Reverse jump links
-AppearanceDetails_ReverseJumpLinksCommand_Text=Set reverse jump links
-ConnectionAppearanceDetails_SmoothnessLabel_Text=Smoothness:
-AppearanceDetails_SmoothnessCommand_Text=Set Smoothness
-# ==================================== END ================================================
-
-# GridPropertySection related resource strings
-# ================================ BEGIN ==================================================
-Grid_On_Label_Text=Show Grid
-Grid_Level_Label_Text=Grid In Front
-Snap_To_Grid_Label_Text=Snap To Grid
-Grid_Spacing_Label_Text=Grid Spacing
-Ruler_On_Label_Text=Show Ruler
-Ruler_Units_Label_Text=Ruler Units
-Display_Group_Label_Text=Display
-Measurement_Group_Label_Text=Measurement
-Gridline_Group_Label_Text=Grid Line
-Line_Color_Label_Text=Color
-Line_Style_Label_Text=Style
-Inches_Label_Text=Inches
-Centimeters_Label_Text=Centimeters
-Pixel_Label_Text=Pixels
-Solid_Label_Text=Solid
-Dash_Label_Text=Dash
-Dot_Label_Text=Dot
-Dash_Dot_Label_Text=Dash Dot
-Dash_Dot_Dot_Label_Text= Dash Dot Dot
-Spaced_Dot_Label_Text= Spaced Dot
-Restore_Defaults_Label_Text=Restore Defaults
-
-
-# ==================================== END ================================================
-
-
-# Error message for negative integer when a positive is required
-Positive_Number_Error=Input must be a positive number
-
-
-# Color Paletter Popup strings
-# ============================== BEGIN ====================================================
-ColorPalettePopup_default=Default
-ColorPalettePopup_custom=Custom ...
-# ==================================== END ================================================

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/package.html
deleted file mode 100644
index 1f3d028..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.properties.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/package.html
deleted file mode 100644
index 2cd2006..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.properties.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/providers/ReadOnlyDiagramPropertiesModifier.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/providers/ReadOnlyDiagramPropertiesModifier.java
deleted file mode 100644
index a175dad..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/providers/ReadOnlyDiagramPropertiesModifier.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.providers;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.properties.ApplyModifiersOperation;
-import org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource;
-import org.eclipse.gmf.runtime.common.ui.services.properties.IPropertiesModifier;
-import org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.properties.views.IReadOnlyDiagramPropertySheetPageContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-/**
- * Install this properties provider for Browse Diagrams where the selected item
- * must not be editable.
- * 
- * @author Wayne Diu, wdiu
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.properties.*
- */
-
-public class ReadOnlyDiagramPropertiesModifier
-	extends AbstractProvider
-	implements IPropertiesModifier {
-
-	/**
-	 * Return true if the <code>DiagramPropertiesProvider</code> would return true for
-	 * this operation and we are on a Browse Diagram.
-	 * 
-	 * @param operation
-	 *            IOperation that we will check if we provide for
-	 *	 
-	 */
-	public boolean provides(IOperation operation) {
-
-		if (operation instanceof ApplyModifiersOperation) {
-
-			IWorkbench workbench = PlatformUI.getWorkbench();
-
-			if (workbench != null) {
-				IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
-
-				if (window != null) {
-					IWorkbenchPage page = window.getActivePage();
-                    
-                    if (page != null) {
-                        IEditorPart part = page.getActiveEditor();
-
-                        return part instanceof IReadOnlyDiagramPropertySheetPageContributor
-                            || (part instanceof DiagramEditor && !((DiagramEditor) part)
-                                .isWritable());
-                    }
-
-				}
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does not allow editing the property source by write protecting
-	 * descriptors. Sets the read-only attribute to <code>true</code>
-	 *
-	 
-	 */
-	public void apply(ICompositePropertySource propertySource) {
-		if (propertySource != null) {
-			IPropertyDescriptor[] descriptors = propertySource
-				.getPropertyDescriptors();
-			for (int i = 0; i < descriptors.length; i++){
-				if( descriptors[i] instanceof ICompositeSourcePropertyDescriptor)
-					((ICompositeSourcePropertyDescriptor) descriptors[i])
-					.setReadOnly(true);
-			}
-
-		}
-
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/providers/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/providers/package.html
deleted file mode 100644
index 8a1d867..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/providers/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the service provider classes for this plugin.
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractBasicTextPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractBasicTextPropertySection.java
deleted file mode 100644
index 096f069..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractBasicTextPropertySection.java
+++ /dev/null

@@ -1,301 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.util.StatusLineUtil;
-import org.eclipse.gmf.runtime.diagram.ui.properties.views.TextChangeHelper;
-
-/**
- * A generic class to edit a property via text field. This class supports
- * multi-select behavior
- * 
- * @author natalia balaba
- */
-public abstract class AbstractBasicTextPropertySection
-	extends AbstractModelerPropertySection {
-
-	// text widget to display and set value of the property
-	private Text textWidget;
-
-	// label widget for the property name
-	private CLabel propertyNameLabelWidget;
-
-	/**
-	 * @return - name of the property to place in the label widget
-	 */
-	abstract protected String getPropertyNameLabel();
-
-	/**
-	 * Set property value for the given object
-	 * 
-	 * @param object -
-	 *            owner of the property
-	 * @param value -
-	 *            new value
-	 */
-	abstract protected void setPropertyValue(EObject object, Object value);
-
-	/**
-	 * @return - string representation of the property value
-	 */
-	abstract protected String getPropertyValueString();
-
-	/**
-	 * @return - title of the command which will be executed to set the property
-	 */
-	protected abstract String getPropertyChangeCommandName();
-
-	/**
-	 * A helper to listen for events that indicate that a text field has been
-	 * changed.
-	 */
-	private TextChangeHelper listener = new TextChangeHelper() {
-		boolean textModified = false;
-		/**
-		 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-		 */
-		public void handleEvent(Event event) {
-			switch (event.type) {
-				case SWT.KeyDown :
-					textModified = true;
-					if (event.character == SWT.CR)
-						textChanged((Control)event.widget);
-					break;
-				case SWT.FocusOut :
-					textChanged((Control)event.widget);
-					break;
-			}
-		}
-		
-		public void textChanged(Control control) {
-			if (textModified) {
-				// clear error message
-				IWorkbenchPart part = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getActivePage().getActivePart();
-				StatusLineUtil.outputErrorMessage(part, StringStatics.BLANK);
-
-				setPropertyValue(control);
-				textModified = false;
-			}
-		}		
-	};
-
-	private Composite sectionComposite;
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		doCreateControls(parent, aTabbedPropertySheetPage);
-	}
-	
-	/**
-	 * Creates the GUI <code>Control</code> for this text property section
-	 * @param parent parent <code>Composite</code>
-	 * @param aTabbedPropertySheetPage <code>TabbedPropertySheetPage</code>
-	 * @see org.eclipse.gmf.runtime.common.ui.properties.ISection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.gmf.runtime.common.ui.properties.TabbedPropertySheetPage)
-	 */
-	public void doCreateControls(Composite parent,
-			TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		super.createControls(parent, aTabbedPropertySheetPage);
-
-		sectionComposite = getWidgetFactory().createFlatFormComposite(parent);
-		textWidget = createTextWidget(sectionComposite);
-		propertyNameLabelWidget = createLabelWidget(sectionComposite);
-
-		startTextWidgetEventListener();
-
-	}
-
-	/**
-	 * Start listening to the text widget events
-	 */
-	protected void startTextWidgetEventListener() {
-		if (!isReadOnly()) {
-			getListener().startListeningTo(getTextWidget());
-			getListener().startListeningForEnter(getTextWidget());
-		}
-	}
-
-	/**
-	 * Stop listening to text widget events
-	 */
-	protected void stopTextWidgetEventListener() {
-		if (!isReadOnly())
-			getListener().stopListeningTo(getTextWidget());
-	}
-
-	/**
-	 * Instantiate a text widget
-	 * 
-	 * @param parent -
-	 *            parent composite
-	 * @return - a text widget to display and edit the property
-	 */
-	protected Text createTextWidget(Composite parent) {
-		Text text = getWidgetFactory().createText(parent, StringStatics.BLANK);
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, getStandardLabelWidth(parent,
-			getPropertyNameStringsArray()));
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		text.setLayoutData(data);
-		if (isReadOnly())
-			text.setEditable(false);
-		return text;
-	}
-
-	/**
-	 * returns as an array the property name
-	 * @return - array of strings where each describes a property name one per
-	 *         property. The strings will be used to calculate common indent
-	 *         from the left
-	 */
-	protected String[] getPropertyNameStringsArray() {
-		return new String[] {getPropertyNameLabel()};
-	}
-
-	/**
-	 * Create a label for property name
-	 * 
-	 * @param parent -
-	 *            parent composite
-	 * @return - label to show property name
-	 */
-	protected CLabel createLabelWidget(Composite parent) {
-		CLabel label = getWidgetFactory().createCLabel(parent,
-			getPropertyNameLabel());
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(getTextWidget(),
-			-ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(getTextWidget(), 0, SWT.CENTER);
-		label.setLayoutData(data);
-		return label;
-	}
-
-	/**
-	 * User pressed Enter key after editing text field - update the model
-	 * 
-	 * @param control <code>Control</code>
-	 */
-	protected synchronized void setPropertyValue(Control control) {
-
-		final Object value = computeNewPropertyValue();
-		ArrayList commands = new ArrayList();
-		for (Iterator it = getEObjectList().iterator(); it.hasNext();) {
-			final EObject next = (EObject) it.next();
-			commands.add(createCommand(getPropertyChangeCommandName(), next,
-				new Runnable() {
-
-					public void run() {
-						setPropertyValue(next, value);
-					}
-
-				}));
-		}
-
-		executeAsCompositeCommand(getPropertyChangeCommandName(), commands);
-		refresh();
-
-	}
-
-	/**
-	 * @return - a default implementation returns contents of the text widget as
-	 *         a new value for the property. Subclasses can override.
-	 */
-	protected Object computeNewPropertyValue() {
-		return getTextWidget().getText();
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#dispose()
-	 */
-	public void dispose() {
-		stopTextWidgetEventListener();
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#refresh()
-	 */
-	public void refresh() {
-		getListener().startNonUserChange();
-		try {
-			executeAsReadAction(new Runnable() {
-
-				public void run() {
-					refreshUI();
-				}
-			});
-		} finally {
-			getListener().finishNonUserChange();
-		}
-	}
-
-	/**
-	 * Refresh UI body - referesh will surround this with read action block
-	 */
-	protected void refreshUI() {
-		getTextWidget().setText(getPropertyValueString());
-	}
-
-	/**
-	 * @return Returns the listener.
-	 */
-	protected TextChangeHelper getListener() {
-		return listener;
-	}
-
-	/**
-	 * @return Returns the textWidget.
-	 */
-	protected Text getTextWidget() {
-		return textWidget;
-	}
-
-	/**
-	 * @return Returns the propertyNameLabelWidget.
-	 */
-	public CLabel getPropertyNameLabelWidget() {
-		return propertyNameLabelWidget;
-	}
-
-	/**
-	 * @return Returns the sectionComposite.
-	 */
-	public Composite getSectionComposite() {
-		return sectionComposite;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractModelerPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractModelerPropertySection.java
deleted file mode 100644
index 3b8a8f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractModelerPropertySection.java
+++ /dev/null

@@ -1,639 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.DemultiplexingListener;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.properties.PropertiesServiceAdapterFactory;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.DiagramPropertiesDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.DiagramPropertiesPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.DiagramPropertiesStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
-import org.eclipse.gmf.runtime.diagram.ui.properties.util.SectionUpdateRequestCollapser;
-import org.eclipse.gmf.runtime.diagram.ui.properties.views.IReadOnlyDiagramPropertySheetPageContributor;
-import org.eclipse.gmf.runtime.diagram.ui.properties.views.PropertiesBrowserPage;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * An abstract implementation of a section in a tab in the tabbed property sheet
- * page for modeler.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com </a>
- */
-public abstract class AbstractModelerPropertySection
-	extends AbstractPropertySection {
-
-	private TabbedPropertySheetPage tabbedPropertySheetPage;
- 
-	/**
-	 * model event listener
-	 */
-	protected DemultiplexingListener eventListener = new DemultiplexingListener(getFilter()) {
-
-		protected void handleNotification(TransactionalEditingDomain domain,
-				Notification notification) {
-			update(domain, notification);
-		}
-	};
-
-	// properties provider to obtain properties of the objects on the list
-	protected static final PropertiesServiceAdapterFactory propertiesProvider = new PropertiesServiceAdapterFactory();
-
-	private boolean bIsCommandInProgress = false;
-
-	/** value changed string */
-	static protected String VALUE_CHANGED_STRING = DiagramUIPropertiesMessages.AbstractPropertySection_UndoIntervalPropertyString;
-
-	/** object currently selected on either a diagram or a ME - a view */
-	protected List input;
-
-	/** eObject should gradually replace EElement */
-	protected EObject eObject;
-
-	private List eObjectList = new ArrayList();
-
-	/**
-	 * a flag indicating if this property section got disposed
-	 */
-	protected boolean disposed = false;
-    
-    private TransactionalEditingDomain editingDomain = null;
-	
-    /* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#setInput(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setInput(IWorkbenchPart part, ISelection selection) {
-		super.setInput(part, selection);
-
-		if (!(selection instanceof IStructuredSelection)
-			|| selection.equals(getInput()))
-			return;
-
-		input = new ArrayList();
-
-		eObjectList = new ArrayList();
-		for (Iterator it = ((IStructuredSelection) selection).iterator(); it
-			.hasNext();) {
-			Object next = it.next();
-			
-			// unwrap down to EObject and add to the eObjects list
-			if (addToEObjectList(next)) {
-				input.add(next);
-			}
-		}
-
-
-		// RATLC000524513 Sometimes there is no eobject. For example if user
-		// creates a constraint,
-		// on a class there will be a connection shown on the diagram which
-		// connects the constraint
-		// with the class. The user can select this connection, even though it
-		// does not have an
-		// underlying eobject. Comments are similar. In this case we show only
-		// the appearanced tab.
-		if (false == eObjectList.isEmpty())
-			setEObject((EObject) eObjectList.get(0));
-
-	}
-
-	/**
-	 * Add next object in the selection to the list of EObjects if this object 
-	 * could be adapted to an <code>EObject</code>
-	 * @param object the object to add
-	 * @return - true if the object is added, false otherwise 
-	 */
-	protected boolean addToEObjectList(Object object) {
-		EObject adapted = unwrap(object);
-		if (adapted != null){
-			getEObjectList().add(adapted);
-			return true;
-		}		
-		return false;
-
-	}
-
-	/**
-	 * Unwarp the ME or diagram object down to the underlaying UML element
-	 * 
-	 * @param object -
-	 *            object from a diagram or ME
-	 * @return - underlaying UML element
-	 */
-	protected EObject unwrap(Object object) {
-		return adapt(object);
-	}
-
-	/**
-	 * Adapt the object to an EObject - if possible
-	 * 
-	 * @param object
-	 *            object from a diagram or ME
-	 * @return EObject
-	 */
-	protected EObject adapt(Object object) {
-		if (object instanceof IAdaptable) {
-			return (EObject) ((IAdaptable) object).getAdapter(EObject.class);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Determines if the page is displaying properties for this element
-	 * 
-	 * @param notification
-	 *            The notification
-	 * @param element
-	 *            The element to be tested
-	 * @return 'true' if the page is displaying properties for this element
-	 */
-	protected boolean isCurrentSelection(Notification notification,
-			EObject element) {
-
-		if (element == null)
-			return false;
-
-		if (eObjectList.contains(element))
-			return true;
-
-		if (eObjectList.size() > 0) {
-			EObject eventObject = element;
-
-			// check for annotations
-			if (element instanceof EAnnotation) {
-				eventObject = element.eContainer();
-			} else {
-				EObject container = element.eContainer();
-				if (container != null && container instanceof EAnnotation) {
-					eventObject = container.eContainer();
-				}
-			}
-
-			if (eventObject == null) {
-				// the annotation has been removed - check the old owner
-				Object tmpObj = notification.getOldValue();
-				if (tmpObj != null && tmpObj instanceof EObject) {
-					eventObject = (EObject) tmpObj;
-				} else {
-					return false;
-				}
-			}
-
-			if (eventObject != element) {
-				return eObjectList.contains(eventObject);
-			}
-
-		}
-		return false;
-	}
-
-	/**
-	 * A utility method allows execute a piece of code wrapping it in the read
-	 * call to the model.
-	 * 
-	 * @param code -
-	 *            Runnable code to execute
-	 */
-	protected void executeAsReadAction(final Runnable code) {
-		try {
-			TransactionalEditingDomain domain = getEditingDomain();
-			
-			if (domain != null) {
-				getEditingDomain().runExclusive(code);
-			} else {
-				// if we are not in a transactional editing domain context, then
-				//    there is no notion of exclusivity.  Just run
-				code.run();
-			}
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramPropertiesPlugin.getDefault(),
-				DiagramPropertiesDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"executeAsReadAction", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * A utility method allows execute a list of commands by wrapping them\ in a
-	 * composite command.
-	 * 
-	 * @param commands -
-	 *            List of commands to execute
-	 */
-	protected CommandResult executeAsCompositeCommand(String actionName,
-			List commands) {
-		
-		if (true == bIsCommandInProgress)
-			return null;
-
-		bIsCommandInProgress = true;
-
-        CompositeCommand command = new CompositeCommand(actionName, commands);
-        IOperationHistory history = OperationHistoryFactory.getOperationHistory();
-
-        try {
-            IStatus status = history.execute(command,
-                new NullProgressMonitor(), null);
-
-            if (status.getCode() == DiagramPropertiesStatusCodes.CANCELLED) {
-			refresh();
-            }
-
-        } catch (ExecutionException e) {
-            Trace.catching(DiagramPropertiesPlugin.getDefault(),
-                DiagramPropertiesDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "executeAsCompositeCommand", e); //$NON-NLS-1$
-            Log.error(DiagramPropertiesPlugin.getDefault(),
-                DiagramPropertiesStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                    .getLocalizedMessage(), e);
-        }
-
-		bIsCommandInProgress = false;
-
-		return command.getCommandResult();
-
-	}
-
-	/**
-	 * Returns currently selected view object
-	 * 
-	 * @return Returns the input.
-	 */
-	public List getInput() {
-		return input;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#aboutToBeHidden()
-	 */
-	public void aboutToBeHidden() {
-		super.aboutToBeHidden();
-        
-        TransactionalEditingDomain theEditingDomain = getEditingDomain();
-        if (theEditingDomain != null) {
-            theEditingDomain.removeResourceSetListener(getEventListener());
-        }
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#aboutToBeShown()
-	 */
-	public void aboutToBeShown() {
-        super.aboutToBeShown();
-
-        TransactionalEditingDomain theEditingDomain = getEditingDomain();
-        if (theEditingDomain != null) {
-            theEditingDomain.addResourceSetListener(getEventListener());
-        }
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		/* 
-		 * if (getUpdateRequestCollapser() != null) {
-		 * getUpdateRequestCollapser().stop(); updateRequestCollapser = null; }
-		 */
-		if (eObjectList != null) {
-			eObjectList.clear();
-		}
-		eObject = null;
-		disposed = true;
-	}
-	
-	/**
-	 * Returns currently selected view object
-	 * 
-	 * @return Returns the input.
-	 */
-	protected Object getPrimarySelection() {
-		return (getInput() != null && !getInput().isEmpty() ? getInput().get(0)
-			: null);
-	}
-	
-
-	/**
-	 * @return Returns the eObject.
-	 */
-	protected EObject getEObject() {
-		return eObject;
-	}
-
-	/**
-	 * @param object
-	 *            The eObject to set.
-	 */	
-	protected void setEObject(EObject object) {
-		this.eObject = object;
-	}
-
-	/**
-	 * Subclasses overriding this method should remember to override
-	 * {@link #update(TransactionalEditingDomain, Notification)} as required.
-	 * The default implementation of
-	 * {@link #update(TransactionalEditingDomain, Notification)} will only
-	 * update if the notifier is an <code>EObject</code>.
-	 * 
-	 * @return the filter for events used by my <code>eventListener</code>.
-	 */
-	public NotificationFilter getFilter() {
-        return NotificationFilter.createEventTypeFilter(Notification.SET).or(
-            NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(
-            NotificationFilter.createNotifierTypeFilter(EObject.class));
-    }
-
-
-	/**
-	 * Update if nessesary, upon receiving the model event. This event will only
-	 * be processed when the reciever is visible (the default behavior is not to
-	 * listen to the model events while not showing). Therefore it is safe to
-	 * refresh the UI. Sublclasses, which will choose to override event
-	 * listening behavior should take into account that the model events are
-	 * sent all the time - regardless of the section visibility. Thus special
-	 * care should be taken by the section that will choose to listen to such
-	 * events all the time. Also, the default implementation of this method
-	 * synchronizes on the GUI thread. The subclasses that overwrite it should
-	 * do the same if they perform any GUI work (because events may be sent from
-	 * a non-GUI thread).
-	 * 
-	 * @see #aboutToBeShown()
-	 * @see #aboutToBeHidden()
-	 * 
-	 * @param notification notification object
-	 * @param element element that has changed
-	 */
-	public void update(final Notification notification, final EObject element) {
-		if (!isDisposed() && isCurrentSelection(notification, element)
-			&& !isNotifierDeleted(notification)) {
-			postUpdateRequest(new Runnable() {
-
-				public void run() {
-					if (!isDisposed()
-						&& isCurrentSelection(notification, element)
-						&& !isNotifierDeleted(notification))
-						refresh();
-
-				}
-			});
-		}
-	}
-	
-	/**
-	 * Updates me if the notifier is an <code>EObject</code> by calling
-	 * {@link #update(Notification, EObject)}. Does nothing otherwise.
-	 * Subclasses should override this method if they need to update based on
-	 * non-EObject notifiers.
-	 * 
-	 * @param domain
-	 *            the editing domain
-	 * @param notification
-	 *            the event notification
-	 */
-	protected void update(TransactionalEditingDomain domain, Notification notification) {
-
-		Object notifier = notification.getNotifier();
-		
-		if (notifier instanceof EObject) {
-			update(notification, (EObject) notifier);
-		}
-	}
-
-	/**
-	 * Returns whether or not the notifier for a particular notification has been
-	 * deleted from its parent.
-	 * 
-	 * This is a fix for RATLC00535181.  What happens is that during deletion of
-	 * an element from the diagram, the element first deletes related elements
-	 * which causes a modification of the element itself.  When the modification occurs
-	 * the event handling mechanism posts a request to the UI queue to refresh the UI.
-	 * A race condition occurs where by the time the posted request runs, the element
-	 * in question may or may not have already been deleted from its container.  If
-	 * the element has been deleted from its container, we should not refresh the
-	 * property section.
-	 * 
-	 * @param notification
-	 * @return <code>true</code> if notification has been deleted from its parent, <code>false</code> otherwise
-	 */
-	protected boolean isNotifierDeleted(Notification notification) {
-		if (!(notification.getNotifier() instanceof EObject)) {
-			return false;
-		}
-		EObject obj = (EObject)notification.getNotifier();
-		return obj.eResource() == null;
-	}
-	
-	/**
-	 * Use requset collapser to post update requests.
-	 * 
-	 * @param updateRequest -
-	 *            runnable update code
-	 */
-	protected void postUpdateRequest(Runnable updateRequest) {
-		getUpdateRequestCollapser().postRequest(this, updateRequest);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.core.edit.IDemuxedMListener#handleElementModifiedEvent(org.eclipse.emf.common.notify.Notification, org.eclipse.emf.ecore.EObject)
-	 */
-	public void handleElementModifiedEvent(final Notification notification,
-			final EObject element) {
-		update(notification, element);
-	}
-
-	/**
-	 * @return Returns the eObjectList.
-	 */
-	protected List getEObjectList() {
-		return eObjectList;
-	}
-
-	/**
-	 * @return Returns the disposed.
-	 */
-	protected boolean isDisposed() {
-		return disposed;
-	}
-
-	/**
-	 * @return Returns the eventListener.
-	 */
-	protected DemultiplexingListener getEventListener() {
-		return eventListener;
-	}
-
-	/**
-	 * @return Returns a command
-	 */
-	protected ICommand createCommand(String name, Resource res,
-			final Runnable runnable) {
-
-		return createCommandInternal(name, res, runnable);
-	}
-
-	/**
-	 * @return Returns a command
-	 */
-	protected ICommand createCommand(String name, EObject res,
-			final Runnable runnable) {
-
-		return createCommandInternal(name, res.eResource(), runnable);
-	}
-
-	/**
-	 * @return Returns a command
-	 */
-	private ICommand createCommandInternal(String name, Resource res,
-			final Runnable runnable) {
-
-        ICommand command = new AbstractTransactionalCommand(getEditingDomain(), name,
-            Collections.singletonList(WorkspaceSynchronizer.getFile(res))) {
-
-            protected CommandResult doExecuteWithResult(
-                    IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-
-				runnable.run();
-
-                return CommandResult.newOKCommandResult();
-			}
-		};
-
-		return command;
-	}
-
-    /**
-     * Gets the editing domain from my EObject input.
-     * 
-     * @return my editing domain
-     */
-    protected TransactionalEditingDomain getEditingDomain() {
-        if (editingDomain == null) {
-            EObject eObjectInput = getEObject();
-            if (eObjectInput != null) {
-                editingDomain = TransactionUtil.getEditingDomain(eObjectInput);
-            } else if (!getEObjectList().isEmpty()) {
-                editingDomain = TransactionUtil.getEditingDomain(getEObjectList().get(0));
-            }
-        }
-        return editingDomain;
-    }
-    
-    /**
-     * Sets the editingDomain.
-     * @param editingDomain The editingDomain to set.
-     */
-    protected void setEditingDomain(TransactionalEditingDomain editingDomain) {
-        this.editingDomain = editingDomain;
-    }
-
-    /* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		super.createControls(parent, aTabbedPropertySheetPage);
-		this.tabbedPropertySheetPage = aTabbedPropertySheetPage;
-
-	}
-
-	/**
-	 * Determine if the property sheet page contributor is read only.
-	 * 
-	 * Topic and Browse diagrams have properties that are read only, even
-	 * theough the selection may be modifiable.
-	 * 
-	 * @return <code>true</code> if the contributor is read only.
-	 */
-	protected boolean isReadOnly() {
-		if (tabbedPropertySheetPage instanceof PropertiesBrowserPage) {
-			PropertiesBrowserPage propertiesBrowserPage = (PropertiesBrowserPage) tabbedPropertySheetPage;
-			ITabbedPropertySheetPageContributor contributor = propertiesBrowserPage
-				.getContributor();
-            if (contributor instanceof IReadOnlyDiagramPropertySheetPageContributor
-                    || (contributor instanceof DiagramEditor && !((DiagramEditor) contributor)
-                        .isWritable())) {
-                return true;
-            }
-		}
-		return false;
-	}
-
-	/**
-	 * Get the standard label width when labels for sections line up on the left
-	 * hand side of the composite. We line up to a fixed position, but if a
-	 * string is wider than the fixed position, then we use that widest string.
-	 * 
-	 * @param parent
-	 *            The parent composite used to create a GC.
-	 * @param labels
-	 *            The list of labels.
-	 * @return the standard label width.
-	 */
-	protected int getStandardLabelWidth(Composite parent, String[] labels) {
-		int standardLabelWidth = STANDARD_LABEL_WIDTH;
-		GC gc = new GC(parent);
-		int indent = gc.textExtent("XXX").x; //$NON-NLS-1$
-		for (int i = 0; i < labels.length; i++) {
-			int width = gc.textExtent(labels[i]).x;
-			if (width + indent > standardLabelWidth) {
-				standardLabelWidth = width + indent;
-			}
-		}
-		gc.dispose();
-		return standardLabelWidth;
-	}
-
-	/**
-	 * @return Returns the updateRequestCollapser.
-	 */
-	protected SectionUpdateRequestCollapser getUpdateRequestCollapser() {
-		return DiagramPropertiesPlugin.getDefault()
-			.getUpdateRequestCollapser();
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractNotationPropertiesSection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractNotationPropertiesSection.java
deleted file mode 100644
index 1d3b7e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractNotationPropertiesSection.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.descriptors.NotationPropertyDescriptor;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * @author nbalaba
- * 
- */
-public abstract class AbstractNotationPropertiesSection
-	extends AbstractModelerPropertySection {
-
-	protected static int vertical_offset = ITabbedPropertyConstants.VSPACE;
-
-	protected static int button_margin = IDialogConstants.BUTTON_MARGIN / 2;
-
-	protected int standardLabelWidth = -1;
-
-	protected Composite composite;
-
-	/**
-	 * 
-	 * Get a label provider to do the translation Most entries on this page are
-	 * handled using the string table to take care of translation. In this case
-	 * the string table does not have what we need so we get a label provider
-	 * from a property descriptor. The property descriptor itself comes from a
-	 * property source. This is the way the advanced tab operates.
-	 * 
-	 * @return
-	 */
-	protected ILabelProvider getLabelProvider(Object propertyId) {
-		IPropertySource propertySource = propertiesProvider
-			.getPropertySource(getSingleInput());
-		ILabelProvider labelProvider = null;
-		NotationPropertyDescriptor pdNotation = null;
-		IPropertyDescriptor[] descriptors = null;
-
-		if (null != propertySource) {
-			descriptors = propertySource.getPropertyDescriptors();
-			for (int i = 0; i < descriptors.length; i++) {
-				if (descriptors[i].getId() == NotationPackage.eINSTANCE
-					.getView_Styles()) {
-					pdNotation = (NotationPropertyDescriptor) descriptors[i];
-					break;
-				}
-			}
-		}
-
-		if (null != pdNotation) {
-			propertySource = (IPropertySource) pdNotation.getPropertyValue();
-
-			descriptors = propertySource.getPropertyDescriptors();
-			for (int j = 0; j < descriptors.length; j++) {
-				if (descriptors[j].getId() == PackageUtil
-					.getElement(propertyId.toString())) {
-					labelProvider = descriptors[j].getLabelProvider();
-					break;
-				}
-			}
-		}
-		return labelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		super.createControls(parent, aTabbedPropertySheetPage);
-		initializeControls(parent);
-	}
-
-	
-	/**
-	 * Provides a level of indirection for subclasses which want 'jump' over
-	 * some control creation/initilialization steps and/or chnage thier order
-	 * 
-	 * @param parent - parent composite
-	 */
-	protected void initializeControls(Composite parent) {
-		composite = getWidgetFactory().createFlatFormComposite(parent);
-		FormLayout layout = (FormLayout) composite.getLayout();
-		layout.spacing = 3;
-	}
-
-	/**
-	 * Determines if the page is displaying properties for this element The
-	 * element being passed to us is the style ie UMLConnectorStyle or
-	 * UMLShapeStype. The element which we are holding will be an association,
-	 * class etc. Comparing these 2 eobjects will always result in false being
-	 * returned and no refresh. We are unable to analytically, consistantly
-	 * trave from the eobject representing the style to the eobject representing
-	 * the shape so we are stuck returning true in all cases.
-	 * 
-	 * @param notification
-	 *            The notification
-	 * @param element
-	 *            The element to be tested
-	 * @return 'true' if the page is displaying properties for this element
-	 * 
-	 */
-	protected boolean isCurrentSelection(Notification notification,
-			EObject element) {
-
-		return true;
-	}
-	
-	/**
-	 * Returns currently selected view object
-	 * 
-	 * @return Returns the input.
-	 */
-	public IGraphicalEditPart getSingleInput() {
-		return (IGraphicalEditPart) getPrimarySelection();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractModelerPropertySection#unwrap(java.lang.Object)
-	 */
-	protected EObject unwrap(Object object) {
-		EObject o = super.unwrap(object);
-		if (o != null && object instanceof IGraphicalEditPart)
-			return o;
-		return null;
-	}
-
-	/**
-	 * Adapt the object to an EObject - if possible
-	 * 
-	 * @param object
-	 *            object from a diagram or ME
-	 * @return EObject
-	 */
-	protected EObject adapt(Object object) {
-		if (object instanceof IAdaptable) {
-			if (object instanceof IGraphicalEditPart)// digram case
-				return (EObject) ((IAdaptable) object).getAdapter(View.class);
-			// ME case
-			return (EObject) ((IAdaptable) object).getAdapter(EObject.class);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractModelerPropertySection#getStandardLabelWidth(org.eclipse.swt.widgets.Composite,
-	 *      java.lang.String[])
-	 */
-	protected int getStandardLabelWidth(Composite parent) {
-		if (standardLabelWidth == -1) {
-			standardLabelWidth = getStandardLabelWidth(parent,
-				getAllNameLabels());
-		}
-		return standardLabelWidth;
-	}
-
-	/**
-	 * @return - an array of property names (I18N-ed) to compute label column
-	 *         width
-	 */
-	protected String[] getAllNameLabels() {
-		return new String[] {};
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AdvancedPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AdvancedPropertySection.java
deleted file mode 100644
index dfca5a6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AdvancedPropertySection.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections;
-
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.ui.properties.sections.UndoableModelPropertySheetEntry;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * The advanced property section displayed the "original" tabular property sheet
- * page.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com </a>
- */
-public class AdvancedPropertySection extends AbstractModelerPropertySection {
-
-    /**
-     * the property sheet page for this section
-     */
-    protected PropertySheetPage page;
-  
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-     */
-    public void createControls(final Composite parent,
-            TabbedPropertySheetPage aTabbedPropertySheetPage) {
-        super.createControls(parent, aTabbedPropertySheetPage);
-        Composite composite = getWidgetFactory()
-                .createFlatFormComposite(parent);
-        FormData data = null;
-
-        String tableLabelStr = getTableLabel();
-        CLabel tableLabel = null;
-        if (tableLabelStr != null && tableLabelStr.length() > 0) {
-            tableLabel = getWidgetFactory().createCLabel(composite,
-                    tableLabelStr);
-            data = new FormData();
-            data.left = new FormAttachment(0, 0);
-            data.top = new FormAttachment(0, 0);
-            tableLabel.setLayoutData(data);
-        }
-
-        page = new PropertySheetPage();
-        UndoableModelPropertySheetEntry root = new UndoableModelPropertySheetEntry(
-            OperationHistoryFactory.getOperationHistory());
-        
-        root.setPropertySourceProvider(getPropertySourceProvider());
-        page.setRootEntry(root);
-
-        page.createControl(composite);
-        data = new FormData();
-        data.left = new FormAttachment(0, 0);
-        data.right = new FormAttachment(100, 0);
-        if (tableLabel == null) {
-            data.top = new FormAttachment(0, 0);
-        } else {
-            data.top = new FormAttachment(tableLabel, 0, SWT.BOTTOM);
-        }
-        data.bottom = new FormAttachment(100, 0);
-        data.height = 100;
-        data.width = 100;
-        page.getControl().setLayoutData(data);
-
-        setActionBars(aTabbedPropertySheetPage.getSite().getActionBars());
-        
-    }
-
-    /**
-     * Sets and prepares the actionBars for this section
-     *  
-     * @param actionBars the action bars for this page
-     * @see org.eclipse.gmf.runtime.common.ui.properties.TabbedPropertySheetPage#setActionBars(org.eclipse.ui.IActionBars)
-     */   
-    public void setActionBars(IActionBars actionBars) {
-        
-        actionBars.getMenuManager().removeAll();
-        actionBars.getToolBarManager().removeAll();
-        actionBars.getStatusLineManager().removeAll();
-
-        page.makeContributions(actionBars.getMenuManager(), actionBars
-                .getToolBarManager(), actionBars.getStatusLineManager());
-        
-        actionBars.getToolBarManager().update(true);
-
-    }
-
-    /**
-     * Returns the PropertySource provider. The default implementation returns
-     * static adapter factory for the properties services. If the extending
-     * class needs to use a different provider then this method has to be
-     * overwriten.
-     * 
-     * @return The PropertySource provider
-     */
-    protected IPropertySourceProvider getPropertySourceProvider() {
-        return propertiesProvider;
-    }
-
-    /**
-     * Returns the label for the table. The default implementation returns null,
-     * that is, there is no label.
-     * 
-     * @return The label for the table
-     */
-    protected String getTableLabel() {
-        return null;
-    }
-
-   
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#setInput(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-     */
-    public void setInput(IWorkbenchPart part, ISelection selection) {
-        IEditingDomainProvider provider = (IEditingDomainProvider) part
-            .getAdapter(IEditingDomainProvider.class);
-        if (provider != null) {
-            EditingDomain theEditingDomain = provider.getEditingDomain();
-            if (theEditingDomain instanceof TransactionalEditingDomain) {
-                setEditingDomain((TransactionalEditingDomain) theEditingDomain);
-            }
-        }
-        
-        // Set the eObject for the section, too. The workbench part may not
-		// adapt to IEditingDomainProvider, in which case the selected EObject
-		// will be used to derive the editing domain.
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-            Object firstElement = ((IStructuredSelection) selection)
-                .getFirstElement();
-            
-            if (firstElement != null) {
-            	EObject adapted = unwrap(firstElement);
-            	
-	            if (adapted != null) {
-	                setEObject(adapted);
-	            }
-            }
-        }
-        
-        page.selectionChanged(part, selection);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#dispose()
-     */
-    public void dispose() {
-        super.dispose();
-
-        if (page != null) {
-            page.dispose();
-            page = null;
-        }
-
-    }
-
- 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#refresh()
-     */
-    public void refresh() {
-
-        page.refresh();
-    }
-
-   
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#shouldUseExtraSpace()
-     */
-    public boolean shouldUseExtraSpace() {
-        return true;
-    }
-
-    /**
-     * Update if nessesary, upon receiving the model event.
-     * 
-     * @see #aboutToBeShown()
-     * @see #aboutToBeHidden()
-     * @param notification -
-     *            even notification
-     * @param element -
-     *            element that has changed
-     */
-    public void update(final Notification notification, EObject element) {
-    	if (!isDisposed()) {
-			postUpdateRequest(new Runnable() {
-
-				public void run() {
-					if (!isDisposed() && !isNotifierDeleted(notification))
-						refresh();
-				}
-			});
-		}
-	}
-   
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.emf.core.edit.IDemuxedMListener#getFilter()
-     */
-    public NotificationFilter getFilter() {
-        return NotificationFilter.createEventTypeFilter(Notification.SET).or(
-            NotificationFilter.createEventTypeFilter(Notification.UNSET)).or(
-            NotificationFilter.createEventTypeFilter(Notification.ADD)).or(
-            NotificationFilter.createEventTypeFilter(Notification.ADD_MANY))
-            .or(NotificationFilter.createEventTypeFilter(Notification.REMOVE))
-            .or(
-                NotificationFilter
-                    .createEventTypeFilter(Notification.REMOVE_MANY)).and(
-                NotificationFilter.createNotifierTypeFilter(EObject.class));
-    }
-
-   
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractModelerPropertySection#addToEObjectList(java.lang.Object)
-	 */
-    protected boolean addToEObjectList(Object object) {
-        /* not implemented */
-    	return true;
-    }  
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/DiagramGeneralSection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/DiagramGeneralSection.java
deleted file mode 100644
index 19d8bdc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/DiagramGeneralSection.java
+++ /dev/null

@@ -1,344 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
-import org.eclipse.gmf.runtime.notation.DescriptionStyle;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * The general section displayed for diagrams in the properties view
- * 
- * @author nbalaba
- */
-public class DiagramGeneralSection
-	extends AbstractBasicTextPropertySection {
-
-	/** Name label for diagram general section. */
-	protected static final String NAME_LABEL = DiagramUIPropertiesMessages.DiagramGeneralDetails_nameLabel_text;
-
-	/** Type label. */
-	protected static final String DIAGRAM_TYPE_LABEL = DiagramUIPropertiesMessages.DiagramGeneralDetails_diagramTypeLabel_text;
-
-	/** Description label. */
-	protected static final String DESCRIPTION_LABEL = DiagramUIPropertiesMessages.DiagramGeneralDetails_diagramDescriptionLabel_text;
-
-	/**
-	 * The labels used by the General Diagram section
-	 */
-	public static final String[] GENERAL_DIAGRAM_LABELS = {NAME_LABEL,
-		DIAGRAM_TYPE_LABEL, DESCRIPTION_LABEL};
-
-	/** Name label. */
-	protected static final String NAME = DiagramUIPropertiesMessages.DiagramGeneralDetails_nameChangeCommand_text;
-
-	/** Description label. */
-	protected static final String DESCRIPTION = DiagramUIPropertiesMessages.DiagramGeneralDetails_diagramDescriptionChangeCommand_text;
-
-	// commads
-	private static final String NAME_PROPERTY_CHANGE_COMMAND_NAME = NAME
-		+ VALUE_CHANGED_STRING;
-
-	private static final String DESCRIPTION_PROPERTY_CHANGE_COMMAND_NAME = DESCRIPTION
-		+ VALUE_CHANGED_STRING;
-
-	/**
-	 * The Type label field.
-	 */
-	private CLabel typeText;
-
-	/**
-	 * The description label field.
-	 */
-	private Text descriptionText;
-
-	/**
-	 * The Name text cached from the model.
-	 */
-	private String descriptionCache;
-
-	/**
-	 * User pressed Enter key after editing name field - update the model
-	 */
-	protected synchronized void setDescription() {
-
-		final String newDescription = descriptionText.getText();
-		if (!newDescription.equals(descriptionCache)) {
-			ArrayList commands = new ArrayList();
-
-			for (Iterator i = getEObjectList().iterator(); i.hasNext();) {
-				final EObject next = (EObject) i.next();
-				commands.add(createCommand(
-					DESCRIPTION_PROPERTY_CHANGE_COMMAND_NAME, next,
-					new Runnable() {
-
-						public void run() {
-							DescriptionStyle description = (DescriptionStyle) ((Diagram) next)
-								.getStyle(NotationPackage.eINSTANCE
-									.getDescriptionStyle());
-							if (description != null)
-								description.setDescription(newDescription);
-						}
-					}));
-			}
-
-			executeAsCompositeCommand(DESCRIPTION_PROPERTY_CHANGE_COMMAND_NAME,
-				commands);
-
-			descriptionCache = newDescription;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#dispose()
-	 */
-	public void dispose() {
-		getListener().stopListeningTo(descriptionText);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractBasicTextPropertySection#refreshUI()
-	 */
-	protected void refreshUI() {
-		super.refreshUI();
-
-		Diagram diagram = (Diagram) getEObject();
-
-		typeText.setText(getDiagramType(diagram));
-
-		DescriptionStyle description = (DescriptionStyle) diagram
-			.getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());
-
-		if (description != null)
-			descriptionText.setText(description.getDescription());
-
-	}
-
-	/**
-	 * Gets the string to be displayed in the diagram type field.
-	 * @param diagram the diagram in question
-	 * @return the string to be displayed
-	 */
-	protected String getDiagramType(Diagram diagram) {
-		return diagram.getType();
-	}
-
-	/**
-	 * Enforce the correct type selection - we are only intersted in Diagram
-	 * objects
-	 * 
-	 */
-	protected EObject unwrap(Object object) {
-
-		EObject o = super.unwrap(object);
-		if (o instanceof Diagram)
-			return o;
-
-		return null;
-	}
-
-	/**
-	 * Adapt the object to an EObject - if possible
-	 * 
-	 * @param object
-	 *            object from a diagram or ME
-	 * @return EObject
-	 */
-	protected EObject adapt(Object object) {
-		if (object instanceof IAdaptable) {
-			if (object instanceof IGraphicalEditPart)// diagram case
-				return (EObject) ((IAdaptable) object).getAdapter(View.class);
-			// ME case
-			return (EObject) ((IAdaptable) object).getAdapter(EObject.class);
-
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractModelerPropertySection#isCurrentSelection(org.eclipse.emf.common.notify.Notification,
-	 *      org.eclipse.emf.ecore.EObject)
-	 */
-	protected boolean isCurrentSelection(Notification notification,
-			EObject element) {
-		if (getEObjectList().size() > 0) {
-			EObject eventObject = element;
-
-			// check for annotations
-			if (element instanceof EAnnotation || element instanceof Diagram) {
-				eventObject = element.eContainer();
-			}
-
-			if (eventObject == null) {
-				// the annotation has been removed - check the old owner
-				Object tmpObj = notification.getOldValue();
-				if (tmpObj != null && tmpObj instanceof EObject) {
-					eventObject = (EObject) tmpObj;
-				} else {
-					return false;
-				}
-			}
-
-			return getEObjectList().contains(eventObject);
-
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractBasicTextPropertySection#getPropertyNameLabel()
-	 */
-	protected String getPropertyNameLabel() {
-		return NAME_LABEL;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractBasicTextPropertySection#setPropertyValue(org.eclipse.swt.widgets.Control)
-	 */
-	protected void setPropertyValue(Control control) {
-		if (control == getTextWidget())
-			super.setPropertyValue(control);
-		else
-			setDescription();
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractBasicTextPropertySection#setPropertyValue(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.String)
-	 */
-	protected void setPropertyValue(EObject object, Object value) {
-		((Diagram) object).setName((String) value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractBasicTextPropertySection#getPropertyValueString()
-	 */
-	protected String getPropertyValueString() {
-		return ((Diagram) getEObject()).getName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractBasicTextPropertySection#getPropertyChangeCommandName()
-	 */
-	protected String getPropertyChangeCommandName() {
-		return NAME_PROPERTY_CHANGE_COMMAND_NAME;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractBasicTextPropertySection#getPropertyNameStringsArray()
-	 */
-	protected String[] getPropertyNameStringsArray() {
-		return GENERAL_DIAGRAM_LABELS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.properties.ISection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.gmf.runtime.common.ui.properties.TabbedPropertySheetPage)
-	 */
-	public void doCreateControls(Composite parent,
-			TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		super.doCreateControls(parent, aTabbedPropertySheetPage);
-
-		FormData data;
-
-		typeText = getWidgetFactory().createCLabel(getSectionComposite(),
-			StringStatics.BLANK);
-		data = new FormData();
-		data.left = new FormAttachment(getTextWidget(), 0, SWT.LEFT);
-		data.right = new FormAttachment(getTextWidget(), 0, SWT.RIGHT);
-		data.top = new FormAttachment(getTextWidget(),
-			ITabbedPropertyConstants.VSPACE, SWT.BOTTOM);
-		typeText.setLayoutData(data);
-
-		CLabel typeLabel = getWidgetFactory().createCLabel(
-			getSectionComposite(), DIAGRAM_TYPE_LABEL);
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(typeText,
-			-ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(typeText, 0, SWT.CENTER);
-		typeLabel.setLayoutData(data);
-
-		descriptionText = getWidgetFactory().createText(getSectionComposite(),
-			StringStatics.BLANK,
-			SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);
-		data = new FormData();
-		data.left = new FormAttachment(typeText, 0, SWT.LEFT);
-		data.right = new FormAttachment(typeText, 0, SWT.RIGHT);
-		data.top = new FormAttachment(typeText,
-			ITabbedPropertyConstants.VSPACE, SWT.BOTTOM);
-		data.bottom = new FormAttachment(100, 0);
-		data.height = 100;
-		data.width = 100;
-		descriptionText.setLayoutData(data);
-
-		CLabel descriptionLabel = getWidgetFactory().createCLabel(
-			getSectionComposite(), DESCRIPTION_LABEL);
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(descriptionText,
-			-ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(typeText, 0, SWT.LEFT);
-
-		descriptionLabel.setLayoutData(data);
-
-		getListener().startListeningTo(descriptionText);
-		getListener().startListeningForEnter(descriptionText);
-
-		if (isReadOnly())
-			descriptionText.setEditable(false);
-
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/AbstractLabeledCheckboxPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/AbstractLabeledCheckboxPropertySection.java
deleted file mode 100644
index 74b6bf7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/AbstractLabeledCheckboxPropertySection.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gef.editparts.AbstractEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractNotationPropertiesSection;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * @author dlander
- */
-public abstract class AbstractLabeledCheckboxPropertySection
-	extends AbstractNotationPropertiesSection {
-
-	//	Abstract methods to provide us with basic data.
-	// Command info. Visible to user in undo/redo
-	public abstract String getCommandName();
-
-	// Label string positioned left of control
-	public abstract String getPrefixLabel();
-
-	// ID to use in communicating with model
-	public abstract String getNameLabel();
-
-	// List of entries to populate with
-	public abstract String getID();
-
-	// Controls
-	private Button checkbox;
-
-	private CLabel leftLabel;
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.properties.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-
-		try {
-			executeAsReadAction(new Runnable() {
-
-				public void run() {
-
-					// Update display from model
-					if (getSingleInput() instanceof GraphicalEditPart) {
-						GraphicalEditPart ep = (GraphicalEditPart) getSingleInput();
-						ENamedElement element = PackageUtil.getElement(getID());
-						if (element instanceof EStructuralFeature){
-							checkbox.setSelection(((Boolean)ep
-								.getStructuralFeatureValue((EStructuralFeature)element)).booleanValue());
-						}
-					} else if (getSingleInput() instanceof ConnectionNodeEditPart) {
-						ENamedElement element = PackageUtil.getElement(getID());
-						ConnectionNodeEditPart ep = (ConnectionNodeEditPart) getSingleInput();
-						if (element instanceof EStructuralFeature){
-							checkbox.setSelection(((Boolean) ep
-								.getStructuralFeatureValue((EStructuralFeature)element)).booleanValue());
-						}
-					}
-				}
-			});
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			//blank
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.properties.ISection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.gmf.runtime.common.ui.properties.TabbedPropertySheetPage)
-	 */
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		super.createControls(parent, aTabbedPropertySheetPage);
-
-
-		FormData data;
-
-		// Create checkbox
-		checkbox = getWidgetFactory().createButton(composite, getNameLabel(),
-			SWT.CHECK);
-		data = new FormData();
-		data.left = new FormAttachment(0, getStandardLabelWidth(parent));
-		data.top = new FormAttachment(0, 0);
-		checkbox.setLayoutData(data);
-		checkbox.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-
-				if (isReadOnly()) {
-					refresh();
-					return;
-				}
-
-				ArrayList commands = new ArrayList();
-
-				Iterator it = getInput().iterator();
-
-				while (it.hasNext()) {
-					final AbstractEditPart aep = (AbstractEditPart) it.next();
-
-					Resource res = ((View)aep.getModel()).eResource();
-
-					commands.add(createCommand(getCommandName(), res,
-						new Runnable() {
-
-							public void run() {
-								if (aep instanceof GraphicalEditPart) {
-									GraphicalEditPart ep = (GraphicalEditPart) aep;
-									ENamedElement element = PackageUtil.getElement(getID());
-									if (element instanceof EStructuralFeature)
-										ep.setStructuralFeatureValue((EStructuralFeature)element, Boolean.valueOf(
-											checkbox.getSelection()));
-								} else if (aep instanceof ConnectionNodeEditPart) {
-									ConnectionNodeEditPart ep = (ConnectionNodeEditPart) aep;
-									ENamedElement element = PackageUtil.getElement(getID());
-									if (element instanceof EStructuralFeature)
-										ep.setStructuralFeatureValue((EStructuralFeature)element, Boolean.valueOf(
-											checkbox.getSelection()));
-								}
-							}
-						}));
-				}
-
-				executeAsCompositeCommand(getCommandName(), commands);
-			}
-		});
-
-		// Create label
-		leftLabel = getWidgetFactory()
-			.createCLabel(composite, getPrefixLabel()); 
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(checkbox, 0, SWT.CENTER);
-		leftLabel.setLayoutData(data);
-
-	}
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorPalettePopup.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorPalettePopup.java
deleted file mode 100644
index cbc0ee4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorPalettePopup.java
+++ /dev/null

@@ -1,347 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-public class ColorPalettePopup {
-
-	/**
-	 * A descirptor for an inventory color
-	 */
-	private static class InventoryColorDescriptor
-		extends ImageDescriptor {
-
-		/** the default preference color */
-		private static final RGB OUTLINE_COLOR = new RGB(192, 192, 192);
-
-		public RGB rgb;
-
-		public InventoryColorDescriptor(RGB colorValue) {
-			this.rgb = colorValue;
-
-		}
-
-		/**
-		 * @see org.eclipse.jface.resource.ImageDescriptor#getImageData()
-		 */
-		public ImageData getImageData() {
-			ImageData data = new ImageData(ICON_SIZE.x, ICON_SIZE.y, 1,
-				new PaletteData(new RGB[] {rgb, OUTLINE_COLOR}));
-
-			for (int i = 0; i < ICON_SIZE.y; i++)
-				data.setPixel(0, i, 1);
-			for (int i = 0; i < ICON_SIZE.y; i++)
-				data.setPixel(ICON_SIZE.x - 1, i, 1);
-			for (int i = 0; i < ICON_SIZE.x; i++)
-				data.setPixel(i, 0, 1);
-			for (int i = 0; i < ICON_SIZE.x; i++)
-				data.setPixel(i, ICON_SIZE.y - 1, 1);
-			return data;
-		}
-
-		/**
-		 * Creates and returns a new SWT image for this image descriptor. The
-		 * returned image must be explicitly disposed using the image's dispose
-		 * call. The image will not be automatically garbage collected. In the
-		 * even of an error, a default image is returned if
-		 * <code>returnMissingImageOnError</code> is true, otherwise
-		 * <code>null</code> is returned.
-		 * <p>
-		 * Note: Even if <code>returnMissingImageOnError</code> is true, it is
-		 * still possible for this method to return <code>null</code> in
-		 * extreme cases, for example if SWT runs out of image handles.
-		 * </p>
-		 * 
-		 * @return a new image or <code>null</code> if the image could not be
-		 *         created
-		 * 
-		 */
-		public Image createImage() {
-
-			Device device = Display.getCurrent();
-			ImageData data = getImageData();
-			if (data == null)
-				data = DEFAULT_IMAGE_DATA;
-
-			/*
-			 * Try to create the supplied image. If there is an SWT Exception
-			 * try and create the default image if that was requested. Return
-			 * null if this fails.
-			 */
-
-			try {
-				if (data.transparentPixel >= 0) {
-					ImageData maskData = data.getTransparencyMask();
-					return new Image(device, data, maskData);
-				}
-				return new Image(device, data);
-			} catch (SWTException exception) {
-
-				try {
-					return new Image(device, DEFAULT_IMAGE_DATA);
-				} catch (SWTException nextException) {
-					return null;
-				}
-
-			}
-		}
-	}
-
-	/** default color icon width */
-	public static final Point ICON_SIZE = new Point(20, 20);
-
-	/** inventory colors */
-	private static final InventoryColorDescriptor WHITE = new InventoryColorDescriptor(
-		new RGB(255, 255, 255));
-
-	private static final InventoryColorDescriptor BLACK = new InventoryColorDescriptor(
-		new RGB(0, 0, 0));
-
-	private static final InventoryColorDescriptor LIGHT_GRAY = new InventoryColorDescriptor(
-		new RGB(192, 192, 192));
-
-	private static final InventoryColorDescriptor GRAY = new InventoryColorDescriptor(
-		new RGB(128, 128, 128));
-
-	private static final InventoryColorDescriptor RED = new InventoryColorDescriptor(
-		new RGB(227, 164, 156));
-
-	private static final InventoryColorDescriptor GREEN = new InventoryColorDescriptor(
-		new RGB(166, 193, 152));
-
-	private static final InventoryColorDescriptor BLUE = new InventoryColorDescriptor(
-		new RGB(152, 168, 191));
-
-	private static final InventoryColorDescriptor YELLOW = new InventoryColorDescriptor(
-		new RGB(225, 225, 135));
-
-	private static final InventoryColorDescriptor PURPLE = new InventoryColorDescriptor(
-		new RGB(184, 151, 192));
-
-	private static final InventoryColorDescriptor TEAL = new InventoryColorDescriptor(
-		new RGB(155, 199, 204));
-
-	private static final InventoryColorDescriptor PINK = new InventoryColorDescriptor(
-		new RGB(228, 179, 229));
-
-	private static final InventoryColorDescriptor ORANGE = new InventoryColorDescriptor(
-		new RGB(237, 201, 122));
-
-	/** the inventory color list key: anRGB, value: anImage */
-	private static final HashMap imageColorMap = new HashMap();
-
-	private static final String DEAFULT_COLOR_STRING = DiagramUIPropertiesMessages.ColorPalettePopup_default;
-
-	private static final String CUSTOM_COLOR_STRING = DiagramUIPropertiesMessages.ColorPalettePopup_custom;
-	
-	static {
-
-		// inventory colors
-		imageColorMap.put(WHITE.rgb, WHITE.createImage());
-		imageColorMap.put(BLACK.rgb, BLACK.createImage());
-		imageColorMap.put(LIGHT_GRAY.rgb, LIGHT_GRAY.createImage());
-		imageColorMap.put(GRAY.rgb, GRAY.createImage());
-		imageColorMap.put(RED.rgb, RED.createImage());
-		imageColorMap.put(GREEN.rgb, GREEN.createImage());
-		imageColorMap.put(BLUE.rgb, BLUE.createImage());
-		imageColorMap.put(YELLOW.rgb, YELLOW.createImage());
-		imageColorMap.put(PURPLE.rgb, PURPLE.createImage());
-		imageColorMap.put(TEAL.rgb, TEAL.createImage());
-		imageColorMap.put(PINK.rgb, PINK.createImage());
-		imageColorMap.put(ORANGE.rgb, ORANGE.createImage());
-	}
-
-	private Shell shell;
-
-	private RGB selectedColor = null;
-
-    /**
-     * The default color to be used if the user presses the default button.
-     */
-    private boolean useDefaultColor = false;
-
-	/**
-     * Creates a color palette popup above the specified shell.
-     * 
-     * @param parent
-     *            a Shell control which will be the parent of the new instance
-     *            (cannot be null)
-     * @deprecated Use the other constructor. This one does not retrieve the
-     *             default value from the correct preference store.
-     */
-    public ColorPalettePopup(Shell parent, String preferenceId, int rowHeight) {
-        this(parent, rowHeight);
-    }
-    
-	/**
-	 * Creates a PopupList above the specified shell.
-	 * 
-	 * @param parent
-	 *            a widget which will be the parent of the new instance (cannot
-	 *            be null)
-	 * @param style
-	 *            the style of widget to construct
-	 */
-	public ColorPalettePopup(Shell parent, int rowHeight) {
-		shell = new Shell(parent, checkStyle(SWT.NONE));
-		GridLayout layout = new GridLayout(4, true);
-		layout.horizontalSpacing = 0;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.verticalSpacing = 0;
-		shell.setLayout(layout);
-
-		for (Iterator e = imageColorMap.keySet().iterator(); e.hasNext();) {
-			Button button = new Button(shell, SWT.PUSH);
-			GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-			data.heightHint = rowHeight;
-			data.widthHint = rowHeight;
-			button.setLayoutData(data);
-
-			final RGB rgb = (RGB) e.next();
-			final Image image = (Image) imageColorMap.get(rgb);
-			button.setImage(image);
-			button.addSelectionListener(new SelectionAdapter() {
-
-				public void widgetSelected(SelectionEvent e1) {
-					selectedColor = rgb;
-					shell.dispose();
-				}
-			});
-		}
-
-		Button defaultButton = new Button(shell, SWT.PUSH);
-		defaultButton.setText(DEAFULT_COLOR_STRING);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 4;
-		data.heightHint = rowHeight;
-		defaultButton.setLayoutData(data);
-
-		defaultButton.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent event) {
-                useDefaultColor = true;
-                shell.dispose();
-            }
-        });
-
-		Button moreColors = new Button(shell, SWT.PUSH);
-		moreColors.setText(CUSTOM_COLOR_STRING);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 4;
-		data.heightHint = rowHeight;
-		moreColors.setLayoutData(data);
-
-		moreColors.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-
-				ColorDialog dialog = new ColorDialog(Display.getCurrent()
-					.getActiveShell());
-				WindowUtil.centerDialog(dialog.getParent(), Display
-					.getCurrent().getActiveShell());
-				dialog.open();
-				selectedColor = dialog.getRGB();
-				shell.dispose();
-
-			}
-		});
-
-		// close dialog if user selects outside of the shell
-		shell.addListener(SWT.Deactivate, new Listener() {
-
-			public void handleEvent(Event e) {
-				shell.setVisible(false);
-			}
-		});
-
-	}
-
-	/**
-	 * @param style
-	 * @return
-	 */
-	private static int checkStyle(int style) {
-		int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
-		return style & mask;
-	}
-
-	/**
-	 * Launches the Popup List, waits for an item to be selected and then closes
-	 * PopupList.
-	 * 
-	 * @param rect
-	 *            the initial size and location of the PopupList; the dialog
-	 *            will be positioned so that it does not run off the screen and
-	 *            the largest number of items are visible
-	 * 
-	 * @return the text of the selected item or null if no item is selected
-	 */
-	public RGB open(Point location) {
-
-		Point listSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		shell.setBounds(location.x, location.y, listSize.x, listSize.y);
-
-		shell.open();
-		shell.setFocus();
-
-		Display display = shell.getDisplay();
-		while (!shell.isDisposed() && shell.isVisible()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
-		return getSelectedColor();
-	}
-
-	/**
-     * Gets the color the user selected. Could be null as the user may have
-     * cancelled the gesture or they may have selected the default color button.
-     * See {@link #useDefaultColor()}.
-     * 
-     * @return the selected color or null
-     */
-    public RGB getSelectedColor() {
-        return selectedColor;
-    }
-
-    /**
-     * Returns true if the user selected to use the default color
-     * 
-     * @return true if the default color is to be used; false otherwise
-     */
-    public boolean useDefaultColor() {
-        return useDefaultColor;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorsAndFontsPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorsAndFontsPropertySection.java
deleted file mode 100644
index 301631f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorsAndFontsPropertySection.java
+++ /dev/null

@@ -1,724 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.FontHelper;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
-import org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractNotationPropertiesSection;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Colors section to represent line and font properties of a shape or connection
- * 
- * @author nbalaba
- * 
- */
-public class ColorsAndFontsPropertySection
-	extends AbstractNotationPropertiesSection {
-
-	// properties
-	protected static final String FONT_COLOR_COMMAND_NAME = DiagramUIPropertiesMessages.
-		FontColor_commandText + StringStatics.SPACE 
-		+ VALUE_CHANGED_STRING;
-
-	protected static final String LINE_COLOR_COMMAND_NAME = DiagramUIPropertiesMessages.
-		LineColor_commandText + StringStatics.SPACE 
-		+ VALUE_CHANGED_STRING;
-
-	// properties
-	protected static final String FONT_COMMAND_NAME = DiagramUIPropertiesMessages.
-		Font_commandText + StringStatics.SPACE 
-		+ VALUE_CHANGED_STRING;
-
-
-	static protected final String FILL_COLOR_COMMAND_NAME = DiagramUIPropertiesMessages.
-		FillColor_commandText + StringStatics.SPACE 
-		+ VALUE_CHANGED_STRING;
-	
-	protected static final String FONTS_AND_COLORS_LABEL = DiagramUIPropertiesMessages.
-		FontAndColor_nameLabel;
-
-	protected Button fillColorButton;
-
-	protected RGB fillColor = null;
-
-	// font family drop down
-	protected CCombo fontFamilyCombo;
-
-	// font size drop down
-	private CCombo fontSizeCombo;
-
-	private Button fontBoldButton;
-
-	private Button fontItalicButton;
-
-	/**
-	 * An image descriptor that overlays two images: a basic icon and a thin
-	 * color bar underneath it
-	 */
-	protected static class ColorOverlayImageDescriptor
-		extends CompositeImageDescriptor {
-
-		/** default color icon width */
-		private static final Point ICON_SIZE = new Point(16, 16);
-
-		/** the basic icon */
-		private ImageData basicImgData;
-
-		/** the color of the thin color bar */
-		private RGB rgb;
-
-		/**
-		 * Creates a new color menu image descriptor
-		 * 
-		 * @param basicIcon
-		 *            The basic Image data
-		 * @param rgb
-		 *            The color bar RGB value
-		 */
-		public ColorOverlayImageDescriptor(ImageData basicImgData, RGB rgb) {
-			this.basicImgData = basicImgData;
-			this.rgb = rgb;
-		}
-
-		/**
-		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int,
-		 *      int)
-		 */
-		protected void drawCompositeImage(int width, int height) {
-
-			// draw the thin color bar underneath
-			if (rgb != null) {
-				ImageData colorBar = new ImageData(width, height / 5, 1,
-				
-					new PaletteData(new RGB[] {rgb}));
-				drawImage(colorBar, 0, height - height / 5);
-				
-			}
-			// draw the base image
-			drawImage(basicImgData, 0, 0);
-		}
-
-		/**
-		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-		 */
-		protected Point getSize() {
-			return ICON_SIZE;
-		}
-	}
-
-	/** the default preference color */
-	protected static final RGB DEFAULT_PREF_COLOR = new RGB(0, 0, 0);
-
-	protected Button fontColorButton;
-
-    protected Button lineColorButton;
-
-	protected RGB fontColor;
-
-	protected RGB lineColor;
-
-	protected Group colorsAndFontsGroup;
-
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractNotationPropertiesSection#initializeControls(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void initializeControls(Composite parent) {
-		super.initializeControls(parent);
-		createFontsAndColorsGroups(composite);		
-	}
-
-	/**
-	 * Create  fonts and colors group
-	 * 
-	 * @param parent - parent composite
-	 */
-	protected Group createFontsAndColorsGroups(Composite parent) {
-		colorsAndFontsGroup = getWidgetFactory().createGroup(parent,
-			FONTS_AND_COLORS_LABEL);
-		GridLayout layout = new GridLayout(1, false);
-		colorsAndFontsGroup.setLayout(layout);
-
-		createFontsGroup(colorsAndFontsGroup);
-
-		return colorsAndFontsGroup;
-
-	}
-	
-	/**
-	 * Create  font tool bar group
-	 * 
-	 * @param parent - parent composite
-	 * @return - font tool bar
-	 */
-	protected Composite createFontsGroup(Composite parent) {
-		Composite familySize = getWidgetFactory().createComposite(parent);
-		GridLayout layout = new GridLayout(2, false);
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		familySize.setLayout(layout);
-
-		fontFamilyCombo = getWidgetFactory().createCCombo(familySize,
-			SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-		fontFamilyCombo.setItems(FontHelper.getFontNames());
-		fontFamilyCombo.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				updateFontFamily();
-			}
-		});
-
-		fontSizeCombo = getWidgetFactory().createCCombo(familySize,
-			SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-		fontSizeCombo.setItems(FontHelper.getFontSizes());
-		fontSizeCombo.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				updateFontSize();
-			}
-		});
-
-		Composite toolBar = new Composite(parent, SWT.SHADOW_NONE);
-		toolBar.setLayout(new GridLayout(7, false));
-		toolBar.setBackground(parent.getBackground());
-
-		fontBoldButton = new Button(toolBar, SWT.TOGGLE);
-		fontBoldButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_BOLD));
-        fontBoldButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-            public void getName(AccessibleEvent e) {
-                e.result = DiagramUIMessages.PropertyDescriptorFactory_FontStyle_Bold;
-            }
-        });
-	
-		
-		fontItalicButton = new Button(toolBar, SWT.TOGGLE );
-		fontItalicButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_ITALIC));
-        fontItalicButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-            public void getName(AccessibleEvent e) {
-                e.result = DiagramUIMessages.PropertyDescriptorFactory_FontStyle_Italic;
-            }
-        });
-
-		fontBoldButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				updateFontBold();
-			}
-		});
-
-		fontItalicButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				updateFontItalic();
-			}
-		});
-
-		new Label(toolBar, SWT.LEFT);
-
-		fontColorButton = new Button(toolBar, SWT.PUSH);
-		fontColorButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FONT_COLOR));
-        fontColorButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-            public void getName(AccessibleEvent e) {
-                e.result = DiagramUIMessages.PropertyDescriptorFactory_FontColor;
-            }
-        });
-		fontColorButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				changeFontColor(event);
-			}
-		});
-
-		new Label(toolBar, SWT.LEFT);
-
-		lineColorButton = new Button(toolBar, SWT.PUSH);
-		lineColorButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_LINE_COLOR));
-        lineColorButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-            public void getName(AccessibleEvent e) {
-                e.result = DiagramUIMessages.PropertyDescriptorFactory_LineColor;
-            }
-        });
-		lineColorButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				changeLineColor(event);
-			}
-		});
-
-		fillColorButton = new Button(toolBar, SWT.PUSH);
-		fillColorButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FILL_COLOR));
-		fillColorButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-            public void getName(AccessibleEvent e) {
-                e.result = DiagramUIMessages.PropertyDescriptorFactory_FillColor;
-            }
-        });
-		fillColorButton.setEnabled(false);
-
-		return toolBar;
-	}
-
-	/**
-	 * @return - an itertor object to iterate over the selected/input edit parts
-	 */
-	protected Iterator getInputIterator() {
-		return getInput().iterator();
-
-	}
-
-	/**
-	 * Apply line color change
-	 * 
-	 * @param event -
-	 *            line color button selection event
-	 */
-	protected void changeLineColor(SelectionEvent event) {
-		lineColor = changeColor(event, lineColorButton,
-			IPreferenceConstants.PREF_LINE_COLOR, Properties.ID_LINECOLOR,
-			LINE_COLOR_COMMAND_NAME, DiagramUIPropertiesImages.DESC_LINE_COLOR);
-	}
-
-	/**
-	 * Apply font color change
-	 * 
-	 * @param event -
-	 *            font button selection event
-	 */
-	protected void changeFontColor(SelectionEvent event) {
-		fontColor = changeColor(event, fontColorButton,
-			IPreferenceConstants.PREF_FONT_COLOR, Properties.ID_FONTCOLOR,
-			FONT_COLOR_COMMAND_NAME, DiagramUIPropertiesImages.DESC_FONT_COLOR);
-	}
-
-	/**
-     * @param event -
-     *            selection event
-     * @param button -
-     *            event source
-     * @param preferenceId -
-     *            id of the preference of the default color value for that
-     *            property
-     * @param propertyId -
-     *            id of the property
-     * @param commandName -
-     *            name of the command
-     * @param imageDescriptor -
-     *            the image to draw overlay on the button after the new color is
-     *            set
-     * @return - new RGB color, or null if none selected
-     * @deprecated The preference is not being retrieved from the correct
-     *             preference store so it is not needed, use the other
-     *             <code>changeColor</code> method.
-     */
-    protected RGB changeColor(SelectionEvent event, Button button,
-            String preferenceId, final String propertyId, String commandName,
-            ImageDescriptor imageDescriptor) {
-
-        return changeColor(event, button, propertyId, commandName,
-            imageDescriptor);
-    }
-    
-    /**
-     * @param event -
-     *            selection event
-     * @param button -
-     *            event source
-     * @param propertyId -
-     *            id of the property
-     * @param commandName -
-     *            name of the command
-     * @param imageDescriptor -
-     *            the image to draw overlay on the button after the new color is
-     *            set
-     * @return - new RGB color, or null if none selected
-     */
-    protected RGB changeColor(SelectionEvent event, Button button,
-            final String propertyId, String commandName,
-            ImageDescriptor imageDescriptor) {
-
-        ColorPalettePopup popup = new ColorPalettePopup(button.getParent()
-            .getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);
-
-        Rectangle r = button.getBounds();
-        Point location = button.getParent().toDisplay(r.x, r.y);
-        popup.open(new Point(location.x, location.y + r.height));
-
-        if (popup.getSelectedColor() == null && !popup.useDefaultColor()) {
-            return null;
-        }
-
-        // selectedColor should be null if we are to use the default color
-        final RGB selectedColor = popup.getSelectedColor();
-
-        final EStructuralFeature feature = (EStructuralFeature) PackageUtil
-            .getElement(propertyId);
-
-        // Update model in response to user
-
-        List commands = new ArrayList();
-        Iterator it = getInputIterator();
-
-        RGB colorToReturn = selectedColor;
-        RGB color = selectedColor;
-        while (it.hasNext()) {
-            final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-
-            color = selectedColor;
-            if (popup.useDefaultColor()) {
-                Object preferredValue = ep.getPreferredValue(feature);
-                if (preferredValue instanceof Integer) {
-                    color = FigureUtilities
-                        .integerToRGB((Integer) preferredValue);
-                }
-            }
-                
-            // If we are using default colors, we want to return the color of the first selected element to be consistent
-            if (colorToReturn == null) {
-                colorToReturn = color;
-            }
-
-            if (color != null) {
-                final RGB finalColor = color; // need a final variable
-               commands.add(createCommand(commandName, ((View) ep.getModel())
-                    .eResource(), new Runnable() {
-
-                    public void run() {
-                        ENamedElement element = PackageUtil
-                            .getElement(propertyId);
-                        if (element instanceof EStructuralFeature)
-                            ep.setStructuralFeatureValue(feature,
-                                FigureUtilities.RGBToInteger(finalColor));
-                    }
-                }));
-            }
-        }
-        if (!commands.isEmpty()){
-	        executeAsCompositeCommand(commandName, commands);
-    	    Image overlyedImage = new ColorOverlayImageDescriptor(
-            imageDescriptor.getImageData(), color).createImage();
-        	disposeImage(button.getImage());
-	        button.setImage(overlyedImage);
-	    }
-        return colorToReturn;
-    }
-    
-	/**
-     * Update font property
-     */
-	protected void updateFontBold() {
-
-		// Update model in response to user
-
-		List commands = new ArrayList();
-		Iterator it = getInputIterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-			commands.add(createCommand(FONT_COMMAND_NAME,
-				((View) ep.getModel()).eResource(), new Runnable() {
-
-					public void run() {
-						ep.setStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_Bold(),
-							Boolean.valueOf(fontBoldButton.getSelection()));
-					}
-				}));
-		}
-
-		executeAsCompositeCommand(FONT_COMMAND_NAME, commands);
-
-	}
-
-	/**
-	 * Update font property
-	 */
-	protected void updateFontItalic() {
-
-		// Update model in response to user
-		List commands = new ArrayList();
-		Iterator it = getInputIterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-			commands.add(createCommand(FONT_COMMAND_NAME,
-				((View) ep.getModel()).eResource(), new Runnable() {
-
-					public void run() {
-						ep.setStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_Italic(),
-							new Boolean(fontItalicButton.getSelection()));
-					}
-				}));
-		}
-
-		executeAsCompositeCommand(FONT_COMMAND_NAME, commands);
-	}
-
-	/**
-	 * Update font family property
-	 */
-	protected void updateFontFamily() {
-
-		// Update model in response to user
-		if (fontFamilyCombo.getText() != null
-			|| !fontFamilyCombo.getText().equals("")) { //$NON-NLS-1$
-			List commands = new ArrayList();
-			Iterator it = getInputIterator();
-
-			while (it.hasNext()) {
-				final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-				commands.add(createCommand(FONT_COMMAND_NAME, ((View) ep
-					.getModel()).eResource(), new Runnable() {
-
-					public void run() {
-						ep.setStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_FontName(),
-							fontFamilyCombo.getText());
-					}
-				}));
-			}
-
-			executeAsCompositeCommand(FONT_COMMAND_NAME, commands);
-		}
-	}
-
-	/**
-	 * Update font size property
-	 */
-	protected void updateFontSize() {
-
-		// Update model in response to user
-		if (fontSizeCombo.getText() != null
-			|| !fontSizeCombo.getText().equals("")) { //$NON-NLS-1$
-			List commands = new ArrayList();
-			Iterator it = getInputIterator();
-
-			while (it.hasNext()) {
-				final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-				commands.add(createCommand(FONT_COMMAND_NAME, ((View) ep
-					.getModel()).eResource(), new Runnable() {
-
-					public void run() {
-						ep.setStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_FontHeight(),
-							new Integer(fontSizeCombo.getText()));
-					}
-				}));
-			}
-
-			executeAsCompositeCommand(FONT_COMMAND_NAME, commands);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#refresh()
-	 */
-	public void refresh() {
-		if(!isDisposed()){
-            Image overlyedImage = new ColorOverlayImageDescriptor(
-				DiagramUIPropertiesImages.DESC_FONT_COLOR.getImageData(),
-				fontColor).createImage();
-            disposeImage(fontColorButton.getImage());
-            fontColorButton.setImage(overlyedImage);
-
-            overlyedImage = new ColorOverlayImageDescriptor(
-				DiagramUIPropertiesImages.DESC_LINE_COLOR.getImageData(),
-				lineColor).createImage();
-            disposeImage(lineColorButton.getImage());
-            lineColorButton.setImage(overlyedImage);
-
-		executeAsReadAction(new Runnable() {
-
-			public void run() {
-
-				IGraphicalEditPart ep = getSingleInput();
-				if (ep != null) {
-
-                    boolean isReadOnly = isReadOnly();
-                    lineColorButton.setEnabled(!isReadOnly);
-                    fillColorButton.setEnabled(!isReadOnly);
-
-					Style style = ep.getNotationView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-					boolean enableFontWidgets = (style != null) && !isReadOnly;
-                    
-                    fontFamilyCombo.setEnabled(enableFontWidgets);
-					fontSizeCombo.setEnabled(enableFontWidgets);
-					fontBoldButton.setEnabled(enableFontWidgets);
-					fontItalicButton.setEnabled(enableFontWidgets);
-					fontColorButton.setEnabled(enableFontWidgets);
-					
-					fontFamilyCombo.setText((String) getSingleInput()
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_FontName()));
-					fontSizeCombo.setText(Integer
-						.toString(((Integer) getSingleInput().getStructuralFeatureValue(
-							NotationPackage.eINSTANCE.getFontStyle_FontHeight())).intValue()));
-					fontBoldButton.setSelection(((Boolean) getSingleInput()
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_Bold()))
-						.booleanValue());
-					fontItalicButton.setSelection(((Boolean) getSingleInput()
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_Italic()))
-						.booleanValue());
-				}
-			}
-		});
-		}
-
-	}
-
-	/**
-	 * Update if nessesary, upon receiving the model event. This event will only
-	 * be processed when the reciever is visible (the default behavior is not to
-	 * listen to the model events while not showing). Therefore it is safe to
-	 * refresh the UI. Sublclasses, which will choose to override event
-	 * listening behavior should take into account that the model events are
-	 * sent all the time - regardless of the section visibility. Thus special
-	 * care should be taken by the section that will choose to listen to such
-	 * events all the time. Also, the default implementation of this method
-	 * synchronizes on the GUI thread. The subclasses that overwrite it should
-	 * do the same if they perform any GUI work (because events may be sent from
-	 * a non-GUI thread).
-	 * 
-	 * @see #aboutToBeShown()
-	 * @see #aboutToBeHidden()
-	 * 
-	 * @param notification
-	 *            notification object
-	 * @param element
-	 *            element that has changed
-	 */
-	public void update(final Notification notification, final EObject element) {
-		if (!isDisposed() && isCurrentSelection(notification, element)) {
-			postUpdateRequest(new Runnable() {
-
-				public void run() {
-					if (!isDisposed()
-						&& isCurrentSelection(notification, element)
-						&& !isNotifierDeleted(notification))
-						updateColorCache();
-					refresh();
-
-				}
-			});
-		}
-	}
-
-	/**
-	 * react to selection or model change - updatye local cache
-	 */
-	protected void updateColorCache() {
-
-		executeAsReadAction(new Runnable() {
-
-			public void run() {
-
-				IGraphicalEditPart ep = getSingleInput();
-				if (ep != null) {
-					fontColor = FigureUtilities.integerToRGB((Integer) ep
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE.getFontStyle_FontColor()));
-					lineColor = FigureUtilities.integerToRGB((Integer) ep
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE.getLineStyle_LineColor()));
-				}
-			}
-		});
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setInput(IWorkbenchPart part, ISelection selection) {
-		super.setInput(part, selection);
-		updateColorCache();
-	}
-
-    /**
-     * Dispose the image if it was created locally to avoid a leak. Do not
-     * dispose the images in the registry.
-     * 
-     * @param image
-     */
-    protected void disposeImage(Image image) {
-        if (image == null) {
-            return;
-        }
-        
-        if (image.equals(DiagramUIPropertiesImages
-            .get(DiagramUIPropertiesImages.IMG_FILL_COLOR))
-            || image.equals(DiagramUIPropertiesImages
-                .get(DiagramUIPropertiesImages.IMG_LINE_COLOR))
-            || image.equals(DiagramUIPropertiesImages
-                .get(DiagramUIPropertiesImages.IMG_FONT_COLOR))) {
-            return;
-        }
-
-        if (! image.isDisposed()) {
-            image.dispose();
-        }
-    }
-
-    public void dispose() {
-        if (fontColorButton != null && ! fontColorButton.isDisposed()) {
-            disposeImage(fontColorButton.getImage());
-        }
-        if (lineColorButton != null && ! lineColorButton.isDisposed()) {
-            disposeImage(lineColorButton.getImage());
-        }
-        if (fillColorButton != null && ! fillColorButton.isDisposed()) {
-            disposeImage(fillColorButton.getImage());
-        }
-        super.dispose();
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ConnectionAppearancePropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ConnectionAppearancePropertySection.java
deleted file mode 100644
index bdab281..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ConnectionAppearancePropertySection.java
+++ /dev/null

@@ -1,451 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * @author dlander, nbalaba
- * 
- * Appearance properties
- */
-public class ConnectionAppearancePropertySection
-	extends ColorsAndFontsPropertySection {
-
-	protected static final String REVERSE_JUMP_LINKS_NAME_LABEL = DiagramUIPropertiesMessages.
-	ConnectionAppearanceDetails_ReverseJumpLinksLabel_Text;
-	
-	private static final String ROUTER_OPTIONS_LABEL = DiagramUIPropertiesMessages.
-		ConnectionAppearanceDetails_RouterOptionsLabel_Text;
-
-	protected static final String AVOID_OBSTACLES_NAME_LABEL = DiagramUIPropertiesMessages.
-		ConnectionAppearanceDetails_AvoidObstaclesLabel_Text;
-
-	protected static final String CLOSEST_DISTANCE_NAME_LABEL = DiagramUIPropertiesMessages.
-		ConnectionAppearanceDetails_ClosestDistanceLabel_Text;
-
-	protected static final String LINE_ROUTER_NAME_LABEL = DiagramUIPropertiesMessages.
-		ConnectionAppearanceDetails_LineRouterLabel_Text;
-
-	protected static final String SMOOTHNESS_NAME_LABEL = DiagramUIPropertiesMessages.
-		ConnectionAppearanceDetails_SmoothnessLabel_Text;
-
-	protected static final String JUMP_LINKS_NAME_LABEL = DiagramUIPropertiesMessages.
-		ConnectionAppearanceDetails_JumpLinksLabel_Text;
-
-	protected static final String JUMP_LINK_TYPE_NAME_LABEL = DiagramUIPropertiesMessages.
-		ConnectionAppearanceDetails_JumpLinkTypeLabel_Text;
-
-
-
-	private static final String JUMP_LINKS_GROUP_NAME = DiagramUIPropertiesMessages.
-	ConnectionAppearanceDetails_JumpLinkGroupLabel_Text;
-	
-
-	// radio buttonn widgets cache with a button as a value and abstract
-	// enumeration literal as a key
-	protected Map buttons = new HashMap();
-
-	private Button avoidObstaclesButton;
-
-	private Button closestDistanceButton;
-
-	private Button reverseJumpLinksButton;
-
-	/**
-	 * Transfer data to model
-	 */
-	private void updateModel(final String szCmd, final String szID,
-			final Object val) {
-		if (isReadOnly()) {
-			refresh();
-			return;
-		}
-
-		ArrayList commands = new ArrayList();
-
-		Iterator it = getInput().iterator();
-
-		while (it.hasNext()) {
-			final ConnectionNodeEditPart ep = (ConnectionNodeEditPart) it
-				.next();
-
-			Resource res = ((View) ep.getModel()).eResource();
-
-			commands.add(createCommand(szCmd, res, new Runnable() {
-
-				public void run() {
-					ENamedElement element = PackageUtil.getElement(szID);
-					if (element instanceof EStructuralFeature)
-						ep.setStructuralFeatureValue((EStructuralFeature)element, val);
-				}
-			}));
-		}
-
-		executeAsCompositeCommand(szCmd, commands);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractNotationPropertiesSection#initializeControls(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void initializeControls(Composite parent) {
-        composite = getWidgetFactory().createFlatFormComposite(parent);
-        FormLayout layout = (FormLayout) composite.getLayout();
-        layout.spacing = 3;
-        
-		Composite groups = getWidgetFactory().createComposite(composite);
-		groups.setLayout(new GridLayout(2, false));		
-		createFontsAndColorsGroups(groups);		
-		colorsAndFontsGroup.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING ));		
-		createConnectionPropertyGroups(groups);
-	}	
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.properties.ISection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.gmf.runtime.common.ui.properties.TabbedPropertySheetPage)
-	 */
-	public void createConnectionPropertyGroups(Composite groups) {
-
-		// routing
-		Group routing = getWidgetFactory().createGroup(groups,
-			ROUTER_OPTIONS_LABEL);
-		routing.setLayout(new GridLayout(1, false));
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		routing.setLayoutData(data);
-		
-		// smoothness
-		createRadioGroup(groups, Smoothness.VALUES.iterator(),
-			Properties.ID_SMOOTHNESS, DiagramUIPropertiesMessages.
-				AppearanceDetails_SmoothnessCommand_Text,
-			SMOOTHNESS_NAME_LABEL, 1);
-
-		// line router
-		createRadioGroup(routing, Routing.VALUES.iterator(),
-			Properties.ID_ROUTING, DiagramUIPropertiesMessages.
-				AppearanceDetails_LineRouterCommand_Text,
-			LINE_ROUTER_NAME_LABEL, 3);
-
-		// router options
-		createRouterOptionsGroup(routing);
-
-		// jump links
-		Group jumpLinks = getWidgetFactory().createGroup(groups,
-			JUMP_LINKS_GROUP_NAME);
-		jumpLinks.setLayout(new GridLayout(2, false));
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		jumpLinks.setLayoutData(data);
-
-		// jump links status
-		createRadioGroup(jumpLinks, JumpLinkStatus.VALUES.iterator(),
-			Properties.ID_JUMPLINKS_STATUS, DiagramUIPropertiesMessages.
-				AppearanceDetails_JumpLinksCommand_Text,
-			JUMP_LINKS_NAME_LABEL, 2);
-
-		// jump links type
-		createRadioGroup(jumpLinks, JumpLinkType.VALUES.iterator(),
-			Properties.ID_JUMPLINKS_TYPE, DiagramUIPropertiesMessages.
-				AppearanceDetails_JumpLinkTypeCommand_Text,
-			JUMP_LINK_TYPE_NAME_LABEL, 2);
-
-		Composite jumpLinksComposite = getWidgetFactory().createComposite(
-			jumpLinks);
-		jumpLinksComposite.setLayout(new GridLayout(2, false));
-
-		reverseJumpLinksButton = getWidgetFactory().createButton(
-			jumpLinksComposite, REVERSE_JUMP_LINKS_NAME_LABEL, SWT.CHECK);
-		reverseJumpLinksButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				updateModel(
-					DiagramUIPropertiesMessages.
-						AppearanceDetails_ReverseJumpLinksCommand_Text,
-					Properties.ID_JUMPLINKS_REVERSE, Boolean.valueOf(
-						reverseJumpLinksButton.getSelection()));
-			}
-		});
-
-	}
-
-	/**
-	 * Create router options group
-	 * 
-	 * @param groups -
-	 *            aprent composite
-	 */
-	protected void createRouterOptionsGroup(Composite groups) {
-
-		Composite routerOptionsGroup = getWidgetFactory().createComposite(
-			groups);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		routerOptionsGroup.setLayoutData(data);
-		routerOptionsGroup.setLayout(new GridLayout(2, false));
-
-		avoidObstaclesButton = getWidgetFactory().createButton(
-			routerOptionsGroup, AVOID_OBSTACLES_NAME_LABEL, SWT.CHECK);
-		avoidObstaclesButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				updateModel(
-					DiagramUIPropertiesMessages.
-						AppearanceDetails_AvoidObstaclesCommand_Text,
-					Properties.ID_AVOIDOBSTRUCTIONS, Boolean.valueOf(
-						avoidObstaclesButton.getSelection()));
-			}
-		});
-
-		closestDistanceButton = getWidgetFactory().createButton(
-			routerOptionsGroup, CLOSEST_DISTANCE_NAME_LABEL, SWT.CHECK);
-
-		closestDistanceButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				updateModel(
-					DiagramUIPropertiesMessages.
-						AppearanceDetails_ClosestDistanceCommand_Text,
-					Properties.ID_CLOSESTDISTANCE, Boolean.valueOf(
-						closestDistanceButton.getSelection()));
-			}
-		});
-	}
-
-	/**
-	 * Create and return a group of radio buttons representing a property
-	 * 
-	 * @param parent -
-	 *            patrent compopsite
-	 * @return - a last control created for this group
-	 */
-	protected void createRadioGroup(Composite parent, Iterator iterator,
-			final Object propertyId, final String commandName,
-			String propertyName, int rows) {
-
-		Group group = getWidgetFactory().createGroup(parent, propertyName);
-		group.setLayout(new GridLayout(rows, true));
-		GridData data = new GridData(GridData.FILL_BOTH);//GridData.FILL_HORIZONTAL | 
-		group.setLayoutData(data);
-
-		Button radioButton = null;
-		for (Iterator e = iterator; e.hasNext();) {
-			AbstractEnumerator literal = (AbstractEnumerator) e.next();
-			String propertyValueName = translate(literal);
-
-			radioButton = getWidgetFactory().createButton(group,
-				propertyValueName, SWT.RADIO);
-			radioButton.setData(literal);
-			buttons.put(literal, radioButton);
-			radioButton.addSelectionListener(new SelectionAdapter() {
-
-				public void widgetSelected(SelectionEvent event) {
-					setPropertyValue(event, propertyId, commandName); 
-				}
-			});
-
-			if (isReadOnly())
-				radioButton.setEnabled(false);
-		}
-
-	}
-
-	/**
-	 * Returns the translated string representing the connection appearance
-	 * properties. This is not a generic method; it needs to be updated if it is
-	 * to handle a new property.
-	 * 
-	 * @param literal
-	 *            the enumerator of literals
-	 * @return the translated string
-	 */
-	private String translate(AbstractEnumerator literal) {
-		
-		if (JumpLinkType.SEMICIRCLE_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_JumplinksType_SemiCircle;
-		} else if (JumpLinkType.SQUARE_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_JumplinksType_Square;
-		} else if (JumpLinkType.CHAMFERED_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_JumplinksType_Chamfered;
-		} else if (JumpLinkStatus.NONE_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_JumplinksStatus_None;
-		} else if (JumpLinkStatus.ALL_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_JumplinksStatus_All;
-		} else if (JumpLinkStatus.BELOW_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_JumplinksStatus_Below;
-		} else if (JumpLinkStatus.ABOVE_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_JumplinksStatus_Above;
-		} else if (Smoothness.NONE_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_Smoothness_SmoothNone;
-		} else if (Smoothness.NORMAL_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_Smoothness_SmoothNormal;
-		} else if (Smoothness.LESS_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_Smoothness_SmoothLess;
-		} else if (Smoothness.MORE_LITERAL.equals(literal)) {
-			return DiagramUIMessages.PropertyDescriptorFactory_Smoothness_SmoothMore;
-		} else if (Routing.MANUAL_LITERAL.equals(literal)) {
-			return DiagramUIMessages.ConnectionAppearancePropertySection_Router_Manual;
-		} else if (Routing.RECTILINEAR_LITERAL.equals(literal)) {
-			return DiagramUIMessages.ConnectionAppearancePropertySection_Router_Rectilinear;
-		} else if (Routing.TREE_LITERAL.equals(literal)) {
-			return DiagramUIMessages.ConnectionAppearancePropertySection_Router_Tree;
-		}
-
-		assert false : "No translated string available."; //$NON-NLS-1$
-		return ""; //$NON-NLS-1$
-
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void setPropertyValue(SelectionEvent event,
-			final Object propertyId, String commandName) {
-
-		ArrayList commands = new ArrayList();
-		Iterator it = getInput().iterator();
-		final Button button = (Button) event.getSource();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-
-			commands.add(createCommand(commandName, ((View) ep.getModel())
-				.eResource(), new Runnable() {
-
-				public void run() {
-					if (propertyId instanceof String){
-						ENamedElement element = PackageUtil.getElement((String)propertyId);
-						if (element instanceof EStructuralFeature)
-							ep.setStructuralFeatureValue((EStructuralFeature)element, button.getData());
-					}
-
-				}
-			}));
-		}
-
-		executeAsCompositeCommand(commandName, commands);
-
-	}
-
-	public void refresh() {
-		super.refresh();
-        if (!isDisposed()) {
-            try {
-                executeAsReadAction(new Runnable() {
-
-                    public void run() {
-
-                        // Deselect all the radio buttons;
-                        // the appropriate radio buttons will be properly
-                        // selected below
-                        for (Iterator i = buttons.keySet().iterator(); i
-                            .hasNext();) {
-                            Button radioButton = (Button) buttons.get(i.next());
-                            radioButton.setSelection(false);
-                        }
-
-                        // Update display from model
-                        ConnectionEditPart obj = (ConnectionEditPart) getSingleInput();
-
-                        if (!avoidObstaclesButton.isDisposed()) {
-                            Boolean val = (Boolean) obj
-                                .getStructuralFeatureValue(NotationPackage.eINSTANCE
-                                    .getRoutingStyle_AvoidObstructions());
-                            avoidObstaclesButton.setSelection(val
-                                .booleanValue());
-                        }
-
-                        if (!closestDistanceButton.isDisposed()) {
-                            Boolean val = (Boolean) obj
-                                .getStructuralFeatureValue(NotationPackage.eINSTANCE
-                                    .getRoutingStyle_ClosestDistance());
-                            closestDistanceButton.setSelection(val
-                                .booleanValue());
-                        }
-
-                        if (!reverseJumpLinksButton.isDisposed()) {
-                            Boolean val = (Boolean) obj
-                                .getStructuralFeatureValue(NotationPackage.eINSTANCE
-                                    .getRoutingStyle_JumpLinksReverse());
-                            reverseJumpLinksButton.setSelection(val
-                                .booleanValue());
-                        }
-
-                        Button button = (Button) buttons
-                            .get(obj
-                                .getStructuralFeatureValue(NotationPackage.eINSTANCE
-                                    .getRoutingStyle_JumpLinkStatus()));
-                        if (button != null)
-                            button.setSelection(true);
-
-                        button = (Button) buttons
-                            .get(obj
-                                .getStructuralFeatureValue(NotationPackage.eINSTANCE
-                                    .getRoutingStyle_JumpLinkType()));
-                        if (button != null)
-                            button.setSelection(true);
-
-                        // determine if tree routing is supported
-                        Button treeRoutingButton = (Button) buttons
-                            .get(Routing.TREE_LITERAL);
-                        if (treeRoutingButton != null)
-                            treeRoutingButton
-                                .setEnabled(obj instanceof ITreeBranchEditPart);
-
-                        button = (Button) buttons
-                            .get(obj
-                                .getStructuralFeatureValue(NotationPackage.eINSTANCE
-                                    .getRoutingStyle_Routing()));
-                        if (button != null)
-                            button.setSelection(true);
-
-                        button = (Button) buttons
-                            .get(obj
-                                .getStructuralFeatureValue(NotationPackage.eINSTANCE
-                                    .getRoutingStyle_Smoothness()));
-                        if (button != null)
-                            button.setSelection(true);
-
-                    }
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/DiagramColorsAndFontsPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/DiagramColorsAndFontsPropertySection.java
deleted file mode 100644
index 1b60010..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/DiagramColorsAndFontsPropertySection.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Image;
-
-
-public class DiagramColorsAndFontsPropertySection
-	extends ShapeColorsAndFontsPropertySection {
-	/**
-	 * @return - an itertor object to iterate over the selected/input edit parts
-	 */
-	protected Iterator getInputIterator() {
-		DiagramEditPart diagram = (DiagramEditPart) super.getSingleInput();
-		return diagram != null ? diagram.getPrimaryEditParts().iterator()
-			: Collections.EMPTY_LIST.iterator();
-
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractNotationPropertiesSection#getSingleInput()
-	 */
-	public IGraphicalEditPart getSingleInput() {
-
-		DiagramEditPart diagram = (DiagramEditPart) super.getSingleInput();
-		if (diagram != null)
-			return (IGraphicalEditPart) diagram.getPrimaryChildEditPart();
-		return null;
-	}
-
-	/**
-	 * Change fill color property value
-	 */
-	protected void changeFillColor() {
-	
-		// Update model in response to user
-	
-		if (fillColor != null) {
-	
-			List commands = new ArrayList();
-			Iterator it = getInputIterator();
-	
-			while (it.hasNext()) {
-				final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-				if (!(ep instanceof ConnectionNodeEditPart))
-					commands.add(createCommand(FILL_COLOR_COMMAND_NAME,
-						((View) ep.getModel()).eResource(), new Runnable() {
-	
-							public void run() {
-								ep.setStructuralFeatureValue(NotationPackage.eINSTANCE.getFillStyle_FillColor(),
-									FigureUtilities.RGBToInteger(fillColor));
-							}
-						}));
-			}
-	
-			executeAsCompositeCommand(FILL_COLOR_COMMAND_NAME, commands);
-			Image overlyedImage = new ColorOverlayImageDescriptor(
-				DiagramUIPropertiesImages.DESC_FILL_COLOR
-					.getImageData(), fillColor).createImage();
-            disposeImage(fillColorButton.getImage());
-			fillColorButton.setImage(overlyedImage);
-		}
-	}
-
-	/**
-	 * Adapt the object to an EObject - if possible
-	 * 
-	 * @param object
-	 *            object from a diagram or ME
-	 * @return EObject
-	 */
-	protected EObject adapt(Object object) {
-		if (object instanceof IAdaptable) {
-			if (object instanceof IGraphicalEditPart)// digram case
-				return (EObject) ((IAdaptable) object).getAdapter(View.class);
-			// ME case
-			return (EObject) ((IAdaptable) object).getAdapter(EObject.class);
-		}
-	
-		return null;
-	}	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ShapeColorsAndFontsPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ShapeColorsAndFontsPropertySection.java
deleted file mode 100644
index 22bdbaa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ShapeColorsAndFontsPropertySection.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Colors section to represent line, font and fill colors properties of a 2D shape
- * 
- * @author nbalaba
- *
- */
-public class ShapeColorsAndFontsPropertySection
-	extends ColorsAndFontsPropertySection {
-
-
-	protected Composite createFontsGroup(Composite contents) {
-		Composite toolBar = super.createFontsGroup(contents);
-
-		fillColorButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				changeFillColor(event);
-			}
-		});
-
-		if (isReadOnly())
-			fillColorButton.setEnabled(false);
-		else
-			fillColorButton.setEnabled(true);
-		
-		return toolBar;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorsAndFontsPropertySection#updateColorCache()
-	 */
-	protected void updateColorCache() {
-		super.updateColorCache();
-		executeAsReadAction(new Runnable() {
-
-			public void run() {
-
-				if (getSingleInput() instanceof GraphicalEditPart) {
-					GraphicalEditPart ep = (GraphicalEditPart) getSingleInput();
-					fillColor = FigureUtilities.integerToRGB((Integer) ep
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE.getFillStyle_FillColor()));
-				} else
-					fillColor = DEFAULT_PREF_COLOR;
-			}
-		});
-
-	}
-
-	/**
-	 * Change fill color property value
-	 */
-	protected void changeFillColor(SelectionEvent event) {
-        // calling the deprectaed method in case a client overrides the deprecated method
-		fillColor = changeColor(event, fillColorButton,
-			IPreferenceConstants.PREF_FILL_COLOR, Properties.ID_FILLCOLOR,
-			FILL_COLOR_COMMAND_NAME, DiagramUIPropertiesImages.DESC_FILL_COLOR);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.tabbed.ISection#refresh()
-	 */
-	public void refresh() {
-		super.refresh();
-		if(!isDisposed()){
-		Image overlyedImage = new ColorOverlayImageDescriptor(
-					DiagramUIPropertiesImages.DESC_FILL_COLOR
-					.getImageData(), fillColor).createImage();
-        disposeImage(fillColorButton.getImage());
-		fillColorButton.setImage(overlyedImage);
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/grid/RulerGridPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/grid/RulerGridPropertySection.java
deleted file mode 100644
index 015e3f7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/grid/RulerGridPropertySection.java
+++ /dev/null

@@ -1,769 +0,0 @@
-package org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid;
-
-import java.text.ParseException;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;
-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
-import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;
-import org.eclipse.gmf.runtime.diagram.ui.properties.views.TextChangeHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-import com.ibm.icu.text.NumberFormat;
-
-
-public class RulerGridPropertySection
-    extends AbstractPropertySection {
-
-    // Groups
-    private Group displayGroup;
-    private Group measurementGroup;
-    private Group gridlineGroup;
-    
-    // Buttons
-    private Button gridVisibilityButton;
-    private Button gridOrderButton;
-    private Button snapToGridButton;
-    private Button restoreButton;
-
-    private Button rulerVisibilityButton;
-
-    private Button lineColorButton; 
-    
-    // Labels
-    private static final String GRID_ON_LABEL = DiagramUIPropertiesMessages.Grid_On_Label_Text;
-    private static final String GRID_LEVEL_LABEL = DiagramUIPropertiesMessages.Grid_Level_Label_Text;
-    private static final String SNAP_TO_GRID_LABEL = DiagramUIPropertiesMessages.Snap_To_Grid_Label_Text;
-    private static final String RULER_ON_LABEL = DiagramUIPropertiesMessages.Ruler_On_Label_Text;
-    private static final String RULER_UNITS_LABEL = DiagramUIPropertiesMessages.Ruler_Units_Label_Text;
-    private static final String GRID_SPACING_LABEL = DiagramUIPropertiesMessages.Grid_Spacing_Label_Text;
-    private static final String VISIBILITY_LABEL = DiagramUIPropertiesMessages.Display_Group_Label_Text;
-    private static final String MEASUREMENT_LABEL = DiagramUIPropertiesMessages.Measurement_Group_Label_Text;
-    private static final String GRIDLINE_LABEL = DiagramUIPropertiesMessages.Gridline_Group_Label_Text;
-    private static final String LINE_COLOR_LABEL = DiagramUIPropertiesMessages.Line_Color_Label_Text;
-    private static final String LINE_STYLE_LABEL = DiagramUIPropertiesMessages.Line_Style_Label_Text;
-    private static final String RESTORE_LABEL = DiagramUIPropertiesMessages.Restore_Defaults_Label_Text;
-
-    // Unit labels
-    private static final String INCHES_LABEL = DiagramUIPropertiesMessages.Inches_Label_Text;
-    private static final String CENTIMETERS_LABEL = DiagramUIPropertiesMessages.Centimeters_Label_Text;
-    private static final String PIXEL_LABEL = DiagramUIPropertiesMessages.Pixel_Label_Text;
-    
-    // Line Style labels
-    private static final String  SOLID_LABEL = DiagramUIPropertiesMessages.Solid_Label_Text;
-    private static final String  DASH_LABEL = DiagramUIPropertiesMessages.Dash_Label_Text;
-    private static final String  DOT_LABEL = DiagramUIPropertiesMessages.Dot_Label_Text;
-    private static final String  DASH_DOT_LABEL = DiagramUIPropertiesMessages.Dash_Dot_Label_Text;
-    private static final String  DASH_DOT_DOT_LABEL = DiagramUIPropertiesMessages.Dash_Dot_Dot_Label_Text;
-    private static final String  SPACED_DOT_LABEL = DiagramUIPropertiesMessages.Spaced_Dot_Label_Text;
-
-    // Default color for the grid.
-    private static final int LIGHT_GRAY_RGB = 12632256;
-
-    // Ruler unit drop down
-    private CCombo rulerUnitCombo;
-
-    // Line style drop down
-    private CCombo lineStyleCombo;
-    
-    // Text widget to display and set value of the property
-    private Text textWidget;
-
-    private RGB lineColor = null;   
-
-    // For changing ruler units
-    private static final int INCHES = 0;
-    private static final int CENTIMETERS = 1;
-    private static final int PIXELS = 2;
-
-    // Conversion from inch to centimeter
-    private static final double INCH2CM = 2.54;
-    
-    // Valid grid spacing range
-    private double minValidValue = 00.009;
-    private double maxValidValue = 99.999;
-    
-    // Listener for workspace property changes
-    private PropertyStoreListener propertyListener = new PropertyStoreListener();
-    
-    private IPreferenceStore workspaceViewerProperties = null;
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-     */
-    public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage) {
-        super.createControls(parent, aTabbedPropertySheetPage);
-        initializeControls(parent);
-    }
-
-    /**
-     * 
-     * Sets up controls with proper layouts and groups
-     * @param parent
-     */
-    private void initializeControls(Composite parent) {
-        parent.setLayout(new GridLayout(1, false));
-
-        // Top row composite
-        Composite topComposite = getWidgetFactory().createComposite(parent);
-        topComposite.setLayout(new GridLayout(2, false));
-        
-        // Create the groups for this section
-        createDisplayGroup(topComposite);
-        createMeasurementGroup(topComposite);
-        
-        // Bottom row composite
-        Composite bottomComposite = getWidgetFactory().createComposite(parent);
-        bottomComposite.setLayout(new GridLayout(2, false));
-
-        // Create grid line settings
-        createGridlineGroup(bottomComposite);
-        
-        Composite extraComposite = getWidgetFactory().createComposite(bottomComposite);
-        extraComposite.setLayout(new GridLayout(1, false));
-
-        // Create snap to grid checkbox
-        snapToGridButton = getWidgetFactory().createButton(
-            extraComposite, SNAP_TO_GRID_LABEL, SWT.CHECK);
-        snapToGridButton.addSelectionListener(new SelectionAdapter() {
-    
-            public void widgetSelected(SelectionEvent event) {
-                // Set the snap to grid workspace property          
-                setWorkspaceProperty(WorkspaceViewerProperties.SNAPTOGRID, snapToGridButton.getSelection());
-            }
-        });
-        
-        // Create restore to preferences defaults
-        restoreButton = getWidgetFactory().createButton(
-            extraComposite, RESTORE_LABEL, SWT.PUSH);
-        restoreButton.addSelectionListener(new SelectionAdapter() {
-    
-            public void widgetSelected(SelectionEvent event) {
-                restorePreferenceValues();
-            }
-                        
-            private void restorePreferenceValues() {
-                IPreferenceStore preferenceStore = getPreferenceStore();
-                
-                // The workspace properties will always exist because it is set 
-                // 
-                IPreferenceStore wsPrefStore = getWorkspaceViewerProperties();
-                
-                if (wsPrefStore.getBoolean(WorkspaceViewerProperties.GRIDORDER) == false) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.GRIDORDER, true);            
-                } 
-                if (wsPrefStore.getInt(WorkspaceViewerProperties.GRIDLINECOLOR) != LIGHT_GRAY_RGB) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.GRIDLINECOLOR, LIGHT_GRAY_RGB);          
-                } 
-                if (wsPrefStore.getInt(WorkspaceViewerProperties.GRIDLINESTYLE) != SWT.LINE_CUSTOM) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.GRIDLINESTYLE, SWT.LINE_CUSTOM);         
-                }
-                if (wsPrefStore.getBoolean(WorkspaceViewerProperties.VIEWRULERS) != preferenceStore.getBoolean(IPreferenceConstants.PREF_SHOW_RULERS)) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.VIEWRULERS, preferenceStore.getBoolean(IPreferenceConstants.PREF_SHOW_RULERS));
-                }
-                if (wsPrefStore.getBoolean(WorkspaceViewerProperties.VIEWGRID) != preferenceStore.getBoolean(IPreferenceConstants.PREF_SHOW_GRID)) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.VIEWGRID, preferenceStore.getBoolean(IPreferenceConstants.PREF_SHOW_GRID));
-                }
-                if (wsPrefStore.getBoolean(WorkspaceViewerProperties.SNAPTOGRID) != preferenceStore.getBoolean(IPreferenceConstants.PREF_SNAP_TO_GRID)) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.SNAPTOGRID, preferenceStore.getBoolean(IPreferenceConstants.PREF_SNAP_TO_GRID));         
-                } 
-                
-                if ((wsPrefStore.getInt(WorkspaceViewerProperties.RULERUNIT) != preferenceStore.getInt(IPreferenceConstants.PREF_RULER_UNITS)) || 
-                        (wsPrefStore.getDouble(WorkspaceViewerProperties.GRIDSPACING) != preferenceStore.getDouble(IPreferenceConstants.PREF_GRID_SPACING))) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, preferenceStore.getInt(IPreferenceConstants.PREF_RULER_UNITS));                       
-                    wsPrefStore.setValue(WorkspaceViewerProperties.GRIDSPACING, preferenceStore.getDouble(IPreferenceConstants.PREF_GRID_SPACING));         
-                }
-                
-                // reset the input values
-                setInput(getPart(),null);
-            }
-        });     
-    }
-    
-     private IPreferenceStore getPreferenceStore() {
-        IPreferenceStore preferenceStore =
-            (IPreferenceStore) ((DiagramEditor) getPart()).getDiagramEditPart().getDiagramPreferencesHint().getPreferenceStore();
-        return preferenceStore;
-    }
-
-    private void createLineColorControl(Composite composite) {
-        getWidgetFactory().createLabel(composite, LINE_COLOR_LABEL);
-        
-        lineColorButton = new Button(composite, SWT.PUSH);
-        lineColorButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_LINE_COLOR));
-
-        lineColorButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-            public void getName(AccessibleEvent e) {
-                e.result = DiagramUIMessages.PropertyDescriptorFactory_LineColor;
-            }
-        });
-        
-        lineColorButton.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent event) {
-                changeLineColor(event);
-            }
-
-            /**
-             * Change line color property value
-             */
-            private void changeLineColor(SelectionEvent event) {
-                lineColor = changeColor(event, lineColorButton, DiagramUIPropertiesImages.DESC_LINE_COLOR);
-                if (lineColor != null) 
-                    setWorkspaceProperty(WorkspaceViewerProperties.GRIDLINECOLOR, FigureUtilities.RGBToInteger(lineColor).intValue());
-            }           
-        });
-
-        lineColorButton.setEnabled(true);   
-    }
-
-    private void createLineStyleControl(Composite composite) {
-        getWidgetFactory().createLabel(composite, LINE_STYLE_LABEL); 
-
-        lineStyleCombo = getWidgetFactory().createCCombo(composite,
-            SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-        lineStyleCombo.setItems(getStyles());
-        lineStyleCombo.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent event) {
-                updateLineStyle();
-            }
-
-            private void updateLineStyle() {
-                int style = lineStyleCombo.getSelectionIndex(); 
-                setWorkspaceProperty(WorkspaceViewerProperties.GRIDLINESTYLE, style + SWT.LINE_SOLID);
-            }
-        });
-
-    }   
-    
-    /**
-     * @param event -
-     *            selection event
-     * @param button -
-     *            event source
-     * @param imageDescriptor -
-     *            the image to draw overlay on the button after the new
-     *            color is set
-     * @return - new RGB color, or null if none selected
-     */
-    private RGB changeColor(SelectionEvent event, Button button,
-            ImageDescriptor imageDescriptor) {
-
-        ColorPalettePopup popup = new ColorPalettePopup(button.getParent()
-            .getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);
-
-        Rectangle r = button.getBounds();
-        Point location = button.getParent().toDisplay(r.x, r.y);
-        popup.open(new Point(location.x, location.y + r.height));
-
-        if (popup.useDefaultColor()) {
-            return FigureUtilities.integerToRGB(new Integer(LIGHT_GRAY_RGB));
-        }
-        return popup.getSelectedColor();
-
-    }
-    
-    private Double convertStringToDouble(String strValue){
-        NumberFormat numberFormatter = NumberFormat.getInstance();
-        Double value;
-        try {
-            value = forceDouble(numberFormatter.parse(strValue));
-        } catch (ParseException e) {
-            // default value
-            value = new Double(getWorkspacePropertyDouble(WorkspaceViewerProperties.GRIDSPACING));
-            setGridSpacing(value.doubleValue());
-        }
-        return value;
-    }   
-
-    private void setGridSpacing(double value) {
-        // Set grid spacing back to the input value
-        NumberFormat numberFormater = NumberFormat.getInstance();
-        textWidget.setText(numberFormater.format(value));
-        textWidget.selectAll();
-    }       
-    
-    /**
-     * Creates group with ruler units and grid spacing controls
-     * @param composite
-     */
-    private void createMeasurementGroup(Composite composite) {
-
-        measurementGroup = getWidgetFactory().createGroup(composite, MEASUREMENT_LABEL);        
-        measurementGroup.setLayout(new GridLayout(2, false));
-                
-        // Create ruler unit combo
-        getWidgetFactory().createLabel(measurementGroup, RULER_UNITS_LABEL);
-        
-        rulerUnitCombo = getWidgetFactory().createCCombo(measurementGroup,
-            SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-        rulerUnitCombo.setItems(getUnits());
-        rulerUnitCombo.addSelectionListener(new SelectionAdapter() {
-            
-            public void widgetSelected(SelectionEvent event) {
-                int oldUnits = getWorkspacePropertyInt(WorkspaceViewerProperties.RULERUNIT);
-                int newUnits = rulerUnitCombo.getSelectionIndex();
-                
-                // Order of the changes is important so that there is no  
-                // interim point with a 1 pixel grid spacing
-                if (oldUnits < newUnits) {
-                    updateSpacing(oldUnits,newUnits);
-                    updateRulerUnits();
-                } else {
-                    updateRulerUnits();
-                    updateSpacing(oldUnits,newUnits);
-                }
-            }
-
-            private void updateSpacing(int fromUnits, int toUnits) {                
-                String currentUnits = convertUnits(fromUnits, toUnits);
-                setWorkspaceProperty(WorkspaceViewerProperties.GRIDSPACING, convertStringToDouble(currentUnits).doubleValue());
-            }
-
-            private void updateRulerUnits() {
-                int units = getCurrentRulerUnit();
-                setWorkspaceProperty(WorkspaceViewerProperties.RULERUNIT, units);
-            }
-        });
-
-
-        // Create grid spacing text field
-        getWidgetFactory().createLabel(measurementGroup, GRID_SPACING_LABEL);
-        textWidget = getWidgetFactory().createText(measurementGroup, StringStatics.BLANK, SWT.BORDER);
-        GridData data = new GridData(SWT.FILL,SWT.FILL,true,false);
-        textWidget.setLayoutData(data);
-        startTextWidgetEventListener();     
-        
-    
-    }
-    
-    /**
-     * 
-     * converts fromUnits to toUnits (e.g. inches to pixels)
-     * 
-     * @param fromUnits
-     * @param toUnits
-     * @return equivalent number of toUnits for the given fromUnits
-     */
-    private String convertUnits(int fromUnits, int toUnits ) {
-        String valueStr = textWidget.getText();
-        if( fromUnits == toUnits ) {
-            return valueStr;
-        }
-        Double value = convertStringToDouble(valueStr);
-        double pixelValue = 0;
-        switch( fromUnits ) {
-            case INCHES:
-                pixelValue = value.doubleValue() * Display.getDefault().getDPI().x;
-                break;
-            case CENTIMETERS:
-                pixelValue = value.doubleValue() * Display.getDefault().getDPI().x / INCH2CM;
-                break;
-            case PIXELS:
-                pixelValue = value.intValue();
-        }
-        
-        double returnValue = 0;
-        
-        switch( toUnits ) {
-            case INCHES:
-                returnValue = pixelValue / Display.getDefault().getDPI().x;
-                break;
-            case CENTIMETERS:
-                returnValue = pixelValue * INCH2CM / Display.getDefault().getDPI().x;
-                break;
-            case PIXELS:
-                returnValue = Math.round(pixelValue);
-        }
-        NumberFormat numberFormatter = NumberFormat.getInstance();
-        return numberFormatter.format(returnValue);     
-        
-    }
-
-    /**
-     * A helper to listen for events that indicate that a text field has been
-     * changed.
-     */
-    private TextChangeHelper textListener = new TextChangeHelper() {
-        boolean textModified = false;
-        /**
-         * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-         */
-        public void handleEvent(Event event) {
-            switch (event.type) {
-                case SWT.KeyDown :
-                    textModified = true;
-                    if (event.character == SWT.CR)
-                        textChanged((Control)event.widget);
-                    break;
-                case SWT.FocusOut :
-                    textChanged((Control)event.widget);
-                    break;
-            }
-        }
-        
-        public void textChanged(Control control) {
-            if (textModified) {
-                String currentText = ((Text) control).getText();
-                try {
-                    
-                    double value = convertStringToDouble(currentText).doubleValue();
-                    double pixels = convertToBase(value);
-                    if (pixels >= minValidValue && pixels <= maxValidValue) {
-                        setWorkspaceProperty(WorkspaceViewerProperties.GRIDSPACING, value);                       
-                        setGridSpacing(value);
-                    } else {
-                        resetGridSpacing();
-                    }
-                    
-                } catch (NumberFormatException e) {
-                    resetGridSpacing();
-                }
-                textModified = false;
-            }
-        }
-        
-        private void resetGridSpacing() {
-            // Set grid spacing back to original value
-            double value = getWorkspacePropertyDouble(WorkspaceViewerProperties.GRIDSPACING);
-            setGridSpacing(value);
-        }       
-        
-    };
-    
-    /**
-     * 
-     * converts the current units used to a base unit value to be used (e.g. in validation)
-     * 
-     * @param number Units to be converted to the base unit
-     * @return
-     */
-    private double convertToBase(double number) {
-        
-        double returnValue = 0;
-        switch( getCurrentRulerUnit() ) {
-            case INCHES:
-                returnValue = number;
-                break;
-            case CENTIMETERS:
-                returnValue = number / INCH2CM;
-                break;
-            case PIXELS:
-                returnValue = number / Display.getDefault().getDPI().x;
-        }
-        return returnValue;
-    }
-    
-    
-    private int getCurrentRulerUnit() {     
-        return rulerUnitCombo.getSelectionIndex();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#setInput(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-     */
-    public void setInput(IWorkbenchPart part, ISelection selection) {
-        super.setInput(part, selection);
-        
-        // Set up workspace property listener 
-        initWorkspacePropertyListener();
-        double value = getWorkspacePropertyDouble(WorkspaceViewerProperties.GRIDSPACING);
-        NumberFormat numberFormatter = NumberFormat.getNumberInstance();
-        textWidget.setText(numberFormatter.format(value));
-        rulerVisibilityButton.setSelection(getBooleanWorkspaceProperty(WorkspaceViewerProperties.VIEWRULERS));
-        gridVisibilityButton.setSelection(getBooleanWorkspaceProperty(WorkspaceViewerProperties.VIEWGRID));
-        gridOrderButton.setSelection(getBooleanWorkspaceProperty(WorkspaceViewerProperties.GRIDORDER));
-        snapToGridButton.setSelection(getBooleanWorkspaceProperty(WorkspaceViewerProperties.SNAPTOGRID));
-        
-        int rulerValue = getValue(WorkspaceViewerProperties.RULERUNIT);
-        int styleValue = getValue(WorkspaceViewerProperties.GRIDLINESTYLE)-1;
-        rulerUnitCombo.setText(getUnits()[rulerValue]);
-        lineStyleCombo.setText(getStyles()[styleValue]);
-        
-    }
-
-    /**
-     * @param property
-     * @return the integer value of the string property
-     */
-    private int getValue(String property) {
-        int value;
-        String valueString = getWorkspaceProperty(property);
-
-        if (valueString.equals(StringStatics.BLANK)) {
-            value = 0;
-        } else {
-            value = new Integer(getWorkspaceProperty(property)).intValue();
-        }
-        return value;
-    }
-
-    private String[] getUnits() {       
-        return new String[]{INCHES_LABEL,CENTIMETERS_LABEL,PIXEL_LABEL};
-    }
-
-    private String[] getStyles() {      
-        return new String[]{SOLID_LABEL,DASH_LABEL,DOT_LABEL,DASH_DOT_LABEL,DASH_DOT_DOT_LABEL,SPACED_DOT_LABEL};
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.views.properties.tabbed.ISection#dispose()
-     */
-    public void dispose() {
-        stopTextWidgetEventListener();
-        removeWorkspacePropertyListener();
-        super.dispose();
-    }   
-
-    /**
-     * Start listening to the text widget events
-     */
-    private void startTextWidgetEventListener() {
-        getListener().startListeningTo(getTextWidget());
-        getListener().startListeningForEnter(getTextWidget());
-    }
-
-    /**
-     * Stop listening to text widget events
-     */
-    private void stopTextWidgetEventListener() {
-        getListener().stopListeningTo(getTextWidget());
-    }
-    
-    /**
-     * @return Returns the textWidget.
-     */
-    private Text getTextWidget() {
-        return textWidget;
-    }
-    
-    /**
-     * @return Returns the listener.
-     */
-    private TextChangeHelper getListener() {
-        return textListener;
-    }
-    
-    /**
-     * Creates group with ruler and grid visibility and grid order controls
-     * @param composite
-     */
-    private void createDisplayGroup(Composite composite) {  
-
-        displayGroup = getWidgetFactory().createGroup(composite, VISIBILITY_LABEL);     
-        displayGroup.setLayout(new GridLayout(1, true));
-        
-        rulerVisibilityButton = getWidgetFactory().createButton(
-            displayGroup, RULER_ON_LABEL, SWT.CHECK);
-        rulerVisibilityButton.addSelectionListener(new SelectionAdapter() {
-    
-            public void widgetSelected(SelectionEvent event) {
-                // Set ruler visibility workspace property
-                setWorkspaceProperty(WorkspaceViewerProperties.VIEWRULERS, rulerVisibilityButton.getSelection());
-            }
-        });
-
-        
-        gridVisibilityButton = getWidgetFactory().createButton(
-            displayGroup, GRID_ON_LABEL, SWT.CHECK);
-        gridVisibilityButton.addSelectionListener(new SelectionAdapter() {
-    
-            public void widgetSelected(SelectionEvent event) {
-                // Set grid visibility workspace property
-                setWorkspaceProperty(WorkspaceViewerProperties.VIEWGRID, gridVisibilityButton.getSelection());
-            }
-        });
-        
-        gridOrderButton = getWidgetFactory().createButton(
-            displayGroup, GRID_LEVEL_LABEL, SWT.CHECK);
-        gridOrderButton.addSelectionListener(new SelectionAdapter() {
-    
-            public void widgetSelected(SelectionEvent event) {
-                // Set grid level workspace property                
-                setWorkspaceProperty(WorkspaceViewerProperties.GRIDORDER, gridOrderButton.getSelection());
-            }
-        });
-                
-    }
-
-    /**
-     * Creates group with line color and style controls
-     * @param composite
-     */
-    private void createGridlineGroup(Composite composite) { 
-
-        gridlineGroup = getWidgetFactory().createGroup(composite, GRIDLINE_LABEL);  
-        GridLayout gridLayout = new GridLayout(2, false);
-        gridlineGroup.setLayout(gridLayout);
-        createLineColorControl(gridlineGroup);
-        createLineStyleControl(gridlineGroup);
-                
-    }
-    
-    
-    private void setWorkspaceProperty(String property, boolean setting) {
-        getWorkspaceViewerProperties().setValue(property, setting);
-    }
-    
-    private void setWorkspaceProperty(String property, int setting) {
-        getWorkspaceViewerProperties().setValue(property, setting);
-    }
-    
-    private void setWorkspaceProperty(String property, double setting) {
-        getWorkspaceViewerProperties().setValue(property, setting);
-    }
-
-    private String getWorkspaceProperty(String property) {
-        return getWorkspaceViewerProperties().getString(property);
-    }
-
-    private int getWorkspacePropertyInt(String property) {
-        return getWorkspaceViewerProperties().getInt(property);
-    }
-    
-    private double getWorkspacePropertyDouble(String property) {
-        return getWorkspaceViewerProperties().getDouble(property);
-    }
-    
-    private boolean getBooleanWorkspaceProperty(String property) {
-        return getWorkspaceViewerProperties().getBoolean(property);
-    }
-
-    private IPreferenceStore getWorkspaceViewerProperties() {
-        return workspaceViewerProperties;
-    }
-
-    
-    /**
-     * Listener for the workspace preference store.
-     */
-    private class PropertyStoreListener implements IPropertyChangeListener {
-        
-        /* 
-         * (non-Javadoc)
-         * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-         */
-        public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) {
-            handleWorkspacePropertyChanged(event);          
-        }
-    }
-    
-    /**
-     * Handles workspace preoperty changes
-     * @param event
-     */
-    private void handleWorkspacePropertyChanged(PropertyChangeEvent event) {
-        if (WorkspaceViewerProperties.VIEWGRID.equals(event.getProperty())) {       
-            if (! gridVisibilityButton.isDisposed()) {
-                gridVisibilityButton.setSelection(getEventBoolean(event));
-            }
-        } else if (WorkspaceViewerProperties.VIEWRULERS.equals(event.getProperty())) {          
-            if (! rulerVisibilityButton.isDisposed()) {
-                rulerVisibilityButton.setSelection(getEventBoolean(event));
-            }
-        } else if (WorkspaceViewerProperties.SNAPTOGRID.equals(event.getProperty())) {          
-            if (! snapToGridButton.isDisposed()) {
-                snapToGridButton.setSelection(getEventBoolean(event));
-            }
-        } else if (WorkspaceViewerProperties.GRIDORDER.equals(event.getProperty())) {
-            if (! gridOrderButton.isDisposed()) {
-                gridOrderButton.setSelection(getEventBoolean(event));
-            }
-        } else if (WorkspaceViewerProperties.GRIDSPACING.equals(event.getProperty())) {
-            if (! textWidget.isDisposed()) {
-                Double value = new Double(getEventString(event));
-                textWidget.setText(NumberFormat.getInstance().format(value));
-            }
-        } else if (WorkspaceViewerProperties.RULERUNIT.equals(event.getProperty())) {           
-            if (! rulerUnitCombo.isDisposed()) {
-                rulerUnitCombo.select(Integer.parseInt(getEventString(event)));
-            }
-        } else if (WorkspaceViewerProperties.GRIDLINESTYLE.equals(event.getProperty())) {
-            if (! lineStyleCombo.isDisposed()) {
-                lineStyleCombo.select(Integer.parseInt(getEventString(event))-1);
-            }
-        }       
-    }
-    
-    private boolean getEventBoolean(PropertyChangeEvent event) {
-        Boolean newValue = (Boolean) event.getNewValue();
-        return newValue.booleanValue();
-    }
-
-    private String getEventString(PropertyChangeEvent event) {
-        return event.getNewValue().toString();
-    }
-
-    
-    /**
-     * Initializes the preferenceStore property change
-     * listener.
-     */
-    private void initWorkspacePropertyListener() {
-        IDiagramWorkbenchPart editor = (IDiagramWorkbenchPart) getPart();
-        if (editor == null) return;
-        DiagramGraphicalViewer viewer = (DiagramGraphicalViewer) editor.getDiagramGraphicalViewer();
-        workspaceViewerProperties = viewer.getWorkspaceViewerPreferenceStore();
-        workspaceViewerProperties.addPropertyChangeListener(propertyListener);
-    }
-    
-    /**
-     * This method removes all listeners to the notational world (views, figures, editpart...etc)
-     * Override this method to remove notational listeners down the hierarchy
-     */
-    private void removeWorkspacePropertyListener() {
-        if (getWorkspaceViewerProperties() != null ) {
-            getWorkspaceViewerProperties().removePropertyChangeListener(propertyListener);
-            workspaceViewerProperties = null;
-        }
-        propertyListener = null;
-    }
-    
-    /**
-     * The NumberFormatter.parse() could return a Long or Double
-     * We are storing all values related to the page setup as doubles
-     * so we call this function when ever we are getting values from
-     * the dialog.
-     * @param number
-     * @return
-     */
-    private Double forceDouble(Number number) {
-        if (!(number instanceof Double))
-            return new Double(number.doubleValue());            
-        return (Double) number;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/package.html
deleted file mode 100644
index 02366bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/util/SectionUpdateRequestCollapser.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/util/SectionUpdateRequestCollapser.java
deleted file mode 100644
index bf50f87..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/util/SectionUpdateRequestCollapser.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.gmf.runtime.common.core.util.RequestCollapser;
-
-/**
- * The receiver will collapse all requests into one and invoke it by the
- * user-interface thread at the next reasonable opportunity. Each thread which
- * calls this collapser is suspended until the runnable completes.
- * 
- * @author nbalaba
- */
-public class SectionUpdateRequestCollapser
-	extends RequestCollapser {
-
-	private Map sectionsUpdateRequests = null;
-
-	private List requestors = null;
-
-	protected void executeRequest(Runnable request) {
-		Display.getDefault().syncExec(request);
-	}
-
-	/**
-	 * posts the request from the client to run in the thread at the next
-	 * possible chance. The posted request will overwrite any previous one
-	 * 
-	 * @param runnable
-	 *            the Runnable request to run
-	 */
-	public synchronized void postRequest(Runnable runnable) {
-		notify();
-	}
-
-	/**
-	 * @param requester
-	 * @param request
-	 */
-	public synchronized void postRequest(Object requester, Runnable request) {
-		if (!requestors.contains(requester))
-			requestors.add(requester);
-		sectionsUpdateRequests.put(requester, request);
-		postRequest(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.internal.util.RequestCollapser#getRequest()
-	 */
-	protected synchronized Runnable getRequest() {
-		Runnable request = null;
-
-		if (requestors.size() > 0) {
-			Object requester = requestors.get(0);
-			requestors.remove(0);
-			request = (Runnable) sectionsUpdateRequests.get(requester);
-			sectionsUpdateRequests.remove(requester);
-		}
-		return request;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.internal.util.RequestCollapser#start()
-	 */
-	public synchronized void start() {
-		sectionsUpdateRequests = new HashMap();
-		requestors = new ArrayList();
-		super.start();
-	}
-
-	/**
-	 * stops this automaton pbject by interrupting the thread
-	 */
-	public synchronized void stop() {
-		super.stop();
-		sectionsUpdateRequests = null;
-		requestors = null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/util/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/util/package.html
deleted file mode 100644
index 01d4796..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/util/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains <i>utility</i> classes used by this plugin.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.properties.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/IReadOnlyDiagramPropertySheetPageContributor.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/IReadOnlyDiagramPropertySheetPageContributor.java
deleted file mode 100644
index dea08b7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/IReadOnlyDiagramPropertySheetPageContributor.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.views;
-
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-
-/**
- * A interface to indicate that the property sheet pages should be read only
- * independant of the selected object and its related file status.
- * 
- * For example, this interface is implemented by topic and browse diagrams. Even
- * though the selected object can be modified, we want the properties to be read
- * only for these diagrams.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com </a>
- */
-public interface IReadOnlyDiagramPropertySheetPageContributor
-	extends ITabbedPropertySheetPageContributor {
-	/*
-	 * there are no methods
-	 */
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/PropertiesBrowserPage.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/PropertiesBrowserPage.java
deleted file mode 100644
index 002a529..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/PropertiesBrowserPage.java
+++ /dev/null

@@ -1,333 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.views;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalActionManager;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * A property sheet page for modeler.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com </a>
- */
-public class PropertiesBrowserPage
-	extends TabbedPropertySheetPage
-	implements IPropertyChangeListener {
-
-	/**
-	 * the contributor for this property sheet page
-	 */
-	private ITabbedPropertySheetPageContributor contributor;
-
-	/**
-	 * save reference to the workbench window if there is a
-	 * modelerViewActivationListener.
-	 */
-	private IWorkbenchWindow modelerViewWorkbenchWindow;
-
-	/**
-	 * the current selection from model explorer.
-	 */
-	private IStructuredSelection modelerViewSelection = null;
-
-	/**
-	 * When the property sheet page is active for the model explorer (or other
-	 * modeler view such as diagram navigator) and when you close a model using
-	 * CTRL + F4 or File + Close All, a selection change event is not sent to
-	 * the workbench, but the model explorer selection has changed. This could
-	 * result in a model being closed, but the tabs still being displayed for
-	 * that model based on the old selection (resulting in NPE when you do
-	 * something). This listener is similar to what the PageRecBook does,
-	 * listens for the editor close and then gets the next model explorer
-	 * selection change event to refresh.
-	 */
-	private IPartListener modelerViewActivationListener = new IPartListener() {
-
-		private boolean propertiesBrowserActive = false;
-
-		public void partActivated(IWorkbenchPart part) {
-			/*
-			 * keep track whether the properties view is active.
-			 */
-			propertiesBrowserActive = (part instanceof PropertySheet && ((PropertySheet) part)
-				.getCurrentPage().equals(PropertiesBrowserPage.this));
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part) {
-			/* not implemented */
-		}
-
-		public void partClosed(IWorkbenchPart part) {
-			if (part instanceof IEditorPart && propertiesBrowserActive) {
-				/*
-				 * The properties view is active and we closed an editor.
-				 */
-				final IViewPart modelerView = (IViewPart) contributor;
-				modelerView.getSite().getSelectionProvider()
-					.addSelectionChangedListener(
-						new ISelectionChangedListener() {
-
-							public void selectionChanged(
-									SelectionChangedEvent event) {
-								IStructuredSelection newModelerViewSelection = (IStructuredSelection) modelerView
-									.getSite().getSelectionProvider()
-									.getSelection();
-								modelerView.getSite().getSelectionProvider()
-									.removeSelectionChangedListener(this);
-
-								if (!newModelerViewSelection
-									.equals(modelerViewSelection)) {
-									/*
-									 * the closed editor caused a selection
-									 * change in the modeler view, send this to
-									 * the property sheet page.
-									 */
-									PropertiesBrowserPage.this
-										.selectionChanged(modelerView,
-											newModelerViewSelection);
-								}
-							}
-						});
-			}
-		}
-
-		public void partDeactivated(IWorkbenchPart part) {
-			/* not implemented */
-		}
-
-		public void partOpened(IWorkbenchPart part) {
-			/* not implemented */
-		}
-
-	};
-
-	private IStructuredSelection selectedElements;
-
-
-
-	/**
-	 * Constructor
-	 * @param contributor the <code>ITabbedPropertySheetPageContributor</code> 
-	 *  for this property sheet page
-	 */
-	public PropertiesBrowserPage(ITabbedPropertySheetPageContributor contributor) {
-		super(contributor);
-
-		this.contributor = contributor;
-
-		// preference listener
-		MslUIPlugin.getDefault().getPreferenceStore()
-			.addPropertyChangeListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-
-		/**
-		 * Remove the part activation listener.
-		 */
-		if (modelerViewWorkbenchWindow != null) {
-			modelerViewWorkbenchWindow.getPartService().removePartListener(
-				modelerViewActivationListener);
-			modelerViewWorkbenchWindow = null;
-		}
-
-		/**
-		 * Remove the preference listener
-		 */
-		MslUIPlugin.getDefault().getPreferenceStore()
-			.removePropertyChangeListener(this);
-        
-        /**
-         * Clean up
-         */
-        contributor = null;
-        selectedElements = null;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
-	 */
-	public void setActionBars(IActionBars actionBars) {
-
-		if (contributor != null && contributor instanceof IWorkbenchPart) {
-
-			/*
-			 * Override the undo and redo global action handlers to use the
-			 * contributors action handlers
-			 */
-			IAction action = GlobalActionManager.getInstance()
-				.getGlobalActionHandler((IWorkbenchPart) contributor,
-					GlobalActionId.UNDO);
-			if (action != null) {
-				actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(),
-					action);
-			}
-
-			action = GlobalActionManager.getInstance().getGlobalActionHandler(
-				(IWorkbenchPart) contributor, GlobalActionId.REDO);
-			if (action != null) {
-				actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(),
-					action);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		/* not implemented */
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#setFocus()
-	 */
-	public void setFocus() {
-		getControl().setFocus();
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-
-		if (contributor instanceof IViewPart) {
-			/**
-			 * If this is the modeler view, add the special part activation
-			 * listener.
-			 */
-			modelerViewWorkbenchWindow = getSite().getWorkbenchWindow();
-			modelerViewWorkbenchWindow.getPartService().addPartListener(
-				modelerViewActivationListener);
-		}
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		super.selectionChanged(part, selection);
-
-		if (selection instanceof IStructuredSelection)
-			selectedElements = (IStructuredSelection) selection;
-
-		if (modelerViewWorkbenchWindow != null && part.equals(contributor)) {
-			/*
-			 * save the current selection.
-			 */
-			IViewPart modelerView = (IViewPart) part;
-			modelerViewSelection = (IStructuredSelection) modelerView.getSite()
-				.getSelectionProvider().getSelection();
-		}
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProviderListener#labelProviderChanged(org.eclipse.jface.viewers.LabelProviderChangedEvent)
-	 */
-	public void labelProviderChanged(LabelProviderChangedEvent event) {
-		if (event.getElements() == null && getControl() != null) {
-            super.labelProviderChanged(event);
-            return;
-        }
-
-		IStructuredSelection structuredSelection = getSelectedElements();
-		if (structuredSelection == null) {
-			return;
-		}
-
-		List selection = new ArrayList();
-		for (Iterator e = structuredSelection.iterator(); e.hasNext();) {
-			Object next = e.next();
-			if (next instanceof IAdaptable) {
-				Object object = ((IAdaptable) next).getAdapter(EObject.class);
-				if (object != null)
-					selection.add(object);
-			} else if (next instanceof EObject) {
-				selection.add(next);
-			}
-		}
-
-
-		if (selection.isEmpty()) // no point in expensive calculations if there
-								 // are no elements
-			return;
-		
-		List elementsAffected = new ArrayList();
-		for (int i = 0; i < event.getElements().length; i++) {
-			Object next = event.getElements()[i];
-			if (next instanceof IAdaptable) {
-				Object object = ((IAdaptable) next).getAdapter(EObject.class);
-				if (object != null)
-					elementsAffected.add(object);
-			} else if (next instanceof EObject) {
-				elementsAffected.add(next);
-			}
-		}
-
-		selection.retainAll(elementsAffected);
-		if (!selection.isEmpty())
-			super.labelProviderChanged(event);
-
-	}
-	
-	/**
-	 * Get the property sheet page contributor.
-	 * 
-	 * @return the property sheet page contributor.
-	 */
-	public ITabbedPropertySheetPageContributor getContributor() {
-		return contributor;
-	}
-	/**
-	 * @return Returns the selectedElements.
-	 */
-	protected IStructuredSelection getSelectedElements() {
-		return selectedElements;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/TextChangeHelper.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/TextChangeHelper.java
deleted file mode 100644
index 77b1231..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/TextChangeHelper.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.properties.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * TextChangeHelper notifies the listner of text lifecycle events 
- * on behalf of the widget(s) it listens to. 
- * 
- * @author Anthony Hunter 
- * <a href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com</a>
- */
-public abstract class TextChangeHelper implements Listener {
-	
-	private boolean nonUserChange;
-
-	/**
-	 * Marks the start of a programmatic change to the widget contents.
-	 * Clients must call startNonUserChange() before directly setting 
-	 * the widget contents to avoid unwanted lifecycle events.
-	 * @throws IllegalArgumentException if a programmatic change is 
-	 * already in progress.
-	 */
-	public void startNonUserChange() {
-		if (nonUserChange)
-			throw new IllegalStateException("we already started a non user change");//$NON-NLS-1$
-		nonUserChange = true;
-	}
-
-	/**
-	 * Clients who call startNonUserChange() should call 
-	 * finishNonUserChange() as soon as possible after the change is done.
-	 * @throws IllegalArgumentException if no change is in progress.
-	 */
-	public void finishNonUserChange() {
-		if (!nonUserChange)
-			throw new IllegalStateException("we are not in a non user change");//$NON-NLS-1$
-		nonUserChange = false;
-	}
-
-	/**
-	 * Returns true if a programmatic change is in progress.
-	 * 
-	 * @return <code>true</code> if a programmatic change is in progress, <code>false</code> otherwise
-	 */
-	public boolean isNonUserChange() {
-		return nonUserChange;
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		switch (event.type) {
-			case SWT.KeyDown :
-				if (event.character == SWT.CR)
-					textChanged((Control)event.widget);
-				break;
-			case SWT.FocusOut :
-				textChanged((Control)event.widget);
-				break;
-		}
-	}
-
-	/**
-	 * Abstract method notified when a text field has been changed.
-	 * @param control
-	 */
-	public abstract void textChanged(Control control);
-
-	/**
-	 * Registers this helper with the given control to listen for events
-	 * which indicate that a change is in progress (or done).
-	 * 
-	 * @param control <code>Control</code> on which listeners will be registered
-	 */
-	public void startListeningTo(Control control) {
-		control.addListener(SWT.FocusOut, this);
-		control.addListener(SWT.Modify, this);
-	}
-
-	/**
-	 * Registers this helper with the given control to listen for the
-	 * Enter key.  When Enter is pressed, the change is considered done 
-	 * (this is only appropriate for single-line Text widgets).
-	 * 
-	 * @param control <code>Control</code> on which enter listener will be registered
-	 */
-	public void startListeningForEnter(Control control) {
-		// NOTE: KeyDown rather than KeyUp, because of similar usage in CCombo. 
-		control.addListener(SWT.KeyDown, this);
-	}
-
-	/**
-	 * Unregisters this helper from a control previously passed to
-	 * startListeningTo() and/or startListeningForEnter().
-	 * 
-	 * @param control <code>Control</code> from which listeners will be removed
-	 */
-	public void stopListeningTo(Control control) {
-		if ((control != null) && !control.isDisposed()) {
-			control.removeListener(SWT.FocusOut, this);
-			control.removeListener(SWT.Modify, this);
-			control.removeListener(SWT.KeyDown, this);
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/package.html b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/package.html
deleted file mode 100644
index 7a71f7e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/views/package.html
+++ /dev/null

@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages.
-
-
-<h2>Package Specification</h2>
-<p>
-Provides a set of classes to use when creating <i>views</i>.
-</p>
-<p>Each created view façade object has two constructors:</p>
-<ul>
-<li> Creation constructor: creates the notational element, adds custom properties, initializes the properties with preferred values from the preference store and then creates any required children sub-views.
-<li> Incarnation constructor: only aggregates the given notational element.
-</ul>
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.classpath b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.cvsignore
deleted file mode 100644
index c64fc1c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.project b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.project
deleted file mode 100644
index faab957..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.providers.ide</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/org.eclipse.gmf.runtime.diagram.ui.providers.ide/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/META-INF/MANIFEST.MF
deleted file mode 100644
index 63cfd30..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.providers.ide; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal.DiagramProvidersIDEPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal.providers;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers
-Require-Bundle: org.eclipse.gmf.runtime.common.ui.action.ide;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/about.html b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/build.properties b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/build.properties
deleted file mode 100644
index 2e11574..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/plugin.properties
deleted file mode 100644
index 08abc0c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/plugin.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram Providers - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram Providers IDE
-Plugin.providerName = Eclipse.org
-
-# ==============================================================================
-#  Diagram Providers - section to be translated
-# ==============================================================================
-ext.diagramIDEContributionItemProvider = Diagram IDE Contribution Item Provider
-ext.diagramMarkerNavigationProvider = Diagram Marker Navigation Provider
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/plugin.xml
deleted file mode 100644
index fd6b330..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/plugin.xml
+++ /dev/null

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension
-      id="diagramIDEContributionItemProvider"
-      name="%ext.diagramIDEContributionItemProvider"
-      point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider
-         class="org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal.providers.DiagramIDEContributionItemProvider"
-         checkPluginLoaded="false">
-         <Priority
-            name="Low">
-         </Priority>
-         <partContribution
-            class="org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart">
-               <partAction
-                  global="true"
-                  id="bookmark">
-            </partAction>
-         </partContribution>         
-      </contributionItemProvider>
-   </extension> 
-   <extension id="org.eclipse.gmf.runtime.diagram.ui.providers.diagramMarkerNavigationProvider" name="%ext.diagramMarkerNavigationProvider" point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders">
-      <MarkerNavigationProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal.providers.DiagramMarkerNavigationProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <MarkerType name="org.eclipse.gmf.runtime.common.ui.services.bookmark">
-         </MarkerType>
-      </MarkerNavigationProvider>
-   </extension>
-
-</plugin>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/DiagramProvidersIDEPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/DiagramProvidersIDEPlugin.java
deleted file mode 100644
index 489e1a7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/DiagramProvidersIDEPlugin.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Wayne Diu, wdiu
- */
-public class DiagramProvidersIDEPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared plugin instance.
-	 */
-	private static DiagramProvidersIDEPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramProvidersIDEPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DiagramProvidersIDEPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/package.html
deleted file mode 100644
index 9865ae4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/package.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Internal class to manage this plugin.</p>
-
-@canBeSeenBy %level1
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/providers/DiagramIDEContributionItemProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/providers/DiagramIDEContributionItemProvider.java
deleted file mode 100644
index ca5f18d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/providers/DiagramIDEContributionItemProvider.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal.providers;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchPage;
-
-import org.eclipse.gmf.runtime.common.ui.action.ide.actions.global.IDEGlobalActionManager;
-import org.eclipse.gmf.runtime.common.ui.action.ide.global.IDEGlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-
-/**
- * The contribution item provider for diagram contributions with IDE
- * dependencies. 
- * 
- * @author Wayne Diu, wdiu
- */
-public class DiagramIDEContributionItemProvider
-	extends AbstractContributionItemProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider#createAction(java.lang.String, org.eclipse.gmf.runtime.common.ui.services.contributionitem.IWorkbenchPartDescriptor)
-	 */
-	protected IAction createAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-
-		IWorkbenchPage workbenchPage = partDescriptor.getPartPage();
-
-		if (actionId.equals(org.eclipse.ui.ide.IDEActionFactory.BOOKMARK
-			.getId()))
-			return IDEGlobalActionManager.getInstance().createActionHandler(
-				workbenchPage, IDEGlobalActionId.BOOKMARK);
-
-		return super.createAction(actionId, partDescriptor);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/providers/DiagramMarkerNavigationProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/providers/DiagramMarkerNavigationProvider.java
deleted file mode 100644
index 987435c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/internal/providers/DiagramMarkerNavigationProvider.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.providers.ide.internal.providers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalViewer;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers.AbstractDiagramMarkerNavigationProvider;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Provider for marker navigation in diagrams
- * 
- * @author Michael Yee, Kevin Cornell
- */
-public class DiagramMarkerNavigationProvider
-    extends AbstractDiagramMarkerNavigationProvider {
-
-    public static final String A_ELEMENT_ID = "elementId"; //$NON-NLS-1$
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.services.marker.AbstractMarkerNavigationProvider#doGotoMarker(org.eclipse.core.resources.IMarker)
-     */
-    protected void doGotoMarker(IMarker marker) {
-        if (getEditor() instanceof IDiagramWorkbenchPart) {
-            List elements = new ArrayList();
-            String elementIds =
-                marker.getAttribute(A_ELEMENT_ID, StringStatics.BLANK);
-            StringTokenizer ids = new StringTokenizer(elementIds);
-            while (ids.hasMoreTokens()) {
-                elements.add(ids.nextToken());
-            }
-            selectInDiagram(elements);
-            return;
-        }
-    }
-
-    /**
-     * This method takes a list of notation element IDs, converts then into
-     * views (IView) defined within the diagram and then selects the
-     * corresponding edit parts. 
-     * <p>
-     * This method assumes the notation elements all reside in the same
-     * diagram and that the editor for that diagram is already open 
-     * (and set via setEditor()).
-     * 
-     * @param notationElementIds - list of notation element IDs in same diagram
-     */
-    private void selectInDiagram(List notationElementIds) {
-        List editParts = findEditParts(convertIdsToViews(notationElementIds));
-        GraphicalViewer viewer = getDiagramEditor().getDiagramGraphicalViewer();
-        viewer.deselectAll();
-        Iterator iter = editParts.iterator();
-        while (iter.hasNext()) {
-            EditPart editPart = (EditPart) iter.next();
-            viewer.appendSelection(editPart);
-            viewer.reveal(editPart);
-        }
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/AbstractDiagramMarkerNavigationProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/AbstractDiagramMarkerNavigationProvider.java
deleted file mode 100644
index 370cff5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/AbstractDiagramMarkerNavigationProvider.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.marker.GotoMarkerOperation;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Abstract Diagram Marker Navigation Provider
- * <p>
- * This class provides utility methods for converting element ID strings
- * into their corresponding edit parts within the diagram.
- * <p>
- * @author Kevin Cornell
- */
-public abstract class AbstractDiagramMarkerNavigationProvider
-    extends AbstractModelMarkerNavigationProvider {
-
-    /**
-     * Get the associated diagram editor (implements IDiagramWorkbenchPart).
-     *
-     * @return the diagram editor
-     */
-    protected final IDiagramWorkbenchPart getDiagramEditor() {
-        if (getEditor() instanceof IDiagramWorkbenchPart) {
-            return (IDiagramWorkbenchPart)getEditor();
-        }
-        return null; // Should not happen because provides() tests the editor.
-    }
-
-    
-    /**
-     * Converts a list of element Id strings into a list of IViews.
-     *
-     * @param  elementIds - a list of element ID strings
-     * @return a list of views corresponding to the ID strings
-     */
-    protected final List convertIdsToViews(List elementIds) {
-    	List result = new ArrayList();
-    	Iterator iter = elementIds.iterator();
-    	Diagram diagramView = getDiagramEditor().getDiagram();
-    	while (iter.hasNext()) {
-    		Object elementId = iter.next();
-    		if (elementId instanceof String && diagramView !=null) {    	
-    			View view; 			    		
-    			
-    			// the Primary views could be nested 
-    			// too deep so we need recursion to get to them    			
-    			List viewList = new ArrayList();
-    			viewList.add(diagramView );
-    			view = recursiveConvertIdToView((String)elementId, viewList );      			    			
-    			
-    			if (view != null) {
-    				result.add(view);
-    			}       			
-    		}    		
-    	}
-    	
-    	return result;
-    }
-    
-    /**
-     * Converts an element Id string into the associated IView.
-     * @param elementId - search the view with the given elemenID
-     * @param viewList - List of views in which to search the view with the given elemenID
-     */
-    private View recursiveConvertIdToView(String elementId, List  viewList) {
-    	
-    	View view = null;
-    	List tmpList = new ArrayList();
-    	Iterator i = viewList.iterator();
-    	while(i.hasNext()){
-    		View tmpView = (View)i.next(); 
-    		view = ViewUtil.getChildByIdStr(tmpView,elementId);				
-    		if(view !=null) return view;	
-    			view = getViewByIdStr(elementId,tmpView.getSourceEdges()); 
-    		if(view !=null) return view;
-    			view = getViewByIdStr(elementId,tmpView.getTargetEdges());
-    		if(view !=null) return view;
-    	    tmpList.addAll(tmpView.getChildren());
-    		if(view !=null) return view;	
-    	}		
-    	
-    	if(tmpList.size() == 0) return null;
-    	
-    	return recursiveConvertIdToView(elementId, tmpList);
-    }
-    
-    /**
-     * @param elementId - search the view with the given elemenID
-     * @param edges - the list of notational edges to search in
-     */
-    private View getViewByIdStr(String elementId, List edges) {		
-    	Iterator iter = edges.iterator();
-    	while( iter.hasNext() ) {
-    		Edge connection = (Edge)iter.next();
-            String id = ((XMLResource)(connection.eResource())).getID(connection); //previously EObjectUtil.getID(connection)
-    		if ( elementId.equals(id)) {
-    			return connection;
-    		}
-    	}
-    	return null;
-    	
-    }
-    
-    
-    
-    /** 
-     * Convert a list of views into a list of associated edit parts.
-     * 
-     * @param elements - list of views (IView) 
-     * @return - list of corresponding edit parts
-     */
-    protected final List findEditParts(List views) {
-    	
-        // Obtain the edit part registry for this diagram.
-        Map editPartRegistry =
-            getDiagramEditor()
-                .getDiagramGraphicalViewer()
-                .getEditPartRegistry();
-
-        // Convert the list of views (IView) into a list of edit parts.
-        List result = new ArrayList();
-        Iterator iterator = views.listIterator();
-        while (iterator.hasNext()) {
-            EditPart part = (EditPart)editPartRegistry.get(iterator.next());
-            if (part != null) {
-                result.add(part);
-            }
-        }
-
-        return result;
-    }
-
-	/** 
-	 * Only accept marker navigation operations for diagram editors.
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GotoMarkerOperation
-			&& ((GotoMarkerOperation)operation).getEditor()
-				instanceof IDiagramWorkbenchPart) {
-			return true;
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/DiagramIDEGlobalActionHandler.java b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/DiagramIDEGlobalActionHandler.java
deleted file mode 100644
index 4553d4e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/DiagramIDEGlobalActionHandler.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers;
-
-import java.util.Iterator;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.ide.global.IDEGlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.resources.AddBookmarkHelper;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The global action handler for diagram global actions with IDE dependencies. 
- * 
- * @author Wayne Diu, wdiu
- */
-public class DiagramIDEGlobalActionHandler
-	extends AbstractGlobalActionHandler {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler#getCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		String actionId = cntxt.getActionId();
-
-		IWorkbenchPart part = cntxt.getActivePart();
-		if (!(part instanceof IDiagramWorkbenchPart)) {
-			return null;
-		}
-
-		IDiagramWorkbenchPart diagramPart = (IDiagramWorkbenchPart) part;
-
-		ICommand command = null;
-
-		if (actionId.equals(IDEGlobalActionId.BOOKMARK)) {
-			AddBookmarkHelper.addBookmark(diagramPart);
-		}
-
-		return command;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractGlobalActionHandler#canHandle(IGlobalActionContext)
-	 */
-	public boolean canHandle(final IGlobalActionContext cntxt) {
-
-		boolean result = false;
-
-		String actionId = cntxt.getActionId();
-
-		if (actionId.equals(IDEGlobalActionId.BOOKMARK)) {
-			result = canBookmark(cntxt);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Checks if the selection can be bookmarked
-	 * @param cntxt the <code>IGlobalActionContext</code> holding the necessary information needed by this action handler
-	 * @return boolean <code>true</code> if the selection can be bookmarked,
-	 *         otherwise <code>false</code>
-	 */
-	private boolean canBookmark(IGlobalActionContext cntxt) {
-		// Check if the active part is a IDiagramEditorPart
-		if (!(cntxt.getActivePart() instanceof IDiagramWorkbenchPart)) {
-			return false;
-		}
-
-		// Check each selected object
-		IStructuredSelection selected = (IStructuredSelection) cntxt
-			.getSelection();
-		for (Iterator i = selected.toList().iterator(); i.hasNext();) {
-			Object selectedElement = i.next();
-			if (!(selectedElement instanceof EditPart)) {
-				return false;
-			}
-
-			// Check that primary view (i.e. shape view or connection view) is
-			// selected
-			View view = (View) ((EditPart) selectedElement)
-			.getAdapter(View.class);
-			if (!((EditPart) selectedElement instanceof IPrimaryEditPart) || view == null
-					||view.eResource()==null) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/DiagramIDEGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/DiagramIDEGlobalActionHandlerProvider.java
deleted file mode 100644
index bdb5e61..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/DiagramIDEGlobalActionHandlerProvider.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers;
-
-import java.util.Hashtable;
-
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext;
-
-/**
- * The provider for the DiagramIDEGlobalActionHandler. 
- * 
- * @author Wayne Diu, wdiu
- */
-public final class DiagramIDEGlobalActionHandlerProvider
-	extends AbstractGlobalActionHandlerProvider {
-
-	/**
-	 * List that contains all the IGlobalActionHandlers mapped to the
-	 * IWorkbenchParts
-	 */
-	private Hashtable handlerList = new Hashtable();
-
-	/**
-	 * Constructor for DiagramGlobalActionHandlerProvider.
-	 */
-	public DiagramIDEGlobalActionHandlerProvider() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.filter.global.IGlobalActionHandlerProvider#getGlobalActionHandler(IGlobalActionHandlerContext)
-	 */
-	public IGlobalActionHandler getGlobalActionHandler(
-			final IGlobalActionHandlerContext context) {
-		/* create the handler */
-		if (!getHandlerList().containsKey(context.getActivePart())) {
-			getHandlerList().put(context.getActivePart(),
-				new DiagramIDEGlobalActionHandler());
-			/*
-			 * register as a part listener so that the cache can be cleared when
-			 * the part is disposed
-			 */
-			context.getActivePart().getSite().getPage().addPartListener(
-				new IPartListener() {
-
-					private IWorkbenchPart localPart = context.getActivePart();
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart)
-					 */
-					public void partActivated(IWorkbenchPart part) {
-						// NULL implementation
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart)
-					 */
-					public void partBroughtToTop(IWorkbenchPart part) {
-						// NULL implementation
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart)
-					 */
-					public void partClosed(IWorkbenchPart part) {
-						/* remove the cache associated with the part */
-						if (part != null && part == localPart
-							&& getHandlerList().containsKey(part)) {
-							getHandlerList().remove(part);
-							localPart.getSite().getPage().removePartListener(
-								this);
-							localPart = null;
-						}
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart)
-					 */
-					public void partDeactivated(IWorkbenchPart part) {
-						// NULL implementation
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart)
-					 */
-					public void partOpened(IWorkbenchPart part) {
-						// NULL implementation
-					}
-				});
-		}
-		return (DiagramIDEGlobalActionHandler) getHandlerList().get(
-			context.getActivePart());
-	}
-
-	/**
-	 * Returns the handlerList.
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getHandlerList() {
-		return handlerList;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/package.html b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/package.html
deleted file mode 100644
index f05156d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/src/org/eclipse/gmf/runtime/diagram/ui/providers/ide/providers/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>This package contains a contribution item provider and a global action
-handler and provider for diagram IDE Global Actions.</p>
-
-<p>Specifically, the bookmark action contains IDE dependencies and is
-handled by this plugin.</P>
-
-@canBeSeenBy %partners
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/.classpath b/org.eclipse.gmf.runtime.diagram.ui.render/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.render/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.render/.cvsignore
deleted file mode 100644
index c64fc1c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/.project b/org.eclipse.gmf.runtime.diagram.ui.render/.project
deleted file mode 100644
index d3c7c35..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.render</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/org.eclipse.gmf.runtime.diagram.ui.render/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.render/META-INF/MANIFEST.MF
deleted file mode 100644
index a1b98d7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.render; singleton:=true
-Bundle-Version: 1.0.3.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.render.actions,
- org.eclipse.gmf.runtime.diagram.ui.render.clipboard,
- org.eclipse.gmf.runtime.diagram.ui.render.editparts,
- org.eclipse.gmf.runtime.diagram.ui.render.internal;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.render.internal.clipboard;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.render.internal.commands;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.render.internal.dialogs;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.render.internal.editparts;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui",
- org.eclipse.gmf.runtime.diagram.ui.render.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.render.internal.providers;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.render.providers,
- org.eclipse.gmf.runtime.diagram.ui.render.util
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/about.html b/org.eclipse.gmf.runtime.diagram.ui.render/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/build.properties b/org.eclipse.gmf.runtime.diagram.ui.render/build.properties
deleted file mode 100644
index 3b5754f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.render/plugin.properties
deleted file mode 100644
index 90dd153..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/plugin.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram UI Render Plug-In
-Plugin.providerName = Eclipse.org
-
-EditPartProvider.name = Diagram UI Render EditPart Provider
-ContributionItemProvider.name = Diagram UI Render Contribution Item Provider
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui.render/plugin.xml
deleted file mode 100644
index 6ab578f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/plugin.xml
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension
-         id="diagramUIRenderEditPartProvider"
-         name="%EditPartProvider.name"
-         point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.render.internal.providers.DiagramUIRenderEditPartProvider">
-         <Priority
-               name="Low">
-         </Priority>
-         <context providesRootEditPart="true"/>
-      </editpartProvider>
-   </extension>
-   
-   <extension id="DiagramUIRenderContributionItemProvider" name="%ContributionItemProvider.name" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider class="org.eclipse.gmf.runtime.diagram.ui.render.internal.providers.DiagramUIRenderContributionItemProvider">
-         <Priority name="Low">
-         </Priority>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart"/>
-            <popupAction path="/fileMenu/saveGroup" id="CopyToImageAction">
-            </popupAction>
-         </popupContribution>
-      </contributionItemProvider>
-   </extension>
-</plugin>

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/actions/ActionIds.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/actions/ActionIds.java
deleted file mode 100644
index 933e844..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/actions/ActionIds.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.actions;
-
-/**
- * A list of constants defining the diagram UI render action and menu action
- * ids.
- * <p>
- * This interface defines constants only, it is <EM>not</EM> intended to be
- * implemented by clients.
- * </p>
- * 
- * @author cmahoney
- */
-public interface ActionIds {
-
-	public static final String ACTION_COPY_TO_IMAGE = "CopyToImageAction"; //$NON-NLS-1$
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/actions/CopyToImageAction.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/actions/CopyToImageAction.java
deleted file mode 100644
index 90d823b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/actions/CopyToImageAction.java
+++ /dev/null

@@ -1,368 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.dialogs.CopyToImageDialog;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.l10n.DiagramUIRenderMessages;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Action to copy the selected shapes in the diagram or the entire diagram to an
- * image file.
- * 
- * @author Anthony Hunter, cmahoney
- */
-public class CopyToImageAction
-	extends DiagramAction {
-
-	/**
-	 * the copy diagram to image file dialog used by the action.
-	 */
-	private CopyToImageDialog dialog = null;
-
-	/**
-	 * Constructor for CopyToImageAction.
-	 * 
-	 * @param page
-	 *            the page of the workbench for the action
-	 */
-	public CopyToImageAction(IWorkbenchPage page) {
-		super(page);
-	}
-
-	/**
-	 * Initialize with the correct text label, action id, and images.
-	 */
-	public void init() {
-		super.init();
-
-		/* set the label for the action */
-		setText(DiagramUIRenderMessages.CopyToImageAction_Label);
-
-		/* set the id */
-		setId(ActionIds.ACTION_COPY_TO_IMAGE);
-
-		/* set the image */
-		ISharedImages sharedImages = PlatformUI.getWorkbench()
-			.getSharedImages();
-		setImageDescriptor(sharedImages
-			.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		setHoverImageDescriptor(sharedImages
-			.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		setDisabledImageDescriptor(sharedImages
-			.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED));
-	}
-
-	public void run() {
-		IPath path = null;
-		String fileName = null;
-
-		if (getWorkbenchPart() instanceof IEditorPart) {
-			IEditorPart editor = (IEditorPart) getWorkbenchPart();
-
-			// The editor's input may provide us with an IContainer where
-			// we should store items related to it.
-			IContainer container = (IContainer) editor.getEditorInput()
-				.getAdapter(IContainer.class);
-
-			// If there is a container in the workspace and it exists then
-			// we will use its path to store the image.
-			if (container != null && container.exists()) {
-				// The path has to be an absolute filesystem path for this
-				// use case rather than just the path relative to the workspace
-				// root.
-				path = container.getLocation();
-			}
-
-			// Otherwise, we will try to adapt the input to the IFile that
-			// represents the place where the editor's input file resides.
-			// We can extrapolate a destination path from this file.
-			if (path == null) {
-				IFile file = (IFile) editor.getEditorInput().getAdapter(
-					IFile.class);
-
-				// We can't necessarily assume that the editor input is a file.
-				if (file != null) {
-					path = file.getLocation().removeLastSegments(1);
-					fileName = file.getLocation().removeFileExtension()
-						.lastSegment();
-				}
-			}
-		}
-
-		dialog = new CopyToImageDialog(Display.getCurrent().getActiveShell(),
-			path, fileName);
-		if (dialog.open() == CopyToImageDialog.CANCEL) {
-			return;
-		}
-
-		if (!overwriteExisting()) {
-			return;
-		}
-
-		Trace
-			.trace(
-				DiagramUIRenderPlugin.getInstance(),
-				"Copy Diagram to " + dialog.getDestination().toOSString() + " as " + dialog.getImageFormat().toString()); //$NON-NLS-1$ //$NON-NLS-2$
-
-		final MultiStatus status = new MultiStatus(DiagramUIRenderPlugin
-			.getPluginId(), DiagramUIRenderStatusCodes.OK,
-			DiagramUIRenderMessages.CopyToImageAction_Label, null);
-
-		IRunnableWithProgress runnable = createRunnable(status);
-
-		ProgressMonitorDialog progressMonitorDialog = new ProgressMonitorDialog(
-			Display.getCurrent().getActiveShell());
-		try {
-			progressMonitorDialog.run(false, true, runnable);
-		} catch (InvocationTargetException e) {
-			Log.warning(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderStatusCodes.IGNORED_EXCEPTION_WARNING, e
-					.getTargetException().getMessage(), e.getTargetException());
-
-			if (e.getTargetException() instanceof OutOfMemoryError) {
-				openErrorDialog(DiagramUIRenderMessages.CopyToImageAction_outOfMemoryMessage);
-			} else if (e.getTargetException() instanceof SWTError) {
-				/**
-				 * SWT returns an out of handles error when processing large
-				 * diagrams
-				 */
-				openErrorDialog(DiagramUIRenderMessages.CopyToImageAction_outOfMemoryMessage);
-			} else {
-				openErrorDialog(e.getTargetException().getMessage());
-			}
-			return;
-		} catch (InterruptedException e) {
-			/* the user pressed cancel */
-			Log.warning(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderStatusCodes.IGNORED_EXCEPTION_WARNING, e
-					.getMessage(), e);
-		}
-
-		if (!status.isOK()) {
-			openErrorDialog(status.getChildren()[0].getMessage());
-		}
-	}
-
-	/**
-	 * copy the selected shapes in the diagram to an image file.
-	 * 
-	 * @param diagramEditPart
-	 *            the diagram editor
-	 * @param list
-	 *            list of selected shapes in the diagram
-	 * @param destination
-	 *            path to the new image file
-	 * @param imageFormat
-	 *            image format to create
-	 * @return the runnable with a progress monitor
-	 */
-	private IRunnableWithProgress createRunnable(final MultiStatus status) {
-		return new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) {
-				try {
-					List editparts = getOperationSet();
-
-					if (editparts.size() == 1
-						&& editparts.get(0) instanceof DiagramEditPart) {
-						monitor.beginTask("", 6); //$NON-NLS-1$
-						monitor.worked(1);
-						monitor
-							.setTaskName(NLS
-								.bind(
-									DiagramUIRenderMessages.CopyToImageAction_copyingDiagramToImageFileMessage,
-									dialog.getDestination().toOSString()));
-						new CopyToImageUtil().copyToImage(
-							(DiagramEditPart) editparts.get(0), dialog
-								.getDestination(), dialog.getImageFormat(),
-							monitor);
-					} else {
-						monitor.beginTask("", 6); //$NON-NLS-1$
-						monitor.worked(1);
-						monitor
-							.setTaskName(NLS
-								.bind(
-									DiagramUIRenderMessages.CopyToImageAction_copyingSelectedElementsToImageFileMessage,
-									dialog.getDestination().toOSString()));
-						new CopyToImageUtil().copyToImage(getDiagramEditPart(),
-							editparts, dialog.getDestination(), dialog
-								.getImageFormat(), monitor);
-					}
-				} catch (CoreException e) {
-					Log.warning(DiagramUIRenderPlugin.getInstance(),
-						DiagramUIRenderStatusCodes.IGNORED_EXCEPTION_WARNING, e
-							.getMessage(), e);
-					status.add(e.getStatus());
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-	}
-
-	protected boolean calculateEnabled() {
-		return !getOperationSet().isEmpty();
-	}
-
-	/**
-	 * display an error dialog
-	 * 
-	 * @param message
-	 *            cause of the error
-	 */
-	private void openErrorDialog(String message) {
-		MessageDialog
-			.openError(
-				Display.getCurrent().getActiveShell(),
-				DiagramUIRenderMessages.CopyToImageAction_copyToImageErrorDialogTitle,
-				NLS
-					.bind(
-						DiagramUIRenderMessages.CopyToImageAction_copyToImageErrorDialogMessage,
-						message));
-	}
-
-	/**
-	 * Warn the user with a question dialog if an existing file is going to be
-	 * overwritten and the user has not selected overwrite existing.
-	 * 
-	 * @return true of it is ok to continue with the copy to image.
-	 */
-	private boolean overwriteExisting() {
-		if (dialog.overwriteExisting()) {
-			/**
-			 * the user has selected to overwrite existing
-			 */
-			return true;
-		}
-
-		if (!dialog.getDestination().toFile().exists()) {
-			/**
-			 * the file does not already exist
-			 */
-			return true;
-		}
-
-		/**
-		 * ask the user to confirm to overwrite existing file.
-		 */
-		return MessageDialog
-			.openQuestion(
-				Display.getCurrent().getActiveShell(),
-				DiagramUIRenderMessages.CopyToImageAction_overwriteExistingConfirmDialogTitle,
-				NLS
-					.bind(
-						DiagramUIRenderMessages.CopyToImageAction_overwriteExistingConfirmDialogMessage,
-						dialog.getDestination().toOSString()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createOperationSet()
-	 */
-	protected List createOperationSet() {
-		List selection = getSelectedObjects();
-
-		if (selection.size() == 1) {
-			Object editpart = selection.get(0);
-			if (editpart instanceof DiagramEditPart) {
-				return selection;
-			}
-			if (editpart instanceof ISurfaceEditPart) {
-				selection = ((ISurfaceEditPart) editpart).getPrimaryEditParts();
-			}
-		}
-
-		// must contain at least one shape
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object editpart = iter.next();
-			if (editpart instanceof ShapeEditPart) {
-				return selection;
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/**
-	 * This action is not really a <code>DiagramAction</code> as it doesn't
-	 * have a request. The doRun() and calculatedEnabled() have been overwritten
-	 * appropriately.
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	protected void doRun(IProgressMonitor progressMonitor) {
-		try {
-			// whatever we are copying belongs to the same editing domain as
-			// the Diagram
-			getDiagramEditPart().getEditingDomain().runExclusive(
-				new Runnable() {
-
-					public void run() {
-						CopyToImageAction.this.run();
-					}
-				});
-		} catch (Exception e) {
-			Trace.catching(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"doRun()", //$NON-NLS-1$
-				e);
-		}
-	}
-
-	/**
-	 * Subclasses may override to specialize the rendering to an image file.
-	 * 
-	 * @return the <code>CopyToImageUtil</code> class to be used.
-	 */
-	protected CopyToImageUtil getCopyToImageUtil() {
-		return new CopyToImageUtil();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/AWTClipboardHelper.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/AWTClipboardHelper.java
deleted file mode 100644
index 6c52b45..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/AWTClipboardHelper.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.clipboard;
-
-import java.awt.Image;
-import java.awt.Toolkit;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.util.CustomData;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.clipboard.AWTViewImageTransferable;
-
-/**
- * Used for image transfer to the clipboard. This is only supported when on
- * Windows systems.
- * <p>
- * SWT does not currently support image transfer to the Clipboard. This utility
- * class is provided in order to transfer an SWT Image to the system clipboard
- * using AWT image transfer APIs.
- * </p>
- */
-public class AWTClipboardHelper {
-
-	/**
-	 * Are we running on Windows?
-	 */
-	private static final boolean IMAGE_COPY_SUPPORTED = System.getProperty(
-		"os.name").toUpperCase().startsWith("WIN"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	static private AWTClipboardHelper INSTANCE = new AWTClipboardHelper();
-
-	/**
-	 * Retrieves the singleton instance of <code>AWTClipboardHelper</code>.
-	 * 
-	 * @return the singleton instance of <code>AWTClipboardHelper</code>
-	 */
-	public static AWTClipboardHelper getInstance() {
-		return INSTANCE;
-	}
-
-	private java.awt.datatransfer.Clipboard awtClipboard;
-	
-	private AWTClipboardHelper() {
-		if (isImageCopySupported())
-			awtClipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-	}
-
-	/**
-	 * Return true if image copy is supported, that is, when running under Windows.
-	 * 
-	 * Workaround for RATLC00526604, ClipboardHelper's hasCustomData invoking
-	 * SunClipboard's getContents which waits indefinitely
-	 * 
-	 * @return true when running under Windows 
-	 */
-	final public boolean isImageCopySupported() {
-		return IMAGE_COPY_SUPPORTED;
-	}
-
-	/**
-	 * Query method to determine if a <code>CustomData</code> object is on the
-	 * clipboard.
-	 * 
-	 * @return true if CustomData is on the clipboard, false otherwise.
-	 */
-	public boolean hasCustomData() {
-		assert (isImageCopySupported());
-		Transferable transferable = getClipboard().getContents(null);
-		if (transferable != null) {
-			DataFlavor[] dataFlavors = transferable.getTransferDataFlavors();
-			for (int i = 0; i < dataFlavors.length; i++) {
-				if (dataFlavors[i]
-					.equals(AWTViewImageTransferable.AWTCUSTOMDATAFLAVOR))
-					return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Accessor method to retrieve the <code>CustomData</code> object from the clipboard.
-	 * 
-	 * @return the <code>CustomData</code> if it exists on the clipboard, null otherwise.
-	 */
-	public CustomData getCustomData() {
-		assert (isImageCopySupported());
-		Transferable transferable = getClipboard().getContents(null);
-		if (transferable == null)
-			return null;
-
-		if (!hasCustomData())
-			return null;
-
-		CustomData data = null;
-
-		try {
-			data = (CustomData) transferable
-				.getTransferData(AWTViewImageTransferable.AWTCUSTOMDATAFLAVOR);
-		} catch (UnsupportedFlavorException e) {
-			Trace.catching(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderDebugOptions.EXCEPTIONS_CATCHING,
-				AWTClipboardHelper.class, "getCustomData", e); //$NON-NLS-1$
-		} catch (IOException e) {
-			Trace.catching(DiagramUIRenderPlugin.getInstance(),
-                DiagramUIRenderDebugOptions.EXCEPTIONS_CATCHING,
-				AWTClipboardHelper.class, "getCustomData", e); //$NON-NLS-1$
-		}
-
-		return data;
-	}
-
-	/**
-	 * Copies an image to the system clipboard. Creates an AWT BufferedImage
-	 * from the SWT Image and transfers the bufferedImage to the system
-	 * clipboard.
-	 * 
-	 * @param data
-	 *            the custom data
-	 * @param image
-	 *            the image to be copied
-	 */
-	public void copyToClipboard(CustomData data, Image image) {
-		assert (isImageCopySupported());
-		getClipboard().setContents(new AWTViewImageTransferable(data, image),
-			null);
-	}
-
-	/**
-	 * @return Returns the clipboard.
-	 */
-	private java.awt.datatransfer.Clipboard getClipboard() {
-		return awtClipboard;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java
deleted file mode 100644
index f364f9b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java
+++ /dev/null

@@ -1,799 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.clipboard;
-
-import java.awt.Image;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.geometry.Translatable;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.AbstractEditPart;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.image.PartPositionInfo;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.IExpandableFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.decorator.Decoration;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg.Sign;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-
-/**
- * Provides the framework to generate SWT and AWT images of a diagram or a
- * subset of editparts on a diagram.
- * 
- * @author sshaw
- * @author Barys Dubauski
- */
-abstract public class DiagramGenerator {
-
-	private int image_margin = 0;
-
-	private DiagramEditPart _dgrmEP;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param dgrmEP
-	 *            the diagram editpart
-	 */
-	public DiagramGenerator(DiagramEditPart dgrmEP) {
-		this._dgrmEP = dgrmEP;
-		image_margin = getMapMode().DPtoLP(10);
-	}
-
-	/**
-	 * @return DiagramEditPart
-	 */
-	protected DiagramEditPart getDiagramEditPart() {
-		return this._dgrmEP;
-	}
-
-	/**
-	 * Allows hook for the creation of a <code>Graphics</code> object that is
-	 * used for the rendering of the diagram.
-	 * 
-	 * @param width
-	 *            of the clipping area
-	 * @param height
-	 *            of the clipping area
-	 * @return Graphics element that is the target for rendering.
-	 */
-	abstract protected Graphics setUpGraphics(int width, int height);
-
-	/**
-	 * Allows hook to dispose of any artifacts around the creation of the
-	 * <code>Graphics</code> object used for rendering.
-	 * 
-	 * @param g
-	 *            Graphics element that is to be disposed.
-	 */
-	protected void disposeGraphics(Graphics g) {
-		g.dispose();
-	}
-
-	/**
-	 * Creates an image descriptor representing the image rendered from the
-	 * diagram.
-	 * 
-	 * @param g
-	 *            Graphics object where information to form the image descriptor
-	 *            can be retrieved from.
-	 * @return ImageDescriptor representing the image rendered from the diagram.
-	 */
-	abstract protected ImageDescriptor getImageDescriptor(Graphics g);
-
-	/**
-	 * Creates an AWT image for the contents of the diagram editpart.
-	 * 
-	 * @return an image in AWT format
-	 */
-	final public Image createAWTImageForDiagram() {
-		List editparts = getDiagramEditPart().getPrimaryEditParts();
-
-		return createAWTImageForParts(editparts);
-	}
-
-	/**
-	 * Creates an AWT image for the list of editparts passed in.
-	 * 
-	 * @param editparts
-	 *            the list of <code>IGraphicalEditParts</code> that will be
-	 *            rendered to the Image
-	 * @return an image in AWT format
-	 */
-	abstract public Image createAWTImageForParts(List editparts);
-
-	/**
-	 * Creates an SWT image descriptor for the contents of the diagram editpart.
-	 * 
-	 * @return an image descriptor for an SWT image
-	 */
-	final public ImageDescriptor createSWTImageDescriptorForDiagram() {
-		List editparts = getDiagramEditPart().getPrimaryEditParts();
-
-		return createSWTImageDescriptorForParts(editparts);
-	}
-
-	/**
-	 * Creates an SWT image descriptor for the list of editparts passed in.Any
-	 * connections where both the source and target editparts are passed in are
-	 * also drawn.
-	 * 
-	 * @param editparts
-	 *            the list of <code>IGraphicalEditParts</code> that will be
-	 *            rendered to the Image
-	 * @return an image descriptor for an SWT image
-	 */
-	final public ImageDescriptor createSWTImageDescriptorForParts(List editparts) {
-		org.eclipse.swt.graphics.Rectangle sourceRect = calculateImageRectangle(editparts);
-
-		// initialize imageDesc to the error icon
-		ImageDescriptor imageDesc = new ImageDescriptor() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.resource.ImageDescriptor#getImageData()
-			 */
-			public ImageData getImageData() {
-				return SharedImages.get(
-					SharedImages.IMG_ERROR).getImageData();
-			}
-		};
-
-		Graphics graphics = null;
-		try {
-			IMapMode mm = getMapMode();
-			
-			// Create the graphics and wrap it with the HiMetric graphics object
-			graphics = setUpGraphics(mm.LPtoDP(sourceRect.width), mm
-				.LPtoDP(sourceRect.height));
-
-			RenderedMapModeGraphics mapModeGraphics = new RenderedMapModeGraphics(
-				graphics, getMapMode());
-
-			renderToGraphics(mapModeGraphics, new Point(sourceRect.x, sourceRect.y), editparts);
-			imageDesc = getImageDescriptor(graphics);
-		} catch (Error e) {
-			// log the Error but allow execution to continue
-			Trace.catching(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-				"createSWTImageDescriptorForParts() failed to generate image", //$NON-NLS-1$
-				e);
-
-		} catch (Exception ex) {
-			// log the Exception but allow execution to continue
-			Trace.catching(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-				"createSWTImageDescriptorForParts() failed to generate image", //$NON-NLS-1$
-				ex);
-		}
-
-		if (graphics != null)
-			disposeGraphics(graphics);
-
-		return imageDesc;
-	}
-
-	/**
-	 * @return
-	 */
-	protected IMapMode getMapMode() {
-		IMapMode mm = MapModeUtil.getMapMode(getDiagramEditPart().getFigure());
-		return mm;
-	}
-
-	/**
-	 * Renders the list of editparts to the graphics object. Any connections
-	 * where both the source and target editparts are passed in are also drawn.
-	 * 
-	 * @param graphics
-	 *            the graphics object on which to draw
-	 * @param translateOffset 
-	 * 			  a <code>Point</code> that the value the <code>graphics</code> object
-	 * 		   	  will be translated by in relative coordinates.
-	 * @param editparts
-	 *            the list of <code>IGraphicalEditParts</code> that will be
-	 *            rendered to the graphics object
-	 */
-	final protected void renderToGraphics(Graphics graphics,
-			Point translateOffset, List editparts) {
-
-		List sortedEditparts = sortSelection(editparts);
-
-		graphics.translate((-translateOffset.x), (-translateOffset.y));
-		graphics.pushState();
-
-		ArrayList connectionsToPaint = new ArrayList();
-
-		Map decorations = findDecorations(editparts);
-
-		for (int i = 0; i < editparts.size(); i++) {
-			IGraphicalEditPart editPart = (IGraphicalEditPart) sortedEditparts
-				.get(i);
-
-			// do not paint selected connection part
-			if (editPart instanceof ConnectionNodeEditPart) {
-				connectionsToPaint.add(editPart);
-			} else {
-				List editParts = new ArrayList();
-
-				// Get the list of edit parts
-				getNestedEditParts(editPart, editParts);
-
-				// Find the connections to be painted
-				findConnectionsToPaint(editParts, connectionsToPaint);
-
-				// paint shape figure
-				IFigure figure = editPart.getFigure();
-				paintFigure(graphics, figure);
-
-				paintDecorations(graphics, figure, decorations);
-			}
-		}
-
-		// paint the connection parts after shape parts paint
-		decorations = findDecorations(connectionsToPaint);
-
-		for (int i = 0; i < connectionsToPaint.size(); i++) {
-			IGraphicalEditPart editPart = (IGraphicalEditPart) connectionsToPaint
-				.get(i);
-			IFigure figure = editPart.getFigure();
-			paintFigure(graphics, figure);
-
-			paintDecorations(graphics, figure, decorations);
-		}
-	}
-
-	/**
-	 * This method is used when a figure needs to be painted to the graphics.
-	 * The figure will be translated based on its absolute positioning.
-	 * 
-	 * @param graphics
-	 *            Graphics object to render figure
-	 * @param figure
-	 *            the figure to be rendered
-	 */
-	private void paintFigure(Graphics graphics, IFigure figure) {
-
-		if (!figure.isVisible())
-			return;
-
-		// Calculate the Relative bounds and absolute bounds
-		Rectangle relBounds = null;
-        if (figure instanceof IExpandableFigure)
-            relBounds = ((IExpandableFigure)figure).getExtendedBounds().getCopy();
-        else
-            relBounds = figure.getBounds().getCopy();
-        
-		Rectangle abBounds = relBounds.getCopy();
-		translateToPrintableLayer(figure, abBounds);
-
-		// Calculate the difference
-		int transX = abBounds.x - relBounds.x;
-		int transY = abBounds.y - relBounds.y;
-
-		// Paint the figure
-		graphics.pushState();
-		graphics.translate(transX, transY);
-		figure.paint(graphics);
-		graphics.popState();
-		graphics.restoreState();
-	}
-
-	/**
-	 * Find the decorations that adorn the specified <code>editParts</code>.
-	 * 
-	 * @param editparts
-	 *            the list of <code>IGraphicalEditParts</code> for which to
-	 *            find decorations
-	 * @return a mapping of {@link IFigure}to ({@link Decoration}or
-	 *         {@link Collection}of decorations})
-	 */
-	private Map findDecorations(List editparts) {
-		// create inverse mapping of figures to edit parts (need this to map
-		// decorations to edit parts)
-		Map figureMap = mapFiguresToEditParts(editparts);
-
-		Map result = new java.util.HashMap();
-
-		if (!editparts.isEmpty()) {
-			IGraphicalEditPart first = (IGraphicalEditPart) editparts.get(0);
-
-			IFigure decorationLayer = LayerManager.Helper.find(first).getLayer(
-				DiagramRootEditPart.DECORATION_PRINTABLE_LAYER);
-
-			if (decorationLayer != null) {
-				// compute the figures of the shapes
-				List figures = new java.util.ArrayList(editparts);
-				for (ListIterator iter = figures.listIterator(); iter.hasNext();) {
-					iter.set(((IGraphicalEditPart) iter.next()).getFigure());
-				}
-
-				// find the decorations on figures that were selected
-				for (Iterator iter = decorationLayer.getChildren().iterator(); iter
-					.hasNext();) {
-					Object next = iter.next();
-
-					if (next instanceof Decoration) {
-						Decoration decoration = (Decoration) next;
-						IFigure owner = decoration.getOwnerFigure();
-
-						if (figureMap.containsKey(owner)) {
-							Object existing = result.get(owner);
-
-							if (existing == null) {
-								result.put(owner, decoration);
-							} else if (existing instanceof Collection) {
-								((Collection) existing).add(decoration);
-							} else {
-								Collection c = new java.util.ArrayList(2);
-								c.add(existing);
-								c.add(decoration);
-								result.put(owner, c);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Constructs a mapping of figures to their corresponding edit parts.
-	 * 
-	 * @param editParts
-	 *            a collection of <code>IGraphicalEditParts</code>
-	 * @return a mapping of {@link IFigure}to {@link IGraphicalEditPart}
-	 */
-	private Map mapFiguresToEditParts(Collection editParts) {
-		Map result = new java.util.HashMap();
-
-		for (Iterator iter = editParts.iterator(); iter.hasNext();) {
-			IGraphicalEditPart next = (IGraphicalEditPart) iter.next();
-
-			result.put(next.getFigure(), next);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Paints the decorations adorning the specified <code>figure</code>, if
-	 * any.
-	 * 
-	 * @param graphics
-	 *            the graphics to paint on
-	 * @param figure
-	 *            the figure
-	 * @param decorations
-	 *            mapping of figures to decorations, in which we will find the
-	 *            <code>figure</code>'s decorations
-	 */
-	private void paintDecorations(Graphics graphics, IFigure figure,
-			Map decorations) {
-		Object decoration = decorations.get(figure);
-
-		if (decoration != null) {
-			if (decoration instanceof Collection) {
-				for (Iterator iter = ((Collection) decoration).iterator(); iter
-					.hasNext();) {
-					paintFigure(graphics, (IFigure) iter.next());
-				}
-			} else {
-				paintFigure(graphics, (IFigure) decoration);
-			}
-		}
-	}
-
-	/**
-	 * This is a recursive method that search a tree of edit parts looking for
-	 * edit parts contained in the open list. If the edit part is found it is
-	 * removed from the open list and placed in the closed list.
-	 * 
-	 * @param editPart
-	 * @param open
-	 * @param closed
-	 */
-	private void sortSelection(GraphicalEditPart editPart, List open,
-			List closed) {
-
-		// Do nothing if the open list is empty
-		if (open.isEmpty()) {
-			return;
-		}
-
-		// IF the edit part is contained in the open list (we are searching for
-		// it)
-		if (open.contains(editPart)) {
-			// Add the Edit Part to the closed list and remove it from
-			// the open list
-			closed.add(editPart);
-			open.remove(editPart);
-		}
-
-		for (Iterator iter = editPart.getChildren().iterator(); iter.hasNext();) {
-			GraphicalEditPart child = (GraphicalEditPart) iter.next();
-			sortSelection(child, open, closed);
-		}
-	}
-
-	private List sortSelection(List toSort) {
-		List closed = new ArrayList(toSort.size());
-		List open = new ArrayList(toSort.size());
-		open.addAll(toSort);
-
-		sortSelection(getDiagramEditPart(), open, closed);
-		if (!open.isEmpty()) {
-			closed.addAll(open);
-		}
-
-		return closed;
-	}
-
-	/**
-	 * This method is used to obtain the list of child edit parts for shape
-	 * compartments.
-	 * 
-	 * @param childEditPart
-	 *            base edit part to get the list of children editparts
-	 * @param editParts
-	 *            list of nested shape edit parts
-	 */
-	private void getNestedEditParts(IGraphicalEditPart childEditPart,
-			List editParts) {
-
-		for (Iterator iter = childEditPart.getChildren().iterator(); iter
-			.hasNext();) {
-
-			IGraphicalEditPart child = (IGraphicalEditPart) iter.next();
-			editParts.add(child);
-			getNestedEditParts(child, editParts);
-		}
-	}
-
-	/**
-	 * Given a selection of editParts determine which source connections have
-	 * both the source and target selected.
-	 * 
-	 * @param editParts
-	 * @param connectionsToPaint
-	 *            the edit parts for connections will be appended to this list
-	 */
-	private void findConnectionsToPaint(List editParts, List connectionsToPaint) {
-
-		EditPartViewer viewer = getDiagramEditPart().getRoot().getViewer();
-
-		// For each edit part
-		for (Iterator iter = editParts.iterator(); iter.hasNext();) {
-			IGraphicalEditPart element = (IGraphicalEditPart) iter.next();
-
-			// Get its view
-			View view = (View) element.getModel();
-
-			// If the view is a shape view...
-			if (element instanceof ShapeEditPart) {
-				// Get its connections source
-				List sourceConnections = view.getSourceEdges();
-
-				// For each source connection...
-				for (int i = 0; i < sourceConnections.size(); i++) {
-					Edge edge = (Edge) sourceConnections.get(i);
-
-					// Get the connections target
-					View toView = (edge).getTarget();
-
-					AbstractEditPart toEditPart = (AbstractEditPart) viewer
-						.getEditPartRegistry().get(toView);
-
-					if (editParts.contains(toEditPart)) {
-
-						ConnectionNodeEditPart connectionEditPart = (ConnectionNodeEditPart) viewer
-							.getEditPartRegistry().get(edge);
-
-						connectionsToPaint.add(connectionEditPart);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Determine the minimal rectangle required to bound the list of editparts.
-	 * A margin is used around each of the editpart's figures when calculating
-	 * the size.
-	 * 
-	 * @param editparts
-	 *            the list of <code>IGraphicalEditParts</code> from which
-	 *            their figure bounds will be used
-	 * @return Rectangle the minimal rectangle that can bound the figures of the
-	 *         list of editparts
-	 */
-	protected org.eclipse.swt.graphics.Rectangle calculateImageRectangle(
-			List editparts) {
-		int minX = 0;
-		int maxX = 0;
-		int minY = 0;
-		int maxY = 0;
-
-		IMapMode mm = getMapMode();
-		
-		for (int i = 0; i < (editparts.size()); i++) {
-			IGraphicalEditPart editPart = (IGraphicalEditPart) editparts.get(i);
-
-			IFigure figure = editPart.getFigure();
-			Rectangle bounds = null;
-            if (figure instanceof IExpandableFigure)
-                bounds = ((IExpandableFigure)figure).getExtendedBounds();
-            else
-                bounds = figure.getBounds().getCopy();
-			translateToPrintableLayer(figure, bounds);
-			bounds = bounds.getExpanded(getImageMargin(), getImageMargin());
-
-			if (i == 0) {
-				minX = bounds.x;
-				maxX = bounds.x + bounds.width;
-				minY = bounds.y;
-				maxY = bounds.y + bounds.height;
-			} else {
-				minX = Math.min(minX, bounds.x);
-				maxX = Math.max(maxX, (bounds.x + bounds.width));
-				minY = Math.min(minY, bounds.y);
-				maxY = Math.max(maxY, (bounds.y + bounds.height));
-			}
-		}
-
-		int width = (maxX - minX);
-		int height = (maxY - minY);
-		if (width <= 0) {
-			width = mm.DPtoLP(100);
-		}
-
-		if (height <= 0) {
-			height = mm.DPtoLP(100); // create an empty image if the
-			// diagram does not contain child
-		}
-		org.eclipse.swt.graphics.Rectangle imageRect = new org.eclipse.swt.graphics.Rectangle(
-			minX, minY, width, height);
-		return imageRect;
-	}
-
-	/**
-	 * Get the positional data and the semantic elements for each
-	 * <code>ShapeEditPart</code>, <code>ShapeCompartmentEditPart</code>,
-	 * and <code>ConnectionEditPart</code> on the diagram.
-	 * 
-	 * @param diagramEditPart
-	 *            The diagram edit part.
-	 * @return A list of {@link PartPositionInfo}objects with positional data
-	 *         and the semantic element for the relevant editparts on the
-	 *         diagram.
-	 */
-	public List getDiagramPartInfo(DiagramEditPart diagramEditPart) {
-		List result = new ArrayList();
-		List editParts = new ArrayList();
-
-		List children = diagramEditPart.getPrimaryEditParts();
-		IMapMode mm = getMapMode();
-
-		// We will use the diagram generate that was used to generate the image
-		// to figure out the outer-bound rectangle so that we are calculating
-		// the
-		// image positions using the same box as was used to create the image.
-		org.eclipse.swt.graphics.Rectangle imageRect = calculateImageRectangle(children);
-
-		Iterator li = children.iterator();
-		while (li.hasNext()) {
-			IGraphicalEditPart part = (IGraphicalEditPart) li.next();
-			editParts.add(part);
-			getNestedEditParts(part, editParts);
-		}
-
-		Iterator iter = editParts.iterator();
-		while (iter.hasNext()) {
-			IGraphicalEditPart part = (IGraphicalEditPart) iter.next();
-			IFigure figure = part.getFigure();
-
-			// RATLC00139941: Need to support any kind of shape edit part
-			// and shape compartments, too, because these sometimes
-			// correspond to distinct semantic elements
-			if (part instanceof ShapeEditPart
-				|| part instanceof ShapeCompartmentEditPart) {
-
-				    PartPositionInfo position = new PartPositionInfo();
-
-					position.setSemanticElement(ViewUtil
-						.resolveSemanticElement((View) part.getModel()));
-
-					Rectangle bounds = figure.getBounds().getCopy();
-					translateToPrintableLayer( figure, bounds );
-					bounds.translate( -imageRect.x, -imageRect.y );
-
-					position.setPartHeight(mm.LPtoDP(bounds.height));
-					position.setPartWidth(mm.LPtoDP(bounds.width));
-					position.setPartX(mm.LPtoDP(bounds.x));
-					position.setPartY(mm.LPtoDP(bounds.y));
-					result.add(0, position);
-			}
-			else if (part instanceof ConnectionEditPart) {
-				// find a way to get (P1, P2, ... PN) for connection edit part
-				// add MARGIN and calculate "stripe" for the polyline instead of 
-				// bounding box.
-			    PartPositionInfo position = new PartPositionInfo();
-
-				position.setSemanticElement(ViewUtil
-					.resolveSemanticElement((View) part.getModel()));
-
-				if (figure instanceof PolylineConnection) {
-					PolylineConnection mainPoly = (PolylineConnection)figure;
-					PointList mainPts = mainPoly.getPoints();
-					
-					translateToPrintableLayer( figure, mainPts );
-					List envelopingPts = calculateEnvelopingPolyline(mainPts, new Point(imageRect.x, imageRect.y));
-					List transformedPts = convertPolylineUnits(envelopingPts);
-					
-					position.setPolyline(transformedPts);
-					result.add(0, position);
-				}
-			}
-		}
-	
-		return result;
-	}
-
-	/**
-	 * Recursively moves up the figure containment tree until it reaches the
-	 * printable layer or the root.
-	 * 
-	 * @param figure
-	 *            the figure that the translatable is relative to
-	 * @param translatable
-	 *            the object that needs to be translated
-	 */
-	private void translateToPrintableLayer(IFigure figure,
-			Translatable translatable) {
-
-		IFigure printableLayer = getDiagramEditPart().getLayer(
-			LayerConstants.PRINTABLE_LAYERS);
-		if (figure == null || figure.equals(printableLayer)) {
-			return;
-		}
-
-		figure.translateToParent(translatable);
-		translateToPrintableLayer(figure.getParent(), translatable);
-	}
-	
-	/**
-	 * Calculates enveloping polyline for a given polyline with margin MARGIN
-	 * 
-	 *   E1                  E2
-	 *     +----------------+
-	 *     |                |<------- MARGIN
-	 *   A *----------------* B
-	 *     |                |
-	 *     +----------------+
-	 *   E4                  E3
-	 * 
-	 * On the figure above: AB is a given polyline. E1E2E3E4 is enveloping polyline
-	 * built around AB perimeter using margin MARGIN.
-	 * 
-	 * 
-	 * @param polyPts
-	 * @param origin location of the main diagram bounding box used to shift coordinates 
-	 * 				to be relative against diagram
-	 * 
-	 * @return List of Point type objects (that carry X and Y coordinate pair) representing the polyline
-	 * @author Barys Dubauski
-	 */
-	private List calculateEnvelopingPolyline(PointList polyPts, Point origin) {
-		ArrayList result = new ArrayList();
-		List mainSegs = PointListUtilities.getLineSegments(polyPts);
-		
-		int mainSegsLength = mainSegs.size();
-		
-		LineSeg segment = null;
-		Point orthoPoint1 = null;
-		Point orthoPoint2 = null;
-		
-		// collect points clockwise
-		for (int i = 0; i < mainSegsLength; i++) {
-			segment = (LineSeg) mainSegs.get(i);
-			orthoPoint1 = segment.locatePoint(0.0, getImageMargin(), Sign.POSITIVE);
-			orthoPoint1.translate(-origin.x, -origin.y );
-			orthoPoint2 = segment.locatePoint(1.0, getImageMargin(), Sign.POSITIVE);
-			orthoPoint2.translate(-origin.x, -origin.y );
-
-			result.add(orthoPoint1);
-			result.add(orthoPoint2);
-		}
-		
-		// now add the original poly
-		for (int i = mainSegsLength - 1; i >= 0; i--) {
-			segment = (LineSeg) mainSegs.get(i);
-			orthoPoint1 = segment.getTerminus();
-			orthoPoint1.translate(-origin.x, -origin.y );
-			result.add(orthoPoint1);
-			orthoPoint2 = segment.getOrigin();
-			orthoPoint2.translate(-origin.x, -origin.y );
-			result.add(orthoPoint2);
-		}
-		
-		// add first point to close the polyline per "poly" area type HTML requirements
-		Object first = result.get(0);
-		result.add(first);
-		
-		return result;
-	}
-
-	/**
-	 * transforms coordinates of the polyline from logical units to device units
-	 * 
-	 * @param polyPts
-	 * @return List of Point type objects (that carry X and Y coordinate pair) representing the polyline
-	 * @author Barys Dubauski
-	 */
-	private List convertPolylineUnits(List polyPts) {
-		ArrayList result = new ArrayList();
-		Iterator iter = polyPts.iterator();
-		
-		IMapMode mm = getMapMode();
-		
-		while (iter.hasNext()) {
-			Point point = (Point) iter.next();
-			Point newPoint = new Point(mm.LPtoDP(point.x), mm.LPtoDP(point.y));
-			result.add(newPoint);
-		}
-		
-		return result;
-	}
-	
-	
-	/**
-	 * @return <code>int</code> value that is the margin around the generated image in logical coordinates.
-	 */
-	protected int getImageMargin() {
-		return image_margin;
-}	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramImageGenerator.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramImageGenerator.java
deleted file mode 100644
index 4972d1c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramImageGenerator.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.clipboard;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.util.List;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.image.ImageConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Supports generation of AWT and SWT images of a diagram or a subset of
- * editparts on a diagram.
- * 
- * @author schafe / sshaw
- */
-public class DiagramImageGenerator
-	extends DiagramGenerator {
-
-	/**
-	 * Creates a new instance.
-	 * @param dgrmEP
-	 *            the diagram editpart
-	 */
-	public DiagramImageGenerator(DiagramEditPart dgrmEP) {
-		super(dgrmEP);
-	}
-
-	private GC gc = null;
-
-	private Image image = null;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.clipboard.DiagramGenerator#setUpGraphics(int,
-	 *      int)
-	 */
-	protected Graphics setUpGraphics(int width, int height) {
-		Display display = Display.getDefault();
-
-		image = new Image(display, new Rectangle(0, 0, width, height));
-		gc = new GC(image);
-		SWTGraphics swtG = new SWTGraphics(gc);
-		
-		/*
-		IPreferenceStore preferenceStore =
-			(IPreferenceStore) getDiagramEditPart().getDiagramPreferencesHint().getPreferenceStore();
-		
-		if (preferenceStore.getBoolean(IPreferenceConstants.PREF_ENABLE_ANTIALIAS)) {
-			swtG.setAntialias(SWT.ON);
-		} else {
-			swtG.setAntialias(SWT.OFF);
-		}
-		*/
-		return swtG;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.clipboard.DiagramGenerator#disposeGraphics(org.eclipse.draw2d.Graphics)
-	 */
-	protected void disposeGraphics(Graphics g) {
-		super.disposeGraphics(g);
-
-		image.dispose();
-
-		if (gc != null)
-			gc.dispose();
-		gc = null;
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator#getImageDescriptor(org.eclipse.draw2d.Graphics)
-	 */
-	protected ImageDescriptor getImageDescriptor(Graphics g) {
-		return new ImageDescriptor() {
-
-			ImageData imgData = image.getImageData();
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jface.resource.ImageDescriptor#getImageData()
-			 */
-			public ImageData getImageData() {
-				return imgData;
-			}
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.clipboard.DiagramGenerator#createAWTImageForParts(java.util.List)
-	 */
-	public java.awt.Image createAWTImageForParts(List selectedObjects) {
-		org.eclipse.swt.graphics.Rectangle sourceRect = calculateImageRectangle(selectedObjects);
-
-		BufferedImage awtImage = null;
-		try {
-			IMapMode mm = getMapMode();
-			awtImage = new BufferedImage(mm.LPtoDP(sourceRect.width),
-				mm.LPtoDP(sourceRect.height),
-				BufferedImage.TYPE_4BYTE_ABGR_PRE);
-
-			Graphics2D g2d = awtImage.createGraphics();
-			g2d.setColor(Color.white);
-			g2d.fillRect(0, 0, awtImage.getWidth(), awtImage.getHeight());
-
-			// Check anti-aliasing preference
-			IPreferenceStore preferenceStore =
-				(IPreferenceStore) getDiagramEditPart().getDiagramPreferencesHint().getPreferenceStore();
-			
-			if (preferenceStore.getBoolean(IPreferenceConstants.PREF_ENABLE_ANTIALIAS)) {				
-				g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-					RenderingHints.VALUE_ANTIALIAS_ON);
-			} else {
-				g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-					RenderingHints.VALUE_ANTIALIAS_OFF);
-			}
-			
-			g2d.clip(new java.awt.Rectangle(0, 0, awtImage.getWidth(), awtImage
-				.getHeight()));
-
-			Graphics graphics = new GraphicsToGraphics2DAdaptor(g2d,
-				new Rectangle(0, 0, mm.LPtoDP(sourceRect.width), mm
-					.LPtoDP(sourceRect.height)));
-
-			RenderedMapModeGraphics mapModeGraphics = new RenderedMapModeGraphics(
-				graphics, mm);
-
-			renderToGraphics(mapModeGraphics, new Point(sourceRect.x, sourceRect.y), selectedObjects);
-
-			graphics.dispose();
-			g2d.dispose();
-		} catch (Error e) {
-			// log the Error but allow execution to continue
-			Trace.catching(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-				"createAWTImageForParts() failed to generate image", //$NON-NLS-1$
-				e);
-			awtImage = ImageConverter.convert(SharedImages.get(SharedImages.IMG_ERROR));
-
-		} catch (Exception ex) {
-			// log the Exception but allow execution to continue
-			Trace.catching(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-				"createAWTImageForParts() failed to generate image", //$NON-NLS-1$
-				ex);
-			awtImage = ImageConverter.convert(SharedImages.get(SharedImages.IMG_ERROR));
-		}
-
-		return awtImage;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramSVGGenerator.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramSVGGenerator.java
deleted file mode 100644
index 1caf428..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramSVGGenerator.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.clipboard;
-
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.image.ImageConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.export.GraphicsSVG;
-import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderedImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.w3c.dom.Element;
-
-/**
- * Supports generation of an SVG DOM for a diagram or a subset of
- * editparts on a diagram.
- * 
- * @author jschofie / sshaw
- */
-public class DiagramSVGGenerator
-	extends DiagramGenerator {
-
-	private RenderedImage svgImage = null;
-
-	private Element svgRoot = null;
-
-	private Rectangle viewBox = null;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param diagramEditPart
-	 *            the diagram editpart
-	 */
-	public DiagramSVGGenerator(DiagramEditPart diagramEditPart) {
-		super(diagramEditPart);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator#setUpGraphics(int, int)
-	 */
-	protected Graphics setUpGraphics(int width, int height) {
-		viewBox = new Rectangle(0, 0, width, height);
-		return GraphicsSVG.getInstance(viewBox);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator#getImageDescriptor(org.eclipse.draw2d.Graphics)
-	 */
-	protected ImageDescriptor getImageDescriptor(Graphics g) {
-		try {
-			GraphicsSVG svgG = (GraphicsSVG) g;
-			// Get the root element (the svg element)
-			svgRoot = svgG.getRoot();
-
-			ByteArrayOutputStream os = new ByteArrayOutputStream(5000); // 5K
-																		// buffer
-			stream(os);
-			os.close();
-
-			setSVGImage(RenderedImageFactory.getInstance(os.toByteArray()));
-
-			return RenderedImageDescriptor
-				.createFromRenderedImage(getSVGImage());
-		} catch (IOException ex) {
-			Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, ex
-				.getMessage(), ex);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Writes the SVG Model out to a file.
-	 * 
-	 * @param outputStream
-	 *            output stream to store the SVG Model
-	 */
-	public void stream(OutputStream outputStream) {
-		try {
-
-			// Define the view box
-			svgRoot.setAttributeNS(null,
-				"viewBox", String.valueOf(viewBox.x) + " " + //$NON-NLS-1$ //$NON-NLS-2$
-					String.valueOf(viewBox.y) + " " + //$NON-NLS-1$
-					String.valueOf(viewBox.width) + " " + //$NON-NLS-1$
-					String.valueOf(viewBox.height));
-
-			// Write the document to the stream
-			Transformer transformer = TransformerFactory.newInstance()
-				.newTransformer();
-			transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-
-			DOMSource source = new DOMSource(svgRoot);
-			StreamResult result = new StreamResult(outputStream);
-			transformer.transform(source, result);
-		} catch (Exception ex) {
-			Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, ex
-				.getMessage(), ex);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.clipboard.DiagramGenerator#createAWTImageForParts(java.util.List)
-	 */
-	public Image createAWTImageForParts(List editparts) {
-		createSWTImageDescriptorForParts(editparts);
-		if (getSVGImage() != null) {
-			try {
-				BufferedImage bufImg = (BufferedImage)getSVGImage().getAdapter(BufferedImage.class);
-				if (bufImg == null)
-					bufImg = ImageConverter.convert(getSVGImage().getSWTImage());
-				return bufImg;
-			} catch (Error e) {
-				// log the Error but allow execution to continue
-				Trace.catching(DiagramUIRenderPlugin.getInstance(),
-					DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-					"createAWTImageForParts() failed to generate image", //$NON-NLS-1$
-					e);
-				return ImageConverter.convert(SharedImages
-					.get(SharedImages.IMG_ERROR));
-
-			} catch (Exception ex) {
-				// log the Exception but allow execution to continue
-				Trace.catching(DiagramUIRenderPlugin.getInstance(),
-					DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-					"createAWTImageForParts() failed to generate image", //$NON-NLS-1$
-					ex);
-				return ImageConverter.convert(SharedImages
-					.get(SharedImages.IMG_ERROR));
-			}
-		}
-
-		return ImageConverter.convert(SharedImages.get(SharedImages.IMG_ERROR));
-	}
-
-	/**
-	 * @return Returns the svgImage.
-	 */
-	private RenderedImage getSVGImage() {
-		return svgImage;
-	}
-
-	/**
-	 * @param svgImage
-	 *            The svgImage to set.
-	 */
-	private void setSVGImage(RenderedImage svgImage) {
-		this.svgImage = svgImage;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/package.html
deleted file mode 100644
index be393ec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/package.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPart.java
deleted file mode 100644
index f9ce3c2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPart.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.editparts;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.figures.ScalableImageFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.WrapperNodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.*
- * 
- * Abstract EditPart for handling display of a image of the diagram surface.
- * There are no assumptions about a semantic element being owned by the view. It
- * is up to subclasses to determine where the image information is being
- * retrieved from.
- */
-public abstract class AbstractImageEditPart
-	extends ShapeNodeEditPart {
-
-	private RenderedImage renderedImage = null;
-	
-	/* Keep figure in order to apply anti-aliasing */
-	ScalableImageFigure sif = null;
-
-	   /**
-	* Listener for the PreferenceStore.
-	* Listen and respond for changes to the 
-	* drop shadow preference store value.
-	* 
-	*/
-	protected class PreferencePropertyChangeListener 
-		implements IPropertyChangeListener {
-	
-		public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) {			           
-			if (event.getProperty().equals(IPreferenceConstants.PREF_ENABLE_ANTIALIAS)){
-				refreshEnableAntiAlias();
-			}			
-		}
-	}
-
-	
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param view
-	 *            IShapeView element that this is a controller for.
-	 */
-	public AbstractImageEditPart(View view) {
-		super(view);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#createNodeFigure()
-	 */
-	protected NodeFigure createNodeFigure() {
-
-		// Check anti-aliasing preference
-		IPreferenceStore preferenceStore =
-			(IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
-		boolean antiAlias = preferenceStore.getBoolean(
-			IPreferenceConstants.PREF_ENABLE_ANTIALIAS);
-		sif = new ScalableImageFigure(getRenderedImage(),
-			true, true, antiAlias);
-		sif.setMaintainAspectRatio(false);
-
-		return new WrapperNodeFigure(sif);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshImage();
-	}
-
-	/**
-	 * Refresh the display image if accessible. Essentially toggles between the
-	 * comment mode and image mode depending on whether there is an image that
-	 * can be displayed.
-	 */
-	protected void refreshImage() {
-		renderedImage = null;
-		getFigure().invalidate();
-	}
-
-	/**
-	 * Refreshes the figures and enables anti-aliasing on the
-	 * non-text portions
-	 */
-	protected void refreshEnableAntiAlias() {
-		// Check anti-aliasing preference
-		IPreferenceStore preferenceStore =
-			(IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
-		boolean antiAlias = preferenceStore.getBoolean(
-			IPreferenceConstants.PREF_ENABLE_ANTIALIAS);
-		sif.setAntiAlias(antiAlias);
-	}	
-	
-	
-	/**
-	 * regenerateImageFromSource This method will recreate the RenderedImage
-	 * object from a specific source (file, bits etc.).
-	 * 
-	 * @return RenderedImage object that will be rendered to the screen using
-	 *         the ScalableImageFigure class. Concrete clients of
-	 *         AbstractImageEditPart need to override this method to return an
-	 *         instance that can be used for rendering.
-	 */
-	abstract protected RenderedImage regenerateImageFromSource();
-
-	/**
-	 * getRenderedImage Accessor method to return the cached rendered image used
-	 * for display.
-	 * 
-	 * @return RenderedImage object that was generated using the
-	 *         regenerateImageFromSource api.
-	 */
-	final public RenderedImage getRenderedImage() {
-		if (renderedImage == null) {
-			RenderedImage img = regenerateImageFromSource();
-			if (img != null && img.getSWTImage() != null)
-				renderedImage = img;
-		}
-
-		return renderedImage;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java
deleted file mode 100644
index 06c9375..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.editparts;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.figures.ScalableImageFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics;
-import org.eclipse.gmf.runtime.gef.ui.internal.editparts.AnimatedZoomListener;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A specialized <code>DiagramRootEditPart</code> that supports rendering of
- * images.
- * 
- * @author cmahoney
- */
-public class RenderedDiagramRootEditPart
-	extends DiagramRootEditPart {
-
-	/**
-	 * Default constructor
-	 */
-	public RenderedDiagramRootEditPart() {
-		super();
-	}
-	
-	/**
-	 * @param mu the <code>MeasurementUnit</code> that is the native coordinate system
-	 * for this root edit part.
-	 */
-	public RenderedDiagramRootEditPart(MeasurementUnit mu) {
-		super(mu);
-	}
-
-	static protected class DiagramRenderedScalableFreeformLayeredPane
-		extends DiagramScalableFreeformLayeredPane implements AnimatedZoomListener {
-
-		private boolean animatedZoomOn;
-		static final private Dimension MAX_RENDER_SIZE = new Dimension(PlatformUI.getWorkbench().getDisplay().getBounds().width, 
-			PlatformUI.getWorkbench().getDisplay().getBounds().height);
-		
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScalableFreeformLayeredPane#createScaledGraphics(org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics)
-		 */
-		protected ScaledGraphics createScaledGraphics(MapModeGraphics gMM) {
-			if (animatedZoomOn) {
-				return new ScaledGraphics(gMM);
-			}
-
-			return new RenderedScaledGraphics(gMM, true, MAX_RENDER_SIZE);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScalableFreeformLayeredPane#createMapModeGraphics(org.eclipse.draw2d.Graphics)
-		 */
-		protected MapModeGraphics createMapModeGraphics(Graphics graphics) {
-			MapModeGraphics gMM = new RenderedMapModeGraphics(graphics, getMapMode(), true, MAX_RENDER_SIZE);
-			return gMM;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.gef.ui.internal.editparts.AnimatedZoomListener#animatedZoomEnded()
-		 */
-		public void animatedZoomEnded() {
-			animatedZoomOn = false;
-			
-			// only repaint ScalableImageFigures
-			Layer primaryLayer = getLayer(PRINTABLE_LAYERS);
-			if (primaryLayer != null)
-				paintScalableImageFigures(primaryLayer.getChildren());
-		}
-
-		private void paintScalableImageFigures(List figures) {
-			ListIterator iter = figures.listIterator();
-			Rectangle absbounds = getBounds().getCopy();
-			translateToAbsolute(absbounds);
-			
-			while (iter.hasNext()) {
-				IFigure fig = (IFigure)iter.next();
-				if (fig instanceof ScalableImageFigure) {
-					Rectangle absfigbounds = fig.getBounds().getCopy();
-					fig.translateToAbsolute(absfigbounds);
-					if (absbounds.intersects(absfigbounds))
-						fig.repaint();
-				}
-				else {
-					paintScalableImageFigures(fig.getChildren());
-				}
-			}
-		}
-		
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.gef.ui.internal.editparts.AnimatedZoomListener#animatedZoomStarted()
-		 */
-		public void animatedZoomStarted() {
-			animatedZoomOn = true;
-		}
-
-		public DiagramRenderedScalableFreeformLayeredPane(IMapMode mm) {
-			super(mm);
-		}
-	}
-
-	/**
-	 * Creates a scalable freeform layered pane that supports rendering of
-	 * images.
-	 */
-	protected org.eclipse.draw2d.ScalableFreeformLayeredPane createScalableFreeformLayeredPane() {
-		setLayers(new DiagramRenderedScalableFreeformLayeredPane(getMapMode()));
-		return getLayers();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPart.java
deleted file mode 100644
index 363174c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPart.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.editparts;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.runtime.common.ui.util.FileUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.*
- *
- * Class for handling display of an image whose source is a URI.
- */
-abstract public class URLImageEditPart
-	extends AbstractImageEditPart {
-
-	/**
-	 * Default constructor
-	 * @param view
-	 */
-	public URLImageEditPart(View view) {
-		super(view);
-	}
-	
-	/**
-	 * getImagePath
-	 * Transient accessor to retrieve the file path representing the image
-	 * file to be rendered.  
-	 * 
-	 * @return String if valid, null otherwise.
-	 */
-	abstract protected String getImagePath();
-	
-	/**
-	 * getPathImagePathIsRelativeTo
-	 * getImagePath could return a relative path.  If so, this transient
-	 * accessor method allows calculation of an absolute path from
-	 * the image file and the return path of this method.
-	 * 
-	 * @return String that is an absolute path that can be used
-	 * to calculate the absolute path of a relative path URL.
-	 */
-	abstract protected String getPathImagePathIsRelativeTo();
-	
-	/**
-	 * getURL
-	 * Accessor method that calculates the URL expression based on the string returned
-	 * by the method getImagePath.
-	 * 
-	 * @return URL that can be streamed to retrieve the image data.
-	 */
-	protected URL getURL() {
-		String urlExpression = getImagePath();
-		if (urlExpression==null || urlExpression.length()==0)
-			return null;
-		URL url = null;		
-		String launchPath = null;
-		
-		try {
-			url = new URL(urlExpression);
-		}
-
-		// URL expression is invalid so convert the URL into a OS specific file
-		// path.
-		catch (MalformedURLException malformedUrl) {
-			launchPath = calculateLaunchPath(urlExpression);
-			try {
-				url = new URL("file:" + launchPath);//$NON-NLS-1$
-			}
-			catch (MalformedURLException malformedUrl2) {
-				// do nothing
-			}
-		}
-	
-		return url;
-	}
-	
-	/**
-	 * @param urlExpression
-	 * @return
-	 */
-	private String calculateLaunchPath(String urlExp) {
-		String launchPath = null;
-		String urlExpression = urlExp;
-		String pathImageIsRelativeTo = getPathImagePathIsRelativeTo();
-		Path path = new Path(urlExpression);
-		if (path != null) {
-			if(path.isAbsolute()) {
-				urlExpression = path.toOSString();
-			} else {
-				if (pathImageIsRelativeTo != null && pathImageIsRelativeTo.length() > 0)
-					urlExpression = FileUtil.getAbsolutePath(path.toOSString(), getPathImagePathIsRelativeTo());
-			}
-		}
-		
-		// Attempt to launch the default program that handles the URL
-		// expression.
-		final String urlPath = urlExpression;
-		if (pathImageIsRelativeTo != null && pathImageIsRelativeTo.length() > 0)
-			launchPath = FileUtil.getAbsolutePath(urlPath, getPathImagePathIsRelativeTo());
-		
-		return launchPath;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.AbstractImageEditPart#regenerateImageFromSource()
-	 */
-	final protected RenderedImage regenerateImageFromSource() {
-		
-		URL url = getURL();
-		
-		// read in the file source specified by the URI, otherwise return null;
-		if (url != null)
-			return RenderedImageFactory.getInstance(url);
-		
-		return null;
-	}
-
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/package.html
deleted file mode 100644
index b7d6f70..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-This package contains the <i>edit part</i> classes.
-An edit part is a controller that specifies how model elements are mapped to visual figures and coordinates the editing behavior of the model.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderDebugOptions.java
deleted file mode 100644
index 7dc9640..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderDebugOptions.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.render.*
- *  
- */
-public final class DiagramUIRenderDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private DiagramUIRenderDebugOptions() {
-		// empty constructor
-	}
-
-	public static final String DEBUG = DiagramUIRenderPlugin.getPluginId()
-		+ "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-	public static final String DND = DEBUG + "/dnd/tracing"; //$NON-NLS-1$  
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderPlugin.java
deleted file mode 100644
index ca4a448..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderPlugin.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.render.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The Diagram UI Render plug-in.
- * 
- * @author cmahoney
- */
-public class DiagramUIRenderPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared instance.
-	 */
-	private static DiagramUIRenderPlugin plugin;
-
-	/**
-	 * The constructor.
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#Plugin()
-	 */
-	public DiagramUIRenderPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the plugin instance
-	 */
-	public static DiagramUIRenderPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderStatusCodes.java
deleted file mode 100644
index f421452..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderStatusCodes.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.render.*
- *  
- */
-public final class DiagramUIRenderStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private DiagramUIRenderStatusCodes() {
-		// empty constructor
-	}
-
-	public static final int OK = 0;
-
-	
-	/**
-	 * Status code indicating that an error occurred with a resource, such as
-	 * loading an image file.
-	 * Set to 5 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int RESOURCE_FAILURE = 5;
-	
-	/**
-	 * Status code warning that an exception was ignored.
-	 * Set to 9 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int IGNORED_EXCEPTION_WARNING = 9;
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/clipboard/AWTViewImageTransferable.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/clipboard/AWTViewImageTransferable.java
deleted file mode 100644
index f63fbd3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/clipboard/AWTViewImageTransferable.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.clipboard;
-
-import java.awt.Image;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-
-/**
- * Used for image transfer to the clipboard. 
- * <p>SWT does not currently support image transfer to 
- * the Clipboard.  This utility class is provided in 
- * order to transfer an SWT Image to the system 
- * clipboard using AWT image transfer APIs.</p>
- * <p>A Transferable which implements the capability required to transfer a View.
- * This Transferable properly supports CUSTOMDATAFLAVOR.</p>
- * @author sshaw
- */
-public class AWTViewImageTransferable
-	implements Transferable {
-
-	private ICustomData data = null;
-
-	private Image image = null;
-
-	/** DataFlavor. */
-	static public DataFlavor AWTCUSTOMDATAFLAVOR = new DataFlavor(
-		ICustomData.class, null);
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param data
-	 * @param image
-	 */
-	public AWTViewImageTransferable(ICustomData data, Image image) {
-		this.data = data;
-		this.image = image;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.awt.datatransfer.Transferable#getTransferDataFlavors()
-	 */
-	public DataFlavor[] getTransferDataFlavors() {
-		return new DataFlavor[] {AWTCUSTOMDATAFLAVOR, DataFlavor.imageFlavor };
-	}
-
-	/* (non-Javadoc)
-	 * @see java.awt.datatransfer.Transferable#isDataFlavorSupported(java.awt.datatransfer.DataFlavor)
-	 */
-	public boolean isDataFlavorSupported(DataFlavor flavor) {
-		return (flavor.equals(AWTCUSTOMDATAFLAVOR) && data != null)
-			|| (flavor.equals(DataFlavor.imageFlavor) && image != null);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.awt.datatransfer.Transferable#getTransferData(java.awt.datatransfer.DataFlavor)
-	 */
-	public Object getTransferData(DataFlavor flavor)
-		throws UnsupportedFlavorException {
-		if (!isDataFlavorSupported(flavor)) {
-			UnsupportedFlavorException ufe = new UnsupportedFlavorException(
-				flavor);
-			Trace.throwing(DiagramUIRenderPlugin.getInstance(),
-				DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-				"getTransferData()", //$NON-NLS-1$
-				ufe);
-			throw ufe;
-		}
-
-		if (flavor.equals(AWTCUSTOMDATAFLAVOR))
-			return data;
-		else if (flavor.equals(DataFlavor.imageFlavor))
-			return image;
-
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/commands/CopyImageCommand.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/commands/CopyImageCommand.java
deleted file mode 100644
index e8a8bf5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/commands/CopyImageCommand.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.commands;
-
-import java.awt.Image;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.util.CustomData;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ClipboardCommand;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.AWTClipboardHelper;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramImageGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.l10n.DiagramUIRenderMessages;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.util.Assert;
-
-/**
- * Command for copying an image to the clipboard
- * 
- * @author sshaw
- * @canBeSeenBy %level1
- */
-public class CopyImageCommand
-	extends AbstractCommand {
-
-	/**
-	 * The list of <code>IView</code> used for the copy operation
-	 */
-	private final List source;
-
-	private DiagramEditPart diagramEP;
-
-	/**
-	 * String constant for the clipboard format
-	 */
-	public static final String DRAWING_SURFACE = "Drawing Surface"; //$NON-NLS-1$
-
-	/**
-	 * The target <code>IView</code> used as a context for the clipboard
-	 * operations. The cut and copy will use this to retrieve the view model.
-	 * The paste will use this as the target view.
-	 */
-	private final View viewContext;
-
-	/**
-	 * Constructor for CopyImageCommand.
-	 * 
-	 * @param context
-	 * @param viewContext
-	 * @param source
-	 */
-	public CopyImageCommand(View viewContext, List source,
-			DiagramEditPart diagramEP) {
-		this(null, viewContext, source, diagramEP);
-	}
-
-	/**
-	 * Constructor for CopyImageCommand.
-	 * 
-	 * @param label
-	 * @param context
-	 * @param viewContext
-	 * @param source
-	 */
-	public CopyImageCommand(String label, View viewContext, List source,
-			DiagramEditPart diagramEP) {
-		super(label, null);
-
-		Assert.isNotNull(source);
-		Assert.isNotNull(viewContext);
-
-		this.source = source;
-		this.viewContext = viewContext;
-		this.diagramEP = diagramEP;
-	}
-
-    // Documentation copied from interface
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		/* Check if the source has elements */
-		boolean imageCopyDiagram = false;
-		if (getSource() == null || getSource().size() == 0) {
-			imageCopyDiagram = true;
-		}
-
-		Map epRegistry = diagramEP.getViewer().getEditPartRegistry();
-		ArrayList editParts = new ArrayList(getSource().size());
-		ListIterator li = getSource().listIterator();
-		while (li.hasNext()) {
-			editParts.add(epRegistry.get(li.next()));
-		}
-
-		DiagramImageGenerator imageGenerator = new DiagramImageGenerator(
-			getDiagramEditPart());
-
-		Image image = null;
-		try {
-			if (imageCopyDiagram)
-				image = imageGenerator.createAWTImageForDiagram();
-			else
-				image = imageGenerator.createAWTImageForParts(editParts);
-		} catch (OutOfMemoryError error) {
-			String eMsg = DiagramUIRenderMessages.CopyAction_UnableToCopyImageMessage;
-			Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, eMsg,
-				error);
-			MessageDialog.openInformation(null,
-				DiagramUIRenderMessages.CopyAction_ErrorDialogTitle, eMsg);
-		}
-
-		/* Get the view model from the view context */
-		CustomData data = null;
-		if (!imageCopyDiagram) {
-			/* Copy the views */
-			data = (getViewContext() != null) ? new CustomData(DRAWING_SURFACE,
-				ClipboardCommand.copyViewsToString(getSource()).getBytes())
-				: null;
-		}
-
-		AWTClipboardHelper.getInstance().copyToClipboard(data, image);
-		diagramEP = null; // we don't want this to end up on the undo stack
-		return CommandResult.newOKCommandResult();
-	}
-    
-    /**
-     * @throws UnsupportedOperationException because redo not supported
-     */
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        UnsupportedOperationException uoe = new UnsupportedOperationException();
-        Trace.throwing(DiagramUIRenderPlugin.getInstance(),
-            DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-            "doRedoWithResult", uoe); //$NON-NLS-1$
-        throw uoe;
-    }
-    
-    /**
-     * @throws UnsupportedOperationException
-     *             undo not supported
-     */
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        UnsupportedOperationException uoe = new UnsupportedOperationException();
-        Trace.throwing(DiagramUIRenderPlugin.getInstance(),
-            DiagramUIRenderDebugOptions.EXCEPTIONS_THROWING, getClass(),
-            "doUndoWithResult", uoe); //$NON-NLS-1$
-        throw uoe;
-    }
-
-	/**
-	 * @return Returns the diagramEP.
-	 */
-	private DiagramEditPart getDiagramEditPart() {
-		return diagramEP;
-	}
-
-	/**
-	 * Returns the source.
-	 * 
-	 * @return List
-	 */
-	private List getSource() {
-		return source;
-	}
-
-	/**
-	 * @return Returns the viewContext.
-	 */
-	private View getViewContext() {
-		return viewContext;
-	}
-    
-    public boolean canRedo() {
-        return false;
-    }
-    
-    public boolean canUndo() {
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/commands/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/commands/package.html
deleted file mode 100644
index 02c2461..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/commands/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/dialogs/CopyToImageDialog.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/dialogs/CopyToImageDialog.java
deleted file mode 100644
index c8b8791..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/dialogs/CopyToImageDialog.java
+++ /dev/null

@@ -1,636 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.dialogs;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Dialog used by the copy diagram to image file action to prompt the user 
- * for a destination and image format.
- * 
- * @author Anthony Hunter, cmahoney
- */
-public class CopyToImageDialog extends Dialog {
-
-	/**
-	 * the text entered into the folder text field
-	 */
-	private String folder = null;
-
-	/**
-	 * the text entered into the file name text field
-	 */
-	private String fileName = null;
-
-	/**
-	 * the image format selected in the image format pulldown field
-	 */
-	private ImageFileFormat imageFormat = null;
-
-	/**
-	 * true to overwrite the existing file.
-	 */
-	private boolean overwriteExisting = false;
-
-	/**
-	 * the folder text field
-	 */
-	private Text folderText = null;
-
-	/**
-	 * the file name text field
-	 */
-	private Text fileNameText = null;
-
-	/**
-	 * the image format pulldown field
-	 */
-	private Combo imageFormatCombo = null;
-
-	/**
-	 * the overwrite existing file checkbox.
-	 */
-	private Button overwriteExistingCheckbox = null;
-
-	/**
-	 * the message image field, displays the error (X) icon when the file 
-	 * name or folder is invalid
-	 */
-	private Label messageImageLabel = null;
-
-	/**
-	 * the message field, displays an error message when the file name or 
-	 * folder is invalid
-	 */
-	private Label messageLabel = null;
-
-	/**
-	 * true if the contents of the file name text field is a valid file name.
-	 */
-	private boolean fileNameValid = true;
-
-	/**
-	 * true if the contents of the folder text field is a valid folder.
-	 */
-	private boolean folderValid = true;
-
-	/**
-	 * the dialog window title
-	 */
-	private static final String DIALOG_TITLE = DiagramUIMessages.CopyToImageDialog_title;;
-
-	/**
-	 * the folder label text
-	 */
-	private static final String FOLDER_LABEL = DiagramUIMessages.CopyToImageDialog_folder_label; 
-
-	/**
-	 * the file name label text
-	 */
-	private static final String FILE_NAME_LABEL = DiagramUIMessages.CopyToImageDialog_filename_label; 
-
-	/**
-	 * the image format label text
-	 */
-	private static final String IMAGE_FORMAT_LABEL = DiagramUIMessages.CopyToImageDialog_imageformat_label; 
-
-	/**
-	 * the browse button text
-	 */
-	private static final String BROWSE_LABEL = DiagramUIMessages.CopyToImageDialog_browse_label;
-
-	/**
-	 * the overwrite existing file checkbox text
-	 */
-	private static final String OVERWRITE_EXISTING_LABEL = DiagramUIMessages.CopyToImageDialog_overwriteExisting_label;
-
-	/**
-	 * the directory dialog text
-	 */
-	private static final String DIRECTORY_DIALOG_TEXT = DiagramUIMessages.CopyToImageDialog_DirectoryDialog_text;
-
-	/**
-	 * the directory dialog message
-	 */
-	private static final String DIRECTORY_DIALOG_MESSAGE = DiagramUIMessages.CopyToImageDialog_DirectoryDialog_message;
-
-	/**
-	 * an error message
-	 */
-	private static final String FOLDER_BLANK_MESSAGE = DiagramUIMessages.CopyToImageDialog_validateFolderText_folderBlank;
-
-	/**
-	 * an error message
-	 */
-	private static final String FOLDER_INVALID_MESSAGE = DiagramUIMessages.CopyToImageDialog_validateFolderText_folderInvalid;
-
-	/**
-	 * an error message
-	 */
-	private static final String FOLDER_NOT_EXIST_MESSAGE = DiagramUIMessages.CopyToImageDialog_validateFolderText_folderNotExist;
-
-	/**
-	 * The default image filename.
-	 */
-	private static final String DEFAULT_IMAGE_FILENAME = DiagramUIMessages.CopyToImageDialog_filename_default;
-	
-	/**
-	 * The empty string.
-	 */
-	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	/**
-	 * The string with a dot for creation of a file extension.
-	 */
-	private static final String DOT_STRING = "."; //$NON-NLS-1$
-
-	/**
-	 * The id for the persistent settings for this dialog.
-	 */
-	private static final String DIALOG_SETTINGS_ID = "CopyToImageDialog"; //$NON-NLS-1$
-
-	/**
-	 * The id for the persistent folder setting for this dialog.
-	 */
-	private static final String DIALOG_SETTINGS_FOLDER = "CopyToImageDialog.folder"; //$NON-NLS-1$
-
-	/**
-	 * The id for the persistent image format setting for this dialog.
-	 */
-	private static final String DIALOG_SETTINGS_IMAGE_FORMAT = "CopyToImageDialog.imageFormat"; //$NON-NLS-1$
-
-	/**
-	 * The id for the persistent overwrite existing setting for this dialog.
-	 */
-	private static final String DIALOG_SETTINGS_OVERWRITE = "CopyToImageDialog.overwriteExisting"; //$NON-NLS-1$
-
-	/**
-	 * Creates an instance of the copy to image dialog.
-	 * @param shell the parent shell
-	 * @param path the default path to store the image or null
-	 * @param fileName A default filename without the file extension or null
-	 *  if the default file name should be used.
-	 */
-	public CopyToImageDialog(Shell shell, IPath path, String fileName) {
-		super(shell);
-		initDialogSettings(path);
-		
-		if (fileName != null) {
-			this.fileName = fileName;
-		} else {
-			this.fileName = DEFAULT_IMAGE_FILENAME;
-		}
-	}
-
-	/**
-	 * Creates and returns the contents of the upper part 
-	 * of this dialog (above the button bar).
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		createFolderGroup(composite);
-		createFileNameGroup(composite);
-		createImageFormatGroup(composite);
-		createOverwriteExistingGroup(composite);
-		createMessageGroup(composite);
-        
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, 
-            "org.eclipse.gmf.runtime.diagram.ui.render.egmf0400"); //$NON-NLS-1$
-
-		return composite;
-	}
-
-	/**
-	 * Configures the shell in preparation for opening this window
-	 * in it.
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(DIALOG_TITLE);
-	}
-
-	/**
-	 *	Create the folder group in the dialog.
-	 *	@param parent the parent widget
-	 */
-	private void createFolderGroup(Composite parent) {
-		Composite composite = createComposite(parent, 4);
-		createLabel(composite, FOLDER_LABEL);
-
-		folderText = new Text(composite, SWT.BORDER);
-		folderText.setText(folder);
-		folderText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validateFolderText();
-			}
-		});
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 250;
-		folderText.setLayoutData(gridData);
-
-		Button button = new Button(composite, SWT.PUSH);
-		button.setText(BROWSE_LABEL);
-		button.setLayoutData(WindowUtil.makeButtonData(button));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				handleBrowseButtonPressed();
-			}
-		});
-	}
-
-	/**
-	 *	Create the file name group in the dialog.
-	 *	@param parent the parent widget
-	 */
-	private void createFileNameGroup(Composite parent) {
-		Composite composite = createComposite(parent, 2);
-		createLabel(composite, FILE_NAME_LABEL);
-
-		fileNameText = new Text(composite, SWT.BORDER);
-		fileNameText.setText(fileName + DOT_STRING + imageFormat.getName().toLowerCase());
-		fileNameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validateFileNameText();
-			}
-		});
-		GridData gridData =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		gridData.widthHint = 250;
-		fileNameText.setLayoutData(gridData);
-	}
-
-	/**
-	 *	Create the image format group in the dialog.
-	 *	@param parent the parent widget
-	 */
-	private void createImageFormatGroup(Composite parent) {
-		Composite composite = createComposite(parent, 2);
-		createLabel(composite, IMAGE_FORMAT_LABEL);
-
-		imageFormatCombo = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-		imageFormatCombo.setItems(getImageFormatItems());
-		imageFormatCombo.setText(imageFormat.getName());
-		imageFormatCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				imageFormat =
-					ImageFileFormat.resolveImageFormat(
-						imageFormatCombo.getSelectionIndex());
-                
-                // update filename to reflect new format
-                fileNameText.setText(fileName + DOT_STRING + imageFormat.getName().toLowerCase());
-                validateFileNameText();
-			}
-		});
-		GridData gridData =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 250;
-		imageFormatCombo.setLayoutData(gridData);
-
-	}
-
-	/**
-	 * Create the overwrite existing file group in the dialog.
-	 * @param parent the parent widget
-	 */
-	private void createOverwriteExistingGroup(Composite parent) {
-		Composite composite = createComposite(parent, 1);
-
-		overwriteExistingCheckbox = new Button(composite, SWT.CHECK | SWT.LEFT);
-		overwriteExistingCheckbox.setText(OVERWRITE_EXISTING_LABEL);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		overwriteExistingCheckbox.setLayoutData(data);
-		overwriteExistingCheckbox.setSelection(overwriteExisting);
-		overwriteExistingCheckbox.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				overwriteExisting = overwriteExistingCheckbox.getSelection();
-			}
-		});
-	}
-
-	/**
-	 *	Create the message group in the dialog used to display error messages.
-	 *	@param parent the parent widget
-	 */
-	private void createMessageGroup(Composite parent) {
-		Composite composite = createComposite(parent, 2);
-
-		messageImageLabel = new Label(composite, SWT.NONE);
-		messageImageLabel.setImage(
-			JFaceResources.getImage(DLG_IMG_MESSAGE_ERROR));
-		messageImageLabel.setVisible(false);
-
-		messageLabel = new Label(composite, SWT.NONE);
-		GridData gridData =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 250;
-		messageLabel.setLayoutData(gridData);
-		messageLabel.setVisible(false);
-	}
-
-	/**
-	 * utility method to create a composite widget
-	 * @param parent the parent widget
-	 * @param columns the number of columns in the grid layout for the new
-	 * composite.
-	 * @return the new composite widget
-	 */
-	private Composite createComposite(Composite parent, int columns) {
-		Composite composite = new Composite(parent, SWT.NONE);
-
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = columns;
-		gridLayout.marginHeight = 0;
-		gridLayout.marginWidth = 0;
-		gridLayout.makeColumnsEqualWidth = false;
-
-		GridData data =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
-
-		composite.setLayoutData(data);
-		composite.setLayout(gridLayout);
-
-		return composite;
-	}
-
-	/**
-	 * utility method to create a label widget
-	 * @param parent the parent widget
-	 * @param text the text for the label
-	 * @return the new label widget
-	 */
-	private Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(text);
-		return label;
-	}
-
-	/**
-	 * get the supported image formats from the enumerated type.
-	 * @return array of supported image formats.
-	 */
-	private String[] getImageFormatItems() {
-		String[] items = new String[ImageFileFormat.VALUES.length];
-		for (int i = 0; i < ImageFileFormat.VALUES.length; i++) {
-			items[i] = ImageFileFormat.VALUES[i].getName();
-		}
-		return items;
-	}
-
-	/**
-	 * Returns the destination image file selected by the user.
-	 * @return folder and filename, including image format extension, to
-	 * the selected destination image file.
-	 */
-	public IPath getDestination() {
-		StringBuffer extension = new StringBuffer(DOT_STRING);
-		extension.append(imageFormat.getName().toLowerCase());
-		StringBuffer f = new StringBuffer(fileName);
-		if (!f.toString().endsWith(extension.toString())) {
-			f.append(extension);
-		}
-		return new Path(folder).append(f.toString());
-	}
-
-	/**
-	 * Returns the destination image file format selected by the user.
-	 * @return the selected image file format.
-	 */
-	public ImageFileFormat getImageFormat() {
-		return imageFormat;
-	}
-
-	/**
-	 * Returns if the existing file should be overwritten without warning.
-	 * @return true if the existing file should be overwritten without warning.
-	 */
-	public boolean overwriteExisting() {
-		return overwriteExisting;
-	}
-
-	/**
-	 * handle a browse button pressed selection.
-	 */
-	private void handleBrowseButtonPressed() {
-		DirectoryDialog dialog =
-			new DirectoryDialog(Display.getCurrent().getActiveShell());
-		dialog.setMessage(DIRECTORY_DIALOG_MESSAGE);
-		dialog.setText(DIRECTORY_DIALOG_TEXT);
-
-		String dirName = folderText.getText();
-		if (!dirName.equals(EMPTY_STRING)) {
-			File path = new File(dirName);
-			if (path.exists())
-				dialog.setFilterPath(new Path(dirName).toOSString());
-		}
-
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null) {
-			folderText.setText(selectedDirectory);
-		}
-	}
-
-	/**
-	 * validate the folder text field.
-	 */
-	private void validateFolderText() {
-
-		if (folderText.getText().equals(EMPTY_STRING)) {
-			setDialogErrorState(FOLDER_BLANK_MESSAGE);
-			folderValid = false;
-			return;
-		}
-
-		IPath path = new Path(EMPTY_STRING);
-		if (!path.isValidPath(folderText.getText())) {
-			setDialogErrorState(FOLDER_INVALID_MESSAGE);
-			folderValid = false;
-			return;
-		}
-
-		File file = new File(folderText.getText());
-		if (!file.exists()) {
-			setDialogErrorState(FOLDER_NOT_EXIST_MESSAGE);
-			folderValid = false;
-			return;
-		}
-
-		folderValid = true;
-		folder = folderText.getText();
-		if (fileNameValid) {
-			setDialogOKState();
-		} else {
-			validateFileNameText();
-		}
-	}
-
-	/**
-	 * validate the file name text field.
-	 */
-	private void validateFileNameText() {
-		IStatus nameStatus =
-			ResourcesPlugin.getWorkspace().validateName(
-				fileNameText.getText(),
-				IResource.FILE);
-
-		if (!nameStatus.isOK()) {
-			setDialogErrorState(nameStatus.getMessage());
-			fileNameValid = false;
-			return;
-		}
-
-		fileNameValid = true;
-        
-        IPath filePath = (new Path(fileNameText.getText())).removeFileExtension();
-		fileName = filePath.toString();
-		if (folderValid) {
-			setDialogOKState();
-		} else {
-			validateFolderText();
-		}
-	}
-
-	/**
-	 * Set the dialog into error state mode. The error image (x) label and 
-	 * error label are made visible and the ok button is disabled.
-	 * @param message the error message
-	 */
-	private void setDialogErrorState(String message) {
-		messageLabel.setText(message);
-		messageImageLabel.setVisible(true);
-		messageLabel.setVisible(true);
-		getButton(IDialogConstants.OK_ID).setEnabled(false);
-		getButton(IDialogConstants.CANCEL_ID).getShell().setDefaultButton(
-			getButton(IDialogConstants.CANCEL_ID));
-	}
-
-	/**
-	 * Set the dialog into ok state mode. The error image (x) label and 
-	 * error label and made not visible and the ok button is enabled.
-	 */
-	private void setDialogOKState() {
-		messageImageLabel.setVisible(false);
-		messageLabel.setVisible(false);
-		getButton(IDialogConstants.OK_ID).setEnabled(true);
-		getButton(IDialogConstants.OK_ID).getShell().setDefaultButton(
-			getButton(IDialogConstants.OK_ID));
-	}
-
-	/**
-	 * Retrieves the persistent settings for this dialog.
-	 * @return the persistent settings for this dialog.
-	 */
-	private IDialogSettings getDialogSettings() {
-		IDialogSettings settings = DiagramUIRenderPlugin.getInstance()
-			.getDialogSettings();
-		settings = settings.getSection(DIALOG_SETTINGS_ID);
-		if (settings == null)
-			settings = DiagramUIRenderPlugin.getInstance().getDialogSettings()
-				.addNewSection(DIALOG_SETTINGS_ID);
-		return settings;
-	}
-
-	/**
-	 * Initialize the settings for this dialog.
-	 * 
-	 * @param path
-	 *            the default path to use for the diagram file or null if the
-	 *            dialog should use some default path.
-	 */
-	private void initDialogSettings(IPath path) {
-		IDialogSettings dialogSettings = getDialogSettings();
-
-		// By defualt, the folder will be the root of the filesystem, where ever
-		//  that may be on a system.
-		folder = "/"; //$NON-NLS-1$
-		
-		if (path == null) {
-			String persistentFolder = dialogSettings.get(DIALOG_SETTINGS_FOLDER);
-			if (persistentFolder != null) {
-				folder = persistentFolder;
-			}
-		} else {
-			folder = path.toOSString();
-		}
-
-		String persistentImageFormat =
-			dialogSettings.get(DIALOG_SETTINGS_IMAGE_FORMAT);
-		if (persistentImageFormat == null) {
-			imageFormat = ImageFileFormat.getDefaultImageFormat();
-		} else {
-			imageFormat =
-				ImageFileFormat.resolveImageFormat(persistentImageFormat);
-		}
-
-		overwriteExisting =
-			dialogSettings.getBoolean(DIALOG_SETTINGS_OVERWRITE);
-	}
-
-	/**
-	 * Retrieves the persistent settings for this dialog.
-	 */
-	private void saveDialogSettings() {
-		IDialogSettings dialogSettings = getDialogSettings();
-		dialogSettings.put(DIALOG_SETTINGS_FOLDER, folder);
-		dialogSettings.put(
-			DIALOG_SETTINGS_IMAGE_FORMAT,
-			imageFormat.getName().toLowerCase());
-		dialogSettings.put(DIALOG_SETTINGS_OVERWRITE, overwriteExisting);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		super.okPressed();
-		saveDialogSettings();
-	}
-
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/editparts/BufferedImageEditPart.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/editparts/BufferedImageEditPart.java
deleted file mode 100644
index 72f00dd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/editparts/BufferedImageEditPart.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.editparts;
-
-import org.eclipse.gmf.runtime.diagram.ui.render.editparts.AbstractImageEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.*
- * 
- * Concrete subclass of AbstractImageEditPart for images that are based on a
- * stored buffer instead of a file.
- */
-public class BufferedImageEditPart
-	extends AbstractImageEditPart {
-
-	/**
-	 * Default constructor
-	 * 
-	 * @param view
-	 *            IShapeView that the EditPart is controlling
-	 */
-	public BufferedImageEditPart(View view) {
-		super(view);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.AbstractImageEditPart#regenerateImageFromSource()
-	 */
-	public RenderedImage regenerateImageFromSource() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/editparts/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/editparts/package.html
deleted file mode 100644
index 4537aa1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/editparts/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the <i>edit part</i> classes.
-An edit part is a controller that specifies how model elements are mapped to visual figures and coordinates the editing behavior of the model.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.java
deleted file mode 100644
index de7cc9a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005, 2006 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramUIRenderMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.render.internal.l10n.DiagramUIRenderMessages";//$NON-NLS-1$
-
-	private DiagramUIRenderMessages() {
-		// Do not instantiate
-	}
-
-	public static String CopyAction_ErrorDialogTitle;
-	public static String CopyAction_UnableToCopyImageMessage;
-	public static String CopyToImageAction_Label;
-	public static String CopyToImageAction_copyToImageErrorDialogTitle;
-	public static String CopyToImageAction_copyToImageErrorDialogMessage;
-	public static String CopyToImageAction_copyingDiagramToImageFileMessage;
-	public static String CopyToImageAction_copyingSelectedElementsToImageFileMessage;
-	public static String CopyToImageAction_outOfMemoryMessage;
-	public static String CopyToImageAction_overwriteExistingConfirmDialogTitle;
-	public static String CopyToImageAction_overwriteExistingConfirmDialogMessage;
-
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIRenderMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.properties
deleted file mode 100644
index cc7a662..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.properties
+++ /dev/null

@@ -1,30 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Actions - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- copy action, used to copy diagram to bitmap file ---
-CopyAction_ErrorDialogTitle=Out of memory error
-CopyAction_UnableToCopyImageMessage=Unable to copy the image.
-
-# --- Copy to Image action - which brings up copy to image dialog ---
-CopyToImageAction_Label=&Save As Image File...
-CopyToImageAction_copyToImageErrorDialogTitle=Copy Diagram to Image File Problem
-CopyToImageAction_copyToImageErrorDialogMessage=Copy Diagram to Image File could not be completed.\n\nReason\n{0}
-CopyToImageAction_copyingDiagramToImageFileMessage=Copying Diagram to Image File {0}
-CopyToImageAction_copyingSelectedElementsToImageFileMessage=Copying Selected Elements to Image File {0}
-CopyToImageAction_outOfMemoryMessage=Out of Memory
-CopyToImageAction_overwriteExistingConfirmDialogTitle=Question
-CopyToImageAction_overwriteExistingConfirmDialogMessage=Destination file {0} exists. Do you wish to overwrite it?

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/package.html
deleted file mode 100644
index c53b98d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderContributionItemProvider.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderContributionItemProvider.java
deleted file mode 100644
index 43d69c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderContributionItemProvider.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.providers;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.render.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.render.actions.CopyToImageAction;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Contribution item provider for the Diagram UI Render plugin.
- * 
- * @author cmahoney
- */
-public class DiagramUIRenderContributionItemProvider
-	extends AbstractContributionItemProvider {
-
-	protected IAction createAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-
-		IWorkbenchPage workbenchPage = partDescriptor.getPartPage();
-
-		if (actionId.equals(ActionIds.ACTION_COPY_TO_IMAGE))
-			return new CopyToImageAction(workbenchPage);
-
-		return super.createAction(actionId, partDescriptor);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderEditPartProvider.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderEditPartProvider.java
deleted file mode 100644
index bc2a49d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderEditPartProvider.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.providers;
-
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.render.editparts.RenderedDiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateRootEditPartOperation;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * EditPart provider for the Diagram UI Render plug-in.
- * 
- * @author cmahoney
- */
-public class DiagramUIRenderEditPartProvider
-	extends AbstractEditPartProvider {
-
-	/**
-	 * Provides for a <code>CreateRootEditPartOperation</code> only.
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateRootEditPartOperation) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Creates a diagram root editpart that supports rendering of images.
-	 */
-	public RootEditPart createRootEditPart(Diagram diagram) {
-		return new RenderedDiagramRootEditPart(diagram.getMeasurementUnit());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/ImageSupportGlobalActionHandler.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/ImageSupportGlobalActionHandler.java
deleted file mode 100644
index e14d7c6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/ImageSupportGlobalActionHandler.java
+++ /dev/null

@@ -1,161 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.internal.providers;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.common.ui.util.CustomData;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.PasteViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.AWTClipboardHelper;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.commands.CopyImageCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Concrete class that implements the <code>IGlobalActionHandler</code>
- * interface and provides a command for <code>GlobalActionId.CUT</code>,
- * <code>GlobalActionId.COPY</code>, and <code>GlobalActionId.PASTE</code>.
- * 
- * @author cmahoney
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.render.*
- */
-public class ImageSupportGlobalActionHandler
-	extends DiagramGlobalActionHandler {
-
-	/**
-	 * Constructor for CopyWithImageSupportGlobalActionHandler.
-	 */
-	public ImageSupportGlobalActionHandler() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractGlobalActionHandler#canHandle(IGlobalActionContext)
-	 */
-	public boolean canHandle(IGlobalActionContext cntxt) {
-
-		/* Check if the active part is a IDiagramWorkbenchPart */
-		IWorkbenchPart part = cntxt.getActivePart();
-		if (!(part instanceof IDiagramWorkbenchPart)) {
-			return false;
-		}
-
-		/* Check if the selection is a structured selection */
-		if (!(cntxt.getSelection() instanceof IStructuredSelection)) {
-			return false;
-		}
-
-		/* Check the action id */
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.COPY)) {
-			return canCopy(cntxt);
-		} else if (actionId.equals(GlobalActionId.CUT)) {
-			return canCut(cntxt);
-		} else if (actionId.equals(GlobalActionId.PASTE)) {
-			return canPaste(cntxt);
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler#canPaste(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext)
-	 */
-	protected boolean canPaste(IGlobalActionContext cntxt) {
-		if (!AWTClipboardHelper.getInstance().isImageCopySupported()) {
-			return super.canPaste(cntxt);
-		}
-		
-		/* Check if the clipboard has data for the drawing surface */
-		return AWTClipboardHelper.getInstance().hasCustomData();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler#getCopyCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext,
-	 *      org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart,
-	 *      boolean)
-	 */
-	protected ICommand getCopyCommand(IGlobalActionContext cntxt,
-			IDiagramWorkbenchPart diagramPart, final boolean isUndoable) {
-		if (!AWTClipboardHelper.getInstance().isImageCopySupported()) {
-			return super.getCopyCommand(cntxt, diagramPart, isUndoable);
-		}
-		
-		return new CopyImageCommand(cntxt.getLabel(), diagramPart.getDiagram(),
-			getSelectedViews(cntxt.getSelection()), diagramPart
-				.getDiagramEditPart()) {
-
-			public boolean canUndo() {
-				return isUndoable;
-			}
-
-			public boolean canRedo() {
-				return isUndoable;
-			}
-
-			protected CommandResult doUndoWithResult(
-                    IProgressMonitor progressMonitor, IAdaptable info)
-                throws ExecutionException {
-                
-				return isUndoable ? CommandResult.newOKCommandResult()
-					: super.doUndoWithResult(progressMonitor, info);
-			}
-
-			protected CommandResult doRedoWithResult(
-                    IProgressMonitor progressMonitor, IAdaptable info)
-                throws ExecutionException {
-                
-				return isUndoable ? CommandResult.newOKCommandResult()
-					: super.doRedoWithResult(progressMonitor, info);
-			}
-            
-            public void addContext(IUndoContext context) {
-                if (isUndoable) {
-                    super.addContext(context);
-                }
-            }
-
-            public void removeContext(IUndoContext context) {
-               if (isUndoable) {
-                   super.removeContext(context);
-               }
-            }
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler#createPasteViewRequest()
-	 */
-	protected PasteViewRequest createPasteViewRequest() {
-		if (!AWTClipboardHelper.getInstance().isImageCopySupported()) {
-			return super.createPasteViewRequest();
-		}
-		
-		CustomData data = AWTClipboardHelper.getInstance().getCustomData();
-
-		return new PasteViewRequest(new ICustomData[] {data});
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/package.html
deleted file mode 100644
index d93a2b1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the service provider classes for this plugin.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/providers/DiagramUIRenderGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/providers/DiagramUIRenderGlobalActionHandlerProvider.java
deleted file mode 100644
index dcc2cb4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/providers/DiagramUIRenderGlobalActionHandlerProvider.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.providers;
-
-import java.util.Hashtable;
-
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.providers.ImageSupportGlobalActionHandler;
-
-/**
- * Concrete class that implements the <code>IGlobalActionHandlerProvider</code>
- * providing <code>IGlobalActionHandler</code> for all diagrams supporting
- * render capabilities.
- * 
- * @author cmahoney
- */
-public final class DiagramUIRenderGlobalActionHandlerProvider
-	extends AbstractGlobalActionHandlerProvider {
-
-	/**
-	 * List for handlers.
-	 */
-	private Hashtable handlerList = new Hashtable();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DiagramUIRenderGlobalActionHandlerProvider() {
-		super();
-	}
-
-	/**
-	 * Returns a global action handler that supports global image operations
-	 * (cut, copy, and paste).
-	 */
-	public IGlobalActionHandler getGlobalActionHandler(
-			final IGlobalActionHandlerContext context) {
-		/* Create the handler */
-		if (!getHandlerList().containsKey(context.getActivePart())) {
-			getHandlerList().put(context.getActivePart(),
-				new ImageSupportGlobalActionHandler());
-
-			/*
-			 * Register as a part listener so that the cache can be cleared when
-			 * the part is disposed
-			 */
-			context.getActivePart().getSite().getPage().addPartListener(
-				new IPartListener() {
-
-					private IWorkbenchPart localPart = context.getActivePart();
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart)
-					 */
-					public void partActivated(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart)
-					 */
-					public void partBroughtToTop(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart)
-					 */
-					public void partClosed(IWorkbenchPart part) {
-						/* Remove the cache associated with the part */
-						if (part != null && part == localPart
-							&& getHandlerList().containsKey(part)) {
-							getHandlerList().remove(part);
-							localPart.getSite().getPage().removePartListener(
-								this);
-							localPart = null;
-						}
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart)
-					 */
-					public void partDeactivated(IWorkbenchPart part) {
-						// Do nothing
-					}
-
-					/**
-					 * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart)
-					 */
-					public void partOpened(IWorkbenchPart part) {
-						// Do nothing
-					}
-				});
-		}
-
-		return (ImageSupportGlobalActionHandler) getHandlerList().get(
-			context.getActivePart());
-	}
-
-	/**
-	 * Returns the handlerList.
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getHandlerList() {
-		return handlerList;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/providers/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/providers/package.html
deleted file mode 100644
index 40b7ebd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/providers/package.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-This package contains the service provider classes for this plugin.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/CopyToImageUtil.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/CopyToImageUtil.java
deleted file mode 100644
index 3e125ea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/CopyToImageUtil.java
+++ /dev/null

@@ -1,553 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.util;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-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.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
-import org.eclipse.gmf.runtime.diagram.ui.image.PartPositionInfo;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramImageGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramSVGGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.image.ImageExporter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Utility class to render a diagram to an image file.
- * 
- * @author Anthony Hunter, cmahoney
- */
-public class CopyToImageUtil {
-
-    /**
-     * Creates a <code>DiagramEditPart</code> given the <code>Diagram</code>
-     * without opening an editor.
-     * 
-     * @param diagram
-     *            the <code>Diagram</code>
-     * @param shell
-     *            An out parameter for the shell that must be disposed after the
-     *            copy to image operation has completed.
-     * @param preferencesHint
-     *            The preference hint that is to be used to find the appropriate
-     *            preference store from which to retrieve diagram preference
-     *            values. The preference hint is mapped to a preference store in
-     *            the preference registry <@link DiagramPreferencesRegistry>.
-     * @return the new populated <code>DiagramEditPart</code>
-     */
-    public DiagramEditPart createDiagramEditPart(Diagram diagram, Shell shell,
-            PreferencesHint preferencesHint) {
-        return OffscreenEditPartFactory.getInstance().createDiagramEditPart(
-            diagram, shell, preferencesHint);
-    }
-
-    /**
-     * Copies the diagram to an image file in the specified format.
-     * 
-     * @param diagram
-     *            the diagram to be copied
-     * @param destination
-     *            the destination file, including path and file name
-     * @param format
-     *            the image file format
-     * @param monitor
-     *            progress monitor.
-     * @param preferencesHint
-     *            The preference hint that is to be used to find the appropriate
-     *            preference store from which to retrieve diagram preference
-     *            values. The preference hint is mapped to a preference store in
-     *            the preference registry <@link DiagramPreferencesRegistry>.
-     * @return A list of {@link PartPositionInfo} objects with details regarding
-     *         each top-level editpart on the diagram represented in the image.
-     * @exception CoreException
-     *                if this method fails
-     */
-    public List copyToImage(Diagram diagram, IPath destination,
-            ImageFileFormat format, IProgressMonitor monitor,
-            PreferencesHint preferencesHint)
-        throws CoreException {
-
-        Trace.trace(DiagramUIRenderPlugin.getInstance(),
-            "Copy diagram to Image " + destination + " as " + format); //$NON-NLS-1$ //$NON-NLS-2$ 
-
-        Shell shell = new Shell();
-        List partInfo = Collections.EMPTY_LIST;
-
-        try {
-            DiagramEditPart diagramEditPart = createDiagramEditPart(diagram,
-                shell, preferencesHint);
-            Assert.isNotNull(diagramEditPart);
-            DiagramGenerator generator = copyToImage(diagramEditPart,
-                destination, format, monitor);
-            partInfo = generator.getDiagramPartInfo(diagramEditPart);
-        } finally {
-            shell.dispose();
-        }
-
-        return partInfo;
-    }
-
-    /**
-     * Copies the diagram to an image file in the specified format.
-     * 
-     * @param diagramEP
-     *            the diagram editpart
-     * @param destination
-     *            the destination file, including path and file name
-     * @param format
-     *            the image format to create.
-     * @param monitor
-     *            progress monitor.
-     * @return The diagram generator used to copy the image.
-     * @exception CoreException
-     *                if this method fails
-     */
-    public DiagramGenerator copyToImage(DiagramEditPart diagramEP,
-            IPath destination, ImageFileFormat format, IProgressMonitor monitor)
-        throws CoreException {
-
-        boolean found = false;
-        DiagramGenerator gen = null;
-        if (format.equals(ImageFileFormat.SVG)) {
-
-            gen = new DiagramSVGGenerator(diagramEP);
-            gen.createSWTImageDescriptorForDiagram();
-
-            monitor.worked(1);
-
-            saveSVGToFile(destination, (DiagramSVGGenerator) gen, monitor);
-            return gen;
-        } else if (format.equals(ImageFileFormat.JPEG)
-                || format.equals(ImageFileFormat.PNG)) {
-
-            String exportFormat = ImageExporter.JPEG_FILE;
-            if (format.equals(ImageFileFormat.PNG))
-                exportFormat = ImageExporter.PNG_FILE;
-
-            gen = new DiagramImageGenerator(diagramEP);
-            java.awt.Image image = gen.createAWTImageForDiagram();
-            if (image instanceof BufferedImage) {
-                ImageExporter.exportToFile(destination, (BufferedImage) image,
-                    exportFormat, monitor);
-                found = true;
-            }
-        }
-
-        if (!found) {
-            gen = new DiagramImageGenerator(diagramEP);
-            Image image = gen.createSWTImageDescriptorForDiagram()
-                .createImage();
-
-            monitor.worked(1);
-
-            saveToFile(destination, image, format, monitor);
-            image.dispose();
-        }
-
-        monitor.worked(1);
-        return gen;
-    }
-
-    /**
-     * Copies the diagram to an image file in the specified format.
-     * 
-     * @param diagramEP
-     *            the diagram edit part
-     * @param selection
-     *            selected shapes in the diagram.
-     * @param destination
-     *            the destination file, including path and file name
-     * @param format
-     *            the image format to create.
-     * @param monitor
-     *            progress monitor.
-     * @exception CoreException
-     *                if this method fails
-     */
-    public void copyToImage(DiagramEditPart diagramEP, List selection,
-            IPath destination, ImageFileFormat format, IProgressMonitor monitor)
-        throws CoreException {
-
-        boolean found = false;
-        if (format.equals(ImageFileFormat.SVG)) {
-
-            DiagramSVGGenerator gen = new DiagramSVGGenerator(diagramEP);
-            gen.createSWTImageDescriptorForParts(selection);
-
-            monitor.worked(1);
-
-            saveSVGToFile(destination, gen, monitor);
-            found = true;
-        } else if (format.equals(ImageFileFormat.JPEG)
-            || format.equals(ImageFileFormat.PNG)) {
-
-            String exportFormat = ImageExporter.JPEG_FILE;
-            if (format.equals(ImageFileFormat.PNG))
-                exportFormat = ImageExporter.PNG_FILE;
-
-            java.awt.Image image = new DiagramImageGenerator(diagramEP)
-                .createAWTImageForParts(selection);
-            if (image instanceof BufferedImage) {
-                ImageExporter.exportToFile(destination, (BufferedImage) image,
-                    exportFormat, monitor);
-                found = true;
-            }
-        }
-
-        if (!found) {
-            Image image = new DiagramImageGenerator(diagramEP)
-                .createSWTImageDescriptorForParts(selection).createImage();
-
-            monitor.worked(1);
-
-            saveToFile(destination, image, format, monitor);
-            image.dispose();
-        }
-
-        monitor.worked(1);
-    }
-
-    /**
-     * Saves the image to a file.
-     * 
-     * @param destination
-     *            the destination file, including path and file name
-     * @param image
-     *            the SWT image
-     * @param imageFormat
-     *            the selected image format
-     * @param monitor
-     *            progress monitor
-     * @exception CoreException
-     *                if this method fails
-     */
-    protected void saveToFile(IPath destination, Image image,
-            ImageFileFormat imageFormat, IProgressMonitor monitor)
-        throws CoreException {
-
-        monitor.worked(1);
-        
-        ImageData imageData = image.getImageData();
-        
-        if (imageFormat.equals(ImageFileFormat.GIF) ||
-                imageFormat.equals(ImageFileFormat.BMP))
-            imageData = createImageData(image); 
-
-        monitor.worked(1);
-        
-        IStatus fileModificationStatus = createFile(destination);
-        if (!fileModificationStatus.isOK()) {
-        	// can't write to the file
-        	return;
-        }
-        
-        monitor.worked(1);
-        ImageLoader imageLoader = new ImageLoader();
-        imageLoader.data = new ImageData[] {imageData};
-        imageLoader.logicalScreenHeight = image.getBounds().width;
-        imageLoader.logicalScreenHeight = image.getBounds().height;
-        imageLoader.save(destination.toOSString(), imageFormat.getOrdinal());
-
-        monitor.worked(1);
-        refreshLocal(destination);
-    }
-
-    /**
-     * Saves an SVG DOM to a file.
-     * 
-     * @param destination
-     *            the destination file, including path and file name
-     * @param generator
-     *            the svg generator for a diagram, used to write
-     * @param monitor
-     *            the progress monitor
-     * @exception CoreException
-     *                if this method fails
-     */
-    protected void saveSVGToFile(IPath destination,
-            DiagramSVGGenerator generator, IProgressMonitor monitor)
-        throws CoreException {
-
-        IStatus fileModificationStatus = createFile(destination);
-        if (!fileModificationStatus.isOK()) {
-        	// can't write to the file
-        	return;
-        }
-        
-        monitor.worked(1);
-
-        try {
-
-            FileOutputStream os = new FileOutputStream(destination.toOSString());
-            monitor.worked(1);
-
-            generator.stream(os);
-            monitor.worked(1);
-
-            os.close();
-            monitor.worked(1);
-            refreshLocal(destination);
-        } catch (IOException ex) {
-            Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, ex
-                .getMessage(), ex);
-        }
-    }
-
-    /**
-     * create a file in the workspace if the destination is in a project in the
-     * workspace.
-     * 
-     * @param destination
-     *            the destination file.
-     * @return the status from validating the file for editing
-     * @exception CoreException
-     *                if this method fails
-     */
-    private IStatus createFile(IPath destination)
-        throws CoreException {
-        IFile file = ResourcesPlugin.getWorkspace().getRoot()
-            .getFileForLocation(destination);
-        if (file != null && !file.exists()) {
-            File osFile = new File(destination.toOSString());
-            if (osFile.exists()) {
-                file.refreshLocal(IResource.DEPTH_ZERO, null);
-            } else {
-                ResourcesPlugin.getWorkspace().getRoot().refreshLocal(
-                    IResource.DEPTH_INFINITE, null);
-                InputStream input = new ByteArrayInputStream(new byte[0]);
-                file.create(input, false, null);
-            }
-        }
-
-        if (file != null) {
-        	return FileModificationValidator.approveFileModification(new IFile[] {file});
-        }
-        return Status.OK_STATUS;
-    }
-
-    /**
-     * refresh the file in the workspace if the destination is in a project in
-     * the workspace.
-     * 
-     * @param destination
-     *            the destination file.
-     * @exception CoreException
-     *                if this method fails
-     */
-    private void refreshLocal(IPath destination)
-        throws CoreException {
-        IFile file = ResourcesPlugin.getWorkspace().getRoot()
-            .getFileForLocation(destination);
-        if (file != null) {
-            file.refreshLocal(IResource.DEPTH_ZERO, null);
-        }
-    }
-
-    /**
-     * Retrieve the image data for the image, using a palette of at most 256
-     * colours.
-     * 
-     * @param image
-     *            the SWT image.
-     * @return new image data.
-     */
-    private ImageData createImageData(Image image) {
-
-        ImageData imageData = image.getImageData();
-
-        /**
-         * If the image depth is 8 bits or less, then we can use the existing
-         * image data.
-         */
-        if (imageData.depth <= 8) {
-            return imageData;
-        }
-
-        /**
-         * get an 8 bit imageData for the image
-         */
-        ImageData newImageData = get8BitPaletteImageData(imageData);
-
-        /**
-         * if newImageData is null, it has more than 256 colours. Use the web
-         * safe pallette to get an 8 bit image data for the image.
-         */
-        if (newImageData == null) {
-            newImageData = getWebSafePalletteImageData(imageData);
-        }
-
-        return newImageData;
-    }
-
-    /**
-     * Retrieve an image data with an 8 bit palette for an image. We assume that
-     * the image has less than 256 colours.
-     * 
-     * @param imageData
-     *            the imageData for the image.
-     * @return the new 8 bit imageData or null if the image has more than 256
-     *         colours.
-     */
-    private ImageData get8BitPaletteImageData(ImageData imageData) {
-        PaletteData palette = imageData.palette;
-        RGB colours[] = new RGB[256];
-        PaletteData newPaletteData = new PaletteData(colours);
-        ImageData newImageData = new ImageData(imageData.width,
-            imageData.height, 8, newPaletteData);
-
-        int lastPixel = -1;
-        int newPixel = -1;
-        for (int i = 0; i < imageData.width; ++i) {
-            for (int j = 0; j < imageData.height; ++j) {
-                int pixel = imageData.getPixel(i, j);
-
-                if (pixel != lastPixel) {
-                    lastPixel = pixel;
-
-                    RGB colour = palette.getRGB(pixel);
-                    for (newPixel = 0; newPixel < 256; ++newPixel) {
-                        if (colours[newPixel] == null) {
-                            colours[newPixel] = colour;
-                            break;
-                        }
-                        if (colours[newPixel].equals(colour))
-                            break;
-                    }
-
-                    if (newPixel >= 256) {
-                        /**
-                         * Diagram has more than 256 colors, return null
-                         */
-                        return null;
-                    }
-                }
-
-                newImageData.setPixel(i, j, newPixel);
-            }
-        }
-
-        RGB colour = new RGB(0, 0, 0);
-        for (int k = 0; k < 256; ++k) {
-            if (colours[k] == null)
-                colours[k] = colour;
-        }
-
-        return newImageData;
-    }
-
-    /**
-     * If the image has less than 256 colours, simply create a new 8 bit palette
-     * and map the colours to the new palatte.
-     */
-    private ImageData getWebSafePalletteImageData(ImageData imageData) {
-        PaletteData palette = imageData.palette;
-        RGB[] webSafePallette = getWebSafePallette();
-        PaletteData newPaletteData = new PaletteData(webSafePallette);
-        ImageData newImageData = new ImageData(imageData.width,
-            imageData.height, 8, newPaletteData);
-
-        int lastPixel = -1;
-        int newPixel = -1;
-        for (int i = 0; i < imageData.width; ++i) {
-            for (int j = 0; j < imageData.height; ++j) {
-                int pixel = imageData.getPixel(i, j);
-
-                if (pixel != lastPixel) {
-                    lastPixel = pixel;
-
-                    RGB colour = palette.getRGB(pixel);
-                    RGB webSafeColour = getWebSafeColour(colour);
-                    for (newPixel = 0; newPixel < 216; ++newPixel) {
-                        if (webSafePallette[newPixel].equals(webSafeColour))
-                            break;
-                    }
-
-                    Assert.isTrue(newPixel < 216);
-                }
-                newImageData.setPixel(i, j, newPixel);
-            }
-        }
-
-        return newImageData;
-    }
-
-    /**
-     * Retrieves a web safe colour that closely matches the provided colour.
-     * 
-     * @param colour
-     *            a colour.
-     * @return the web safe colour.
-     */
-    private RGB getWebSafeColour(RGB colour) {
-        int red = Math.round((colour.red + 25) / 51) * 51;
-        int green = Math.round((colour.green + 25) / 51) * 51;
-        int blue = Math.round((colour.blue + 25) / 51) * 51;
-        return new RGB(red, green, blue);
-    }
-
-    /**
-     * Retrieves a web safe pallette. Our palette will be 216 web safe colours
-     * and the remaining filled with white.
-     * 
-     * @return array of 256 colours.
-     */
-    private RGB[] getWebSafePallette() {
-        RGB[] colours = new RGB[256];
-        int i = 0;
-        for (int red = 0; red <= 255; red = red + 51) {
-            for (int green = 0; green <= 255; green = green + 51) {
-                for (int blue = 0; blue <= 255; blue = blue + 51) {
-                    RGB colour = new RGB(red, green, blue);
-                    colours[i++] = colour;
-                }
-            }
-        }
-
-        RGB colour = new RGB(0, 0, 0);
-        for (int k = 0; k < 256; ++k) {
-            if (colours[k] == null)
-                colours[k] = colour;
-        }
-
-        return colours;
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramRenderUtil.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramRenderUtil.java
deleted file mode 100644
index d252569..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramRenderUtil.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.util;
-
-import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramImageGenerator;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Provides miscellaneous utilities for this plug-in.
- * 
- * @author cmahoney
- */
-public class DiagramRenderUtil {
-
-	/**
-	 * Utility api to generate an AWT based image representation of the diagram
-	 * contents.
-	 * 
-	 * @param diagram
-	 *            The Diagram to render the image from.
-	 * @return java.awt.Image that is the bitmap representation of the diagram
-	 *         contents.
-	 * 
-	 * @throws NullPointerException
-	 *             <code>diagram</code> is <code>null</code>
-	 */
-	public static java.awt.Image renderToAWTImage(Diagram diagram) {
-		if (null == diagram) {
-			throw new NullPointerException("Argument 'diagram' is null"); //$NON-NLS-1$
-		}
-
-        Shell shell = new Shell();
-        try {
-            DiagramEditPart diagramEP = OffscreenEditPartFactory.getInstance()
-                .createDiagramEditPart(diagram, shell);
-            DiagramImageGenerator imageGenerator = new DiagramImageGenerator(
-                diagramEP);
-
-            return imageGenerator.createAWTImageForDiagram();
-        } finally {
-            shell.dispose();
-        }
-	}
-
-	/**
-	 * Utility api to generate an SWT based image representation of the diagram
-	 * contents.
-	 * 
-	 * @param diagram
-	 *            The Diagram to render the image from.
-	 * @return org.eclipse.swt.graphics.Image that is the bitmap representation
-	 *         of the diagram contents. Caller is responsible for calling
-	 *         dispose() on the return image.
-	 * 
-	 * @throws NullPointerException
-	 *             <code>diagram</code> is <code>null</code>
-	 */
-	public static org.eclipse.swt.graphics.Image renderToSWTImage(
-			Diagram diagram) {
-		if (null == diagram) {
-			throw new NullPointerException("Argument 'diagram' is null"); //$NON-NLS-1$
-		}
-
-        Shell shell = new Shell();
-        try {
-    		DiagramEditPart diagramEP = OffscreenEditPartFactory.getInstance()
-    			.createDiagramEditPart(diagram, shell);
-    		DiagramImageGenerator imageGenerator = new DiagramImageGenerator(
-    			diagramEP);
-    
-    		return imageGenerator.createSWTImageDescriptorForDiagram()
-    			.createImage();
-        } finally {
-            shell.dispose();
-        }
-            
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/ImageClipboardContentsHelper.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/ImageClipboardContentsHelper.java
deleted file mode 100644
index d4dcb0a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/ImageClipboardContentsHelper.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.render.util;
-
-import org.eclipse.swt.dnd.Transfer;
-
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardContentsHelper;
-import org.eclipse.gmf.runtime.common.ui.util.CustomDataTransfer;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.AWTClipboardHelper;
-
-/**
- * A specialized <code>ClipboardContentsHelper</code> that supports images in
- * the clipboard.
- * 
- * <p>
- * This is only supported on Windows
- * {@link org.eclipse.gmf.runtime.diagram.ui.render.clipboard.AWTClipboardHelper}.
- * </p>
- * 
- * @author cmahoney
- */
-public class ImageClipboardContentsHelper
-	extends ClipboardContentsHelper {
-
-	/**
-	 * The singleton instance of <code>ClipboardContentsHelper</code>.
-	 */
-	private static ClipboardContentsHelper instance;
-
-	/**
-	 * Retrieves the singleton instance of <code>ClipboardContentsHelper</code>.
-	 * 
-	 * @return the singleton instance of <code>ClipboardContentsHelper</code>
-	 */
-	public static ClipboardContentsHelper getInstance() {
-		if (instance == null) {
-			instance = new ImageClipboardContentsHelper();
-		}
-		return instance;
-	}
-
-	/**
-	 * Creates a new instance.
-	 */
-	protected ImageClipboardContentsHelper() {
-		// nothing to initialize
-	}
-	
-	/**
-	 * Returns the system clipboard contents with image support.
-	 */
-	public Object getClipboardContents(Transfer dataType) {
-		Object data = super.getClipboardContents(dataType);
-
-		if ((data == null)
-			&& (CustomDataTransfer.getInstance().equals(dataType))
-			&& (AWTClipboardHelper.getInstance().isImageCopySupported())) {
-			data = AWTClipboardHelper.getInstance().getCustomData();
-			if (data instanceof ICustomData) {
-				data = new ICustomData[] {(ICustomData) data};
-			}
-		}
-
-		return data;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/package.html b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/package.html
deleted file mode 100644
index 862b089..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/package.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.classpath b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.project b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.project
deleted file mode 100644
index fa566f0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide</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/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/META-INF/MANIFEST.MF
deleted file mode 100644
index 3641294..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide; singleton:=true
-Bundle-Version: 1.0.3.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.EditorIDEPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/about.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/build.properties b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/build.properties
deleted file mode 100644
index 9cf9d71..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/plugin.properties
deleted file mode 100644
index 322ff27..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Presentation - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF IDE Editor
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/plugin.xml
deleted file mode 100644
index f398961..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/plugin.xml
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-   <extension
-         id="IDEDiagramDocumentProviders"
-         name="IDE Diagram Document Providers"
-         point="org.eclipse.gmf.runtime.diagram.ui.resources.editor.documentProviders">
-      <provider
-            class="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDiagramDocumentProvider"
-            documentType="org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument"
-            id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.FileDiagramDocumentProvider"
-            inputTypes="org.eclipse.ui.IFileEditorInput"/>
-      <provider
-            class="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.StorageDiagramDocumentProvider"
-            documentType="org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument"
-            id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.StorageDiagramDocumentProvider"
-            inputTypes="org.eclipse.ui.IStorageEditorInput"/>
-   </extension>
-
-    
-</plugin>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDiagramDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDiagramDocumentProvider.java
deleted file mode 100644
index 00e4968..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDiagramDocumentProvider.java
+++ /dev/null

@@ -1,392 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramModificationListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DocumentEvent;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.EditorIDEPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-
-
-/**
- * An implementation of <code>IDiagramDocumentProvider</code> for 
- * connecting <code>org.eclipse.ui.IFileEditorInput</code> and
- * <code>IDiagramDocument</code>.
- * 
- * @author mgoyal
- *
- */
-public class FileDiagramDocumentProvider
-	extends FileDocumentProvider implements IDiagramDocumentProvider {
-	
-	public class DiagramFileInfo extends FileInfo {
-		DiagramModificationListener fListener;
-		/**
-		 * Creates and returns a new file info.
-		 *
-		 * @param document the document
-		 * @param model the annotation model
-		 * @param fileSynchronizer the file synchronizer
-		 */
-		public DiagramFileInfo(IDocument document, FileSynchronizer fileSynchronizer, DiagramModificationListener listener) {
-			super(document, fileSynchronizer);
-			fListener = listener;
-		}
-		
-		public void documentAboutToBeChanged(DocumentEvent event) {
-			if(event.getEventKind() == DocumentEvent.CONTENT_REPLACED) {
-				// release the existing content.
-				IDiagramDocument diagramDoc = ((IDiagramDocument)event.getDocument());
-				Diagram existingContent = diagramDoc.getDiagram();
-				URI existingURI = null;
-				if(existingContent != null) {
-					existingURI = existingContent.eResource().getURI();
-					DiagramIOUtil.unload(diagramDoc.getEditingDomain(), existingContent);
-				}
-
-				Diagram newContent = (Diagram)event.getEventInfo();
-				if(newContent != null && existingURI != null) {
-					newContent.eResource().setURI(existingURI);
-				}
-			}
-			super.documentAboutToBeChanged(event);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.StorageDocumentProvider#createEmptyDocument()
-	 */
-	protected IDocument createEmptyDocument() {
-		return new DiagramDocument();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDiagramDocumentProvider#getDiagramDocument(java.lang.Object)
-	 */
-	public IDiagramDocument getDiagramDocument(Object element) {
-		IDocument doc = getDocument(element);
-		if(doc instanceof IDiagramDocument)
-			return (IDiagramDocument)doc;
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#disposeElementInfo(java.lang.Object, org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider.ElementInfo)
-	 */
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		super.disposeElementInfo(element, info);
-		Object content = info.fDocument.getContent();
-		if(content instanceof Diagram && info.fDocument instanceof IDiagramDocument) {
-			DiagramIOUtil.unload(((IDiagramDocument)info.fDocument).getEditingDomain(), (Diagram)content);
-
-			assert info instanceof DiagramFileInfo;
-		}
-        if(((DiagramFileInfo)info).fListener != null)
-            ((DiagramFileInfo)info).fListener.stopListening();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.StorageDocumentProvider#setDocumentContentFromStorage(org.eclipse.gmf.runtime.diagram.ui.editor.IDocument, org.eclipse.core.resources.IStorage)
-	 */
-	protected void setDocumentContentFromStorage(IDocument document, IStorage storage)
-		throws CoreException {
-		Diagram diagram = (Diagram)document.getContent();
-		if(diagram != null) {
-			Resource resource = diagram.eResource();
-			IFile resourceFile = WorkspaceSynchronizer.getFile(resource);
-			// unload if the resourceFile and storage is same.
-			// if not same throw exception.
-			if(resourceFile != null) {
-				if(resourceFile.equals(storage)) {
-					document.setContent(null);
-				} else {
-					throw new CoreException(new Status(IStatus.ERROR, EditorIDEPlugin.getPluginId(), EditorStatusCodes.ERROR, EditorMessages.FileDocumentProvider_handleElementContentChanged, null));
-				}
-			}
-		}
-		IDiagramDocument diagramDocument = (IDiagramDocument)document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-
-		diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());
-		document.setContent(diagram);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDocumentProvider#saveDocumentToFile(org.eclipse.gmf.runtime.diagram.ui.editor.IDocument, org.eclipse.core.resources.IFile, boolean, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void saveDocumentToFile(IDocument document, IFile file, boolean overwrite, IProgressMonitor monitor)
-		throws CoreException {
-		Diagram diagram = (Diagram)document.getContent();
-		Resource resource = diagram.eResource();
-		IFile resourceFile = WorkspaceSynchronizer.getFile(resource);
-		// if the diagram in the document is referring to another file, then we should
-		// create a copy of this diagram and save it to the new file, save as scenario.
-		if(resourceFile != null && !resourceFile.equals(file)) {
-			diagram = copyDiagramResource(diagram, file);
-		}
-		IDiagramDocument diagramDocument = (IDiagramDocument)document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-		doSave(domain, file, diagram, null, monitor);
-	}
-	
-	private Diagram copyDiagramResource(Diagram sourceDiagram, IFile file) {
-		Resource sourceRes = sourceDiagram.eResource();
-		EList contents = sourceRes.getContents();
-		
-		int indexOfDiagram = contents.indexOf(sourceDiagram);
-		final Collection copiedContents = EcoreUtil.copyAll(contents);
-
-		TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(sourceDiagram);
-		String fileName = file.getFullPath().toString();
-		final Resource newResource = editingDomain.getResourceSet()
-            .createResource(URI.createPlatformResourceURI(fileName, true));
-         
-        Map options = new HashMap();
-        options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
- 
-        AbstractEMFOperation operation = new AbstractEMFOperation(
-            editingDomain, StringStatics.BLANK,
-            options) {
-
-            protected IStatus doExecute(IProgressMonitor monitor,
-                    IAdaptable info)
-                throws ExecutionException {
-
-                newResource.getContents().addAll(copiedContents);
-
-                return Status.OK_STATUS;
-            }
-        };
-        try {
-            operation.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            Trace.catching(EditorIDEPlugin.getInstance(),
-                EditorDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "createView", e); //$NON-NLS-1$
-            Log
-                .warning(EditorIDEPlugin.getInstance(),
-                    EditorStatusCodes.RESOURCE_FAILURE,
-                    "createView", e); //$NON-NLS-1$
-        }
- 	
-		return (Diagram)newResource.getContents().get(indexOfDiagram);
-	}
-
-	/**
-	 * Updates the element info to a change of the file content and sends out
-	 * appropriate notifications.
-	 *
-	 * @param fileEditorInput the input of an text editor
-	 */
-	protected void handleElementContentChanged(IFileEditorInput fileEditorInput) {
-		// unload the diagram from the MSL.
-		// Since MSL won't load another resource from same file if one is already loaded.
-		FileInfo info= (FileInfo) getElementInfo(fileEditorInput);
-		if (info == null && !(info.fDocument instanceof IDiagramDocument))
-			return;
-		assert fileEditorInput instanceof FileEditorInputProxy;
-		IDiagramDocument diagramDoc = (IDiagramDocument)info.fDocument;
-		Diagram existingContent = diagramDoc.getDiagram();
-		if(existingContent != null)
-			DiagramIOUtil.unload(((FileEditorInputProxy)fileEditorInput).getEditingDomain(), existingContent);
-		
-		super.handleElementContentChanged(fileEditorInput);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDocumentProvider#createFileInfo(org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument, org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDocumentProvider.FileSynchronizer, org.eclipse.ui.IFileEditorInput)
-	 */
-    protected FileInfo createFileInfo(IDocument document,
-            FileSynchronizer synchronizer, IFileEditorInput input) {
-        assert document instanceof DiagramDocument;
-
-        DiagramModificationListener diagramListener = null;
-        if (((DiagramDocument) document).getDiagram() != null) {
-            diagramListener = new FileDiagramModificationListener(this,
-                (DiagramDocument) document, input);
-        }
-        DiagramFileInfo info = new DiagramFileInfo(document, synchronizer,
-            diagramListener);
-
-        if (info.fListener != null)
-            info.fListener.startListening();
-        return info;
-    }
-	/*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.StorageDocumentProvider#setDocumentContent(org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument,
-     *      org.eclipse.ui.IEditorInput)
-     */
-	protected boolean setDocumentContent(IDocument document,
-			IEditorInput editorInput)
-		throws CoreException {
-		if (editorInput instanceof FileEditorInputProxy) {
-			FileEditorInputProxy diagramElement = (FileEditorInputProxy) editorInput;
-
-			((IDiagramDocument) document).setEditingDomain(diagramElement
-				.getEditingDomain());
-			boolean docContentSet = super.setDocumentContent(document,
-				editorInput);
-			return docContentSet;
-		}
-		return super.setDocumentContent(document, editorInput);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider#createInputWithEditingDomain(org.eclipse.ui.IEditorInput, org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain)
-	 */
-	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {
-		if(editorInput instanceof IFileEditorInput)
-			return new FileEditorInputProxy((IFileEditorInput)editorInput, domain);
-		assert false;
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument, boolean)
-	 */
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)
-		throws CoreException {
-		if(element instanceof IFileEditorInput) {
-			// refresh the file for diagram input.
-			IFileEditorInput input= (IFileEditorInput) element;
-			IFile file= input.getFile();
-			file.refreshLocal(IResource.DEPTH_ZERO, getProgressMonitor());
-		}
-		super.doSaveDocument(monitor, element, document, overwrite);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getSaveRule(java.lang.Object)
-	 */
-	protected ISchedulingRule getSaveRule(Object element) {
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			return computeSaveSchedulingRule(input.getFile());
-		}
-		return null;
-	}
-	
-	/**
-	 * Computes the scheduling rule needed to create or modify a resource. If
-	 * the resource exists, its modify rule is returned. If it does not, the
-	 * resource hierarchy is iterated towards the workspace root to find the
-	 * first parent of <code>toCreateOrModify</code> that exists. Then the
-	 * 'create' rule for the last non-existing resource is returned.
-	 *
-	 * @param toCreateOrModify the resource to create or modify
-	 * @return the minimal scheduling rule needed to modify or create a resource
-	 */
-	private ISchedulingRule computeSaveSchedulingRule(IResource toCreateOrModify) {
-		if (toCreateOrModify.exists() && toCreateOrModify.isSynchronized(IResource.DEPTH_ZERO))
-			return fResourceRuleFactory.modifyRule(toCreateOrModify);
-
-		IResource parent= toCreateOrModify;
-		do {
-			 /*
-			 * XXX This is a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601
-			 * IResourceRuleFactory.createRule should iterate the hierarchy itself.
-			 */
-			toCreateOrModify= parent;
-			parent= toCreateOrModify.getParent();
-		} while (parent != null && !parent.exists() && !parent.isSynchronized(IResource.DEPTH_ZERO));
-
-		return fResourceRuleFactory.createRule(toCreateOrModify);
-	}
-    
-    /**
-     * Handles the saving of the diagram to a file
-     * 
-     * @param domain
-     *            the TransactionalEditingDomain we are saving in
-     * @param file
-     *            the IFile to save to
-     * @param diagram
-     *            Diagram that will be saved
-     * @param options
-     *            save options or null
-     * @param monitor
-     *            IProgressMonitor
-     * @throws CoreException
-     */
-    protected void doSave(TransactionalEditingDomain domain, IFile file,
-            Diagram diagram, Map options, IProgressMonitor monitor)
-        throws CoreException {
-        if (options == null) {
-            DiagramIOUtil.save(domain, file, diagram, DiagramIOUtil
-                .hasUnrecognizedData(diagram.eResource()), monitor);
-        } else {
-            DiagramIOUtil.save(domain, file, diagram, monitor, options);
-        }
-    }
-    
-    /**
-     * Additionally handles updating the URI of the diagram's resource when on
-     * an element moved event.
-     *
-     * @param fileEditorInput the input of an document editor
-     * @param path the path of the new location of the file
-     */
-    protected void handleElementMoved(IFileEditorInput fileEditorInput, IPath path) {
-        if (path != null) {
-            IDiagramDocument diagramDocument = getDiagramDocument(fileEditorInput);
-            Diagram diagram = null;
-            if (diagramDocument != null) {
-                diagram = diagramDocument.getDiagram();
-            }
-            if (diagram != null) {
-                //not to os string!
-                diagram.eResource().setURI(URI.createPlatformResourceURI(path.toString()));
-            }
-        }
-        
-        super.handleElementMoved(fileEditorInput, path);
-    }    
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDiagramModificationListener.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDiagramModificationListener.java
deleted file mode 100644
index 0c8307a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDiagramModificationListener.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramModificationListener;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IFileEditorInput;
-
-/**
- * Listener for modification events on a diagram.
- * 
- * This listener is well suited for detecting save events. 
- * 
- * @author mgoyal, wdiu
- */
-public class FileDiagramModificationListener
-	extends DiagramModificationListener {
-
-	private NotificationFilter diagramResourceModifiedFilter;
-	
-	private FileDocumentProvider documentProvider;
-	
-	private IFileEditorInput input;
-	
-	/**
-	 * Constructs a modification listener which listens to modifications on a
-	 * diagram and handles saving of files.
-	 * 
-	 * @param documentProvider
-	 *            the FileDocumentProvider to handle the document being saved
-	 * @param document
-	 *            the DiagramDocument being saved
-	 * @param input
-	 *            the IFileEditorInput that contains the file being saved
-	 */
-	public FileDiagramModificationListener(
-			final FileDocumentProvider documentProvider,
-			final DiagramDocument document, final IFileEditorInput input) {
-
-		super(documentProvider, document);
-		this.documentProvider = documentProvider;
-		this.input = input;
-		
-		Diagram diagram = document.getDiagram();
-
-		diagramResourceModifiedFilter = NotificationFilter
-            .createNotifierFilter(diagram.eResource()).and(
-                NotificationFilter.createEventTypeFilter(Notification.SET).or(
-                    NotificationFilter
-                        .createEventTypeFilter(Notification.UNSET))).and(
-                NotificationFilter.createFeatureFilter(Resource.class,
-                    Resource.RESOURCE__IS_MODIFIED));
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return type == FileDiagramModificationListener.class
-			|| super.isAdapterForType(type);
-	}
-
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-		if (diagramResourceModifiedFilter.matches(notification)) {
-			// provide further filtering not available with the
-			// NotificationFilter
-			if (getDiagramDocument().getDiagram() != null
-				&& notification.getNotifier() instanceof Resource) {
-				Resource notifierResource = (Resource) notification
-					.getNotifier();
-	
-				EList contents = notifierResource.getContents();
-				if (!contents.isEmpty()) {
-					Object root = contents.get(0);
-	
-					if (notification.getNewBooleanValue() == false) {
-						if (root instanceof EObject
-							&& ((EObject) root).eResource() != null
-							&& ((EObject) root).eResource().equals(
-								notifierResource)
-							&& notifierResource.isLoaded()) {
-	
-							getDiagramDocument().setContent(getDiagramDocument().getContent(),
-								documentProvider
-									.computeModificationStamp(input
-										.getFile()));
-	
-							// this sets the timestamp
-							documentProvider
-								.handleExistingDocumentSaved(input);
-						}
-					}
-				}
-			}
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDocumentProvider.java
deleted file mode 100644
index bf1c2ae..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileDocumentProvider.java
+++ /dev/null

@@ -1,824 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import java.io.ByteArrayInputStream;
-
-import org.eclipse.core.filebuffers.manipulation.ContainerCreator;
-import org.eclipse.core.resources.IFile;
-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.IResourceRuleFactory;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-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.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages;
-
-
-/**
- * Shared document provider specialized for file resources (<code>IFile</code>).
- * <p>
- * This class should be subclassed for different types of documents.</p>
- */
-public abstract class FileDocumentProvider
-	extends StorageDocumentProvider {
-
-	/**
-	 * The runnable context for that provider.
-	 */
-	private WorkspaceOperationRunner fOperationRunner;
-	/**
-	 * The scheduling rule factory.
-	 */
-	protected IResourceRuleFactory fResourceRuleFactory;
-
-	/**
-	 * Runnable encapsulating an element state change. This runnable ensures
-	 * that a element change failed message is sent out to the element state listeners
-	 * in case an exception occurred.
-	 *
-	 * 
-	 */
-	protected class SafeChange implements Runnable {
-
-		/** The input that changes. */
-		private IFileEditorInput fInput;
-
-		/**
-		 * Creates a new safe runnable for the given input.
-		 *
-		 * @param input the input
-		 */
-		public SafeChange(IFileEditorInput input) {
-			fInput= input;
-		}
-
-		/**
-		 * Execute the change.
-		 * Subclass responsibility.
-		 *
-		 * @param input the input
-		 * @throws Exception an exception in case of error
-		 */
-		protected void execute(IFileEditorInput input) throws Exception {
-			// overriden
-		}
-
-		/*
-		 * @see java.lang.Runnable#run()
-		 */
-		public void run() {
-
-			if (getElementInfo(fInput) == null) {
-				fireElementStateChangeFailed(fInput);
-				return;
-			}
-
-			try {
-				execute(fInput);
-			} catch (Exception e) {
-				fireElementStateChangeFailed(fInput);
-			}
-		}
-	}
-
-
-	/**
-	 * Synchronizes the document with external resource changes.
-	 */
-	protected class FileSynchronizer implements IResourceChangeListener, IResourceDeltaVisitor {
-
-		/** The file editor input. */
-		protected IFileEditorInput fFileEditorInput;
-		/**
-		 * A flag indicating whether this synchronizer is installed or not.
-		 *
-		 * 
-		 */
-		protected boolean fIsInstalled= false;
-
-		/**
-		 * Creates a new file synchronizer. Is not yet installed on a resource.
-		 *
-		 * @param fileEditorInput the editor input to be synchronized
-		 */
-		public FileSynchronizer(IFileEditorInput fileEditorInput) {
-			fFileEditorInput= fileEditorInput;
-		}
-
-		/**
-		 * Returns the file wrapped by the file editor input.
-		 *
-		 * @return the file wrapped by the editor input associated with that synchronizer
-		 */
-		protected IFile getFile() {
-			return fFileEditorInput.getFile();
-		}
-
-		/**
-		 * Installs the synchronizer on the input's file.
-		 */
-		public void install() {
-			getFile().getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-			fIsInstalled= true;
-		}
-
-		/**
-		 * Uninstalls the synchronizer from the input's file.
-		 */
-		public void uninstall() {
-			getFile().getWorkspace().removeResourceChangeListener(this);
-			fIsInstalled= false;
-		}
-
-		/*
-		 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
-		 */
-		public void resourceChanged(IResourceChangeEvent e) {
-			IResourceDelta delta= e.getDelta();
-			try {
-				if (delta != null && fIsInstalled)
-					delta.accept(this);
-			} catch (CoreException x) {
-				handleCoreException(x, EditorMessages.FileDocumentProvider_resourceChanged);
-			}
-		}
-
-		/*
-		 * @see IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			if (delta == null)
-				return false;
-
-			delta= delta.findMember(getFile().getFullPath());
-
-			if (delta == null)
-				return false;
-
-			Runnable runnable= null;
-
-			switch (delta.getKind()) {
-				case IResourceDelta.CHANGED:
-					FileInfo info= (FileInfo) getElementInfo(fFileEditorInput);
-					if (info == null || info.fCanBeSaved)
-						break;
-
-					boolean isSynchronized= computeModificationStamp(getFile()) == info.fModificationStamp;
-					if (((IResourceDelta.ENCODING & delta.getFlags()) != 0 && isSynchronized) || ((IResourceDelta.CONTENT & delta.getFlags()) != 0 && !isSynchronized)) {
-						runnable = new SafeChange(fFileEditorInput) {
-							protected void execute(IFileEditorInput input) throws Exception {
-								handleElementContentChanged(input);
-							}
-						};
-					}
-					break;
-
-				case IResourceDelta.REMOVED:
-					if ((IResourceDelta.MOVED_TO & delta.getFlags()) != 0) {
-						final IPath path= delta.getMovedToPath();
-						runnable= new SafeChange(fFileEditorInput) {
-							protected void execute(IFileEditorInput input) throws Exception {
-								handleElementMoved(input, path);
-							}
-						};
-					} else {
-						info= (FileInfo) getElementInfo(fFileEditorInput);
-						if (info != null && !info.fCanBeSaved) {
-							runnable= new SafeChange(fFileEditorInput) {
-								protected void execute(IFileEditorInput input) throws Exception {
-									handleElementDeleted(input);
-								}
-							};
-						}
-					}
-					break;
-			}
-
-			if (runnable != null)
-				update(runnable);
-
-			return false;
-		}
-
-		/**
-		 * Posts the update code "behind" the running operation.
-		 *
-		 * @param runnable the update code
-		 */
-		protected void update(Runnable runnable) {
-
-			if (runnable instanceof SafeChange)
-				fireElementStateChanging(fFileEditorInput);
-
-			IWorkbench workbench= PlatformUI.getWorkbench();
-			IWorkbenchWindow[] windows= workbench.getWorkbenchWindows();
-			if (windows != null && windows.length > 0) {
-				Display display= windows[0].getShell().getDisplay();
-				display.asyncExec(runnable);
-			} else {
-				runnable.run();
-			}
-		}
-	}
-
-
-
-	/**
-	 * Bundle of all required information to allow files as underlying document resources.
-	 */
-	protected class FileInfo extends StorageInfo {
-
-		/** The file synchronizer. */
-		public FileSynchronizer fFileSynchronizer;
-		/** The time stamp at which this provider changed the file. */
-		public long fModificationStamp= IResource.NULL_STAMP;
-
-		/**
-		 * Creates and returns a new file info.
-		 *
-		 * @param document the document
-		 * @param model the annotation model
-		 * @param fileSynchronizer the file synchronizer
-		 */
-		public FileInfo(IDocument document, FileSynchronizer fileSynchronizer) {
-			super(document);
-			fFileSynchronizer= fileSynchronizer;
-		}
-	}
-
-
-	/**
-	 * Creates and returns a new document provider.
-	 */
-	public FileDocumentProvider() {
-		super();
-		fResourceRuleFactory= ResourcesPlugin.getWorkspace().getRuleFactory();
-	}
-
-	/**
-	 * Checks whether the given resource has been changed on the
-	 * local file system by comparing the actual time stamp with the
-	 * cached one. If the resource has been changed, a <code>CoreException</code>
-	 * is thrown.
-	 *
-	 * @param cachedModificationStamp the cached modification stamp
-	 * @param resource the resource to check
-	 * @throws org.eclipse.core.runtime.CoreException if resource has been changed on the file system
-	 */
-	protected void checkSynchronizationState(long cachedModificationStamp, IResource resource) throws CoreException {
-		if (cachedModificationStamp != computeModificationStamp(resource)) {
-			Status status= new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, IResourceStatus.OUT_OF_SYNC_LOCAL, EditorMessages.FileDocumentProvider_error_out_of_sync, null);
-			throw new CoreException(status);
-		}
-	}
-
-	/**
-	 * Computes the initial modification stamp for the given resource.
-	 *
-	 * @param resource the resource
-	 * @return the modification stamp
-	 */
-	protected long computeModificationStamp(IResource resource) {
-		long modificationStamp= resource.getModificationStamp();
-
-		IPath path= resource.getLocation();
-		if (path == null)
-			return modificationStamp;
-
-		modificationStamp= path.toFile().lastModified();
-		return modificationStamp;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentProvider#getModificationStamp(java.lang.Object)
-	 */
-	public long getModificationStamp(Object element) {
-
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			return computeModificationStamp(input.getFile());
-		}
-
-		return super.getModificationStamp(element);
-	}
-
-	/*
-	 * @see IDocumentProvider#getSynchronizationStamp(Object)
-	 */
-	public long getSynchronizationStamp(Object element) {
-
-		if (element instanceof IFileEditorInput) {
-			FileInfo info= (FileInfo) getElementInfo(element);
-			if (info != null)
-				return info.fModificationStamp;
-		}
-
-		return super.getSynchronizationStamp(element);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#doSynchronize(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doSynchronize(Object element, IProgressMonitor monitor)  throws CoreException {
-		if (element instanceof IFileEditorInput) {
-
-			IFileEditorInput input= (IFileEditorInput) element;
-
-			FileInfo info= (FileInfo) getElementInfo(element);
-			if (info != null) {
-
-				if (info.fFileSynchronizer != null) {
-					info.fFileSynchronizer.uninstall();
-					refreshFile(input.getFile(), monitor);
-					info.fFileSynchronizer.install();
-				} else {
-					refreshFile(input.getFile(), monitor);
-				}
-
-				handleElementContentChanged((IFileEditorInput) element);
-			}
-			return;
-
-		}
-		super.doSynchronize(element, monitor);
-	}
-
-	/*
-	 * @see IDocumentProvider#isDeleted(Object)
-	 */
-	public boolean isDeleted(Object element) {
-
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-
-			IPath path= input.getFile().getLocation();
-			if (path == null)
-				return true;
-
-			return !path.toFile().exists();
-		}
-
-		return super.isDeleted(element);
-	}
-
-	/**
-	 * Initializes the given document with the given stream using the given encoding.
-	 *
-	 * @param document the document to be initialized
-	 * @param contentStream the stream which delivers the document content
-	 * @param encoding the character encoding for reading the given stream
-	 * @throws CoreException if the given stream can not be read
-	 * 
-	 */
-	protected abstract void saveDocumentToFile(IDocument document, IFile file, boolean overwrite, IProgressMonitor monitor) throws CoreException;
-
-	/*
-	 * @see AbstractDocumentProvider#doSaveDocument(IProgressMonitor, Object, IDocument, boolean)
-	 */
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
-		if (element instanceof IFileEditorInput) {
-
-			IFileEditorInput input= (IFileEditorInput) element;
-			FileInfo info= (FileInfo) getElementInfo(element);
-			IFile file= input.getFile();
-
-			if (file.exists()) {
-
-				if (info != null && !overwrite)
-					checkSynchronizationState(info.fModificationStamp, file);
-
-				// inform about the upcoming content change
-				fireElementStateChanging(element);
-				try {
-					saveDocumentToFile(document, file, overwrite, monitor);
-				} catch (CoreException x) {
-					// inform about failure
-					fireElementStateChangeFailed(element);
-					throw x;
-				} catch (RuntimeException x) {
-					// inform about failure
-					fireElementStateChangeFailed(element);
-					throw x;
-				}
-
-				// If here, the editor state will be flipped to "not dirty".
-				// Thus, the state changing flag will be reset.
-
-				if (info != null) {
-					info.fModificationStamp= computeModificationStamp(file);
-				}
-
-			} else {
-				try {
-					monitor.beginTask(EditorMessages.FileDocumentProvider_task_saving, 3000);
-					ContainerCreator creator = new ContainerCreator(file.getWorkspace(), file.getParent().getFullPath());
-					creator.createContainer(new SubProgressMonitor(monitor, 1000));
-					file.create(new ByteArrayInputStream("".getBytes()), false, new SubProgressMonitor(monitor, 1000)); //$NON-NLS-1$
-					saveDocumentToFile(document, file, overwrite, new SubProgressMonitor(monitor, 1000));
-				}
-				finally {
-					monitor.done();
-				}
-			}
-		} else {
-			super.doSaveDocument(monitor, element, document, overwrite);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#createElementInfo(java.lang.Object)
-	 */
-	protected ElementInfo createElementInfo(Object element) throws CoreException {
-		if (element instanceof IFileEditorInput) {
-
-			IFileEditorInput input= (IFileEditorInput) element;
-
-			try {
-				refreshFile(input.getFile());
-			} catch (CoreException x) {
-				handleCoreException(x, EditorMessages.FileDocumentProvider_createElementInfo);
-			}
-
-			IDocument d= null;
-			IStatus s= null;
-
-			try {
-				d= createDocument(element);
-			} catch (CoreException x) {
-				handleCoreException(x, EditorMessages.FileDocumentProvider_createElementInfo);
-				s= x.getStatus();
-				d= createEmptyDocument();
-			}
-			
-			FileSynchronizer f= new FileSynchronizer(input);
-			f.install();
-
-			FileInfo info= createFileInfo(d, f, input);
-			info.fModificationStamp= computeModificationStamp(input.getFile());
-			info.fStatus= s;
-
-			return info;
-		}
-
-		return super.createElementInfo(element);
-	}
-	
-	/**
-	 * Create a FileInfo for the given document.
-	 * 
-	 * May also construct and start required listeners.
-	 * 
-	 * @param document to create a FileInfo for
-	 * @param synchronizer FileSynchronizer which has been created for the
-	 * IFileEditorInput
-	 * @param input IFileEditorInput corresponding to the document
-	 * @return FileInfo for the given document
-	 */
-	protected FileInfo createFileInfo(IDocument document, FileSynchronizer synchronizer, IFileEditorInput input) {
-		return new FileInfo(document, synchronizer);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#disposeElementInfo(java.lang.Object, org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider.ElementInfo)
-	 */
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		if (info instanceof FileInfo) {
-			FileInfo fileInfo= (FileInfo) info;
-			if (fileInfo.fFileSynchronizer != null)
-				fileInfo.fFileSynchronizer.uninstall();
-		}
-
-		super.disposeElementInfo(element, info);
-	}
-
-	/**
-	 * Updates the element info to a change of the file content and sends out
-	 * appropriate notifications.
-	 *
-	 * @param fileEditorInput the input of a document editor
-	 */
-	protected void handleElementContentChanged(IFileEditorInput fileEditorInput) {
-		FileInfo info= (FileInfo) getElementInfo(fileEditorInput);
-		if (info == null)
-			return;
-
-		IDocument document= createEmptyDocument();
-		IStatus status= null;
-
-		try {
-
-			try {
-				refreshFile(fileEditorInput.getFile());
-			} catch (CoreException x) {
-				handleCoreException(x, EditorMessages.FileDocumentProvider_handleElementContentChanged);
-			}
-
-			setDocumentContent(document, fileEditorInput);
-
-		} catch (CoreException x) {
-			status= x.getStatus();
-		}
-
-		Object newContent= document.getContent();
-
-		if ( !newContent.equals(info.fDocument.getContent())) {
-
-			// set the new content and fire content related events
-			fireElementContentAboutToBeReplaced(fileEditorInput);
-
-			removeUnchangedElementListeners(fileEditorInput, info);
-
-			info.fDocument.removeDocumentListener(info);
-			info.fDocument.setContent(newContent);
-			info.fCanBeSaved= false;
-			info.fModificationStamp= computeModificationStamp(fileEditorInput.getFile());
-			info.fStatus= status;
-
-			addUnchangedElementListeners(fileEditorInput, info);
-
-			fireElementContentReplaced(fileEditorInput);
-
-		} else {
-			
-			handleExistingDocumentSaved(fileEditorInput, info, status);
-
-		}
-	}
-	
-	
-	/**
-	 * Called when an existing document matching the given IFileEditorInput
-	 * was saved.
-	 * 
-	 * @param input IFileEditorInput for the document that was saved 
-	 */
-	void handleExistingDocumentSaved(IFileEditorInput input) {
-		
-		ElementInfo info = getElementInfo(input);
-		assert info instanceof FileInfo;
-		
-		handleExistingDocumentSaved(input, (FileInfo)info, null);
-	}
-	
-	/**
-	 * Called when an existing document was saved.
-	 * 
-	 * @param fileEditorInput IFileEditorInput for the document that was saved
-	 * @param info FileInfo for the given fileEditorInput element
-	 * @param status IStatus of the FileInfo
-	 */
-	private void handleExistingDocumentSaved(IFileEditorInput fileEditorInput, FileInfo info, IStatus status) {
-		removeUnchangedElementListeners(fileEditorInput, info);
-
-		// fires only the dirty state related event
-		info.fCanBeSaved= false;
-		info.fModificationStamp= computeModificationStamp(fileEditorInput.getFile());
-		info.fStatus= status;
-
-		addUnchangedElementListeners(fileEditorInput, info);
-
-		fireElementDirtyStateChanged(fileEditorInput, false);		
-	}
-	
-
-	/**
-	 * Initializes the given document with the given stream using the given encoding.
-	 *
-	 * @param document the document to be initialized
-	 * @param contentStream the stream which delivers the document content
-	 * @param encoding the character encoding for reading the given stream
-	 * @throws CoreException if the given stream can not be read
-	 * 
-	 */
-	protected void setDocumentContent(IDocument document, Object content) throws CoreException {
-		document.setContent(content);
-	}
-	/**
-	 * Sends out the notification that the file serving as document input has been moved.
-	 *
-	 * @param fileEditorInput the input of an document editor
-	 * @param path the path of the new location of the file
-	 */
-	protected void handleElementMoved(IFileEditorInput fileEditorInput, IPath path) {
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IFile newFile= workspace.getRoot().getFile(path);
-		fireElementMoved(fileEditorInput, newFile == null ? null : new FileEditorInput(newFile));
-	}
-
-	/**
-	 * Sends out the notification that the file serving as document input has been deleted.
-	 *
-	 * @param fileEditorInput the input of an document editor
-	 */
-	protected void handleElementDeleted(IFileEditorInput fileEditorInput) {
-		fireElementDeleted(fileEditorInput);
-	}
-
-	/*
-	 * @see AbstractDocumentProvider#getElementInfo(Object)
-	 * It's only here to circumvent visibility issues with certain compilers.
-	 */
-	protected ElementInfo getElementInfo(Object element) {
-		return super.getElementInfo(element);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#doValidateState(java.lang.Object, java.lang.Object)
-	 */
-	protected void doValidateState(Object element, Object computationContext) throws CoreException {
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			FileInfo info= (FileInfo) getElementInfo(input);
-			if (info != null) {
-				IFile file= input.getFile();
-				if (file.isReadOnly()) { // do not use cached state here
-					IWorkspace workspace= file.getWorkspace();
-					workspace.validateEdit(new IFile[] { file }, computationContext);
-				}
-			}
-		}
-
-		super.doValidateState(element, computationContext);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentProvider#isModifiable(java.lang.Object)
-	 */
-	public boolean isModifiable(Object element) {
-		if (!isStateValidated(element)) {
-			if (element instanceof IFileEditorInput)
-				return true;
-		}
-		return super.isModifiable(element);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#doResetDocument(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doResetDocument(Object element, IProgressMonitor monitor) throws CoreException {
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			try {
-				refreshFile(input.getFile(), monitor);
-			} catch (CoreException x) {
-				handleCoreException(x,EditorMessages.FileDocumentProvider_resetDocument);
-			}
-		}
-
-		super.doResetDocument(element, monitor);
-	}
-
-	/**
-	 * Refreshes the given file resource.
-	 *
-	 * @param file
-	 * @throws CoreException if the refresh fails
-	 * 
-	 */
-	protected void refreshFile(IFile file) throws CoreException {
-		refreshFile(file, getProgressMonitor());
-	}
-
-	/**
-	 * Refreshes the given file resource.
-	 *
-	 * @param file the file to be refreshed
-	 * @param monitor the progress monitor
-	 * @throws  org.eclipse.core.runtime.CoreException if the refresh fails
-	 * 
-	 */
-	protected void refreshFile(IFile file, IProgressMonitor monitor) throws CoreException {
-		try {
-			file.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-		} catch (OperationCanceledException x) {
-			// ignore
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentProvider#isSynchronized(java.lang.Object)
-	 */
-	public boolean isSynchronized(Object element) {
-		if (element instanceof IFileEditorInput) {
-			FileInfo info = null;
-			if ((info = (FileInfo)getElementInfo(element)) != null) {
-				IFileEditorInput input= (IFileEditorInput) element;
-				IResource resource= input.getFile();
-				return (info.fModificationStamp == computeModificationStamp(resource)) && resource.isSynchronized(IResource.DEPTH_ZERO);
-			}
-			return false;
-		}
-		return super.isSynchronized(element);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
-		if (fOperationRunner == null)
-			fOperationRunner = new WorkspaceOperationRunner();
-		fOperationRunner.setProgressMonitor(monitor);
-		return fOperationRunner;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getResetRule(java.lang.Object)
-	 */
-	protected ISchedulingRule getResetRule(Object element) {
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			return fResourceRuleFactory.modifyRule(input.getFile());
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getSaveRule(java.lang.Object)
-	 */
-	protected ISchedulingRule getSaveRule(Object element) {
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			return computeSchedulingRule(input.getFile());
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getSynchronizeRule(java.lang.Object)
-	 */
-	protected ISchedulingRule getSynchronizeRule(Object element) {
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			return fResourceRuleFactory.refreshRule(input.getFile());
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getValidateStateRule(java.lang.Object)
-	 */
-	protected ISchedulingRule getValidateStateRule(Object element) {
-		if (element instanceof IFileEditorInput) {
-			IFileEditorInput input= (IFileEditorInput) element;
-			return fResourceRuleFactory.validateEditRule(new IResource[] { input.getFile() });
-		}
-		return null;
-	}
-
-	/**
-	 * Computes the scheduling rule needed to create or modify a resource. If
-	 * the resource exists, its modify rule is returned. If it does not, the
-	 * resource hierarchy is iterated towards the workspace root to find the
-	 * first parent of <code>toCreateOrModify</code> that exists. Then the
-	 * 'create' rule for the last non-existing resource is returned.
-	 *
-	 * @param toCreateOrModify the resource to create or modify
-	 * @return the minimal scheduling rule needed to modify or create a resource
-	 */
-	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {
-		if (toCreateOrModify.exists())
-			return fResourceRuleFactory.modifyRule(toCreateOrModify);
-
-		IResource parent= toCreateOrModify;
-		do {
-			 /*
-			 * XXX This is a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601
-			 * IResourceRuleFactory.createRule should iterate the hierarchy itself.
-			 */
-			toCreateOrModify= parent;
-			parent= toCreateOrModify.getParent();
-		} while (parent != null && !parent.exists());
-
-		return fResourceRuleFactory.createRule(toCreateOrModify);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileEditorInputProxy.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileEditorInputProxy.java
deleted file mode 100644
index e39ad71..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/FileEditorInputProxy.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement;
-
-
-/**
- * FileEditorInput Proxy.
- * 
- * @author mgoyal
- *
- *
- */
-public class FileEditorInputProxy extends StorageEditorInputProxy
-	implements IFileEditorInput, IPathEditorInput, IPersistableElement, MEditingDomainElement {
-	/**
-	 * @param proxied
-	 * @param domain
-	 */
-	public FileEditorInputProxy(IFileEditorInput proxied, TransactionalEditingDomain domain) {
-		super(proxied, domain);
-		assert proxied != null && domain != null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPersistableElement#getFactoryId()
-	 */
-	public String getFactoryId() {
-		IPersistableElement persistable = getPersistableElement();
-		if(persistable != null)
-			return persistable.getFactoryId();
-		assert false;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IFileEditorInput#getFile()
-	 */
-	public IFile getFile() {
-		IFileEditorInput fileInput = getFileInput();
-		if(fileInput != null)
-			return fileInput.getFile();
-		assert false;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPathEditorInput#getPath()
-	 */
-	public IPath getPath() {
-		IPathEditorInput pathInput = getPathInput();
-		if(pathInput != null)
-			return pathInput.getPath();
-		assert false;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
-	 */
-	public void saveState(IMemento memento) {
-		IPersistableElement persistable = getPersistableElement();
-		if(persistable != null)
-			persistable.saveState(memento);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return fProxied.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement#getEditingDomain()
-	 */
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-	
-	/**
-	 * @return FileEditorInput
-	 */
-	private IFileEditorInput getFileInput() {
-		return fProxied instanceof IFileEditorInput ? (IFileEditorInput)fProxied : null;
-	}
-
-	/**
-	 * @return PathEditorInput
-	 */
-	private IPathEditorInput getPathInput() {
-		return fProxied instanceof IPathEditorInput ? (IPathEditorInput)fProxied : null;
-	}
-	
-	/**
-	 * @return Persistable Element
-	 */
-	private IPersistableElement getPersistableElement() {
-		return fProxied instanceof IPersistableElement ? (IPersistableElement)fProxied : null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDiagramDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDiagramDocumentProvider.java
deleted file mode 100644
index 52009a2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDiagramDocumentProvider.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
-f * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramModificationListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-
-
-/**
- * An implementation of <code>IDiagramDocumentProvider</code> for 
- * connecting <code>org.eclipse.ui.IStorageEditorInput</code> and
- * <code>IDiagramDocument</code>.
- * 
- * @author mgoyal
- *
- */
-public class StorageDiagramDocumentProvider
-	extends StorageDocumentProvider
-	implements IDiagramDocumentProvider {
-	
-	//a StorageInfo with a DiagramModificationListener 
-	private class DiagramStorageInfo extends StorageInfo {
-
-		DiagramModificationListener fListener;
-		public DiagramStorageInfo(IDocument document, DiagramModificationListener listener) {
-			super(document);
-			fListener = listener;
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.StorageDocumentProvider#createEmptyDocument()
-	 */
-	protected IDocument createEmptyDocument() {
-		return new DiagramDocument();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDiagramDocumentProvider#getDiagramDocument(java.lang.Object)
-	 */
-	public IDiagramDocument getDiagramDocument(Object element) {
-		IDocument doc = getDocument(element);
-		if(doc instanceof IDiagramDocument)
-			return (IDiagramDocument)doc;
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#disposeElementInfo(java.lang.Object, org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider.ElementInfo)
-	 */
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		super.disposeElementInfo(element, info);
-		Object content = info.fDocument.getContent();
-		if(content instanceof Diagram && info.fDocument instanceof IDiagramDocument) {
-			TransactionalEditingDomain domain = ((IDiagramDocument)info.fDocument).getEditingDomain();
-			DiagramIOUtil.unload(domain, (Diagram)content);
-			
-			assert info instanceof DiagramStorageInfo;
-		}
-        ((DiagramStorageInfo)info).fListener.stopListening();
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.StorageDocumentProvider#setDocumentContentFromStorage(org.eclipse.gmf.runtime.diagram.ui.editor.IDocument, org.eclipse.core.resources.IStorage)
-	 */
-	protected void setDocumentContentFromStorage(IDocument document, IStorage storage)
-		throws CoreException {
-		IDiagramDocument diagramDocument = (IDiagramDocument)document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-		Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());
-		document.setContent(diagram);
-	}
-
-	protected boolean setDocumentContent(IDocument document, IEditorInput editorInput)
-		throws CoreException {
-		if(editorInput instanceof StorageEditorInputProxy) {
-			StorageEditorInputProxy diagramElement = (StorageEditorInputProxy)editorInput;
-
-			((IDiagramDocument)document).setEditingDomain(diagramElement.getEditingDomain());
-			boolean docContentSet = super.setDocumentContent(document, editorInput);
-			return docContentSet;
-		}
-		return super.setDocumentContent(document, editorInput);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider#createInputWithEditingDomain(org.eclipse.ui.IEditorInput, org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain)
-	 */
-	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {
-		if(editorInput instanceof IStorageEditorInput)
-			return new StorageEditorInputProxy((IStorageEditorInput)editorInput, domain);
-		assert false;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.StorageDocumentProvider#createNewElementInfo(org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument)
-	 */
-	public ElementInfo createNewElementInfo(IDocument document) {
-		DiagramModificationListener listener = new DiagramModificationListener(this, (DiagramDocument)document);
-		DiagramStorageInfo info = new DiagramStorageInfo(document, listener);
-		listener.startListening();
-		return info;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDocumentProvider.java
deleted file mode 100644
index 68c4f7e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDocumentProvider.java
+++ /dev/null

@@ -1,280 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages;
-/**
- * Shared document provider specialized for {@link org.eclipse.core.resources.IStorage}s.
- */
-public abstract class StorageDocumentProvider
-	extends AbstractDocumentProvider {
-
-	/**
-	 * Bundle of all required information to allow {@link org.eclipse.core.resources.IStorage} as underlying document resources.
-	 */
-	protected class StorageInfo extends ElementInfo {
-
-		/** The flag representing the cached state whether the storage is modifiable. */
-		public boolean fIsModifiable= false;
-		/** The flag representing the cached state whether the storage is read-only. */
-		public boolean fIsReadOnly= true;
-		/** The flag representing the need to update the cached flag.  */
-		public boolean fUpdateCache= true;
-
-		/**
-		 * Creates a new storage info.
-		 *
-		 * @param document the document
-		 * @param model the annotation model
-		 */
-		public StorageInfo(IDocument document) {
-			super(document);
-		}
-	}
-
-	/**
-	 * Creates a new document provider.
-	 *
-	 * 
-	 */
-	public StorageDocumentProvider() {
-		super();
-	}
-
-
-	/**
-	 * @see AbstractDocumentProvider#createDocument(Object)
-	 */
-	protected IDocument createDocument(Object element) throws CoreException {
-
-		if (element instanceof IStorageEditorInput) {
-			IDocument document= createEmptyDocument();
-			if (setDocumentContent(document, (IEditorInput) element)) {
-				setupDocument(element, document);
-				return document;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Sets up the given document as it would be provided for the given element. The
-	 * content of the document is not changed. This default implementation is empty.
-	 * Subclasses may reimplement.
-	 *
-	 * @param element the blue-print element
-	 * @param document the document to set up
-	 */
-	protected void setupDocument(Object element, IDocument document) {
-		// for subclasses
-	}
-
-	/**
-	 * Factory method for creating empty documents.
-	 * @return the newly created document
-	 * 
-	 */
-	protected abstract IDocument createEmptyDocument();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#createElementInfo(java.lang.Object)
-	 */
-	protected ElementInfo createElementInfo(Object element) throws CoreException {
-		if (element instanceof IStorageEditorInput) {
-
-			IDocument document= null;
-			IStatus status= null;
-
-			try {
-				document= createDocument(element);
-			} catch (CoreException x) {
-				handleCoreException(x, EditorMessages.StorageDocumentProvider_createElementInfo);
-				status= x.getStatus();
-				document= createEmptyDocument();
-			}
-
-			ElementInfo info= createNewElementInfo(document);
-			info.fStatus= status;
-
-			return info;
-		}
-
-		return super.createElementInfo(element);
-	}
-	
-	/**
-	 * Create a new ElementInfo
-	 * @param document
-	 * @return ElementInfo
-	 */
-	public ElementInfo createNewElementInfo(IDocument document) {
-		return new StorageInfo(document);
-	}
-
-	/**
-	 * Initializes the given document from the given editor input using the given character encoding.
-	 *
-	 * @param document the document to be initialized
-	 * @param editorInput the input from which to derive the content of the document
-	 * @param encoding the character encoding used to read the editor input
-	 * @return <code>true</code> if the document content could be set, <code>false</code> otherwise
-	 * @throws CoreException if the given editor input cannot be accessed
-	 * 
-	 */
-	protected boolean setDocumentContent(IDocument document, IEditorInput editorInput) throws CoreException {
-		if (editorInput instanceof IStorageEditorInput) {
-			IStorage storage= ((IStorageEditorInput) editorInput).getStorage();
-			setDocumentContentFromStorage(document, storage);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Initializes the given document with the given stream using the given encoding.
-	 *
-	 * @param document the document to be initialized
-	 * @param contentStream the stream which delivers the document content
-	 * @param encoding the character encoding for reading the given stream
-	 * @throws CoreException if the given stream can not be read
-	 * 
-	 */
-	protected abstract void setDocumentContentFromStorage(IDocument document, IStorage storage) throws CoreException;
-
-	/*
-	 * @see AbstractDocumentProvider#doSaveDocument(IProgressMonitor, Object, IDocument, boolean)
-	 */
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
-		// for subclasses
-	}
-
-	/**
-	 * Defines the standard procedure to handle <code>CoreExceptions</code>. Exceptions
-	 * are written to the plug-in log.
-	 *
-	 * @param exception the exception to be logged
-	 * @param message the message to be logged
-	 * 
-	 */
-	protected void handleCoreException(CoreException exception, String message) {
-
-		Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID);
-		ILog log= Platform.getLog(bundle);
-
-		if (message != null)
-			log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, message, exception));
-		else
-			log.log(exception.getStatus());
-	}
-
-	/**
-	 * Updates the internal cache for the given input.
-	 *
-	 * @param input the input whose cache will be updated
-	 * @throws CoreException if the storage cannot be retrieved from the input
-	 * 
-	 */
-	protected void updateCache(IStorageEditorInput input) throws CoreException {
-		StorageInfo info= (StorageInfo) getElementInfo(input);
-		if (info != null) {
-			try {
-				IStorage storage= input.getStorage();
-				if (storage != null) {
-					boolean readOnly= storage.isReadOnly();
-					info.fIsReadOnly=  readOnly;
-					info.fIsModifiable= !readOnly;
-				}
-			} catch (CoreException x) {
-				handleCoreException(x, EditorMessages.StorageDocumentProvider_updateCache);
-			}
-			info.fUpdateCache= false;
-		}
-	}
-
-	/*
-	 * @see IDocumentProvider#isReadOnly(Object)
-	 * 
-	 */
-	public boolean isReadOnly(Object element) {
-		if (element instanceof IStorageEditorInput) {
-			StorageInfo info= (StorageInfo) getElementInfo(element);
-			if (info != null) {
-				if (info.fUpdateCache) {
-					try {
-						updateCache((IStorageEditorInput) element);
-					} catch (CoreException x) {
-						handleCoreException(x, EditorMessages.StorageDocumentProvider_isReadOnly);
-					}
-				}
-				return info.fIsReadOnly;
-			}
-		}
-		return super.isReadOnly(element);
-	}
-
-	/*
-	 * @see IDocumentProvider#isModifiable(Object)
-	 * 
-	 */
-	public boolean isModifiable(Object element) {
-		if (element instanceof IStorageEditorInput) {
-			StorageInfo info= (StorageInfo) getElementInfo(element);
-			if (info != null) {
-				if (info.fUpdateCache) {
-					try {
-						updateCache((IStorageEditorInput) element);
-					} catch (CoreException x) {
-						handleCoreException(x, EditorMessages.StorageDocumentProvider_isModifiable);
-					}
-				}
-				return info.fIsModifiable;
-			}
-		}
-		return super.isModifiable(element);
-	}
-
-	/*
-	 * @see AbstractDocumentProvider#doUpdateStateCache(Object)
-	 * 
-	 */
-	protected void doUpdateStateCache(Object element) throws CoreException {
-		if (element instanceof IStorageEditorInput) {
-			StorageInfo info= (StorageInfo) getElementInfo(element);
-			if (info != null)
-				info.fUpdateCache= true;
-		}
-		super.doUpdateStateCache(element);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageEditorInputProxy.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageEditorInputProxy.java
deleted file mode 100644
index 1a9024a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageEditorInputProxy.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.HashUtil;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.EditorInputProxy;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement;
-import org.eclipse.ui.IStorageEditorInput;
-
-
-/**
- * @author mgoyal
- *
- */
-public class StorageEditorInputProxy extends EditorInputProxy
-	implements IStorageEditorInput, MEditingDomainElement {
-
-	/**
-	 * @param input IEditorInput
-	 * @param domain EditingDomain
-	 */
-	public StorageEditorInputProxy(IStorageEditorInput input, TransactionalEditingDomain domain) {
-		super(input, domain);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IStorageEditorInput#getStorage()
-	 */
-	public IStorage getStorage()
-		throws CoreException {
-		if(fProxied != null && fProxied instanceof IStorageEditorInput)
-			return ((IStorageEditorInput)fProxied).getStorage();
-		assert false;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object arg0) {
-		if(this == arg0)
-			return true;
-		if(arg0 instanceof StorageEditorInputProxy) {
-			StorageEditorInputProxy proxy = (StorageEditorInputProxy)arg0;
-			if(proxy.editingDomain.equals(editingDomain) &&
-					proxy.fProxied.equals(fProxied))
-				return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return HashUtil.hash(HashUtil.hash(fProxied), editingDomain);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/WorkspaceOperationRunner.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/WorkspaceOperationRunner.java
deleted file mode 100644
index 84f3e5a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/WorkspaceOperationRunner.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.ISchedulingRuleProvider;
-
-
-
-/**
- * 
- */
-public class WorkspaceOperationRunner implements IRunnableContext {
-
-	private IProgressMonitor fProgressMonitor;
-
-	public WorkspaceOperationRunner() {
-		// empty constructor
-	}
-
-	/**
-	 * Sets the progress monitor.
-	 *
-	 * @param progressMonitor the progress monitor to set
-	 */
-	public void setProgressMonitor(IProgressMonitor progressMonitor) {
-		fProgressMonitor= progressMonitor;
-	}
-
-	/**
-	 * Returns the progress monitor. It there is no progress monitor the monitor\
-	 * is set to the <code>NullProgressMonitor</code>.
-	 *
-	 * @return the progress monitor
-	 */
-	public IProgressMonitor getProgressMonitor() {
-		if (fProgressMonitor == null)
-			fProgressMonitor= new NullProgressMonitor();
-		return fProgressMonitor;
-	}
-
-	/*
-	 * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress)
-	 */
-	public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
-		if (runnable instanceof ISchedulingRuleProvider)
-			run(fork, cancelable, runnable, ((ISchedulingRuleProvider)runnable).getSchedulingRule());
-		else
-			run(fork, cancelable, runnable, ResourcesPlugin.getWorkspace().getRoot());
-	}
-
-	/*
-	 * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress)
-	 */
-	public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable, ISchedulingRule schedulingRule) throws InvocationTargetException, InterruptedException {
-		WorkspaceModifyDelegatingOperation operation= new WorkspaceModifyDelegatingOperation(runnable, schedulingRule);
-		operation.run(getProgressMonitor());
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/FileDiagramEditor.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/FileDiagramEditor.java
deleted file mode 100644
index 521c672..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/FileDiagramEditor.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-
-/**
- * FileDiagramEditor with optional flyout palette.
- * 
- * @author mgoyal
- */
-public class FileDiagramEditor
-	extends IDEDiagramDocumentEditor {
-
-	/**
-	 * Constructs a file diagram editor, with flyout palette if
-	 * <code>hasFlyoutPalette</code> is true and without flyout palette
-	 * if <code>hasFlyoutPalette</code> is false.
-	 * 
-	 * @param hasFlyoutPalette true if flyoutPalette is required.
-	 */
-	public FileDiagramEditor(boolean hasFlyoutPalette) {
-		super(hasFlyoutPalette);
-	}
-
-	/**
-	 * Constructs a file diagram editor without flyout palette.
-	 */
-	public FileDiagramEditor() {
-		this(false);
-	}
-	
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/FileDiagramEditorWithFlyoutPalette.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/FileDiagramEditorWithFlyoutPalette.java
deleted file mode 100644
index 85dff2b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/FileDiagramEditorWithFlyoutPalette.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor;
-
-
-
-/**
- * FileDiagramEditor With a flyout palette
- * @author mgoyal
- *
- */
-public class FileDiagramEditorWithFlyoutPalette
-	extends FileDiagramEditor {
-
-	/**
-	 * Constructs a FileDiagramEditor with Flyout Palette.
-	 */
-	public FileDiagramEditorWithFlyoutPalette() {
-		super(true);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/IDEDiagramDocumentEditor.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/IDEDiagramDocumentEditor.java
deleted file mode 100644
index ec1f3f0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/IDEDiagramDocumentEditor.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.IStatus;
-import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorMessages;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorMatchingStrategy;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-
-
-public class IDEDiagramDocumentEditor
-	extends DiagramDocumentEditor implements IGotoMarker {
-
-	public IDEDiagramDocumentEditor(boolean hasFlyoutPalette) {
-		super(hasFlyoutPalette);
-	}
-
-	/**
-	 * Performs a save as and reports the result state back to the
-	 * given progress monitor. This default implementation does nothing.
-	 * Subclasses may reimplement.
-	 *
-	 * @param progressMonitor the progress monitor for communicating result state or <code>null</code>
-	 */
-	
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-
-		Shell shell= getSite().getShell();
-		IEditorInput input = getEditorInput();
-
-		SaveAsDialog dialog= new SaveAsDialog(shell);
-
-		IFile original= (input instanceof IFileEditorInput) ? ((IFileEditorInput) input).getFile() : null;
-		if (original != null)
-			dialog.setOriginalFile(original);
-
-		dialog.create();
-
-		IDocumentProvider provider= getDocumentProvider();
-		if (provider == null) {
-			// editor has been programmatically closed while the dialog was open
-			return;
-		}
-
-		if (provider.isDeleted(input) && original != null) {
-			String message= NLS.bind(EditorMessages.Editor_warning_save_delete, original.getName());
-			dialog.setErrorMessage(null);
-			dialog.setMessage(message, IMessageProvider.WARNING);
-		}
-
-		if (dialog.open() == Window.CANCEL) {
-			if (progressMonitor != null)
-				progressMonitor.setCanceled(true);
-			return;
-		}
-
-		IPath filePath= dialog.getResult();
-		if (filePath == null) {
-			if (progressMonitor != null)
-				progressMonitor.setCanceled(true);
-			return;
-		}
-
-		IWorkspaceRoot workspaceRoot= ResourcesPlugin.getWorkspace().getRoot();
-		IFile file= workspaceRoot.getFile(filePath);
-		final IEditorInput newInput= new FileEditorInput(file);
-
-		// Check if the editor is already open
-		IEditorMatchingStrategy matchingStrategy = getEditorDescriptor().getEditorMatchingStrategy();
-		
-		IEditorReference[] editorRefs = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditorReferences();
-		for (int i=0; i < editorRefs.length; i++) {
-			if (matchingStrategy.matches(editorRefs[i],newInput)) {
-				MessageDialog.openWarning(shell, org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileSaveAs_DialogTitle, org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileSaveAs_DialogMessageText);
-				return;
-			}
-		}
-		
-		boolean success= false;		
-		try {
-			provider.aboutToChange(newInput);
-			getDocumentProvider(newInput).saveDocument(progressMonitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true);
-			success= true;
-
-		} catch (CoreException x) {
-			IStatus status= x.getStatus();
-			if (status == null || status.getSeverity() != IStatus.CANCEL)
-				ErrorDialog.openError(shell, EditorMessages.Editor_error_saving_title2, EditorMessages.Editor_error_saving_message2, x.getStatus());
-		} finally {
-			provider.changed(newInput);
-			if (success)
-				setInput(newInput);
-		}
-
-		if (progressMonitor != null)
-			progressMonitor.setCanceled(!success);
-	}
-	
-    /**
-     * go to a specific marker
-     * 
-     * @param marker
-     *            marker to use
-     */
-    public final void gotoMarker(IMarker marker) {
-        MarkerNavigationService.getInstance().gotoMarker(this, marker);
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/EditorIDEDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/EditorIDEDebugOptions.java
deleted file mode 100644
index 4d8e9d5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/EditorIDEDebugOptions.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author Wayne Diu, wdiu
- *
- */
-public final class EditorIDEDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private EditorIDEDebugOptions() {
-		//private constructor
-	}
-
-	public static final String DEBUG = EditorIDEPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/EditorIDEPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/EditorIDEPlugin.java
deleted file mode 100644
index 1cd4bf4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/EditorIDEPlugin.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- * Editor IDE Plug-in
- * 
- * @author Wayne Diu, wdiu
- */
-public class EditorIDEPlugin extends AbstractUIPlugin {
-
-	/**
-	 * The shared instance.
-	 */
-	private static EditorIDEPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public EditorIDEPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the plugin instance
-	 */
-	public static EditorIDEPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 * 
-	 * @return the workspace
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Returns active workbench window
-	 * 
-	 * @return the active workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Returns active page
-	 * 
-	 * @return the active page
-	 */
-	public static IWorkbenchPage getActivePage() {
-		return getActiveWorkbenchWindow().getActivePage();
-	}
-
-	/**
-	 * Returns active editor
-	 * 
-	 * @return the active editor
-	 */
-	public static IEditorPart getActiveEditor() {
-		return getActivePage().getActiveEditor();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/EditorMessages.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/EditorMessages.java
deleted file mode 100644
index 75de15e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/EditorMessages.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n;
-
-
-/**
- * Messages for the IDE Editor.
- * @author mgoyal
- *
- */
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class to get NLSed messages.
- */
-final public class EditorMessages extends NLS {
-	private static final String BUNDLE_NAME= EditorMessages.class.getName();
-
-	private EditorMessages() {
-		// Do not instantiate
-	}
-
-	public static String FileDocumentProvider_createElementInfo;
-	public static String FileDocumentProvider_error_out_of_sync;
-	public static String FileDocumentProvider_task_saving;
-	public static String FileDocumentProvider_resetDocument;
-	public static String FileDocumentProvider_resourceChanged;
-	public static String FileDocumentProvider_handleElementContentChanged;
-	
-	public static String StorageDocumentProvider_createElementInfo;
-	public static String StorageDocumentProvider_updateCache;
-	public static String StorageDocumentProvider_isReadOnly;
-	public static String StorageDocumentProvider_isModifiable;
-	
-	public static String WizardPage_DIAGRAM_CREATION_FAIL_EXC_;
-
-	public static String WizardPage_Message_FileExists_ERROR_;
-
-	public static String FileCreator_TaskTitle;
-	public static String EditorWizardPage_DialogInternalErrorTitle;
-	public static String EditorWizardPage_InvalidFilename; 
-	
-	public static String FileSaveAs_DialogTitle;
-	public static String FileSaveAs_DialogMessageText;
-
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EditorMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/EditorMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/EditorMessages.properties
deleted file mode 100644
index 42c9ae0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/EditorMessages.properties
+++ /dev/null

@@ -1,43 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2000, 2005   IBM Corporation and others.                 |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-## Errors ##
-
-FileDocumentProvider_createElementInfo=FileDocumentProvider.createElementInfo
-FileDocumentProvider_error_out_of_sync=The file has been changed on the file system
-FileDocumentProvider_task_saving=Saving
-FileDocumentProvider_resetDocument=FileDocumentProvider.resetDocument
-FileDocumentProvider_resourceChanged=FileDocumentProvider.resourceChanged
-FileDocumentProvider_handleElementContentChanged=FileDocumentProvider.handleElementContentChanged
-
-StorageDocumentProvider_createElementInfo=StorageDocumentProvider.createElementInfo
-StorageDocumentProvider_updateCache=StorageDocumentProvider.updateCache
-StorageDocumentProvider_isReadOnly=StorageDocumentProvider.isReadOnly
-StorageDocumentProvider_isModifiable=StorageDocumentProvider.isModifiable
-
-#--- Exceptions ---
-WizardPage_DIAGRAM_CREATION_FAIL_EXC_=Unable to create diagram file
-
-#--- Errors ---
-WizardPage_Message_FileExists_ERROR_=The same name already exists.
-
-#---- File creation
-FileCreator_TaskTitle = Creating
-EditorWizardPage_DialogInternalErrorTitle=Creation Problems
-EditorWizardPage_InvalidFilename = ''{0}'' is not a valid file name. 
-
-#---- File Save As
-FileSaveAs_DialogTitle =Problem During Save As...
-FileSaveAs_DialogMessageText =Save could not be completed. Target file is already open in another editor.
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/package.html
deleted file mode 100644
index 1f34ae4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/package.html
deleted file mode 100644
index cfdc60b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/internal/package.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-The basic plug-in lifecycle classes in the Diagram Editor IDE plug-in.
-
-<h2>Package Specification</h2>
-
-<p>
-This package contains the classes that provide basic plug-in lifecycle
-interactions with the Eclipse run-time.  These classes are
-not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.*
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/IDEEditorFileCreator.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/IDEEditorFileCreator.java
deleted file mode 100644
index 67e7ee4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/IDEEditorFileCreator.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util;
-
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.ContainerGenerator;
-
-/**
- * A file creator that creates a file in an IDE dependent
- * WorkspaceModifyOperation.
- * 
- * @author wdiu, Wayne Diu, refactored from DiagramFileCreator
- */
-public abstract class IDEEditorFileCreator
-	extends DiagramFileCreator {
-
-	/**
-	 * Creates the file, taking other file operations in the workspace into
-	 * account.
-	 * 
-	 * @param fileHandle
-	 *            the IFile that will be created.
-	 * @param contents
-	 *            InputStream with the initial contents for the new IFile
-	 * @param runContext
-	 *            the IRunnableContext that the operation to create the file
-	 *            will be run in.
-	 * @throws InterruptedException
-	 *             if the create file operation is interrupted
-	 * @throws InvocationTargetException
-	 *             which may be caused by the create file operation
-	 */
-	protected void createFile(final IFile fileHandle,
-			final InputStream contents, final IRunnableContext runContext)
-		throws InterruptedException, InvocationTargetException {
-
-		WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
-
-			protected void execute(IProgressMonitor monitor)
-				throws CoreException, InterruptedException {
-				try {
-					monitor.beginTask(EditorMessages.FileCreator_TaskTitle, 2000);
-
-					assert fileHandle.getFullPath().segmentCount() >= 2;
-
-					IPath containerPath = fileHandle.getFullPath()
-						.removeLastSegments(1);
-
-					ContainerGenerator generator = new ContainerGenerator(
-						containerPath);
-					generator.generateContainer(new SubProgressMonitor(monitor,
-						1000));
-					createFile(fileHandle, contents, new SubProgressMonitor(
-						monitor, 1000));
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		runContext.run(true, true, op);
-
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/IDEEditorUtil.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/IDEEditorUtil.java
deleted file mode 100644
index 7d29a50..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/IDEEditorUtil.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util;
-
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.ide.IDE;
-
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.EditorIDEDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.EditorUtil;
-
-/**
- * Diagram utilities for IDE editors
- * 
- * @author wdiu, Wayne Diu, refactored from EditorUtil
- */
-public class IDEEditorUtil extends EditorUtil {
-	
-	/**
-	 * Opens the diagram in an IEditorPart
-	 *  
-	 * @param file IFile that contains the diagram
-	 * @param dWindow the workbench window
-	 * @param saveDiagram true to save the diagram after opening, false to not
-	 * save it.
-	 * @param progressMonitor used when opening the diagram.
-	 * For now, it is only used when the diagram is being saved after opening.
-	 *  
-	 * @return DiagramEditPart for the diagram opened in an IEditorPart.
-	 */
-	public static final DiagramEditPart openDiagram(IFile file,
-			IWorkbenchWindow dWindow, boolean saveDiagram,
-			IProgressMonitor progressMonitor) {
-		IEditorPart editorPart = null;
-		try {
-			IWorkbenchPage page = dWindow.getActivePage();
-			if (page != null) {
-				editorPart = IDE.openEditor(page, file, true);
-
-				if (saveDiagram)
-					editorPart.doSave(progressMonitor);
-			}
-			file.refreshLocal(IResource.DEPTH_ZERO, null);
-			return ((IDiagramWorkbenchPart) editorPart).getDiagramEditPart();
-		} catch (Exception e) {
-			Trace.catching(EditorPlugin.getInstance(),
-				EditorIDEDebugOptions.EXCEPTIONS_CATCHING,
-				EditorUtil.class, "openDiagram", e); //$NON-NLS-1$
-		}
-
-		return null;
-	}
-	
-	/**
-	 * Create and open a diagram.
-	 * 
-	 * @param diagramFileCreator that the new diagram is created from.
-	 * @param containerPath IPath for the container of the diagram file
-	 * @param fileName String of the name of the diagram
-	 * @param initialContents initial contents of the new diagram file
-	 * @param kind String of the kind of diagram to create
-	 * @param dWindow 
-	 * @param progressMonitor IProgressMonitor to use when creating the
-	 * new diagram and opening it
-	 * @param openEditor boolean true to open the editor after creating it,
-	 * false to not open it after creating it
-	 * @param saveDiagram boolean true to save the diagram after creating it
-	 * 
-	 * @return IFile containing the created diagram
-	 */
-	public static IFile createAndOpenDiagram(
-			DiagramFileCreator diagramFileCreator,
-			IPath containerPath, String fileName, InputStream initialContents,
-			String kind, IWorkbenchWindow dWindow,
-			IProgressMonitor progressMonitor, boolean openEditor,
-			boolean saveDiagram) {
-		IFile newFile = EditorUtil.createNewDiagramFile(diagramFileCreator,
-			containerPath, fileName, initialContents, kind, dWindow.getShell(),
-			progressMonitor, PreferencesHint.USE_DEFAULTS);
-
-		if (newFile != null && openEditor) {
-			//Since the file resource was created fine, open it for editing
-			// iff requested by the user
-			IDEEditorUtil.openDiagram(newFile, dWindow, saveDiagram,
-				progressMonitor);
-		}
-
-		return newFile;
-	}	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/package.html
deleted file mode 100644
index e3d3658..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/util/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>This package contains <i>utility</i> classes used by this plugin which have
-IDE dependencies.  For example, the {@link
-org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorFileCreator}
-IDEEditorFileCreator will take other operations taking place in the IDE in
-account when performing file modifications and the {@link
-org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorUtil
-IDEEditorUtil's} method of opening diagrams is dependent on having an IDE.</p>
-
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/EditorCreationWizard.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/EditorCreationWizard.java
deleted file mode 100644
index 2ad6ac8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/EditorCreationWizard.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-/**
- * Create Editor Diagram Wizard
- *
- * @author qili
- * @canBeSeenBy %level1
- * 
- */
-public class EditorCreationWizard
-	extends BasicNewResourceWizard {
-
-	/**
-	 * the wizard page
-	 */
-	protected EditorWizardPage page;
-
-	/**
-	 * the diagram file
-	 */
-	protected IFile diagramFile;
-	
-	/**
-	 * 
-	 */
-	public EditorCreationWizard() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		boolean retVal = page.finish();
-		diagramFile = page.getDiagramFile();
-		return retVal;
-	}
-
-	/**
-	 * returns the diagram file 
-	 * @return IFile the diagram file
-	 */
-	public final IFile getDiagramFile() {
-		return diagramFile;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/EditorWizardPage.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/EditorWizardPage.java
deleted file mode 100644
index 4c71e2a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/EditorWizardPage.java
+++ /dev/null

@@ -1,332 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards;
-
-
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.emf.common.util.URI;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorUtil;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.EditorUtil;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-;
-
-/**
- * @author qili
- * @canBeSeenBy %level1
- * 
- * Create Diagram Wizard Page
- */
-public abstract class EditorWizardPage
-	extends WizardNewFileCreationPage {
-	
-	/** workbench */
-	protected final IWorkbench workbench;
-	
-	/**
-	 * the selection holding the elements to be displayed
-	 */
-	private final IStructuredSelection selection;
-	
-	/**
-	 * the diagram file for the newlt created diagram
-	 */
-	protected IFile diagramFile;
-	
-	/**
-	 * A flag indicating whether or not to open the editor of the newly created diagram
-	 * The default is true
-	 */
-	protected boolean openNewlyCreatedDiagramEditor;
-
-	/**
-	 * EditorWizardPage constructor
-	 *
-	 * @param pageName the page name
-	 * @param aWorkbench
-	 *            workbench the workbench this page will be displayed in
-	 * @param selection
-	 *            selection the current selection
-	 */
-	public EditorWizardPage(String pageName, IWorkbench aWorkbench,
-			IStructuredSelection selection) {
-		super(pageName, selection);
-		this.workbench = aWorkbench;
-		this.selection = selection;
-		this.diagramFile = null;
-		this.openNewlyCreatedDiagramEditor = true;
-	}
-
-	/**
-	 * @param monitor the <code>IProgressMonitor</code> to use to indicate progress and check for cancellation
-	 * @return boolean indicating whether the creation and opening the Diagram was successful
-	 */
-	public boolean doFinish(IProgressMonitor monitor) {
-		diagramFile = createAndOpenDiagram(
-				getContainerFullPath(),
-				getFileName(),
-				getInitialContents(),
-				getDiagramKind(),
-				workbench.getActiveWorkbenchWindow(),
-				monitor,
-				true);
-
-		return diagramFile != null;
-	}
-
-	/**
-	 * @param containerPath
-	 * @param fileName
-	 * @param initialContents
-	 * @param kind
-	 * @param dWindow
-	 * @param progressMonitor
-	 * @param saveDiagram
-	 * @return
-	 */
-	public IFile createAndOpenDiagram(
-			IPath containerPath,
-			String fileName,
-			InputStream initialContents,
-			String kind,
-			IWorkbenchWindow dWindow,
-			IProgressMonitor progressMonitor,
-			boolean saveDiagram) {
-		return IDEEditorUtil.createAndOpenDiagram(
-				getDiagramFileCreator(),
-				containerPath,
-				fileName,
-				initialContents,
-				kind,
-				dWindow,
-				progressMonitor,
-				isOpenNewlyCreatedDiagramEditor(),
-				saveDiagram);
-	}
-	
-	/**
-	 * Answers whether or not this Wizard will open the editor of the newly created diagram
-	 * @return Returns the openNewlyCreatedDiagramEditor.
-	 */
-	public boolean isOpenNewlyCreatedDiagramEditor() {
-		return openNewlyCreatedDiagramEditor;
-	}
-	
-	/**
-	 * Sets a flag indicating whether or not the newly created diagram editor should be opened 
-	 * @param openNewlyCreatedDiagramEditor The openNewlyCreatedDiagramEditor to set.
-	 */
-	public void setOpenNewlyCreatedDiagramEditor(
-			boolean openNewlyCreatedDiagramEditor) {
-		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;
-	}
-	
-	
-	/**
-	 * Performs the operations necessary to create and open the diagram
-	 * @return boolean indicating whether the creation and opening the Diagram was successful 
-	 */
-	public boolean finish() {
-		final boolean[] result = new boolean[1];
-		WorkspaceModifyOperation op = new WorkspaceModifyOperation(null) {
-			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {
-				result[0] = doFinish(monitor);
-			}
-		};
-
-		try {
-			getContainer().run(false, true, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			if (e.getTargetException() instanceof CoreException) {
-				ErrorDialog.openError(
-					getContainer().getShell(),
-					EditorMessages.EditorWizardPage_DialogInternalErrorTitle,
-					null,	// no special message
-					((CoreException) e.getTargetException()).getStatus());
-			}
-			else {
-				// CoreExceptions are handled above, but unexpected runtime exceptions and errors may still occur.
-				Trace.catching(EditorPlugin.getInstance(), EditorDebugOptions.EXCEPTIONS_CATCHING, getClass(), "finish", e.getTargetException()); //$NON-NLS-1$
-				Log.error(EditorPlugin.getInstance(), EditorStatusCodes.ERROR, EditorMessages.WizardPage_DIAGRAM_CREATION_FAIL_EXC_, e.getTargetException());
-			}
-			return false;
-		}
-		return result[0];
-	}
-	
-	/**
-	 * Accessor for the diagram's file
-	 * @return IFile the file owning the diagram
-	 */
-	public final IFile getDiagramFile() {
-		return diagramFile;
-	}
-	
-	/**
-	 * @return the default file name
-	 */
-	protected String getDefaultFileName() {
-		return null;
-	}
-
-	/**
-	 * @return the diagram file creator
-	 */
-	public abstract DiagramFileCreator getDiagramFileCreator();
-
-	/**
-	 * @return the diagram kind
-	 */
-	protected String getDiagramKind() {
-		return null;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#getInitialContents()
-	 */
-	protected InputStream getInitialContents() {
-		return EditorUtil.getInitialContents();
-	}
-	
-	/**
-	 * Returns the current file name as entered by the user, or its anticipated
-	 * initial value.
-	 *
-	 * @return the file name, its anticipated initial value, or <code>null</code>
-	 *   if no file name is known
-	 */
-	public String getFileName() {
-		String fileName = super.getFileName();
-
-		if (fileName != null)
-			fileName = getDiagramFileCreator().appendExtensionToFileName(fileName);
-
-		return fileName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validatePage()
-	 */
-	protected boolean validatePage() {
-		if (super.validatePage()) {
-			// do additional validation on the anticipated filename
-			String fileName = getFileName();
-
-			if (fileName == null)
-				return false;
-
-			IPath path = getContainerFullPath().append(fileName);
-
-			if (ResourcesPlugin.getWorkspace().getRoot().exists(path)) {
-				setErrorMessage(EditorMessages.WizardPage_Message_FileExists_ERROR_);
-				return false;
-			}
-
-			// Some characters reserved in URI should be checked here. :,#,\,/
-			URI fileURI = URI.createFileURI(path.toString());
-			String ext = fileURI.fileExtension(); 
-
-			if (ext != null
-				&& getDiagramFileCreator().getExtension().equals("." + ext)) { //$NON-NLS-1$
-				return true;
-			}
-
-			setErrorMessage(NLS.bind(EditorMessages.EditorWizardPage_InvalidFilename, fileName));
-		}
-
-		return false;
-	}
-
-	/**
-	 * Accessor for selected elements
-	 * @return IStructuredSelection the selection holding the elements to be displayed on the diagram 
-	 */
-	public final IStructuredSelection getSelection() {
-		return selection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-
-		IPath path = getContainerFullPath();
-
-		if (null != path) {
-			String fileName = getDiagramFileCreator().getUniqueFileName(path,
-				getDefaultFileName());
-
-			setFileName(fileName);
-		}
-
-		setPageComplete(validatePage());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#initialPopulateContainerNameField()
-	 */
-	protected void initialPopulateContainerNameField() {
-		IPath path = EditorUtil.getDefaultDiagramPath(selection.toList(), getDiagramKind());
-
-		if (path == null) {
-			super.initialPopulateContainerNameField();
-
-			path = getContainerFullPath();
-
-			if (path == null) {
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				IProject[] projects = root.getProjects();
-
-				path = root.getFullPath();
-
-				for (int i = 0; i < projects.length; ++i) {
-					IProject project = projects[i];
-
-					if (project.isOpen()) {
-						path = project.getFullPath();
-						break;
-					}
-				}
-			}
-		}
-
-		setContainerFullPath(path);
- 	}
-
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/package.html
deleted file mode 100644
index 134cf99..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.classpath b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.cvsignore
deleted file mode 100644
index c64fc1c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.project b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.project
deleted file mode 100644
index b9c5699..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.resources.editor</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/org.eclipse.gmf.runtime.diagram.ui.resources.editor/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index e9070d8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.resources.editor; singleton:=true
-Bundle-Version: 1.0.3.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.resources.editor.document,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.notationprovider;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.palette;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.ui.parts;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.util
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.0.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/about.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/build.properties b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/build.properties
deleted file mode 100644
index d9c3bce..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               schema/,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/doc/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/doc/.cvsignore
deleted file mode 100644
index 72e8ffc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/doc/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-*

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/plugin.properties
deleted file mode 100644
index b56fe9d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/plugin.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram UI Resources Editor Plug-In
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/plugin.xml
deleted file mode 100644
index 016e87b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/plugin.xml
+++ /dev/null

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-   <extension-point id="documentProviders" name="Document Providers Registry" schema="schema/documentProviders.exsd"/>
-   <extension
-         id="DefaultDiagramDocumentProviders"
-         name="Default Diagram Document Providers"
-         point="org.eclipse.gmf.runtime.diagram.ui.resources.editor.documentProviders">
-      <provider
-            class="org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramInputDocumentProvider"
-            documentType="org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument"
-            id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.DiagramInputDocumentProvider"
-            inputTypes="org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditorInput"/>
-   </extension>
-</plugin>

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/schema/documentProviders.exsd b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/schema/documentProviders.exsd
deleted file mode 100644
index 08556fc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/schema/documentProviders.exsd
+++ /dev/null

@@ -1,161 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.ui.resources.editor">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor" id="documentProviders" name="Document Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define mappings between file types and document providers or between types of editor inputs and document providers that can be used by editors. Document providers must implement the interface &lt;samp&gt;org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentProvider&lt;/samp&gt;. Editor inputs must be instance of &lt;samp&gt;org.eclipse.ui.IEditorInput&lt;/samp&gt;.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="provider" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="provider">
-      <complexType>
-         <attribute name="extensions" type="string">
-            <annotation>
-               <documentation>
-                  a comma separated  list of file extensions
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="inputTypes" type="string">
-            <annotation>
-               <documentation>
-                  a comma separated list of qualified editor input class names
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the qualified name of the document provider class
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the unique id of this provider
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="documentType" type="string" use="default" value="org.eclipse.gmf.runtime.diagram.ui.editor.IDocument">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0 (similar to org.eclipse.ui.editors.documentProviders)
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.gmf.runtime.diagram.ui.resources.editor.documentProviders&quot;&gt; 
-    &lt;provider 
-        extensions=&quot;.jav&quot; 
-        class=&quot;org.eclipse.ui.examples.javaeditor.JavaDocumentProvider&quot; 
-        id=&quot;org.eclipse.ui.examples.javaeditor.JavaDocumentProvider&quot;&gt; 
-    &lt;/provider&gt; 
-&lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;p&gt;
-This example registers &lt;samp&gt;org.eclipse.ui.examples.javaeditor.JavaDocumentProvider&lt;/samp&gt; as the default provider for files with the extension &quot;.jav&quot;. 
-&lt;/p&gt;
-&lt;p&gt;
-&lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.gmf.runtime.diagram.ui.resources.editor.documentProviders&quot;&gt; 
-    &lt;provider 
-        inputTypes=&quot;org.eclipse.ui.IStorageEditorInput&quot; 
-        class=&quot;org.eclipse.gmf.runtime.diagram.ui.resources.editor.FileDocumentProvider&quot; 
-        id=&quot;org.eclipse.gmf.runtime.diagram.ui.resources.editor.FileDocumentProvider&quot;&gt; 
-    &lt;/provider&gt; 
-&lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;
-This example registers &lt;samp&gt;org.eclipse.gmf.runtime.diagram.ui.resources.editor.FileDocumentProvider&lt;/samp&gt; as the default provider for all editor inputs that are &lt;samp&gt;instance of org.eclipse.ui.IStorageEditorInput&lt;/samp&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Document providers registered for a file extension have precedence over those registered for input types. Document providers must implement the interface &lt;samp&gt;org.eclipse.ui.texteditor.IDocumentProvider&lt;/samp&gt;. Editor inputs must be instance of &lt;samp&gt;org.eclipse.ui.IEditorInput&lt;/samp&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2001, 2004  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/AbstractDocument.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/AbstractDocument.java
deleted file mode 100644
index c95d9b6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/AbstractDocument.java
+++ /dev/null

@@ -1,257 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-/**
- * Abstract implementation of <code>IDocument</code>. This class
- * provides implementation for registering <code>IDocumentListener</code>s.
- * Additionally it also handles firing of <code>DocumentEvent</code> to
- * the document listeners. 
- */
-public abstract class AbstractDocument
-	implements IDocument {
-
-	/**
-	 * Content of this document.
-	 */
-	protected Object content;
-	
-	/**
-	 * The current modification stamp.
-	 */
-	private long fModificationStamp= IDocument.UNKNOWN_MODIFICATION_STAMP;
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#getModificationStamp()
-	 */
-	public long getModificationStamp() {
-		return fModificationStamp;
-	}
-
-	/** The registered document listeners */
-	private List fDocumentListeners;
-	/** The registered pre-notified document listeners */
-	private List fPrenotifiedDocumentListeners;
-
-	/**
-	 * Indicates whether the notification of listeners has been stopped.
-	 */
-	private int fStoppedListenerNotification= 0;
-	
-	/**
-	 * The document event to be sent after listener notification has been resumed.
-	 */
-	private DocumentEvent fDeferredDocumentEvent;
-
-	/**
-	 * Initializes document listeners, positions, and position updaters.
-	 * Must be called inside the constructor after the implementation plug-ins
-	 * have been set.
-	 */
-	protected void completeInitialization() {
-		fDocumentListeners= new ArrayList();
-		fPrenotifiedDocumentListeners= new ArrayList();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#addDocumentListener(org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentListener)
-	 */
-	public void addDocumentListener(IDocumentListener listener) {
-		assert listener != null;
-		if (! fDocumentListeners.contains(listener))
-			fDocumentListeners.add(listener);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#removeDocumentListener(org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentListener)
-	 */
-	public void removeDocumentListener(IDocumentListener listener) {
-		assert listener != null;
-		fDocumentListeners.remove(listener);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#addPrenotifiedDocumentListener(org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentListener)
-	 */
-	public void addPrenotifiedDocumentListener(IDocumentListener listener) {
-		assert listener != null;
-		if (! fPrenotifiedDocumentListeners.contains(listener))
-			fPrenotifiedDocumentListeners.add(listener);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#removePrenotifiedDocumentListener(org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentListener)
-	 */
-	public void removePrenotifiedDocumentListener(
-			IDocumentListener listener) {
-		assert listener != null;
-		fPrenotifiedDocumentListeners.remove(listener);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#getContent()
-	 */
-	public Object getContent() {
-		return content;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#setContent(java.lang.Object)
-	 */
-	public void setContent(Object documentContent) {
-		setContent(documentContent, getNextModificationStamp());
-	}
-	
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#setContent(java.lang.Object, long)
-	 */
-	public void setContent(Object documentContent, long modificationStamp) {
-		
-		DocumentEvent eventToBeFired = null;
-		
-		if (content != documentContent) {
-			DocumentEvent changed= new DocumentEvent(this, DocumentEvent.CONTENT_REPLACED, documentContent);
-			DocumentEvent changing= new DocumentEvent(this, DocumentEvent.CONTENT_REPLACED, content);
-			fireDocumentAboutToBeChanged(changed);
-
-			content = documentContent;
-
-			fModificationStamp= modificationStamp;
-			changed.fModificationStamp= fModificationStamp;
-			changing.fModificationStamp = fModificationStamp;
-
-			eventToBeFired = changing;
-			fireDocumentChanged(changing);
-		}
-		else {
-			eventToBeFired = new DocumentEvent(this, DocumentEvent.CONTENT_MODIFIED, documentContent);
-			fireDocumentChanged(eventToBeFired);
-		}
-	}
-
-	private long getNextModificationStamp() {
-		if (fModificationStamp == Long.MAX_VALUE || fModificationStamp == IDocument.UNKNOWN_MODIFICATION_STAMP)
-			return 0;
-
-		return fModificationStamp + 1;
-	}
-
-	/**
-	 * Fires the given document event to all registers document listeners informing them
-	 * about the forthcoming document manipulation. Uses a robust iterator.
-	 *
-	 * @param event the event to be sent out
-	 */
-	protected void fireDocumentAboutToBeChanged(DocumentEvent event) {
-
-		if (fPrenotifiedDocumentListeners.size() > 0) {
-
-			List list= new ArrayList(fPrenotifiedDocumentListeners);
-			Iterator e= list.iterator();
-			while (e.hasNext()) {
-				IDocumentListener l= (IDocumentListener) e.next();
-				l.documentAboutToBeChanged(event);
-			}
-		}
-
-		if (fDocumentListeners.size() > 0) {
-
-			List list= new ArrayList(fDocumentListeners);
-			Iterator e= list.iterator();
-			while (e.hasNext()) {
-				IDocumentListener l= (IDocumentListener) e.next();
-				l.documentAboutToBeChanged(event);
-			}
-		}
-	}
-	/**
-	 * Updates the internal document structures and informs all document listeners
-	 * if listener notification has been enabled. Otherwise it remembers the event
-	 * to be sent to the listeners on resume.
-	 *
-	 * @param event the document event to be sent out
-	 */
-	protected void fireDocumentChanged(DocumentEvent event) {
-		if (fStoppedListenerNotification == 0)
-			doFireDocumentChanged(event);
-		else
-			fDeferredDocumentEvent= event;
-	}
-
-	/**
-	 * Notifies all listeners about the given document change. Uses a robust
-	 * iterator.
-	 * <p>
-	 * Executes all registered post notification replace operation.
-	 * <p>
-	 * This method will be renamed to <code>doFireDocumentChanged</code>.
-	 *
-	 * @param event the event to be sent out
-	 */
-	protected void doFireDocumentChanged(DocumentEvent event) {
-
-		if (fPrenotifiedDocumentListeners.size() > 0) {
-			List list= new ArrayList(fPrenotifiedDocumentListeners);
-			Iterator e= list.iterator();
-			while (e.hasNext()) {
-				IDocumentListener l= (IDocumentListener) e.next();
-				l.documentChanged(event);
-			}
-		}
-
-		if (fDocumentListeners.size() > 0) {
-
-			List list= new ArrayList(fDocumentListeners);
-			Iterator e= list.iterator();
-			while (e.hasNext()) {
-				IDocumentListener l= (IDocumentListener) e.next();
-				l.documentChanged(event);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#resumeListenerNotification()
-	 */
-	public void resumeListenerNotification() {
-		-- fStoppedListenerNotification;
-		if (fStoppedListenerNotification == 0) {
-			resumeDocumentListenerNotification();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocument#stopListenerNotification()
-	 */
-	public void stopListenerNotification() {
-		++ fStoppedListenerNotification;
-	}
-
-	/**
-	 * Resumes the document listener notification by sending out the remembered
-	 * partition changed and document event.
-	 */
-	private void resumeDocumentListenerNotification() {
-		if (fDeferredDocumentEvent != null) {
-			DocumentEvent event= fDeferredDocumentEvent;
-			fDeferredDocumentEvent= null;
-			doFireDocumentChanged(event);
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/AbstractDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/AbstractDocumentProvider.java
deleted file mode 100644
index 0ad8971..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/AbstractDocumentProvider.java
+++ /dev/null

@@ -1,1014 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorMessages;
-
-
-/**
- * An abstract implementation of a sharable document provider.
- * <p>
- * Subclasses must implement 
- * <code>createDocument</code>, 
- * <code>createEmptyDocument</code>,
- * <code>getOperationRunner</code>, and <code>doSaveDocument</code>.
- * </p>
- */
-public abstract class AbstractDocumentProvider implements IDocumentProvider {
-
-		/**
-		 * Operation created by the document provider and to be executed by the providers runnable context.
-		 *
-		 */
-		protected static abstract class DocumentProviderOperation implements IRunnableWithProgress {
-
-			/**
-			 * The actual functionality of this operation.
-			 *
-			 * @param monitor a progress monitor to track execution
-			 * @throws CoreException
-			 */
-			protected abstract void execute(IProgressMonitor monitor) throws CoreException;
-
-			/**
-			 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-			 */
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				try {
-					execute(monitor);
-				} catch (CoreException x) {
-					throw new InvocationTargetException(x);
-				}
-			}
-		}
-
-		/**
-		 * Collection of all information managed for a connected element.
-		 */
-		protected class ElementInfo implements IDocumentListener {
-
-			/** The element for which the info is stored */
-			public Object fElement;
-			/** How often the element has been connected */
-			public int fCount;
-			/** Can the element be saved */
-			public boolean fCanBeSaved;
-			/** The element's document */
-			public IDocument fDocument;
-			/**
-			 * Has element state been validated
-			 */
-			public boolean fIsStateValidated;
-			/**
-			 * The status of this element
-			 */
-			public IStatus fStatus;
-
-
-			/**
-			 * Creates a new element info, initialized with the given
-			 * document and annotation model.
-			 *
-			 * @param document the document
-			 * @param model the annotation model
-			 */
-			public ElementInfo(IDocument document) {
-				fDocument= document;
-				fCount= 0;
-				fCanBeSaved= false;
-				fIsStateValidated= false;
-			}
-
-			/**
-			 * An element info equals another object if this object is an element info
-			 * and if the documents of the two element infos are equal.
-			 * @see Object#equals(java.lang.Object)
-			 */
-			public boolean equals(Object o) {
-				if (o instanceof ElementInfo) {
-					ElementInfo e= (ElementInfo) o;
-					return fDocument.equals(e.fDocument);
-				}
-				return false;
-			}
-
-			/*
-			 * @see Object#hashCode()
-			 */
-			public int hashCode() {
-				return fDocument.hashCode();
-			}
-
-			/**
-			 * @see IDocumentListener#documentChanged(DocumentEvent)
-			 */
-			public void documentChanged(DocumentEvent event) {
-				fCanBeSaved= true;
-				removeUnchangedElementListeners(fElement, this);
-				fireElementDirtyStateChanged(fElement, fCanBeSaved);
-			}
-
-			/**
-			 * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
-			 */
-			public void documentAboutToBeChanged(DocumentEvent event) {
-				// nothing to do.
-			}
-		}
-
-
-	/**
-	 * Enables a certain behavior.
-	 * Indicates whether this provider should behave as described in
-	 * use case 5 of http://bugs.eclipse.org/bugs/show_bug.cgi?id=10806.
-	 * Current value: <code>true</code> since 3.0
-	 * 
-	 */
-	static final protected boolean PR10806_UC5_ENABLED= true;
-
-	/**
-	 * Enables a certain behavior.
-	 * Indicates whether this provider should behave as described in
-	 * http://bugs.eclipse.org/bugs/show_bug.cgi?id=14469
-	 * Notes: This contradicts <code>PR10806_UC5_ENABLED</code>.
-	 * Current value: <code>false</code> since 3.0
-	 * 
-	 */
-	static final protected boolean PR14469_ENABLED= false;
-
-	/**
-	 * Constant for representing the OK status. This is considered a value object.
-	 * 
-	 */
-	static final public IStatus STATUS_OK= new Status(IStatus.OK, EditorPlugin.getPluginId(), IStatus.OK, EditorMessages.AbstractDocumentProvider_ok, null);
-
-	/**
-	 * Constant for representing the error status. This is considered a value object.
-	 * 
-	 */
-	static final public IStatus STATUS_ERROR= new Status(IStatus.ERROR, EditorPlugin.getPluginId(), IStatus.INFO, EditorMessages.AbstractDocumentProvider_error, null);
-
-
-	/** Element information of all connected elements */
-	private Map fElementInfoMap= new HashMap();
-	/** The element state listeners */
-	private List fElementStateListeners= new ArrayList();
-	/**
-	 * The current progress monitor
-	 */
-	private IProgressMonitor fProgressMonitor;
-
-
-	/**
-	 * Creates a new document provider.
-	 */
-	protected AbstractDocumentProvider() {
-		// Empty
-	}
-
-	/**
-	 * Creates the document for the given element.
-	 * <p>
-	 * Subclasses must implement this method.</p>
-	 *
-	 * @param element the element
-	 * @return the document
-	 * @exception CoreException if the document could not be created
-	 */
-	protected abstract IDocument createDocument(Object element) throws CoreException;
-
-	/**
-	 * Creates the document for the given element.
-	 * <p>
-	 * Subclasses must implement this method.</p>
-	 *
-	 * @param element the element
-	 * @return the document
-	 * @exception CoreException if the document could not be created
-	 */
-	protected abstract IDocument createEmptyDocument();
-
-	/**
-	 * Performs the actual work of saving the given document provided for the
-	 * given element.
-	 * <p>
-	 * Subclasses must implement this method.</p>
-	 *
-	 * @param monitor a progress monitor to report progress and request cancellation
-	 * @param element the element
-	 * @param document the document
-	 * @param overwrite indicates whether an overwrite should happen if necessary
-	 * @exception CoreException if document could not be stored to the given element
-	 */
-	protected abstract void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException;
-
-	/**
-	 * Returns the runnable context for this document provider.
-	 *
-	 * @param monitor a progress monitor to track the operation
-	 * @return the runnable context for this document provider
-	 * 
-	 */
-	protected abstract IRunnableContext getOperationRunner(IProgressMonitor monitor);
-
-	/**
-	 * Returns the scheduling rule required for executing
-	 * <code>synchronize</code> on the given element. This default
-	 * implementation returns <code>null</code>.
-	 *
-	 * @param element the element
-	 * @return the scheduling rule for <code>synchronize</code>
-	 * 
-	 */
-	protected ISchedulingRule getSynchronizeRule(Object element) {
-		return null;
-	}
-
-	/**
-	 * Returns the scheduling rule required for executing
-	 * <code>validateState</code> on the given element. This default
-	 * implementation returns <code>null</code>.
-	 *
-	 * @param element the element
-	 * @return the scheduling rule for <code>validateState</code>
-	 * 
-	 */
-	protected ISchedulingRule getValidateStateRule(Object element) {
-		return null;
-	}
-
-	/**
-	 * Returns the scheduling rule required for executing
-	 * <code>save</code> on the given element. This default
-	 * implementation returns <code>null</code>.
-	 *
-	 * @param element the element
-	 * @return the scheduling rule for <code>save</code>
-	 * 
-	 */
-	protected ISchedulingRule getSaveRule(Object element) {
-		return null;
-	}
-
-	/**
-	 * Returns the scheduling rule required for executing
-	 * <code>reset</code> on the given element. This default
-	 * implementation returns <code>null</code>.
-	 *
-	 * @param element the element
-	 * @return the scheduling rule for <code>reset</code>
-	 * 
-	 */
-	protected ISchedulingRule getResetRule(Object element) {
-		return null;
-	}
-
-	/**
-	 * Returns the element info object for the given element.
-	 *
-	 * @param element the element
-	 * @return the element info object, or <code>null</code> if none
-	 */
-	protected ElementInfo getElementInfo(Object element) {
-		return (ElementInfo) fElementInfoMap.get(element);
-	}
-
-	/**
-	 * Creates a new element info object for the given element.
-	 * <p>
-	 * This method is called from <code>connect</code> when an element info needs
-	 * to be created. The <code>AbstractDocumentProvider</code> implementation
-	 * of this method returns a new element info object whose document and
-	 * annotation model are the values of <code>createDocument(element)</code>
-	 * and  <code>createAnnotationModel(element)</code>, respectively. Subclasses
-	 * may override.</p>
-	 *
-	 * @param element the element
-	 * @return a new element info object
-	 * @exception CoreException if the document or annotation model could not be created
-	 */
-	protected ElementInfo createElementInfo(Object element) throws CoreException {
-		return new ElementInfo(createDocument(element));
-	}
-
-	/**
-	 * Disposes of the given element info object.
-	 * <p>
-	 * This method is called when an element info is disposed. The
-	 * <code>AbstractDocumentProvider</code> implementation of this
-	 * method does nothing. Subclasses may reimplement.</p>
-	 *
-	 * @param element the element
-	 * @param info the element info object
-	 */
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		// for subclasses
-	}
-
-	/**
-	 * Called on initial creation and when the dirty state of the element
-	 * changes to <code>false</code>. Adds all listeners which must be
-	 * active as long as the element is not dirty. This method is called
-	 * before <code>fireElementDirtyStateChanged</code> or <code>
-	 * fireElementContentReplaced</code> is called.
-	 * Subclasses may extend.
-	 *
-	 * @param element the element
-	 * @param info the element info object
-	 */
-	protected void addUnchangedElementListeners(Object element, ElementInfo info) {
-		if (info.fDocument != null)
-			info.fDocument.addDocumentListener(info);
-	}
-
-	/**
-	 * Called when the given element gets dirty. Removes all listeners
-	 * which must be active only when the element is not dirty. This
-	 * method is called before <code>fireElementDirtyStateChanged</code>
-	 * or <code>fireElementContentReplaced</code> is called.
-	 * Subclasses may extend.
-	 *
-	 * @param element the element
-	 * @param info the element info object
-	 */
-	protected void removeUnchangedElementListeners(Object element, ElementInfo info) {
-		if (info.fDocument != null)
-			info.fDocument.removeDocumentListener(info);
-	}
-
-	/**
-	 * Enumerates the elements connected via this document provider.
-	 *
-	 * @return the list of elements (element type: <code>Object</code>)
-	 */
-	protected Iterator getConnectedElements() {
-		Set s= new HashSet();
-		Set keys= fElementInfoMap.keySet();
-		if (keys != null)
-			s.addAll(keys);
-		return s.iterator();
-	}
-
-	/*
-	 * @see IDocumentProvider#connect(Object)
-	 */
-	public final void connect(Object element) throws CoreException {
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		if (info == null) {
-
-			info= createElementInfo(element);
-			if (info == null)
-				info= new ElementInfo(null);
-
-			info.fElement= element;
-
-			addUnchangedElementListeners(element, info);
-
-			fElementInfoMap.put(element, info);
-			if (fElementInfoMap.size() == 1)
-				connected();
-		}
-		++ info.fCount;
-	}
-
-	/**
-	 * This hook method is called when this provider starts managing documents for
-	 * elements. I.e. it is called when the first element gets connected to this provider.
-	 * Subclasses may extend.
-	 * 
-	 */
-	protected void connected() {
-		// for subclasses
-	}
-
-	/*
-	 * @see IDocumentProvider#disconnect
-	 */
-	public final void disconnect(Object element) {
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-
-		if (info == null)
-			return;
-
-		if (info.fCount == 1) {
-
-			fElementInfoMap.remove(element);
-			removeUnchangedElementListeners(element, info);
-			disposeElementInfo(element, info);
-
-			if (fElementInfoMap.size() == 0)
-				disconnected();
-
-		} else
-		 	-- info.fCount;
-	}
-
-	/**
-	 * This hook method is called when this provider stops managing documents for
-	 * element. I.e. it is called when the last element gets disconnected from this provider.
-	 * Subclasses may extend.
-	 * 
-	 */
-	protected void disconnected() {
-		// for subclasses
-	}
-
-	/*
-	 * @see IDocumentProvider#getDocument(Object)
-	 */
-	public IDocument getDocument(Object element) {
-
-		if (element == null)
-			return null;
-
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		return (info != null ? info.fDocument : null);
-	}
-
-	/*
-	 * @see IDocumentProvider#mustSaveDocument(Object)
-	 */
-	public boolean mustSaveDocument(Object element) {
-
-		if (element == null)
-			return false;
-
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		return (info != null ? info.fCount == 1 && info.fCanBeSaved : false);
-	}
-
-	/*
-	 * @see IDocumentProvider#canSaveDocument(Object)
-	 */
-	public boolean canSaveDocument(Object element) {
-
-		if (element == null)
-			return false;
-
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		return (info != null ? info.fCanBeSaved : false);
-	}
-
-	/**
-	 * Executes the actual work of reseting the given elements document.
-	 *
-	 * @param element the element
-	 * @param monitor the progress monitor
-	 * @throws CoreException
-	 * 
-	 */
-	protected void doResetDocument(Object element, IProgressMonitor monitor) throws CoreException {
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		if (info != null) {
-
-			IDocument original= null;
-			IStatus status= null;
-
-			try {
-				original= createDocument(element);
-			} catch (CoreException x) {
-				status= x.getStatus();
-			}
-
-			info.fStatus= status;
-
-			if (original != null) {
-				fireElementContentAboutToBeReplaced(element);
-				info.fDocument.setContent(original.getContent());
-				if (info.fCanBeSaved) {
-					info.fCanBeSaved= false;
-					addUnchangedElementListeners(element, info);
-				}
-				fireElementContentReplaced(element);
-				fireElementDirtyStateChanged(element, false);
-			}
-		}
-	}
-
-	/**
-	 * Executes the given operation in the providers runnable context.
-	 *
-	 * @param operation the operation to be executes
-	 * @param monitor the progress monitor
-	 * @exception CoreException the operation's core exception
-	 * 
-	 */
-	protected void executeOperation(DocumentProviderOperation operation, IProgressMonitor monitor) throws CoreException {
-		try {
-			IRunnableContext runner= getOperationRunner(monitor);
-			if (runner != null)
-				runner.run(false, false, operation);
-			else
-				operation.run(monitor);
-		} catch (InvocationTargetException x) {
-			Throwable e= x.getTargetException();
-			if (e instanceof CoreException)
-				throw (CoreException) e;
-			String message= (e.getMessage() != null ? e.getMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, EditorPlugin.getPluginId(), IStatus.ERROR, message, e));
-		} catch (InterruptedException x) {
-			String message= (x.getMessage() != null ? x.getMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.CANCEL, EditorPlugin.getPluginId(), IStatus.OK, message, x));
-		}
-	}
-
-	/*
-	 * @see IDocumentProvider#resetDocument(Object)
-	 */
-	public final void resetDocument(final Object element) throws CoreException {
-
-		if (element == null)
-			return;
-
-		executeOperation(getResetOperation(element), getProgressMonitor());
-	}
-	
-	public DocumentProviderOperation getResetOperation(final Object element) {
-		class ResetOperation extends DocumentProviderOperation implements ISchedulingRuleProvider {
-
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				doResetDocument(element, monitor);
-			}
-
-			public ISchedulingRule getSchedulingRule() {
-				return getResetRule(element);
-			}
-		}
-
-		return new ResetOperation();
-	}
-
-
-	/*
-	 * @see IDocumentProvider#saveDocument(IProgressMonitor, Object, IDocument, boolean)
-	 */
-	public final void saveDocument(IProgressMonitor monitor, final Object element, final IDocument document, final boolean overwrite) throws CoreException {
-
-		if (element == null)
-			return;
-
-
-		executeOperation(getSaveOperation(element, document, overwrite), monitor);
-	}
-	
-	public DocumentProviderOperation getSaveOperation(final Object element, final IDocument document, final boolean overwrite) {
-		class SaveOperation extends DocumentProviderOperation implements ISchedulingRuleProvider {
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.document.AbstractDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-			 */
-			protected void execute(IProgressMonitor pm) throws CoreException {
-				ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-				if (info != null) {
-					if (info.fDocument != document) {
-						Status status= new Status(IStatus.WARNING, EditorPlugin.getPluginId(), IStatus.ERROR, EditorMessages.AbstractDocumentProvider_error_save_inuse, null);
-						throw new CoreException(status);
-					}
-
-					doSaveDocument(pm, element, document, overwrite);
-
-					if (pm != null && pm.isCanceled())
-						return;
-
-					info.fCanBeSaved= false;
-					addUnchangedElementListeners(element, info);
-					fireElementDirtyStateChanged(element, false);
-
-				} else {
-					doSaveDocument(pm, element, document, overwrite);
-				}
-			}
-
-			public ISchedulingRule getSchedulingRule() {
-				return getSaveRule(element);
-			}
-		}
-		return new SaveOperation();
-	}
-
-	/**
-	 * The <code>AbstractDocumentProvider</code> implementation of this
-	 * <code>IDocumentProvider</code> method does nothing. Subclasses may
-	 * reimplement.
-	 *
-	 * @param element the element
-	 */
-	public void aboutToChange(Object element) {
-		// for subclasses
-	}
-
-	/**
-	 * The <code>AbstractDocumentProvider</code> implementation of this
-	 * <code>IDocumentProvider</code> method does nothing. Subclasses may
-	 * reimplement.
-	 *
-	 * @param element the element
-	 */
-	public void changed(Object element) {
-		// for subclasses
-	}
-
-	/*
-	 * @see IDocumentProvider#addElementStateListener(IElementStateListener)
-	 */
-	public void addElementStateListener(IElementStateListener listener) {
-		assert listener != null;
-		if (!fElementStateListeners.contains(listener))
-			fElementStateListeners.add(listener);
-	}
-
-	/*
-	 * @see IDocumentProvider#removeElementStateListener(IElementStateListener)
-	 */
-	public void removeElementStateListener(IElementStateListener listener) {
-		assert listener != null;
-		fElementStateListeners.remove(listener);
-	}
-
-	/**
-	 * Informs all registered element state listeners about a change in the
-	 * dirty state of the given element.
-	 *
-	 * @param element the element
-	 * @param isDirty the new dirty state
-	 * @see IElementStateListener#elementDirtyStateChanged(Object, boolean)
-	 */
-	protected void fireElementDirtyStateChanged(Object element, boolean isDirty) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			IElementStateListener l= (IElementStateListener) e.next();
-			l.elementDirtyStateChanged(element, isDirty);
-		}
-	}
-
-	/**
-	 * Informs all registered element state listeners about an impending
-	 * replace of the given element's content.
-	 *
-	 * @param element the element
-	 * @see IElementStateListener#elementContentAboutToBeReplaced(Object)
-	 */
-	protected void fireElementContentAboutToBeReplaced(Object element) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			IElementStateListener l= (IElementStateListener) e.next();
-			l.elementContentAboutToBeReplaced(element);
-		}
-	}
-
-	/**
-	 * Informs all registered element state listeners about the just-completed
-	 * replace of the given element's content.
-	 *
-	 * @param element the element
-	 * @see IElementStateListener#elementContentReplaced(Object)
-	 */
-	protected void fireElementContentReplaced(Object element) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			IElementStateListener l= (IElementStateListener) e.next();
-			l.elementContentReplaced(element);
-		}
-	}
-
-	/**
-	 * Informs all registered element state listeners about the deletion
-	 * of the given element.
-	 *
-	 * @param element the element
-	 * @see IElementStateListener#elementDeleted(Object)
-	 */
-	protected void fireElementDeleted(Object element) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			IElementStateListener l= (IElementStateListener) e.next();
-			l.elementDeleted(element);
-		}
-	}
-
-	/**
-	 * Informs all registered element state listeners about a move.
-	 *
-	 * @param originalElement the element before the move
-	 * @param movedElement the element after the move
-	 * @see IElementStateListener#elementMoved(Object, Object)
-	 */
-	protected void fireElementMoved(Object originalElement, Object movedElement) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			IElementStateListener l= (IElementStateListener) e.next();
-			l.elementMoved(originalElement, movedElement);
-		}
-	}
-
-	/*
-	 * @see IDocumentProvider#getModificationStamp(Object)
-	 * 
-	 */
-	public long getModificationStamp(Object element) {
-		return 0;
-	}
-
-	/*
-	 * @see IDocumentProvider#getSynchronizationStamp(Object)
-	 * 
-	 */
-	public long getSynchronizationStamp(Object element) {
-		return 0;
-	}
-
-	/*
-	 * @see IDocumentProvider#isDeleted(Object)
-	 * 
-	 */
-	public boolean isDeleted(Object element) {
-		return false;
-	}
-
-	/*
-	 * @see IDocumentProviderExtension#isReadOnly(Object)
-	 * 
-	 */
-	public boolean isReadOnly(Object element) {
-		return true;
-	}
-
-	/*
-	 * @see IDocumentProviderExtension#isModifiable(Object)
-	 * 
-	 */
-	public boolean isModifiable(Object element) {
-		return false;
-	}
-
-	/**
-	 * Returns whether <code>validateState</code> has been called for the given element
-	 * since the element's state has potentially been invalidated.
-	 *
-	 * @param element the element
-	 * @return whether <code>validateState</code> has been called for the given element
-	 * 
-	 */
-	public boolean isStateValidated(Object element) {
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		if (info != null)
-			return info.fIsStateValidated;
-		return false;
-	}
-
-	/**
-	 * Hook method for validating the state of the given element. Must not take care of cache updating etc.
-	 * Default implementation is empty.
-	 *
-	 * @param element the element
-	 * @param computationContext the context in which validation happens
-	 * @exception CoreException in case validation fails
-	 * 
-	 */
-	protected void doValidateState(Object  element, Object computationContext) throws CoreException {
-		// empty block
-	}
-
-	/*
-	 * @see IDocumentProviderExtension#validateState(Object, Object)
-	 * 
-	 */
-	public void validateState(final Object element, final Object computationContext) throws CoreException {
-		if (element == null)
-			return;
-
-		class ValidateStateOperation extends DocumentProviderOperation implements ISchedulingRuleProvider {
-
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-				if (info == null)
-					return;
-
-				doValidateState(element, computationContext);
-
-				doUpdateStateCache(element);
-				info.fIsStateValidated= true;
-				fireElementStateValidationChanged(element, true);
-			}
-
-			public ISchedulingRule getSchedulingRule() {
-				return getValidateStateRule(element);
-			}
-		}
-
-		executeOperation(new ValidateStateOperation(), getProgressMonitor());
-	}
-
-	/**
-	 * Hook method for updating the state of the given element.
-	 * Default implementation is empty.
-	 *
-	 * @param element the element
-	 * @exception CoreException in case state cache updating fails
-	 * 
-	 */
-	protected void doUpdateStateCache(Object element) throws CoreException {
-		// for subclasses
-	}
-
-	/**
-	 * Returns whether the state of the element must be invalidated given its
-	 * previous read-only state.
-	 *
-	 * @param element the element
-	 * @param wasReadOnly the previous read-only state
-	 * @return <code>true</code> if the state of the given element must be invalidated
-	 * 
-	 */
-	protected boolean invalidatesState(Object element, boolean wasReadOnly) {
-		assert PR10806_UC5_ENABLED != PR14469_ENABLED;
-		boolean readOnlyChanged= (isReadOnly(element) != wasReadOnly && !wasReadOnly);
-		if (PR14469_ENABLED)
-			return readOnlyChanged && !canSaveDocument(element);
-		return readOnlyChanged;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider#updateStateCache(java.lang.Object)
-	 */
-	final public void updateStateCache(Object element) throws CoreException {
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		if (info != null) {
-			boolean wasReadOnly= isReadOnly(element);
-			doUpdateStateCache(element);
-			if (invalidatesState(element, wasReadOnly)) {
-				info.fIsStateValidated= false;
-				fireElementStateValidationChanged(element, false);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider#setCanSaveDocument(java.lang.Object)
-	 */
-	public void setCanSaveDocument(Object element) {
-		if (element != null) {
-			ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-			if (info != null) {
-				info.fCanBeSaved= true;
-				removeUnchangedElementListeners(element, info);
-				fireElementDirtyStateChanged(element, info.fCanBeSaved);
-			}
-		}
-	}
-
-	/**
-	 * Informs all registered element state listeners about a change in the
-	 * state validation of the given element.
-	 *
-	 * @param element the element
-	 * @param isStateValidated
-	 * @see IElementStateListenerExtension#elementStateValidationChanged(Object, boolean)
-	 * 
-	 */
-	protected void fireElementStateValidationChanged(Object element, boolean isStateValidated) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			Object o= e.next();
-			if (o instanceof IElementStateListener) {
-				IElementStateListener l= (IElementStateListener) o;
-				l.elementStateValidationChanged(element, isStateValidated);
-			}
-		}
-	}
-
-	/**
-	 * Informs all registered element state listeners about the current state
-	 * change of the element
-	 *
-	 * @param element the element
-	 * @see IElementStateListenerExtension#elementStateChanging(Object)
-	 * 
-	 */
-	protected void fireElementStateChanging(Object element) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			Object o= e.next();
-			if (o instanceof IElementStateListener) {
-				IElementStateListener l= (IElementStateListener) o;
-				l.elementStateChanging(element);
-			}
-		}
-	}
-
-	/**
-	 * Informs all registered element state listeners about the failed
-	 * state change of the element
-	 *
-	 * @param element the element
-	 * @see IElementStateListenerExtension#elementStateChangeFailed(Object)
-	 * 
-	 */
-	protected void fireElementStateChangeFailed(Object element) {
-		Iterator e= new ArrayList(fElementStateListeners).iterator();
-		while (e.hasNext()) {
-			Object o= e.next();
-			if (o instanceof IElementStateListener) {
-				IElementStateListener l= (IElementStateListener) o;
-				l.elementStateChangeFailed(element);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider#getStatus(java.lang.Object)
-	 */
-	public IStatus getStatus(Object element) {
-		ElementInfo info= (ElementInfo) fElementInfoMap.get(element);
-		if (info != null) {
-			if (info.fStatus != null)
-				return info.fStatus;
-			return (info.fDocument == null ? STATUS_ERROR : STATUS_OK);
-		}
-
-		return STATUS_ERROR;
-	}
-
-	/**
-	 * Performs the actual work of synchronizing the given element.
-	 *
-	 * @param element the element
-	 * @param monitor the progress monitor
-	 * @exception CoreException in the case that synchronization fails
-	 * 
-	 */
-	protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException {
-		// for subclasses
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDocumentProvider#synchronize(java.lang.Object)
-	 */
-	public final void synchronize(final Object element) throws CoreException {
-
-		if (element == null)
-			return;
-
-		class SynchronizeOperation extends DocumentProviderOperation implements ISchedulingRuleProvider {
-
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				doSynchronize(element, monitor);
-			}
-
-			public ISchedulingRule getSchedulingRule() {
-				return getSynchronizeRule(element);
-			}
-		}
-
-		executeOperation(new SynchronizeOperation(), getProgressMonitor());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider#getProgressMonitor()
-	 */
-	public IProgressMonitor getProgressMonitor() {
-		return fProgressMonitor == null ? new NullProgressMonitor() : fProgressMonitor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void setProgressMonitor(IProgressMonitor progressMonitor) {
-		fProgressMonitor= progressMonitor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider#isSynchronized(java.lang.Object)
-	 */
-	public boolean isSynchronized(Object element) {
-		return true;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramDocument.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramDocument.java
deleted file mode 100644
index 9228279..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramDocument.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-
-/**
- * An implementation of <code>IDiagramDocument</code>,
- * 
- * @author mgoyal
- */
-public final class DiagramDocument
-	extends AbstractDocument
-	implements IDiagramDocument {
-
-	public DiagramDocument() {
-		completeInitialization();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDiagramDocument#getDiagram()
-	 */
-	public Diagram getDiagram() {
-		return (Diagram)getContent();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.diagramdocument.IDiagramDocument#detachDiagram()
-	 */
-	public Diagram detachDiagram() {
-		Object oldContent = content;
-		content = null;
-		return (Diagram)oldContent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocument#completeInitialization()
-	 */
-	protected void completeInitialization() {
-		super.completeInitialization();
-	}
-
-	/**
-	 * The editing domain for this document.
-	 */
-	private TransactionalEditingDomain fDomain = null;
-	
-	public TransactionalEditingDomain getEditingDomain() {
-		return fDomain;
-	}
-
-	public void setEditingDomain(TransactionalEditingDomain domain) {
-		fDomain = domain;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramInputDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramInputDocumentProvider.java
deleted file mode 100644
index 3cc76d0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramInputDocumentProvider.java
+++ /dev/null

@@ -1,285 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditorInput;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorMessages;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.osgi.framework.Bundle;
-
-
-/**
- * An implementation of <code>IDiagramDocumentProvider</code> that
- * connects a <code>org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditorInput</code>
- * and a <code>IDiagramDocument</code>.
- * 
- * @author mgoyal
- */
-public class DiagramInputDocumentProvider
-	extends AbstractDocumentProvider
-	implements IDiagramDocumentProvider {
-	
-	/**
-	 * Bundle of all required information to allow {@link org.eclipse.core.resources.IStorage} as underlying document resources.
-	 */
-	protected class DiagramResourceInfo extends ElementInfo {
-
-		/** The flag representing the cached state whether the storage is modifiable. */
-		public boolean fIsModifiable= false;
-		/** The flag representing the cached state whether the storage is read-only. */
-		public boolean fIsReadOnly= true;
-		/** The flag representing the need to update the cached flag.  */
-		public boolean fUpdateCache= true;
-		
-		public DiagramModificationListener fListener = null;
-
-		/**
-		 * Creates a new storage info.
-		 *
-		 * @param document the document
-		 * @param model the annotation model
-		 */
-		public DiagramResourceInfo(IDocument document, DiagramModificationListener listener) {
-			super(document);
-			fListener = listener;
-		}
-	}
-
-	/*
-	 * @see AbstractDocumentProvider#createDocument(Object)
-	 */
-	protected IDocument createDocument(Object element) throws CoreException {
-
-		if (element instanceof IDiagramEditorInput) {
-			IDocument document= createEmptyDocument();
-			if (setDocumentContent(document, (IEditorInput) element)) {
-				setupDocument(element, document);
-				return document;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Sets up the given document as it would be provided for the given element. The
-	 * content of the document is not changed. This default implementation is empty.
-	 * Subclasses may reimplement.
-	 *
-	 * @param element the blue-print element
-	 * @param document the document to set up
-	 */
-	protected void setupDocument(Object element, IDocument document) {
-		// for subclasses
-	}
-
-	/**
-	 * Factory method for creating empty documents.
-	 * @return the newly created document
-	 * 
-	 */
-	protected IDocument createEmptyDocument() {
-		return new DiagramDocument();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#createElementInfo(java.lang.Object)
-	 */
-	protected ElementInfo createElementInfo(Object element) throws CoreException {
-		if (element instanceof IDiagramEditorInput) {
-
-			IDocument document= null;
-			IStatus status= null;
-
-			try {
-				document= createDocument(element);
-			} catch (CoreException x) {
-				handleCoreException(x, EditorMessages.DiagramInputDocumentProvider_createElementInfo);
-				status= x.getStatus();
-				document= createEmptyDocument();
-			}
-
-			DiagramModificationListener listener = new DiagramModificationListener(this, (DiagramDocument)document);
-			ElementInfo info= new DiagramResourceInfo(document, listener);
-			info.fStatus= status;
-			listener.startListening();
-
-			return info;
-		}
-
-		return super.createElementInfo(element);
-	}
-	
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		super.disposeElementInfo(element, info);
-		
-		((DiagramResourceInfo)info).fListener.stopListening();
-	}
-
-	/**
-	 * Initializes the given document from the given editor input using the given character encoding.
-	 *
-	 * @param document the document to be initialized
-	 * @param editorInput the input from which to derive the content of the document
-	 * @param encoding the character encoding used to read the editor input
-	 * @return <code>true</code> if the document content could be set, <code>false</code> otherwise
-	 * @throws CoreException if the given editor input cannot be accessed
-	 * 
-	 */
-	protected boolean setDocumentContent(IDocument document, IEditorInput editorInput) throws CoreException {
-		if (editorInput instanceof IDiagramEditorInput) {
-			Diagram diagram = ((IDiagramEditorInput) editorInput).getDiagram();
-			document.setContent(diagram);
-			return true;
-		}
-		return false;
-	}
-
-	/*
-	 * @see AbstractDocumentProvider#doSaveDocument(IProgressMonitor, Object, IDocument, boolean)
-	 */
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
-		// for subclasses
-	}
-
-	/**
-	 * Defines the standard procedure to handle <code>CoreExceptions</code>. Exceptions
-	 * are written to the plug-in log.
-	 *
-	 * @param exception the exception to be logged
-	 * @param message the message to be logged
-	 * 
-	 */
-	protected void handleCoreException(CoreException exception, String message) {
-
-		Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID);
-		ILog log= Platform.getLog(bundle);
-
-		if (message != null)
-			log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, message, exception));
-		else
-			log.log(exception.getStatus());
-	}
-
-	/**
-	 * Updates the internal cache for the given input.
-	 *
-	 * @param input the input whose cache will be updated
-	 * @throws CoreException if the storage cannot be retrieved from the input
-	 * 
-	 */
-	protected void updateCache(IDiagramEditorInput input) throws CoreException {
-		DiagramResourceInfo info= (DiagramResourceInfo) getElementInfo(input);
-		if (info != null) {
-			IStorage storage= (IStorage)input.getAdapter(IStorage.class);
-			if (storage != null) {
-				boolean readOnly= storage.isReadOnly();
-				info.fIsReadOnly=  readOnly;
-				info.fIsModifiable= !readOnly;
-			}
-			info.fUpdateCache= false;
-		}
-	}
-
-	/*
-	 * @see IDocumentProviderExtension#isReadOnly(Object)
-	 * 
-	 */
-	public boolean isReadOnly(Object element) {
-		if (element instanceof IDiagramEditorInput) {
-			DiagramResourceInfo info= (DiagramResourceInfo) getElementInfo(element);
-			if (info != null) {
-				if (info.fUpdateCache) {
-					try {
-						updateCache((IDiagramEditorInput) element);
-					} catch (CoreException x) {
-						handleCoreException(x, EditorMessages.DiagramInputDocumentProvider_isReadOnly);
-					}
-				}
-				return info.fIsReadOnly;
-			}
-		}
-		return super.isReadOnly(element);
-	}
-
-	/*
-	 * @see IDocumentProviderExtension#isModifiable(Object)
-	 * 
-	 */
-	public boolean isModifiable(Object element) {
-		if (element instanceof IDiagramEditorInput) {
-			DiagramResourceInfo info= (DiagramResourceInfo) getElementInfo(element);
-			if (info != null) {
-				if (info.fUpdateCache) {
-					try {
-						updateCache((IDiagramEditorInput) element);
-					} catch (CoreException x) {
-						handleCoreException(x, EditorMessages.DiagramInputDocumentProvider_isModifiable);
-					}
-				}
-				return info.fIsModifiable;
-			}
-		}
-		return super.isModifiable(element);
-	}
-
-	/*
-	 * @see AbstractDocumentProvider#doUpdateStateCache(Object)
-	 * 
-	 */
-	protected void doUpdateStateCache(Object element) throws CoreException {
-		if (element instanceof IDiagramEditorInput) {
-			DiagramResourceInfo info= (DiagramResourceInfo) getElementInfo(element);
-			if (info != null)
-				info.fUpdateCache= true;
-		}
-		super.doUpdateStateCache(element);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDiagramDocumentProvider#getDiagramDocument(java.lang.Object)
-	 */
-	public IDiagramDocument getDiagramDocument(Object element) {
-		IDocument doc = getDocument(element);
-		if(doc instanceof IDiagramDocument)
-			return (IDiagramDocument)doc;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider#createInputWithEditingDomain(org.eclipse.ui.IEditorInput, org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain)
-	 */
-	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {
-		if(editorInput instanceof IDiagramEditorInput)
-			return new EditorInputProxy(editorInput, domain);
-		assert false;
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramModificationListener.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramModificationListener.java
deleted file mode 100644
index c04ddb8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DiagramModificationListener.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.EList;
-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.util.EContentAdapter;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-
-/**
- * Listener for modification events on a diagram.
- * 
- * This listener is well suited for detecting events that make a diagram dirty. 
- * 
- * @author mgoyal, wdiu
- */
-public class DiagramModificationListener extends EContentAdapter {
-
-	private TransactionalEditingDomain editingDomain;
-
-	private NotificationFilter diagramResourceModifiedFilter;
-	
-	private DiagramDocument document;
-	
-	/**
-	 * Constructs a modification listener which listens to modifications on
-	 * a diagram.
-	 * 
-	 * @param documentProvider the FileDocumentProvider to handle the document
-	 * being dirtied
-	 * @param document the DiagramDocument being dirtied
-	 * @param element the IFileEditorInput that contains the file being saved
-	 */
-	public DiagramModificationListener(
-			AbstractDocumentProvider documentProvider,
-			DiagramDocument document) {
-		this.document = document;
-		Diagram diagram = document.getDiagram();
-		editingDomain = TransactionUtil.getEditingDomain(diagram);
-
-		diagramResourceModifiedFilter = NotificationFilter
-            .createNotifierFilter(diagram.eResource()).and(
-                NotificationFilter.createEventTypeFilter(Notification.SET).or(
-                    NotificationFilter
-                        .createEventTypeFilter(Notification.UNSET))).and(
-                NotificationFilter.createFeatureFilter(Resource.class,
-                    Resource.RESOURCE__IS_MODIFIED));
-	}
-
-	public void startListening() {
-		EList adapters = getEditingDomain().getResourceSet().eAdapters();
-		if (!adapters.contains(this)) {
-				adapters.add(this);
-		}
-	}
-	
-	public void stopListening() {
-		getEditingDomain().getResourceSet().eAdapters().remove(this);
-	}
-	
-	/**
-	 * Gets the editingDomain.
-	 * @return Returns the editingDomain.
-	 */
-	protected TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	protected DiagramDocument getDiagramDocument() {
-		return document;
-	}
-	
-	public boolean isAdapterForType(Object type) {
-		return type == DiagramModificationListener.class;
-	}
-
-	public void notifyChanged(Notification notification) {
-		if (notification.getNotifier() instanceof ResourceSet) {
-			super.notifyChanged(notification);
-		}
-		
-		if (diagramResourceModifiedFilter.matches(notification)) {
-			// provide further filtering not available with the
-			// NotificationFilter
-			if (getDiagramDocument().getDiagram() != null
-				&& notification.getNotifier() instanceof Resource) {
-				Resource notifierResource = (Resource) notification
-					.getNotifier();
-	
-				EList contents = notifierResource.getContents();
-				if (!contents.isEmpty()) {
-					Object root = contents.get(0);
-					if (notification.getNewBooleanValue() == true
-						&& notification.getOldBooleanValue() == false) {
-						if (root instanceof EObject
-							&& ((EObject) root).eResource() != null
-							&& ((EObject) root).eResource().equals(
-								notifierResource)
-							&& notifierResource.isLoaded()) {
-	
-							getDiagramDocument().setContent(getDiagramDocument().getContent());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public void unsetTarget(Notifier oldTarget) {
-		if (oldTarget instanceof ResourceSet) {
-		    super.unsetTarget(oldTarget);
-		}
-	}
-
-	public Notifier getTarget() {
-		return null;
-	}
-
-	public void setTarget(Notifier newTarget) {
-		if (newTarget instanceof ResourceSet) {
-		    super.setTarget(newTarget);
-		}
-	}
-	
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DocumentEvent.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DocumentEvent.java
deleted file mode 100644
index c3f75eb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DocumentEvent.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-
-
-/**
- * Specification of changes applied to documents. 
- * The event contains the changed document.
- *
- * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument
- */
-public class DocumentEvent {
-
-	/** The changed document */
-	public IDocument fDocument;
-	
-	public int fEventKind;
-	
-	public Object fEventInfo;
-	/**
-	 * The modification stamp of the document when firing this event.
-	 * 
-	 */
-	protected long fModificationStamp;
-	
-	public static final int CONTENT_REPLACED = 0;
-	public static final int CONTENT_MODIFIED = 1;
-
-	/**
-	 * Creates a new document event.
-	 *
-	 * @param doc the changed document
-	 */
-	public DocumentEvent(IDocument doc, int eventKind, Object eventInfo) {
-
-		assert doc != null;
-
-		fDocument= doc;
-		fEventKind = eventKind;
-		fEventInfo = eventInfo;
-		fModificationStamp = fDocument.getModificationStamp();
-	}
-
-	/**
-	 * Creates a new, not initialized document event.
-	 */
-	public DocumentEvent() {
-		//default constructor
-	}
-
-	/**
-	 * Returns the changed document.
-	 *
-	 * @return the changed document
-	 */
-	public IDocument getDocument() {
-		return fDocument;
-	}
-	/**
-	 * Returns the document's modification stamp at the
-	 * time when this event was sent.
-	 *
-	 * @return the modification stamp or {@link IDocument#UNKNOWN_MODIFICATION_STAMP}.
-	 */
-	public long getModificationStamp() {
-		return fModificationStamp;
-	}
-
-	
-	/**
-	 * @return The Event Kind
-	 */
-	public int getEventKind() {
-		return fEventKind;
-	}
-
-	/**
-	 * @return The Event Information
-	 */
-	public Object getEventInfo() {
-		return fEventInfo;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DocumentProviderRegistry.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DocumentProviderRegistry.java
deleted file mode 100644
index 90e5cc5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/DocumentProviderRegistry.java
+++ /dev/null

@@ -1,382 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * This registry manages shared document providers. Document
- * providers are specified in <code>plugin.xml</code> either
- * per name extension or per editor input type. A name extension
- * rule always overrules an editor input type rule. Editor input
- * type rules follow the same rules <code>IAdapterManager</code>
- * used to find object adapters.
- *
- * @see org.eclipse.core.runtime.IAdapterManager
- */
-public class DocumentProviderRegistry {
-	
-	public interface IDocumentProviderSelector {
-		public boolean select(String documentType);
-	}
-
-	/** The registry singleton. */
-	private static DocumentProviderRegistry fgRegistry;
-
-	/**
-	 * Returns the standard document provider registry.
-	 *
-	 * @return the default document provider registry
-	 */
-	public static DocumentProviderRegistry getDefault() {
-		if (fgRegistry == null)
-			fgRegistry= new DocumentProviderRegistry();
-		return fgRegistry;
-	}
-
-	/** The mapping between name extensions and configuration elements. */
-	public Map fExtensionMapping= new HashMap();
-	/** The mapping between editor input type names and configuration elements. */
-	public Map fInputTypeMapping= new HashMap();
-	/** The mapping between configuration elements and instantiated document providers. */
-	private Map fInstances= new HashMap();
-
-
-	/**
-	 * Creates a new document provider registry and initializes it with the information
-	 * found in the plug-in registry.
-	 */
-	private DocumentProviderRegistry() {
-		initialize();
-	}
-
-	/**
-	 * Reads the comma-separated value of the given configuration element
-	 * for the given attribute name and remembers the configuration element
-	 * in the given map under the individual tokens of the attribute value.
-	 *
-	 * @param map the map
-	 * @param element the configuration element
-	 * @param attributeName the attribute name
-	 */
-	private void read(Map map, IConfigurationElement element, String attributeName) {
-		String value= element.getAttribute(attributeName);
-
-		if (value != null) {
-			StringTokenizer tokenizer= new StringTokenizer(value, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String token= tokenizer.nextToken().trim();
-
-				Set s= (Set) map.get(token);
-				if (s == null) {
-					s= new HashSet();
-					map.put(token, s);
-				}
-				s.add(element);
-			}
-		}
-	}
-
-	/**
-	 * Initializes the document provider registry. It retrieves all implementers of the <code>documentProviders</code>
-	 * extension point and remembers those implementers based on the name extensions and the editor input
-	 * types they are for.
-	 */
-	private void initialize() {
-
-		IExtensionPoint extensionPoint;
-		extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(EditorPlugin.getPluginId(), "documentProviders"); //$NON-NLS-1$
-
-		if (extensionPoint == null) {
-			String msg= NLS.bind(EditorMessages.DocumentProviderRegistry_error_extension_point_not_found, PlatformUI.PLUGIN_ID);
-			Bundle bundle = Platform.getBundle(EditorPlugin.getPluginId());
-			ILog log= Platform.getLog(bundle);
-			log.log(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, msg, null));
-			return;
-		}
-
-		IConfigurationElement[] elements= extensionPoint.getConfigurationElements();
-		for (int i= 0; i < elements.length; i++) {
-			read(fExtensionMapping, elements[i], "extensions"); //$NON-NLS-1$
-			read(fInputTypeMapping, elements[i], "inputTypes"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Returns the document provider for the given configuration element.
-	 * If there is no instantiated document provider remembered for this
-	 * element, a new document provider is created and put into the cache.
-	 *
-	 * @param entry the configuration element
-	 * @return the document provider for the given entry
-	 */
-	private IDocumentProvider getDocumentProvider(IConfigurationElement entry) {
-		IDocumentProvider provider= (IDocumentProvider) fInstances.get(entry);
-		if (provider == null) {
-			try {
-				provider = (IDocumentProvider) entry.createExecutableExtension("class"); //$NON-NLS-1$
-				fInstances.put(entry, provider);
-			} catch (CoreException x) {
-				// ignore
-			}
-		}
-		return provider;
-	}
-	
-	/**
-	 * Returns the first enumerated element of the given set.
-	 *
-	 * @param set the set
-	 * @return the first configuration element in the set or <code>null</code> if none
-	 */
-	private IConfigurationElement selectConfigurationElement(Collection set, IDocumentProviderSelector selector) {
-		if (set != null && !set.isEmpty()) {
-			Iterator e= set.iterator();
-			while(e.hasNext()) {
-				IConfigurationElement element = (IConfigurationElement) e.next();
-				String docTypeClass = element.getAttribute("documentType"); //$NON-NLS-1$
-				if(selector.select(docTypeClass))
-					return element;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a shared document provider for the given name extension.
-	 *
-	 * @param extension the name extension to be used for lookup
-	 * @return the shared document provider or <code>null</code>
-	 */
-	public IDocumentProvider getDocumentProvider(String extension, IDocumentProviderSelector selector) {
-
-		Set set= (Set) fExtensionMapping.get(extension);
-		if (set != null) {
-			IConfigurationElement entry = selectConfigurationElement(set, selector);
-			if(entry != null)
-				return getDocumentProvider(entry);
-		}
-		return null;
-	}
-
-	/**
-	 * Computes the class hierarchy of the given type. The type is
-	 * part of the computed hierarchy.
-	 *
-	 * @param type the type
-	 * @return a list containing the super class hierarchy
-	 */
-	private List computeClassList(Class type) {
-
-		List result= new ArrayList();
-
-		Class c= type;
-		while (c != null) {
-			result.add(c);
-			c= c.getSuperclass();
-		}
-
-		return result;
-	}
-
-	/**
-	 * Computes the list of all interfaces for the given list of
-	 * classes. The interface lists of the given classes are
-	 * concatenated.
-	 *
-	 * @param classes a list of {@link java.lang.Class} objects
-	 * @return a list with elements of type <code>Class</code>
-	 */
-	private List computeInterfaceList(List classes) {
-
-		List result= new ArrayList(4);
-		Hashtable visited= new Hashtable(4);
-
-		Iterator e= classes.iterator();
-		while (e.hasNext()) {
-			Class c= (Class) e.next();
-			computeInterfaceList(c.getInterfaces(), result, visited);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Computes the list of all interfaces of the given list of interfaces,
-	 * taking a depth-first approach.
-	 *
-	 * @param interfaces an array of {@link java.lang.Class} objects denoting interfaces
-	 * @param result the result list
-	 * @param visited map of visited interfaces
-	 */
-	private void computeInterfaceList(Class[] interfaces, List result, Hashtable visited) {
-
-		List toBeVisited= new ArrayList(interfaces.length);
-
-		for (int i= 0; i < interfaces.length; i++) {
-			Class iface= interfaces[i];
-			if (visited.get(iface) == null) {
-				visited.put(iface, iface);
-				result.add(iface);
-				toBeVisited.add(iface);
-			}
-		}
-
-		Iterator e= toBeVisited.iterator();
-		while(e.hasNext()) {
-			Class iface= (Class) e.next();
-			computeInterfaceList(iface.getInterfaces(), result, visited);
-		}
-	}
-
-	/**
-	 * Returns the configuration elements for the first class in the list
-	 * of given classes for which configuration elements have been remembered.
-	 *
-	 * @param classes a list of {@link java.lang.Class} objects
-	 * @return an input type mapping or <code>null</code>
-	 */
-	private Set getFirstInputTypeMapping(List classes) {
-		Iterator e= classes.iterator();
-		while (e.hasNext()) {
-			Class c= (Class) e.next();
-			Set mapping= (Set)fInputTypeMapping.get(c.getName());
-			if (mapping != null)
-				return mapping;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the configuration elements for the first class in the list
-	 * of given classes for which configuration elements have been remembered.
-	 *
-	 * @param classes a list of {@link java.lang.Class} objects
-	 * @return an input type mapping or <code>null</code>
-	 */
-	private List getInputTypeMappings(List classes) {
-		List mappings = new ArrayList();
-		Iterator e= classes.iterator();
-		while (e.hasNext()) {
-			Class c= (Class) e.next();
-			Set mapping= (Set)fInputTypeMapping.get(c.getName());
-			if (mapping != null)
-				mappings.addAll(mapping);
-		}
-		return mappings;
-	}
-
-	/**
-	 * Returns the appropriate configuration element for the given type. If
-	 * there is no configuration element for the type's name, first the list of
-	 * super classes is searched, and if not successful the list of all interfaces.
-	 *
-	 * @param type a {@link java.lang.Class} object
-	 * @return an input type mapping or <code>null</code>
-	 */
-	protected Set findInputTypeMapping(Class type) {
-
-		if (type == null)
-			return null;
-
-		Set mapping= (Set)fInputTypeMapping.get(type.getName());
-		if (mapping != null)
-			return mapping;
-
-		List classList= computeClassList(type);
-		mapping= getFirstInputTypeMapping(classList);
-		if (mapping != null)
-			return mapping;
-
-		return getFirstInputTypeMapping(computeInterfaceList(classList));
-	}
-
-	/**
-	 * Returns the appropriate configuration element for the given type. If
-	 * there is no configuration element for the type's name, first the list of
-	 * super classes is searched, and if not successful the list of all interfaces.
-	 *
-	 * @param type a {@link java.lang.Class} object
-	 * @return an input type mapping or <code>null</code>
-	 */
-	private List findInputTypeMappings(Class type) {
-
-		List inputTypeMappings = new ArrayList();
-		if (type == null)
-			return null;
-
-		Set mapping= (Set)fInputTypeMapping.get(type.getName());
-		if (mapping != null)
-			inputTypeMappings.addAll(mapping);
-
-		List classList= computeClassList(type);
-		List clsMapping= getInputTypeMappings(classList);
-		if (clsMapping != null)
-			inputTypeMappings.addAll(clsMapping);
-
-		inputTypeMappings.addAll(getInputTypeMappings(computeInterfaceList(classList)));
-		return inputTypeMappings;
-	}
-
-	/**
-	 * Returns the shared document for the type of the given editor input.
-	 *
-	 * @param editorInput the input for whose type the provider is looked up
-	 * @return the shared document provider
-	 */
-	public IDocumentProvider getDocumentProvider(IEditorInput editorInput, IDocumentProviderSelector selector) {
-
-		IDocumentProvider provider= null;
-
-		IFile file= (IFile) editorInput.getAdapter(IFile.class);
-		if (file != null)
-			provider= getDocumentProvider(file.getFileExtension(), selector);
-
-		if (provider == null) {
-			List inputTypeMappings= findInputTypeMappings(editorInput.getClass());
-			if (inputTypeMappings != null) {
-				IConfigurationElement entry = selectConfigurationElement(inputTypeMappings, selector);
-				if(entry != null)
-					provider= getDocumentProvider(entry);
-			}
-		}
-
-		return provider;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/EditorInputProxy.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/EditorInputProxy.java
deleted file mode 100644
index 39a57a8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/EditorInputProxy.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.HashUtil;
-
-
-/**
- * @author mgoyal
- *
- */
-public class EditorInputProxy
-	implements IEditorInput, MEditingDomainElement {
-
-	protected IEditorInput fProxied = null;
-	protected TransactionalEditingDomain editingDomain = null;
-	
-	/**
-	 * @param input IEditorInput
-	 * @param domain EditingDomain
-	 */
-	public EditorInputProxy(IEditorInput input, TransactionalEditingDomain domain) {
-		assert input != null && domain != null;
-		fProxied = input;
-		editingDomain = domain;
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return fProxied.exists();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return fProxied.getImageDescriptor();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return fProxied.getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return fProxied.getPersistable();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return fProxied.getToolTipText();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return fProxied.getAdapter(adapter);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement#getEditingDomain()
-	 */
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object arg0) {
-		if(this == arg0)
-			return true;
-		if(arg0 instanceof EditorInputProxy) {
-			EditorInputProxy proxy = (EditorInputProxy)arg0;
-			if(proxy.editingDomain.equals(editingDomain) &&
-					proxy.fProxied.equals(fProxied))
-				return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return HashUtil.hash(HashUtil.hash(fProxied), editingDomain);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDiagramDocument.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDiagramDocument.java
deleted file mode 100644
index 0ea9765..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDiagramDocument.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-
-/**
- * An interface defining a <code>IDocument</code> with content 
- * of <code>org.eclipse.gmf.runtime.notation.Diagram</code>
- * 
- * @author mgoyal
- */
-public interface IDiagramDocument
-	extends IDocument {
-	/**
-	 * Returns the diagram for this diagram document
-	 * @return Diagram for this document
-	 */
-	Diagram getDiagram();
-	
-	/**
-	 * @return The editing domain for this diagram document
-	 */
-	TransactionalEditingDomain getEditingDomain();
-	
-	/**
-	 * Sets the EditingDomain for this document
-	 */
-	void setEditingDomain(TransactionalEditingDomain domain);
-	
-	/**
-	 * Detaches the attached <code>Diagram</code> from this document.
-	 *  
-	 * @return the detached diagram.
-	 */
-	Diagram detachDiagram();
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDiagramDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDiagramDocumentProvider.java
deleted file mode 100644
index 795e28c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDiagramDocumentProvider.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.ui.IEditorInput;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-
-
-/**
- * An interface to be implemented by all document providers,
- * that create <code>IDiagramDocument</code>
- * 
- * @author mgoyal
- */
-public interface IDiagramDocumentProvider {
-	/**
-	 * Returns the diagram document.
-	 * 
-	 * @param element The Editor Input for which the diagram document is requred.
-	 * @return the Diagram document.
-	 * 
-	 * @see IDocumentProvider#getDocument(Object)
-	 */
-	IDiagramDocument getDiagramDocument(Object element);
-	
-	IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain);
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocument.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocument.java
deleted file mode 100644
index fee8d48..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocument.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-/**
- * An <code>IDocument</code> represents extensible content providing support
- *
- * A document allows to set its content and to manipulate it. 
- * On each document change, all registered document listeners are informed exactly once.
- * 
- * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentListener
- */
-public interface IDocument {
-	/**
-	 * The unknown modification stamp.
-	 */
-	long UNKNOWN_MODIFICATION_STAMP= -1;
-
-	/**
-	 * Returns the modification stamp of this document. The modification stamp
-	 * is updated each time a modifying operation is called on this document. If
-	 * two modification stamps of the same document are identical then the document
-	 * content is too, however, same content does not imply same modification stamp.
-	 * <p>
-	 * The magnitude or sign of the numerical difference between two modification stamps
-	 * is not significant.
-	 * </p>
-	 *
-	 * @return the modification stamp of this document or <code>UNKNOWN_MODIFICATION_STAMP</code>
-	 */
-	long getModificationStamp();
-	
-	/**
-	 * Registers the document listener with the document. After registration
-	 * the IDocumentListener is informed about each change of this document.
-	 * If the listener is already registered nothing happens.<p>
-	 * An <code>IDocumentListener</code> may call back to this method
-	 * when being inside a document notification.
-	 *
-	 * @param listener the listener to be registered
-	 */
-	void addDocumentListener(IDocumentListener listener);
-
-	/**
-	 * Removes the listener from the document's list of document listeners.
-	 * If the listener is not registered with the document nothing happens.<p>
-	 * An <code>IDocumentListener</code> may call back to this method
-	 * when being inside a document notification.
-	 *
-	 * @param listener the listener to be removed
-	 */
-	void removeDocumentListener(IDocumentListener listener);
-
-	/**
-	 * Adds the given document listener as one which is notified before
-	 * those document listeners added with <code>addDocumentListener</code>
-	 * are notified. If the given listener is also registered using
-	 * <code>addDocumentListener</code> it will be notified twice.
-	 * If the listener is already registered nothing happens.<p>
-	 *
-	 * This method is not for public use.
-	 *
-	 * @param documentAdapter the listener to be added as pre-notified document listener
-	 *
-	 * @see #removePrenotifiedDocumentListener(IDocumentListener)
-	 */
-	void addPrenotifiedDocumentListener(IDocumentListener documentAdapter);
-
-	/**
-	 * Removes the given document listener from the document's list of
-	 * pre-notified document listeners. If the listener is not registered
-	 * with the document nothing happens. <p>
-	 *
-	 * This method is not for public use.
-	 *
-	 * @param documentAdapter the listener to be removed
-	 *
-	 * @see #addPrenotifiedDocumentListener(IDocumentListener)
-	 */
-	void removePrenotifiedDocumentListener(IDocumentListener documentAdapter);
-	
-	/**
-	 * Returns this document's contents.
-	 *
-	 * @return the document's contents
-	 */
-	Object getContent();
-	
-	/**
-	 * Replaces the content of the document with the given content.
-	 * Sends a <code>DocumentEvent</code> to all registered <code>IDocumentListener</code>.
-	 *
-	 * @param documentContent the new content of the document
-	 *
-	 * @see DocumentEvent
-	 * @see IDocumentListener
-	 */
-	void setContent(Object documentContent);
-	
-	/**
-	 * Replaces the content of the document with the given text.
-	 * Sends a <code>DocumentEvent</code> to all registered <code>IDocumentListener</code>.
-	 *
-	 * @param content the new content of the document
-	 * @param modificationStamp of the document after setting the content
-	 *
-	 * @see DocumentEvent
-	 * @see IDocumentListener
-	 */
-	void setContent(Object content, long modificationStamp);
-	
-	/**
-	 * The affect of these calls is that no document listener is notified
-	 * until <code>resumeListenerNotification</code> is called. This allows clients
-	 * to update structure before any listener is informed about the change.<p>
-	 * Listener notification can only be stopped for a single <code>replace</code> operation.
-	 * Otherwise, document change notifications will be lost.
-	 */
-	void stopListenerNotification();
-
-	/**
-	 * Resumes the notification of document listeners which must previously
-	 * have been stopped by a call to <code>stopListenerNotification</code>.
-	 */
-	void resumeListenerNotification();
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentEditor.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentEditor.java
deleted file mode 100644
index 48d80f2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentEditor.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-
-/**
- * An interface to be implemented by all the editors displaying a diagram
- */
-public interface IDocumentEditor {
-
-	/**
-	 * Returns this text editor's document provider.
-	 *
-	 * @return the document provider or <code>null</code> if none, e.g. after closing the editor
-	 */
-	IDocumentProvider getDocumentProvider();
-
-	/**
-	 * Closes this text editor after optionally saving changes.
-	 *
-	 * @param save <code>true</code> if unsaved changed should be saved, and
-	 *   <code>false</code> if unsaved changed should be discarded
-	 */
-	void close(boolean save);
-
-	/**
-	 * Returns whether the text in this text editor can be changed by the user.
-	 *
-	 * @return <code>true</code> if it can be edited, and <code>false</code> if it is read-only
-	 */
-	boolean isEditable();
-
-	/**
-	 * Returns whether the editor's input is read-only. The semantics of
-	 * this method is orthogonal to <code>isEditable</code> as it talks about the
-	 * editor input, i.e. the domain element, and <b>not</b> about the editor
-	 * document.
-	 *
-	 * @return <code>true</code> if the editor input is read-only
-	 */
-	boolean isEditorInputReadOnly();
-
-
-	/**
-	 * Returns whether the editor's input can be persistently be modified.
-	 * This is orthogonal to <code>ITextEditorExtension.isEditorInputReadOnly</code> as read-only elements may be modifiable and
-	 * writable elements may not be modifiable. If the given element is not connected to this document
-	 * provider, the result is undefined. Document providers are allowed to use a cache to answer this
-	 * question, i.e. there can be a difference between the "real" state of the element and the return
-	 * value.
-	 *
-	 * @return <code>true</code> if the editor input is modifiable
-	 */
-	boolean isEditorInputModifiable();
-
-	/**
-	 * Validates the state of the given editor input. The predominate intent
-	 * of this method is to take any action probably necessary to ensure that
-	 * the input can persistently be changed.
-	 *
-	 * @return <code>true</code> if the input was validated, <code>false</code> otherwise
-	 */
-	boolean validateEditorInputState();
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentListener.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentListener.java
deleted file mode 100644
index ed861bd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentListener.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-
-/**
- * Interface for objects which are interested in getting informed about
- * document changes. A listener is informed about document changes before
- * they are applied and after they have been applied. It is ensured that
- * the document event passed into the listener is the same for the two
- * notifications, i.e. the two document events can be checked using object identity.
- * <p>
- * Clients may implement this interface.
- * </p>
- *
- * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument
- */
-public interface IDocumentListener {
-	/**
-	 * The manipulation described by the document event will be performed.
-	 *
-	 * @param event the document event describing the document change
-	 */
-	void documentAboutToBeChanged(DocumentEvent event);
-
-	/**
-	 * The manipulation described by the document event has been performed.
-	 *
-	 * @param event the document event describing the document change
-	 */
-	void documentChanged(DocumentEvent event);
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentProvider.java
deleted file mode 100644
index 2e4867c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IDocumentProvider.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-
-
-/**
- * A document provider maps between domain elements and documents. A document provider has the
- * following responsibilities:
- * <ul>
- * <li>create and manage a content representation, i.e., a document, of a domain model element
- * <li>create and save the content of domain model elements based on given documents
- * <li>update the documents this document provider manages for domain model elements to changes
- * directly applied to those domain model elements
- * <li>notify all element state listeners about changes directly applied to domain model elements
- * this document provider manages a document for, i.e. the document provider must know which changes
- * of a domain model element are to be interpreted as element moves, deletes, etc.
- * </ul>
- * A single document provider may be shared between multiple editors; the
- * methods take the editors' input elements as a parameter.
- * <p>
- * This interface may be implemented by clients; or subclass the standard abstract base class
- * <code>AbstractDocumentProvider</code>.
- * </p>
- *
- * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument
- * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider
- */
-public interface IDocumentProvider {
-
-	/**
-	 * Connects the given element to this document provider. This tells the provider
-	 * that caller of this method is interested to work with the document provided for
-	 * the given domain model element. By counting the invocations of this method and
-	 * <code>disconnect(Object)</code> this provider can assume to know the
-	 * correct number of clients working with the document provided for that
-	 * domain model element. <p>
-	 * The given element must not be <code>null</code>.
-	 *
-	 * @param element the element
-	 * @exception CoreException if the document representation could not be created
-	 */
-	void connect(Object element) throws CoreException;
-
-	/**
-	 * Disconnects the given element from this document provider. This tells the provider
-	 * that the caller of this method is no longer interested in working with the document
-	 * provided for the given domain model element. By counting the invocations of
-	 * <code>connect(Object)</code> and of this method this provider can assume to
-	 * know the correct number of clients working with the document provided for that
-	 * domain model element. <p>
-	 * The given element must not be <code>null</code>.
-	 *
-	 * @param element the element
-	 */
-	void disconnect(Object element);
-
-	/**
-	 * Returns the document for the given element. Usually the document contains
-	 * a content presentation of the content of the element, or is the element itself.
-	 *
-	 * @param element the element, or <code>null</code>
-	 * @return the document, or <code>null</code> if none
-	 */
-	IDocument getDocument(Object element);
-
-	/**
-	 * Resets the given element's document to its last saved state.
-	 * Element state listeners are notified both before (<code>elementContentAboutToBeReplaced</code>)
-	 * and after (<code>elementContentReplaced</code>) the content is changed.
-	 *
-	 * @param element the element, or <code>null</code>
-	 * @exception CoreException if document could not be reset for the given element
-	 */
-	void resetDocument(Object element) throws CoreException;
-
-	/**
-	 * Saves the given document provided for the given element.
-	 *
-	 * @param monitor a progress monitor to report progress and request cancellation
-	 * @param element the element, or <code>null</code>
-	 * @param document the document
-	 * @param overwrite indicates whether overwrite should be performed
-	 * 			while saving the given element if necessary
-	 * @exception CoreException if document could not be stored to the given element
-	 */
-	void saveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException;
-
-	/**
-	 * Returns the modification stamp of the given element.
-	 *
-	 * @param element the element
-	 * @return the modification stamp of the given element
-	 */
-	long getModificationStamp(Object element);
-
-	/**
-	 * Returns the time stamp of the last synchronization of
-	 * the given element and it's provided document.
-	 *
-	 * @param element the element
-	 * @return the synchronization stamp of the given element
-	 */
-	long getSynchronizationStamp(Object element);
-
-	/**
-	 * Returns whether the given element has been deleted.
-	 *
-	 * @param element the element
-	 * @return <code>true</code> if the element has been deleted
-	 */
-	boolean isDeleted(Object element);
-
-	/**
-	 * Returns whether the document provided for the given element must be saved.
-	 *
-	 * @param element the element, or <code>null</code>
-	 * @return <code>true</code> if the document must be saved, and
-	 *   <code>false</code> otherwise (including the element is <code>null</code>)
-	 */
-	boolean mustSaveDocument(Object element);
-
-	/**
-	 * Returns whether the document provided for the given element differs from
-	 * its original state which would required that it be saved.
-	 *
-	 * @param element the element, or <code>null</code>
-	 * @return <code>true</code> if the document can be saved, and
-	 *   <code>false</code> otherwise (including the element is <code>null</code>)
-	 */
-	boolean canSaveDocument(Object element);
-
-	/**
-	 * Informs this document provider about upcoming changes of the given element.
-	 * The changes might cause change notifications specific for the type of the given element.
-	 * If this provider manages a document for the given element, the document provider
-	 * must not change the document because of the notifications received after <code>
-	 * aboutToChange</code> has been and before <code>changed</code> is called. In this case,
-	 * it is assumed that the document is already up to date, e.g., a save operation is a
-	 * typical case. <p>
-	 * The concrete nature of the change notification depends on the concrete type of the
-	 * given element. If the element is, e.g., an <code>IResource</code> the notification
-	 * is a resource delta.
-	 *
-	 * @param element the element, or <code>null</code>
-	 */
-	void aboutToChange(Object element);
-
-	/**
-	 * Informs this document provider that the given element has been changed.
-	 * All notifications have been sent out. If this provider manages a document
-	 * for the given element, the document provider  must from now on change the
-	 * document on the receipt of change notifications. The concrete nature of the change
-	 * notification depends on the concrete type of the given element. If the element is,
-	 * e.g., an <code>IResource</code> the notification is a resource delta.
-	 *
-	 * @param element the element, or <code>null</code>
-	 */
-	void changed(Object element);
-
-	/**
-	 * Adds the given element state listener to this document provider.
-	 * Has no effect if an identical listener is already registered.
-	 *
-	 * @param listener the listener
-	 */
-	void addElementStateListener(IElementStateListener listener);
-
-	/**
-	 * Removes the given element state listener from this document provider.
-	 * Has no affect if an identical listener is not registered.
-	 *
-	 * @param listener the listener
-	 */
-	void removeElementStateListener(IElementStateListener listener);
-
-
-	/**
-	 * Returns whether the document provider thinks that the given element is read-only.
-	 * If this method returns <code>true</code>, <code>saveDocument</code> could fail.
-	 * This method does not say anything about the document constructed from the given
-	 * element. If the given element is not connected to this document provider, the return
-	 * value is undefined. Document providers are allowed to use a cache to answer this
-	 * question, i.e. there can be a difference between the "real" state of the element and
-	 * the return value.
-	 *
-	 * @param element the element
-	 * @return <code>true</code> if the given element is read-only, <code>false</code> otherwise
-	 */
-	boolean isReadOnly(Object element);
-
-	/**
-	 * Returns whether the document provider thinks that the given element can persistently be modified.
-	 * This is orthogonal to <code>isReadOnly</code> as read-only elements may be modifiable and
-	 * writable elements may not be modifiable. If the given element is not connected to this document
-	 * provider, the result is undefined. Document providers are allowed to use a cache to answer this
-	 * question, i.e. there can be a difference between the "real" state of the element and the return
-	 * value.
-	 *
-	 * @param element the element
-	 * @return <code>true</code> if the given element is modifiable, <code>false</code> otherwise
-	 */
-	boolean isModifiable(Object element);
-
-	/**
-	 * Validates the state of the given element. This method  may change the "real" state of the
-	 * element. If using, it also updates the internal caches, so that this method may also change
-	 * the results returned by <code>isReadOnly</code> and <code>isModifiable</code>. If the
-	 * given element is not connected to this document provider, the effect is undefined.
-	 *
-	 * @param element the element
-	 * @param computationContext the context in which the computation is performed, e.g., a SWT shell
-	 * @exception CoreException if validating fails
-	 */
-	void validateState(Object element, Object computationContext) throws CoreException;
-
-	/**
-	 * Returns whether the state of the given element has been validated.
-	 *
-	 * @param element the element
-	 * @return <code>true</code> if the state has been validated
-	 */
-	boolean isStateValidated(Object element);
-
-	/**
-	 * Updates the state cache for the given element. This method may change the result returned
-	 * by <code>isReadOnly</code> and <code>isModifiable</code>. If the given element is not
-	 * connected to this document provider, the effect is undefined.
-	 *
-	 * @param element the element
-	 * @exception CoreException if validating fails
-	 */
-	void updateStateCache(Object element) throws CoreException;
-
-	/**
-	 * Marks the document managed for the given element as saveable. I.e.
-	 * <code>canBeSaved(element)</code> will return <code>true</code>
-	 * afterwards.
-	 *
-	 * @param element the element
-	 */
-	void setCanSaveDocument(Object element);
-
-	/**
-	 * Returns the status of the given element.
-	 *
-	 * @param element the element
-	 * @return the status of the given element
-	 */
-	IStatus getStatus(Object element);
-
-	/**
-	 * Synchronizes the document provided for the given element with the
-	 * given element. After that call <code>getSynchronizationTimeStamp</code>
-	 * and <code>getModificationTimeStamp</code> return the same value.
-	 *
-	 * @param element the element
-	 * @exception CoreException  if the synchronization could not be performed
-	 */
-	void synchronize(Object element) throws CoreException;
-
-
-	/**
-	 * Sets this providers progress monitor.
-	 * @param progressMonitor
-	 */
-	void setProgressMonitor(IProgressMonitor progressMonitor);
-
-	/**
-	 * Returns this providers progress monitor.
-	 * @return IProgressMonitor
-	 */
-	IProgressMonitor getProgressMonitor();
-
-	/**
-	 * Returns whether the information provided for the given element is in sync with the element.
-	 *
-	 * @param element the element
-	 * @return <code>true</code> if the information is in sync with the element, <code>false</code> otherwise
-	 */
-	boolean isSynchronized(Object element);
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IElementStateListener.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IElementStateListener.java
deleted file mode 100644
index f14347f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/IElementStateListener.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-
-/**
- * Interface for parties interested in standardized element changes. These
- * changes are:
- * <ul>
- * <li> dirty state changes
- * <li> content replacements
- * <li> moves
- * <li> deletions
- * </ul>
- * The notifications sent to the element state listeners inform about those standardized,
- * abstract changes. The concrete change applied might differ from the one the listeners
- * are notified about, but should be interpreted as the one the listeners receive.
- * <p>
- * In order to provided backward compatibility for clients of <code>IElementStateListener</code>,
- * extension interfaces are used to provide a means of evolution. The following extension interface
- * exists:
- * </p>
- */
-public interface IElementStateListener {
-
-	/**
-	 * Notifies that the dirty state of the given element has changed.
-	 *
-	 * @param element the element
-	 * @param isDirty the new dirty state
-	 */
-	void elementDirtyStateChanged(Object element, boolean isDirty);
-
-	/**
-	 * Notifies that the content of the given element is about to be replaced.
-	 *
-	 * @param element the element
-	 */
-	void elementContentAboutToBeReplaced(Object element);
-
-	/**
-	 * Notifies that the content of the given element has been replaced.
-	 *
-	 * @param element the element
-	 */
-	void elementContentReplaced(Object element);
-
-	/**
-	 * Notifies that the given element has been deleted.
-	 *
-	 * @param element the element
-	 */
-	void elementDeleted(Object element);
-
-	/**
-	 * Notifies that the element has moved. If <code>movedElement</code>
-	 * is <code>null</code> it is similar to <code>elementDeleted(originalElement)</code>.
-	 *
-	 * @param originalElement the element before the move
-	 * @param movedElement the element after the move
-	 */
-	void elementMoved(Object originalElement, Object movedElement);
-
-	/**
-	 * Notifies that the state validation of the given element has changed.
-	 *
-	 * @param element the element
-	 * @param isStateValidated the flag indicating whether state validation is done
-	 */
-	void elementStateValidationChanged(Object element, boolean isStateValidated);
-
-	/**
-	 * Notifies that the given element is currently being changed. This method may
-	 * be sent from a non-ui thread.
-	 *
-	 * @param element the element
-	 */
-	void elementStateChanging(Object element);
-
-	/**
-	 * Notifies that changing the given element has failed.
-	 *
-	 * @param element the element
-	 */
-	void elementStateChangeFailed(Object element);
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/ISchedulingRuleProvider.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/ISchedulingRuleProvider.java
deleted file mode 100644
index 69b4917..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/ISchedulingRuleProvider.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2005  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-/**
- * A scheduling rule provider provides a scheduling rule which
- * can be used when running operations.
- */
-public interface ISchedulingRuleProvider {
-
-	/**
-	 * Returns the scheduling rule.
-	 *
-	 * @return a scheduling rule or <code>null</code> if none
-	 */
-	ISchedulingRule getSchedulingRule();
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/MEditingDomainElement.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/MEditingDomainElement.java
deleted file mode 100644
index 025f32b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/MEditingDomainElement.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-
-/**
- * @author mgoyal
- *
- */
-public interface MEditingDomainElement {
-	/**
-	 * @return The editing domain for this diagram document
-	 */
-	TransactionalEditingDomain getEditingDomain();
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/PathEditorInputProxy.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/PathEditorInputProxy.java
deleted file mode 100644
index 788230a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/document/PathEditorInputProxy.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.document;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.ui.IPathEditorInput;
-
-
-/**
- * @author mgoyal
- *
- */
-public class PathEditorInputProxy extends EditorInputProxy
-	implements IPathEditorInput, MEditingDomainElement {
-
-	/**
-	 * @param input IEditorInput
-	 * @param domain EditingDomain
-	 */
-	public PathEditorInputProxy(IPathEditorInput input, TransactionalEditingDomain domain) {
-		super(input, domain);
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPathEditorInput#getPath()
-	 */
-	public IPath getPath() {
-		IPathEditorInput pathEditorInput = getPathEditorInput();
-		if(pathEditorInput != null)
-			return pathEditorInput.getPath();
-		assert false;
-		return null;
-	}
-	
-	/**
-	 * @return PathEditorInput
-	 */
-	private IPathEditorInput getPathEditorInput() {
-		return fProxied instanceof IPathEditorInput ? (IPathEditorInput) fProxied
-			: null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorDebugOptions.java
deleted file mode 100644
index d2c4794..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorDebugOptions.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author qili
- * @canBeSeenBy %level1
- *
- */
-public final class EditorDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private EditorDebugOptions() {
-		//Limiting the scope of the constructor so that no-one can initialize.
-	}
-
-	public static final String DEBUG = EditorPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorPlugin.java
deleted file mode 100644
index 8f4e89b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorPlugin.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Editor Plug-in
- * 
- * @author qili
- * @author mgoyal
- */
-public class EditorPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The shared instance.
-	 */
-	private static EditorPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public EditorPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the plugin instance
-	 */
-	public static EditorPlugin getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorStatusCodes.java
deleted file mode 100644
index 26ea586..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/EditorStatusCodes.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal;
-
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author qili
- *
- */
-public final class EditorStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private EditorStatusCodes() {
-		//Limit the scope of the constructor
-	}
-
-	public static final int OK = 0;
-    public static final int ERROR = 1;
-    
-	/**
-	 * Status code indicating that an error occurred with a resource, such as
-	 * loading an image file.
-	 * Set to 5 to be consistent with CommonUIStatusCodes.
-	 */
-	public static final int RESOURCE_FAILURE = 5;
-
-	public static final int WARNING = 7;
-
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/EditorMessages.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/EditorMessages.java
deleted file mode 100644
index 206090d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/EditorMessages.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n;
-
-
-/**
- * Messages for the Editor.
- */
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class to get NLSed messages.
- */
-final public class EditorMessages extends NLS {
-	private static final String BUNDLE_NAME= EditorMessages.class.getName();
-
-	private EditorMessages() {
-		// Do not instantiate
-	}
-
-	public static String Editor_error_no_provider;
-	public static String Editor_error_save_title;
-	public static String Editor_error_save_message;
-	public static String Editor_error_save_deleted_title;
-	public static String Editor_error_save_deleted_message;
-	public static String Editor_error_init;
-	public static String Editor_error_save_outofsync_title;
-	public static String Editor_error_save_outofsync_message;
-	public static String Editor_error_activated_outofsync_title;
-	public static String Editor_error_activated_outofsync_message;
-	public static String Editor_error_activated_deleted_save_title;
-	public static String Editor_error_activated_deleted_save_message;
-	public static String Editor_error_activated_deleted_save_button_save;
-	public static String Editor_error_activated_deleted_save_button_close;
-	public static String Editor_error_activated_deleted_close_title;
-	public static String Editor_error_activated_deleted_close_message;
-	public static String Editor_error_refresh_outofsync_title;
-	public static String Editor_error_refresh_outofsync_message;
-	public static String Editor_error_revert_title;
-	public static String Editor_error_revert_message;
-	public static String Editor_error_setinput_title;
-	public static String Editor_error_setinput_message;
-	public static String Editor_error_validateEdit_title;
-	public static String Editor_error_validateEdit_message;
-	public static String Editor_error_open_message;
-	public static String Editor_error_create_file_title;
-	public static String Editor_error_create_file_message;
-	public static String Editor_error_dialog_internal_message;
-	public static String AbstractDocumentProvider_error_save_inuse;
-	public static String Editor_statusline_state_readonly_label;
-	public static String Editor_statusline_state_writable_label;
-	public static String Editor_statusline_mode_insert_label;
-	public static String Editor_statusline_mode_overwrite_label;
-	public static String Editor_statusline_mode_smartinsert_label;
-	public static String Editor_statusline_position_pattern;
-	public static String Editor_statusline_error_label;
-	public static String AbstractDocumentProvider_ok;
-	public static String AbstractDocumentProvider_error;
-	public static String DocumentProviderRegistry_error_extension_point_not_found;
-
-	public static String DiagramInputDocumentProvider_createElementInfo;
-	public static String DiagramInputDocumentProvider_updateCache;
-	public static String DiagramInputDocumentProvider_isReadOnly;
-	public static String DiagramInputDocumentProvider_isModifiable;
-	public static String Editor_error_saveas_title;
-	public static String Editor_warning_save_delete;
-	public static String NullProvider_error;
-	public static String Editor_error_saving_message1;
-	public static String Editor_error_saving_message2;
-	public static String Editor_error_saving_title1;
-	public static String Editor_error_saving_title2;
-	
-	public static String Diagram_UNABLE_TO_LOAD_RESOURCE;
-	public static String Diagram_NO_DIAGRAM_IN_RESOURCE;
-
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EditorMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/EditorMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/EditorMessages.properties
deleted file mode 100644
index 82f4fb8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/EditorMessages.properties
+++ /dev/null

@@ -1,90 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2000, 2005   IBM Corporation and others.                 |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-## Errors ##
-
-Editor_error_no_provider=Text editor does not have a document provider
-
-Editor_error_save_title=Save problems
-#Editor_error_save_message=Save could not be completed.
-
-Editor_error_save_deleted_title=Cannot Save
-Editor_error_save_deleted_message=The file has been deleted.
-
-Editor_error_init= Editor could not be initialized.
-
-Editor_error_save_outofsync_title=Update conflict
-Editor_error_save_outofsync_message=The file has been changed on the file system. Do you want to overwrite the changes?
-
-Editor_error_activated_outofsync_title=File Changed
-Editor_error_activated_outofsync_message=The file has been changed on the file system. Do you want to load the changes?
-
-Editor_error_activated_deleted_save_title=File Deleted
-Editor_error_activated_deleted_save_message=The file has been deleted from the file system. Do you want to save your changes or close the editor without saving?
-Editor_error_activated_deleted_save_button_save=Save
-Editor_error_activated_deleted_save_button_close=Close
-Editor_error_activated_deleted_close_title=File Deleted
-Editor_error_activated_deleted_close_message=The file has been deleted from the file system. This editor will be closed.
-
-Editor_error_refresh_outofsync_title=Problems loading File
-Editor_error_refresh_outofsync_message=The file could not be loaded from the file system.
-
-Editor_error_revert_title=Problems while reverting to saved state
-Editor_error_revert_message=Could not revert to saved state.
-Editor_error_setinput_title=Problem opening
-Editor_error_setinput_message=Cannot open input element:
-
-Editor_error_validateEdit_title= Problems editing file
-Editor_error_validateEdit_message= The file cannot be edited.
-
-Editor_error_open_message=Unable to open the editor.
-Editor_error_create_file_title=Creation Problems
-Editor_error_create_file_message=Creation Problems
-Editor_error_dialog_internal_message=Internal error: {0}
-Diagram_UNABLE_TO_LOAD_RESOURCE=Unable to load the resource
-Diagram_NO_DIAGRAM_IN_RESOURCE=Resource contains no diagram
-
-AbstractDocumentProvider_error_save_inuse=File is either open in another editor or in use by another operation.
-
-## Status line ##
-Editor_statusline_state_readonly_label=Read-Only
-Editor_statusline_state_writable_label=Writable
-Editor_statusline_mode_insert_label=Insert
-Editor_statusline_mode_overwrite_label=Overwrite
-Editor_statusline_mode_smartinsert_label=Smart Insert
-Editor_statusline_position_pattern={0} : {1}
-Editor_statusline_error_label=?
-
-AbstractDocumentProvider_ok=OK
-AbstractDocumentProvider_error=ERROR
-
-DocumentProviderRegistry_error_extension_point_not_found=Extension point: {0}.documentProviders not found
-
-DiagramInputDocumentProvider_createElementInfo=DiagramInputDocumentProvider.createElementInfo
-DiagramInputDocumentProvider_updateCache=DiagramInputDocumentProvider.updateCache
-DiagramInputDocumentProvider_isReadOnly=DiagramInputDocumentProvider.isReadOnly
-DiagramInputDocumentProvider_isModifiable=DiagramInputDocumentProvider.isModifiable
-
-Editor_error_save_message=Save could not be completed.
-Editor_error_saveas_title=Problems During Save As...
-Editor_warning_save_delete=The original file ''{0}'' has been deleted.
-Editor_error_saving_message1=File has been deleted.
-Editor_error_saving_message2=Could not save file.
-Editor_error_saving_title1=Cannot Save
-Editor_error_saving_title2=Save Problems
-
-NullProvider_error= ERROR
-
-
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/package.html
deleted file mode 100644
index 310f904..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/EMFNotationModelFactory.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/EMFNotationModelFactory.java
deleted file mode 100644
index 6574a3c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/EMFNotationModelFactory.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.notationprovider;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * @author qili
- * 
- */
-public class EMFNotationModelFactory {
-	
-	/**
-	 * load an existing diagram file.
-	 * 
-	 * @param file
-	 * @return
-	 * @throws EmfNotationException
-	 */	
-	static public Diagram load(final IFile file, TransactionalEditingDomain editingDomain) throws EmfNotationException {
-		Resource notationModel = null;
-		try {
-			file.refreshLocal(IResource.DEPTH_ZERO, null); //RATLC00514368
-			String fileName = file.getLocation().toOSString();
-			
-	        // File exists with contents..
-	        notationModel = editingDomain.loadResource(fileName);//TODO which MEditingDomain to use?
-		     
-		} catch (Exception e) {
-            Trace.catching(
-                EditorPlugin.getInstance(),
-                EditorDebugOptions.EXCEPTIONS_CATCHING,
-                EMFNotationModelFactory.class,
-                "load", //$NON-NLS-1$
-                e);
-            EmfNotationException t = new EmfNotationException(e);
-            Trace.throwing(
-                EditorPlugin.getInstance(),
-                EditorDebugOptions.EXCEPTIONS_CATCHING,
-                EMFNotationModelFactory.class,
-                "load", //$NON-NLS-1$
-                e);
-            throw t;
-		}
-
-		EList contents = notationModel.getContents();
-		if (!contents.isEmpty()) {
-			Object element = contents.get(0);
-			return (element instanceof Diagram) ? (Diagram) element
-				: null;
-		}
-		return null;
-	}
-	
-	static public void save(IFile file, Diagram diagram, boolean clone, IProgressMonitor progressMonitor) throws Exception {
-        Resource notationModel = ((EObject)diagram).eResource();
-        String fileName = file.getLocation().toOSString();
-        
-        if (clone) {
-			// save as option..
-//            URI uri = URI.createPlatformResourceURI(fFile.getFullPath().toString(), true);
-			notationModel.setURI(URI.createURI((fileName)));
-			notationModel.save(null);
-		} else {
-			notationModel.save(null);
-		}
-
-		if (progressMonitor != null)		
-			progressMonitor.done();
-	}
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/EmfNotationException.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/EmfNotationException.java
deleted file mode 100644
index db0c2f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/EmfNotationException.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.notationprovider;
-
-
-/*
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.*
- */
-public class EmfNotationException extends Exception {
-	static final long serialVersionUID = 1;
-	
-	/**
-	 * @param cause
-	 * 
-	 */
-	public EmfNotationException(Throwable cause) {
-		super(cause);		// TODO Auto-generated constructor stub
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/package.html
deleted file mode 100644
index 7d6f671..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/notationprovider/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/package.html
deleted file mode 100644
index f1340de..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/DiagramPaletteContent.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/DiagramPaletteContent.java
deleted file mode 100644
index 4d77fc8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/DiagramPaletteContent.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.palette;
-
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-
-/**
- * The default palette content. 
- * An instance of this class is passed to 
- * <code>org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteService</code>
- * when creating a palette for an Editor
- * <p>
- * This palette content is based on the kind of project for which this
- * content is created. It allows the Palette items to check on Nature
- * of project containing the diagram and provide an enablement criteria. 
- * 
- * @author mgoyal
- * 
- */
-public class DiagramPaletteContent {
-    /**
-     * Attribute to hold the diagram View that is currently
-     * open in the editor
-     */
-    private IDiagramDocument fDiagramDocument;
-    
-    /**
-     * Constructor to create palette content based on project
-     * containing the diagram file.
-     * 
-     * @param project Project containing the diagram file.
-     * @param diagramView The diagram view opened in the editor.
-     */
-    public DiagramPaletteContent(IDiagramDocument diagramDocument) {
-        this.fDiagramDocument = diagramDocument;
-    }
-    
-    /**
-     * Accessor method for the diagram view field.
-     * @return the diagram field.
-     */
-    public Diagram getDiagramView() {
-    	return getDiagram();
-    }
-
-    /**
-     * Accessor method for the diagram.
-     * @return the diagram for the content.
-     */
-    public Diagram getDiagram() {
-    	return fDiagramDocument != null ? fDiagramDocument.getDiagram() : null;
-    }
-    
-    public IDiagramDocument getDiagramDocument() {
-    	return fDiagramDocument;
-    }
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/EditorInputPaletteContent.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/EditorInputPaletteContent.java
deleted file mode 100644
index 385faa9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/EditorInputPaletteContent.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.palette;
-
-
-import org.eclipse.ui.IEditorInput;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-
-
-/**
- * The default palette content. 
- * An instance of this class is passed to 
- * <code>org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteService</code>
- * when creating a palette for an Editor
- * <p>
- * This palette content is based on the kind of project for which this
- * content is created. It allows the Palette items to check on Nature
- * of project containing the diagram and provide an enablement criteria. 
- * 
- * @author mgoyal
- * 
- */
-public class EditorInputPaletteContent extends DiagramPaletteContent {
-    /**
-     * Attribute to hold the project information 
-     * in which the diagram file is located.
-     */
-    private IEditorInput input;
-    
-    /**
-     * Constructor to create palette content based on project
-     * containing the diagram file.
-     * 
-     * @param project Project containing the diagram file.
-     * @param diagramView The diagram view opened in the editor.
-     */
-    public EditorInputPaletteContent(IEditorInput pInput, IDiagramDocument diagramDocument) {
-    	super(diagramDocument);
-        this.input = pInput;
-    }
-    
-    public IEditorInput getEditorInput() {
-    	return input;
-    }
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/PaletteContent.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/PaletteContent.java
deleted file mode 100644
index 72edb29..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/PaletteContent.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.palette;
-
-
-import org.eclipse.core.resources.IProject;
-
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-
-/**
- * The default palette content. 
- * An instance of this class is passed to 
- * <code>org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteService</code>
- * when creating a palette for an Editor
- * <p>
- * This palette content is based on the kind of project for which this
- * content is created. It allows the Palette items to check on Nature
- * of project containing the diagram and provide an enablement criteria. 
- * 
- * @author qili
- * 
- */
-public class PaletteContent {
-    /**
-     * Attribute to hold the project information 
-     * in which the diagram file is located.
-     */
-    //private IProject project;
-    
-    /**
-     * Attribute to hold the diagram View that is currently
-     * open in the editor
-     */
-    private Diagram diagramView;
-    
-    /**
-     * Constructor to create palette content based on project
-     * containing the diagram file.
-     * 
-     * @param project Project containing the diagram file.
-     * @param diagramView The diagram view opened in the editor.
-     */
-    public PaletteContent(IProject project, Diagram diagramView) {
-        //this.project = project;
-        this.diagramView = diagramView;
-    }
-    
-    /**
-     * Accessor method for the diagram view field.
-     * @return the diagram field.
-     */
-    public Diagram getDiagramView() {
-    	return diagramView;
-    }
-
-    /**
-     * Accessor method for the diagram.
-     * @return the diagram for the content.
-     */
-    public Diagram getDiagram() {
-    	return diagramView != null ? diagramView.getDiagram() : null;
-    }
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/package.html
deleted file mode 100644
index 7d6f671..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/palette/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/FileResourceDiagramEditorInput.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/FileResourceDiagramEditorInput.java
deleted file mode 100644
index e46a7c4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/FileResourceDiagramEditorInput.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.ui.parts;
-
-import java.lang.ref.WeakReference;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-
-/**
- * Implementation of an editor input that's based on both an IFile and a
- * Diagram.
- * 
- * @author wdiu, Wayne Diu
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.*
- */
-public class FileResourceDiagramEditorInput extends FileResourceEditorInput{
-	
-	/**
-	 * The editor's diagram stored as a weak reference
-	 */
-	private WeakReference diagram;
-	
-	/**
-	 * Constructor for FileResourceEditorInput
-	 * 
-	 * @param file, IFile for this editor input
-	 * @param diagram, Diagram for this editor input
-	 */
-	public FileResourceDiagramEditorInput(
-		IFile file,
-		Diagram diagram) {
-		
-		super(file);
-		
-		assert diagram != null;
-		setDiagram(diagram);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditorInput#getDiagram()
-	 */
-	public Diagram getDiagram() {
-		return (Diagram)diagram.get();
-	}
-
-	/**
-	 * Sets the diagram.
-	 * @param diagram The diagram to set
-	 */
-	protected void setDiagram(Diagram diagram) {
-		this.diagram = new WeakReference(diagram);
-	}	
-	
-	/**
-	 * Method clone.
-	 * 
-	 * @param newFile, clone this editor input to the specified IFile, keeping
-	 * the same diagram object.
-	 * @return Object
-	 */
-	public Object clone(IFile newFile) {
-		return new FileResourceDiagramEditorInput(
-			newFile, getDiagram());
-	}	
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/FileResourceEditorInput.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/FileResourceEditorInput.java
deleted file mode 100644
index a7268c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/FileResourceEditorInput.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.ui.parts;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * An IFile based editor input that does not extend FileEditorInput.
- * 
- * @author wdiu, Wayne Diu
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.*
- */
-public class FileResourceEditorInput
-	implements IPathEditorInput, IPersistableElement {
-	
-	/**
-	 * The path key for the memento
-	 */
-	private static final String MEMENTO_PATH_KEY = "path"; //$NON-NLS-1$
-	
-	/**
-	 * The factory id for the IPersistableElement 
-	 */
-	private static final String PERSISTABLE_ELEMENT_FACTORY_ID = "XToolsEditorInputFactoryID"; //$NON-NLS-1$
-
-	/**
-	 * IFile for this editor input
-	 */
-	private IFile file;
-
-	/**
-	 * Constructor for FileResourceEditorInput
-	 * 
-	 * @param file, IFile for this editor input
-	 */
-	public FileResourceEditorInput(
-		IFile file) {
-		assert file != null;
-		this.file = file;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return file.exists();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(file.getName());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return file.getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return file.getFullPath().makeRelative().toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IFile.class)
-			return file;
-		return file.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPathEditorInput#getPath()
-	 */
-	public IPath getPath() {
-		return file.getLocation();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPersistableElement#getFactoryId()
-	 */
-	public String getFactoryId() {
-		return PERSISTABLE_ELEMENT_FACTORY_ID;
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IPersistableElement.
-	 */
-	public void saveState(IMemento memento) {
-		memento.putString(MEMENTO_PATH_KEY, file.getFullPath().toString());
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/ui/parts/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/DiagramIOUtil.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/DiagramIOUtil.java
deleted file mode 100644
index 503acd3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/DiagramIOUtil.java
+++ /dev/null

@@ -1,276 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.FeatureNotFoundException;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorMessages;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.util.NotationExtendedMetaData;
-
-public class DiagramIOUtil {
-	
-	// localized labels
-	private static String UNABLE_TO_LOAD_DIAGRAM = EditorMessages.Diagram_UNABLE_TO_LOAD_RESOURCE;
-
-	private static String NO_DIAGRAM_IN_RESOURCE = EditorMessages.Diagram_NO_DIAGRAM_IN_RESOURCE;
-
-	private static interface ILoader {
-		public Resource load(TransactionalEditingDomain domain, Map loadOptions, IProgressMonitor monitor) throws IOException, CoreException;
-	}
-	
-	private static class FileLoader implements ILoader {
-		private IFile fFile;
-		public FileLoader(IFile file) {
-			assert file != null;
-			fFile = file;
-		}
-		
-		public Resource load(TransactionalEditingDomain domain, Map loadOptions, IProgressMonitor monitor) throws IOException, CoreException {
-			fFile.refreshLocal(IResource.DEPTH_ZERO, monitor);
-			URI uri = URI.createPlatformResourceURI(fFile.getFullPath()
-                .toString(), true);
-			
-			Resource resource = domain.getResourceSet().getResource(uri, false);
-			
-			if (resource == null) {
-				resource = domain.getResourceSet().createResource(uri);
-			}
-			
-			if (!resource.isLoaded()) {
-				Map loadingOptions = new HashMap(GMFResourceFactory.getDefaultLoadOptions());
-				
-                // propogate passed in options to the defaults
-                Iterator iter = loadOptions.keySet().iterator();
-                while (iter.hasNext()) {
-                    Object key = iter.next();
-                    loadingOptions.put(key, loadOptions.get(key));
-                }
-                
-                try {
-                	resource.load(loadingOptions);
-                } catch (IOException e) {
-                	resource.unload();
-                	throw e;
-                }
-			}
-			
-			logResourceErrorsAndWarnings(resource);
-						
-			return resource;
-		}
-	}
-
-	private static void logResourceErrorsAndWarnings(Resource resource) {
-		for (Iterator iter = resource.getErrors().iterator(); iter.hasNext();) {
-			Resource.Diagnostic diagnostic = (Resource.Diagnostic) iter.next();
-			Log.error(EditorPlugin.getInstance(), EditorStatusCodes.ERROR, diagnostic.getMessage());				
-		}
-
-		for (Iterator iter = resource.getWarnings().iterator(); iter.hasNext();) {
-			Resource.Diagnostic diagnostic = (Resource.Diagnostic) iter.next();
-			Log.warning(EditorPlugin.getInstance(), EditorStatusCodes.WARNING, diagnostic.getMessage());				
-		}
-	}
-
-	
-	private static class StorageLoader implements ILoader {
-		private IStorage fStorage;
-		public StorageLoader(IStorage storage) {
-			assert storage != null;
-			fStorage = storage;
-		}
-		
-		public Resource load(TransactionalEditingDomain editingDomain,
-				Map loadOptions, IProgressMonitor monitor)
-			throws IOException, CoreException {
-            String storageName = fStorage.getName();
-            URI uri = URI.createPlatformResourceURI(storageName);
-            Resource resource = editingDomain.getResourceSet().getResource(uri,false);
-            if (resource == null) {
-                resource = editingDomain.getResourceSet().createResource(uri);
-            }
-            if (!resource.isLoaded()) {
-                resource.load(fStorage.getContents(), loadOptions);
-            }
-			logResourceErrorsAndWarnings(resource);
-			return resource;
-		}
-	}
-	
-	static public Diagram load(final TransactionalEditingDomain domain, final IFile file, boolean bTryCompatible, IProgressMonitor monitor) throws CoreException {
-		FileLoader loader = new FileLoader(file);
-		return load(domain, loader, bTryCompatible, monitor);
-	}
-	
-	static public Diagram load(final TransactionalEditingDomain domain, final IStorage storage, boolean bTryCompatible, IProgressMonitor monitor) throws CoreException {
-		ILoader loader = null;
-		if(storage instanceof IFile) {
-			loader = new FileLoader((IFile)storage);
-		} else {
-			loader = new StorageLoader(storage);
-		}
-		return load(domain, loader, bTryCompatible, monitor);
-	}
-	
-	/**
-	 * load an existing diagram file.
-	 * 
-	 * @param file
-	 * @return
-	 * @throws CoreException
-	 */
-	static private Diagram load(final TransactionalEditingDomain domain, final ILoader loader, boolean bTryCompatible, IProgressMonitor monitor) throws CoreException  {
-		Resource notationModel = null;
-		try {
-			try {	
-				// File exists with contents..
-				notationModel = loader.load(domain, new HashMap(), monitor);
-			} catch (Resource.IOWrappedException e) {
-				if (bTryCompatible) {
-					Throwable causeError = e.getCause();
-					
-					if (causeError == null) {
-						causeError = e;
-					}
-					
-					String errMsg = causeError.getLocalizedMessage();
-					if (causeError instanceof Resource.IOWrappedException) {
-						Exception exc = (Exception)((Resource.IOWrappedException) causeError)
-							.getCause();
-						if (exc != null) {
-							causeError = exc;
-						}
-					}
-					
-					if ((causeError instanceof PackageNotFoundException 
-							|| causeError instanceof ClassNotFoundException
-							|| causeError instanceof FeatureNotFoundException)) {
-						if (shouldLoadInCompatibilityMode(errMsg)) {
-                            Map loadOptions = new HashMap();
-            				
-                            // We will place a special extended metadata in here to ensure that we can load diagrams
-            				//  from older versions of our metamodel.
-            				loadOptions.put(XMLResource.OPTION_EXTENDED_META_DATA, new NotationExtendedMetaData());
-            				
-                            loadOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-							notationModel = loader.load(domain, loadOptions, monitor);
-						} else {
-							// user does not want to load in compatibility mode.
-							return null; 
-						}
-					} else {
-                        throw e;
-					}
-				} else {
-					throw e;
-				}
-			}
-			if(notationModel == null)
-				throw new RuntimeException(UNABLE_TO_LOAD_DIAGRAM);
-
-			Iterator rootContents = notationModel.getContents().iterator();
-			while(rootContents.hasNext()) {
-				EObject rootElement = (EObject)rootContents.next();
-				if(rootElement instanceof Diagram)
-					return (Diagram)rootElement;
-			}
-			
-			throw new RuntimeException(NO_DIAGRAM_IN_RESOURCE);
-		} catch(Exception e) {
-			Trace.catching(EditorPlugin.getInstance(), EditorDebugOptions.EXCEPTIONS_CATCHING, DiagramIOUtil.class, "load(IFile, boolean)", e); //$NON-NLS-1$
-			CoreException thrownExcp = null;
-			if(e instanceof CoreException) {
-				thrownExcp = (CoreException)e;
-            } else {
-                String exceptionMessage = e.getLocalizedMessage();
-                thrownExcp = new CoreException(new Status(IStatus.ERROR,
-                    EditorPlugin.getPluginId(), EditorStatusCodes.ERROR,
-                    exceptionMessage != null ? exceptionMessage
-                        : "load(IFile, boolean)", e)); //$NON-NLS-1$
-            }
-			Trace.throwing(EditorPlugin.getInstance(), EditorDebugOptions.EXCEPTIONS_THROWING, DiagramIOUtil.class, "load(IFile, boolean)", thrownExcp); //$NON-NLS-1$
-			throw thrownExcp;
-		}
-	}
-
-	static public void save(TransactionalEditingDomain domain, IFile file, Diagram diagram, boolean bKeepUnrecognizedData, IProgressMonitor progressMonitor) throws CoreException {
-        Map options = new HashMap();
-		if(bKeepUnrecognizedData)
-            options.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-        save(domain, file, diagram, progressMonitor, options);
-	}
-    
-    static public void save(TransactionalEditingDomain domain, IFile file, Diagram diagram, IProgressMonitor progressMonitor) throws CoreException {
-        Map options = new HashMap();
-        save(domain, file, diagram, progressMonitor, options);
-    }
-	
-	static public void save(TransactionalEditingDomain domain, IFile file, Diagram diagram, IProgressMonitor progressMonitor, Map options) throws CoreException {
-		Resource notationModel = ((EObject) diagram).eResource();
-		String fileName = file.getFullPath().toOSString();
-		notationModel.setURI(URI.createPlatformResourceURI(fileName, true));
-		try {
-			notationModel.save(options);
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, EditorPlugin
-				.getPluginId(), EditorStatusCodes.RESOURCE_FAILURE, e
-				.getLocalizedMessage(), null));
-		}
-
-		if (progressMonitor != null)
-			progressMonitor.done();
-		
-		logResourceErrorsAndWarnings(notationModel);
-	}
-	
-		/**
-	 * @param errMsg
-	 * @return
-	 */
-	private static boolean shouldLoadInCompatibilityMode(String errMsg) {
-		// no compatibility support at present
-		return false;
-	}
-	
-	public static void unload(TransactionalEditingDomain domain, Diagram diagram) {
-		diagram.eResource().unload();
-	}
-
-	public static boolean hasUnrecognizedData(Resource resource) {
-		// no compatibility support at present
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/RunnableQueue.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/RunnableQueue.java
deleted file mode 100644
index 65a7e1a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/RunnableQueue.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author qili
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.resources.editor.*
- */
-public class RunnableQueue {
-	
-	static private final List queue = new ArrayList(4);
-	static private boolean running = false;
-	
-	static public void addRunnable(Runnable r) {
-		synchronized(queue) {
-			queue.add(r);
-		}
-	}
-	
-	static public void addRunnableToHead(Runnable r) {
-		synchronized(queue) {
-			queue.add(0, r);
-		}
-	}
-	
-	static public Runnable runner = new Runnable() {
-		public void run() {
-			if (running)
-				return;
-			running = true;
-				
-			try {
-				while (true) {
-					int size = 0;
-					synchronized (queue) {
-						size = queue.size();
-					}
-					
-					if (size == 0)
-						break;
-						
-					Runnable r = null;
-					synchronized (queue) { 
-						r = (Runnable) queue.get(0);
-						queue.remove(0);	
-					}
-					r.run();
-				}
-			}
-			finally {
-				running = false;
-			}
-		}
-	};
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/Util.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/Util.java
deleted file mode 100644
index 1f9442d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/Util.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-
-/**
- * @author qili
- * 
- */
-public class Util {
-
-    /**
-     * The relative path of the elements and relationships icons.
-     * It's relative to the icon subdirectory.
-     *
-     * I use PATH_SEPARATOR since we are not getting an os path.
-     */
-    protected static final String ELEMENTS_AND_RELATIONSHIPS_PATH = "elementsandrelationships" + StringStatics.PATH_SEPARATOR; //$NON-NLS-1$
-
-    final static String PLUGIN_ID = "org.eclipse.gmf.runtime.diagram.ui.resources.editor"; //$NON-NLS-1$
-
-    static public IProject getProject(IFile file) {
-        return file.getProject();
-    }
-
-    static public IProject getProject(IEditorPart editor) {
-        if (editor == null)
-            return null;
-        IEditorInput input = editor.getEditorInput();
-        if (input == null)
-            return null;
-        IResource resource =
-            (IResource) ((IAdaptable)input).getAdapter(IResource.class);
-        if (resource == null)
-            return null;
-        IProject project = resource.getProject();
-        return project;
-    }
-
-    static public void logWarning(String s) {
-        Log.warning(EditorPlugin.getInstance(), IStatus.OK, s);
-    }
-    static public void logError(String s) {
-        Log.error(EditorPlugin.getInstance(), IStatus.OK, s);
-    }
-    static public void logInfo(String s) {
-        Log.info(EditorPlugin.getInstance(), IStatus.OK, s);
-    }
-
-    public static void reportException(CoreException e) {
-        final IStatus status = e.getStatus();
-        logError(status.getMessage());
-        Display display = getStandardDisplay();
-        display.asyncExec(new Runnable() {
-            public void run() {
-                ErrorDialog.openError(null, null, null, status);
-            }
-        });
-    }
-
-    /**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display= Display.getCurrent();
-		if (display == null)
-			display= PlatformUI.getWorkbench().getDisplay();
-		return display;
-	}
-
-
-    public static void reportException(
-        Throwable e,
-        final String title,
-        String message,
-        String pluginId) {
-        if (e instanceof InvocationTargetException) {
-            e = ((InvocationTargetException)e).getTargetException();
-        }
-        IStatus status = null;
-        if (e instanceof CoreException) {
-            reportException((CoreException)e);
-            return;
-        } else {
-            if (message == null)
-                message = e.getMessage();
-            if (message == null)
-                message = e.toString();
-            status =
-                new org.eclipse.core.runtime.Status(
-                    IStatus.ERROR,
-                    pluginId,
-                    IStatus.OK,
-                    message,
-                    e);
-        }
-        logError(message);
-        final IStatus fstatus = status;
-        Display display = getStandardDisplay();
-        display.asyncExec(new Runnable() {
-            public void run() {
-                ErrorDialog.openError(null, title, null, fstatus);
-            }
-        });
-    }
-    
-    public static void reportException(
-            Throwable e,
-            final String title,
-            String message) {
-    	reportException(e, title, message, PLUGIN_ID);
-    }
-    
-}
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/package.html b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/package.html
deleted file mode 100644
index 0cd4662..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/internal/util/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains <i>utility</i> classes used by this plugin.
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditor.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditor.java
deleted file mode 100644
index 979aa2a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditor.java
+++ /dev/null

@@ -1,1508 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gmf.runtime.common.ui.action.ActionManager;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette;
-import org.eclipse.gmf.runtime.diagram.ui.properties.views.PropertiesBrowserPage;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DocumentProviderRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentEditor;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IElementStateListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DocumentProviderRegistry.IDocumentProviderSelector;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorMessages;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.palette.EditorInputPaletteContent;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IReusableEditor;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.osgi.framework.Bundle;
-
-
-/**
- * A Diagram Editor with optional flyout palette.
- * 
- * @author mgoyal
- *
- */
-public class DiagramDocumentEditor
-	extends DiagramEditorWithFlyOutPalette implements IDocumentEditor, IReusableEditor {
-	
-	/**
-	 * Constructs a diagram editor with optional flyout palette.
-	 * 
-	 * @param hasFlyoutPalette creates a palette if true, else no palette
-	 */
-	public DiagramDocumentEditor(boolean hasFlyoutPalette) {
-		super(hasFlyoutPalette);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class type) {
-		if (type == IPropertySheetPage.class) {
-			return new PropertiesBrowserPage(this);
-		}
-		return super.getAdapter(type);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite,
-	 *      org.eclipse.ui.IEditorInput)
-	 */
-	public void init(final IEditorSite site, final IEditorInput input)
-		throws PartInitException {
-		super.init(site, input);
-
-		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				getDocumentProvider().setProgressMonitor(monitor);
-			}
-		};
-
-		try {
-//			When using the progress service always a modal dialog pops up. The site should be asked for a runnable context
-//			which could be the workbench window or the progress service, depending on what the site represents.
-//			getSite().getWorkbenchWindow().getWorkbench().getProgressService().run(false, true, runnable);
-
-			getSite().getWorkbenchWindow().run(false, true, runnable);
-
-		} catch (InterruptedException x) {
-			// ignore
-		} catch (InvocationTargetException x) {
-			Throwable t= x.getTargetException();
-			if (t instanceof CoreException) {
-                /*
-                /* XXX: Remove unpacking of CoreException once the following bug is
-                 *		fixed: https://bugs.eclipse.org/bugs/show_bug.cgi?id=81640
-                 */
-                CoreException e= (CoreException)t;
-                IStatus status= e.getStatus();
-                if (status.getException() != null)
-                    throw new PartInitException(status);
-               	throw new PartInitException(new Status(status.getSeverity(), status.getPlugin(), status.getCode(), status.getMessage(), t));
-            }
-			throw new PartInitException(new Status(IStatus.ERROR, EditorPlugin.getPluginId(), IStatus.OK, EditorMessages.Editor_error_init, t));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setSite(org.eclipse.ui.IWorkbenchPartSite)
-	 */
-	protected final void setSite(IWorkbenchPartSite site) {
-		super.setSite(site);
-		fActivationListener= new ActivationListener(site.getWorkbenchWindow().getPartService());
-		fActivationListener.activate();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		if (fActivationListener != null) {
-			fActivationListener.deactivate();
-			fActivationListener.dispose();
-			fActivationListener= null;
-		}
-
-		if (fTitleImage != null) {
-			fTitleImage.dispose();
-			fTitleImage= null;
-		}
-
-        IDocumentProvider provider = getDocumentProvider();
-        IStatus status = provider.getStatus(getEditorInput());
-
-		disposeDocumentProvider();
-
-        super.setInput(null);
-		
-        if(status != null && status.isOK())
-            super.dispose();
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagram()
-	 */
-	public Diagram getDiagram() {
-		if (getDocumentProvider() != null) {
-			IDiagramDocument document = ((IDiagramDocument) getDocumentProvider()
-				.getDocument(getEditorInput()));
-			if (document != null)
-				return document.getDiagram();
-		}
-		return null;
-	}
-	
-	public IDiagramDocument getDiagramDocument() {
-		return (IDiagramDocument)getDocumentProvider().getDocument(getEditorInput());
-	}
-
-	// Save Overwrite Dialog (Yes/No) true for OK and false for otherwise
-	public boolean askUserSaveOverwrite() {
-		String title = DiagramUIMessages.DiagramEditor_save_outofsync_dialog_title;
-		String msg = DiagramUIMessages.DiagramEditor_save_outofsync_dialog_message;
-		Shell shell = getSite().getShell();
-		return MessageDialog.openQuestion(shell, title, msg);
-	}
-	
-	// Save/Close Dialog
-	// 0 -- Save, 1 -- Close, -1 -- Cancel
-	public int askUserSaveClose() {
-		String title = DiagramUIMessages.DiagramEditor_handleDeleteEvent_dialog_title;
-		String message = DiagramUIMessages.DiagramEditor_handleDeleteEvent_dialog_message;
-		String[] buttons = { DiagramUIMessages.DiagramEditor_handleDeleteEvent_dialog_button_save,
-			DiagramUIMessages.DiagramEditor_handleDeleteEvent_dialog_button_close};
-		MessageDialog dialog =
-			new MessageDialog(
-				getSite().getShell(),
-				title,
-				null,
-				message,
-				MessageDialog.QUESTION,
-				buttons,
-				0);
-		return dialog.open();
-	}
-	
-	// Refresh Contents Dialog (Yes/No) true for OK and false for otherwise
-	public boolean askUserReload() {
-		String title = DiagramUIMessages.DiagramEditor_activated_outofsync_dialog_title;
-		String msg = DiagramUIMessages.DiagramEditor_activated_outofsync_dialog_message;
-		Shell shell = getSite().getShell();
-		return MessageDialog.openQuestion(shell, title, msg);
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor#configureDiagramEditDomain()
-	 */
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		DiagramEditDomain editDomain =
-			(DiagramEditDomain) getDiagramEditDomain();
-		editDomain.setActionManager(createActionManager());
-	}
-	
-	/**
-	 * @overridable
-	 */
-	protected ActionManager createActionManager() {
-		return new ActionManager(createOperationHistory());
-	}
-    
-    /**
-     * Create my operation history.
-     * 
-     * @return my operation history
-     */
-    protected IOperationHistory createOperationHistory() {
-        return OperationHistoryFactory.getOperationHistory();
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette#getDefaultPaletteContent()
-	 */
-	protected Object getDefaultPaletteContent() {
-		EditorInputPaletteContent defPaletteContent = null;
-		if(getDiagram() != null) {
-			defPaletteContent = new EditorInputPaletteContent(getEditorInput(), getDiagramDocument());
-		}
-		return defPaletteContent;
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		super.selectionChanged(part, selection);
-//		updateStatusLine();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.IDiagramEditor#getDocumentProvider()
-	 */
-	public IDocumentProvider getDocumentProvider() {
-		return fExplicitDocumentProvider;
-	}
-
-	/**
-	 * Sets this editor's document provider. This method must be
-	 * called before the editor's control is created.
-	 *
-	 * @param provider the document provider
-	 */
-	protected void setDocumentProvider(IDocumentProvider provider) {
-		assert provider != null;
-		fExplicitDocumentProvider= provider;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.diagramdocument.IDiagramEditor#isEditable()
-	 */
-	public boolean isEditable() {
-		IDocumentProvider provider= getDocumentProvider();
-		return provider.isModifiable(getEditorInput());
-	}
-
-	/**
-	 * Hook method for setting the document provider for the given input.
-	 * This default implementation does nothing. Clients may
-	 * reimplement.
-	 *
-	 * @param input the input of this editor.
-	 * 
-	 */
-	protected void setDocumentProvider(IEditorInput input) {
-		IDocumentProvider provider = DocumentProviderRegistry.getDefault().getDocumentProvider(input, new IDocumentProviderSelector() {
-			public boolean select(String documentType) {
-				// Only checking of the interface name
-				return documentType.equals(IDiagramDocument.class.getName());
-			}
-		});
-		setDocumentProvider(provider);
-	}
-
-	/**
-	 * Hook method for setting the document provider for the given input.
-	 * This default implementation does nothing. Clients may
-	 * reimplement.
-	 *
-	 * @param input the input of this editor.
-	 * 
-	 */
-	protected IDocumentProvider getDocumentProvider(IEditorInput input) {
-		IDocumentProvider provider = DocumentProviderRegistry.getDefault().getDocumentProvider(input, new IDocumentProviderSelector() {
-			public boolean select(String documentType) {
-				// Only checking of the interface name
-				return documentType.equals(IDiagramDocument.class.getName());
-			}
-		});
-		return provider;
-	}
-
-	/**
-	 * If there is no explicit document provider set, the implicit one is
-	 * re-initialized based on the given editor input.
-	 *
-	 * @param input the editor input.
-	 */
-	private void updateDocumentProvider(IEditorInput input) {
-
-		IProgressMonitor rememberedProgressMonitor= null;
-
-		IDocumentProvider provider= getDocumentProvider();
-		if (provider != null) {
-			provider.removeElementStateListener(fElementStateListener);
-			rememberedProgressMonitor= provider.getProgressMonitor();
-			provider.setProgressMonitor(null);
-		}
-
-		setDocumentProvider(input);
-
-		provider= getDocumentProvider();
-		if (provider != null) {
-			provider.addElementStateListener(fElementStateListener);
-			provider.setProgressMonitor(rememberedProgressMonitor);
-		}
-	}
-
-	/**
-	 * refreshes the editor with the given file by: 0 - resets resource
-	 * modification stamp 1- Flushing the command stack 2- Clearing the
-	 * graphical viewer's contents 3- Setting the new File input 4- Setting the
-	 * new graphical viewer's contents 5- Clearing the graphical viewer's
-	 * selection
-	 * 
-	 * @param file
-	 *            The new file editor input
-	 */
-	protected void releaseInput() {
-		getCommandStack().flush();
-		clearGraphicalViewerContents();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	public void setInput(IEditorInput input) {
-
-		try {
-			doSetInput(input, true);
-		} catch (CoreException x) {
-			String title= EditorMessages.Editor_error_setinput_title;
-			String msg= EditorMessages.Editor_error_setinput_message;
-			Shell shell= getSite().getShell();
-			ErrorDialog.openError(shell, title, msg, x.getStatus());
-		}
-	}
-	/*
-	 * @see EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	public void doSetInput(IEditorInput input, boolean releaseEditorContents) throws CoreException {
-		if (input == null)
-
-			close(isSaveOnCloseNeeded());
-
-		else {
-
-			IEditorInput oldInput= getEditorInput();
-			if (oldInput != null) {
-				getDocumentProvider().disconnect(oldInput);
-				if(releaseEditorContents)
-					releaseInput();
-			}
-			
-			updateDocumentProvider(input);
-
-			IDocumentProvider provider= getDocumentProvider();
-			if (provider == null || !(provider instanceof IDiagramDocumentProvider)) {
-				IStatus s= new Status(IStatus.ERROR, EditorPlugin.getPluginId(), IStatus.OK, EditorMessages.Editor_error_no_provider, null);
-				throw new CoreException(s);
-			}
-
-			if (!(input instanceof MEditingDomainElement)) {
-				input = ((IDiagramDocumentProvider)provider).createInputWithEditingDomain(input, createEditingDomain());
-			}
-
-			provider.connect(input);
-
-			try {
-				super.setInput(input);
-			} catch(Throwable e) {
-				if(getDiagram() == null) {
-					IStatus status = provider.getStatus(input);
-					if(status != null)
-						throw new CoreException(status);
-					else {
-						IStatus s= new Status(IStatus.ERROR, EditorPlugin.getPluginId(), IStatus.OK, EditorMessages.Editor_error_init, null);
-						throw new CoreException(s);
-					}
-				}
-			}
-
-			initializeTitle(input);
-			
-			if(oldInput != null && releaseEditorContents)
-				initializeGraphicalViewerContents();
-		}
-		/*
-		 * The following bugs explain why we fire this property change:
-		 * 	https://bugs.eclipse.org/bugs/show_bug.cgi?id=90283
-		 * 	https://bugs.eclipse.org/bugs/show_bug.cgi?id=92049
-		 * 	https://bugs.eclipse.org/bugs/show_bug.cgi?id=92286
-		 */
-		firePropertyChange(IEditorPart.PROP_INPUT);
-	}
-
-	public void close(final boolean save) {
-
-		enableSanityChecking(false);
-
-		Display display= getSite().getShell().getDisplay();
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (getGraphicalViewer() != null)
-					getSite().getPage().closeEditor(DiagramDocumentEditor.this, save);
-			}
-		});
-	}
-
-	/**
-	 * Disposes of the connection with the document provider. Subclasses
-	 * may extend.
-	 *
-	 * 
-	 */
-	protected void disposeDocumentProvider() {
-		IDocumentProvider provider= getDocumentProvider();
-		if (provider != null) {
-
-			IEditorInput input= getEditorInput();
-			if (input != null)
-				provider.disconnect(input);
-
-			if (fElementStateListener != null) {
-				provider.removeElementStateListener(fElementStateListener);
-				fElementStateListener= null;
-			}
-
-			fExplicitDocumentProvider= null;
-		}
-	}
-
-	/**
-	 * Returns the progress monitor related to this editor. It should not be
-	 * necessary to extend this method.
-	 *
-	 * @return the progress monitor related to this editor
-	 * 
-	 */
-	protected IProgressMonitor getProgressMonitor() {
-
-		IProgressMonitor pm= null;
-		IStatusLineManager manager= getStatusLineManager();
-		if (manager != null)
-			pm= manager.getProgressMonitor();
-
-		return pm != null ? pm : new NullProgressMonitor();
-	}
-
-    private boolean isHandlingElementDeletion = false;
-	/**
-	 * Handles an external change of the editor's input element. Subclasses may
-	 * extend.
-	 */
-	protected void handleEditorInputChanged() {
-
-		String title;
-		String msg;
-		Shell shell= getSite().getShell();
-
-		final IDocumentProvider provider= getDocumentProvider();
-		if (provider == null) {
-			// fix for http://dev.eclipse.org/bugs/show_bug.cgi?id=15066
-			close(false);
-			return;
-		}
-
-		final IEditorInput input= getEditorInput();
-		if (provider.isDeleted(input)) {
-            try {
-                isHandlingElementDeletion = true;
-    			if (isSaveAsAllowed()) {
-    				title= EditorMessages.Editor_error_activated_deleted_save_title;
-    				msg= EditorMessages.Editor_error_activated_deleted_save_message;
-    
-    				String[] buttons= {
-    					EditorMessages.Editor_error_activated_deleted_save_button_save,
-    					EditorMessages.Editor_error_activated_deleted_save_button_close,
-    				};
-    
-    				MessageDialog dialog= new MessageDialog(shell, title, null, msg, MessageDialog.QUESTION, buttons, 0);
-    
-    				if (dialog.open() == 0) {
-    					IProgressMonitor pm= getProgressMonitor();
-    					performSaveAs(pm);
-    					if (pm.isCanceled())
-    						handleEditorInputChanged();
-    				} else {
-    					close(false);
-    				}
-    			} else {
-    				title= EditorMessages.Editor_error_activated_deleted_close_title;
-    				msg= EditorMessages.Editor_error_activated_deleted_close_message;
-    				if (MessageDialog.openConfirm(shell, title, msg))
-    					close(false);
-    			}
-            } finally {
-                isHandlingElementDeletion = false;
-            }
-		} else {
-
-			title= EditorMessages.Editor_error_activated_outofsync_title;
-			msg= EditorMessages.Editor_error_activated_outofsync_message;
-
-			if (MessageDialog.openQuestion(shell, title, msg)) {
-
-
-				try {
-					provider.synchronize(input);
-//					if (provider instanceof IDocumentProviderExtension) {
-//						IDocumentProviderExtension extension= (IDocumentProviderExtension) provider;
-//						extension.synchronize(input);
-//					} else {
-//						setInput(input);
-//					}
-				} catch (CoreException x) {
-					IStatus status= x.getStatus();
-					if (status == null || status.getSeverity() != IStatus.CANCEL) {
-						title= EditorMessages.Editor_error_refresh_outofsync_title;
-						msg= EditorMessages.Editor_error_refresh_outofsync_message;
-						ErrorDialog.openError(shell, title, msg, x.getStatus());
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * The <code>AbstractDiagramEditor</code> implementation of this
-	 * <code>IEditorPart</code> method calls <code>performSaveAs</code>.
-	 * Subclasses may reimplement.
-	 */
-	public void doSaveAs() {
-		/*
-		 * 1GEUSSR: ITPUI:ALL - User should never loose changes made in the editors.
-		 * Changed Behavior to make sure that if called inside a regular save (because
-		 * of deletion of input element) there is a way to report back to the caller.
-		 */
-		performSaveAs(getProgressMonitor());
-	}
-
-	/**
-	 * Performs a save as and reports the result state back to the
-	 * given progress monitor. This default implementation does nothing.
-	 * Subclasses may reimplement.
-	 *
-	 * @param progressMonitor the progress monitor for communicating result state or <code>null</code>
-	 */
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// for subclasses
-	}
-
-	/**
-	 * The <code>AbstractDiagramEditor</code> implementation of this
-	 * <code>IEditorPart</code> method may be extended by subclasses.
-	 *
-	 * @param progressMonitor the progress monitor for communicating result state or <code>null</code>
-	 */
-	public void doSave(IProgressMonitor progressMonitor) {
-
-		IDocumentProvider p= getDocumentProvider();
-		if (p == null)
-			return;
-
-		if (p.isDeleted(getEditorInput())) {
-
-			if (isSaveAsAllowed()) {
-
-				/*
-				 * 1GEUSSR: ITPUI:ALL - User should never loose changes made in the editors.
-				 * Changed Behavior to make sure that if called inside a regular save (because
-				 * of deletion of input element) there is a way to report back to the caller.
-				 */
-				performSaveAs(progressMonitor);
-
-			} else {
-
-				Shell shell= getSite().getShell();
-				String title= EditorMessages.Editor_error_save_deleted_title;
-				String msg= EditorMessages.Editor_error_save_deleted_message;
-				MessageDialog.openError(shell, title, msg);
-			}
-
-		} else {
-			updateState(getEditorInput());
-			validateState(getEditorInput());
-			performSave(false, progressMonitor);
-		}
-	}
-
-	/**
-	 * Enables/disables sanity checking.
-	 * @param enable <code>true</code> if sanity checking should be enabled, <code>false</code> otherwise
-	 * 
-	 */
-	protected void enableSanityChecking(boolean enable) {
-		synchronized (this) {
-			fIsSanityCheckEnabled= enable;
-		}
-	}
-
-	/**
-	 * Checks the state of the given editor input if sanity checking is enabled.
-	 * @param input the editor input whose state is to be checked
-	 * 
-	 */
-	protected void safelySanityCheckState(IEditorInput input) {
-		boolean enabled= false;
-
-		synchronized (this) {
-			enabled= fIsSanityCheckEnabled;
-		}
-
-		if (enabled)
-			sanityCheckState(input);
-	}
-
-	/**
-	 * Checks the state of the given editor input.
-	 * @param input the editor input whose state is to be checked
-	 * 
-	 */
-	protected void sanityCheckState(IEditorInput input) {
-
-		IDocumentProvider p= getDocumentProvider();
-		if (p == null)
-			return;
-
-		long stamp= p.getModificationStamp(input);
-		if (stamp != fModificationStamp) {
-			fModificationStamp= stamp;
-			if (!p.isSynchronized(input))
-				handleEditorInputChanged();
-		}
-		updateState(getEditorInput());
-	}
-
-	/**
-	 * Enables/disables state validation.
-	 * @param enable <code>true</code> if state validation should be enabled, <code>false</code> otherwise
-	 * 
-	 */
-	protected void enableStateValidation(boolean enable) {
-		synchronized (this) {
-			fIsStateValidationEnabled= enable;
-		}
-	}
-
-	/**
-	 * Validates the state of the given editor input. The predominate intent
-	 * of this method is to take any action probably necessary to ensure that
-	 * the input can persistently be changed.
-	 *
-	 * @param input the input to be validated
-	 * 
-	 */
-	protected void validateState(IEditorInput input) {
-
-		IDocumentProvider provider= getDocumentProvider();
-
-		try {
-
-			provider.validateState(input, getSite().getShell());
-
-		} catch (CoreException x) {
-			IStatus status= x.getStatus();
-			if (status == null || status.getSeverity() != IStatus.CANCEL) {
-				Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID);
-				ILog log= Platform.getLog(bundle);
-				log.log(x.getStatus());
-
-				Shell shell= getSite().getShell();
-				String title= EditorMessages.Editor_error_validateEdit_title;
-				String msg= EditorMessages.Editor_error_validateEdit_message;
-				ErrorDialog.openError(shell, title, msg, x.getStatus());
-			}
-			return;
-		}
-
-		
-		if (getDiagramEditPart() != null) {
-			if(isEditable())
-				getDiagramEditPart().enableEditMode();
-			else
-				getDiagramEditPart().disableEditMode();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.diagramdocument.IDiagramEditor#validateEditorInputState()
-	 */
-	public boolean validateEditorInputState() {
-
-		boolean enabled= false;
-
-		synchronized (this) {
-			enabled= fIsStateValidationEnabled;
-		}
-
-		if (enabled) {
-
-			GraphicalViewer viewer= getGraphicalViewer();
-			if (viewer == null)
-				return false;
-
-			final IEditorInput input= getEditorInput();
-			BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
-				/*
-				 * @see java.lang.Runnable#run()
-				 */
-				public void run() {
-					validateState(input);
-				}
-			});
-			sanityCheckState(input);
-			return !isEditorInputReadOnly();
-		}
-
-		return !isEditorInputReadOnly();
-	}
-
-	/**
-	 * Updates the state of the given editor input such as read-only flag.
-	 *
-	 * @param input the input to be validated
-	 * 
-	 */
-	protected void updateState(IEditorInput input) {
-		IDocumentProvider provider= getDocumentProvider();
-		try {
-
-//			boolean wasReadOnly= isEditorInputReadOnly();
-			provider.updateStateCache(input);
-
-			if (getDiagramEditPart() != null) {
-				if(isEditable())
-					getDiagramEditPart().enableEditMode();
-				else
-					getDiagramEditPart().disableEditMode();
-			}
-
-		} catch (CoreException x) {
-			Bundle bundle= Platform.getBundle(PlatformUI.PLUGIN_ID);
-			ILog log= Platform.getLog(bundle);
-			log.log(x.getStatus());
-		}
-	}
-
-	/**
-	 * Performs the save and handles errors appropriately.
-	 *
-	 * @param overwrite indicates whether or not overwriting is allowed
-	 * @param progressMonitor the monitor in which to run the operation
-	 * 
-	 */
-	protected void performSave(boolean overwrite, IProgressMonitor progressMonitor) {
-
-		IDocumentProvider provider= getDocumentProvider();
-		if (provider == null)
-			return;
-
-		try {
-
-			provider.aboutToChange(getEditorInput());
-			IEditorInput input= getEditorInput();
-			provider.saveDocument(progressMonitor, input, getDocumentProvider().getDocument(input), overwrite);
-			editorSaved();
-
-		} catch (CoreException x) {
-			IStatus status= x.getStatus();
-			if (status == null || status.getSeverity() != IStatus.CANCEL)
-				handleExceptionOnSave(x, progressMonitor);
-		} finally {
-			provider.changed(getEditorInput());
-		}
-	}
-
-	/**
-	 * The number of re-entrances into error correction code while saving.
-	 * 
-	 */
-	private int fErrorCorrectionOnSave;
-
-	/**
-	 * Handles the given exception. If the exception reports an out-of-sync
-	 * situation, this is reported to the user. Otherwise, the exception
-	 * is generically reported.
-	 *
-	 * @param exception the exception to handle
-	 * @param progressMonitor the progress monitor
-	 */
-	protected void handleExceptionOnSave(CoreException exception, IProgressMonitor progressMonitor) {
-
-		try {
-			++ fErrorCorrectionOnSave;
-
-			Shell shell= getSite().getShell();
-
-			boolean isSynchronized= false;
-			IDocumentProvider p= getDocumentProvider();
-
-			isSynchronized= p.isSynchronized(getEditorInput());
-
-			if (isNotSynchronizedException(exception) && fErrorCorrectionOnSave == 1 && !isSynchronized) {
-				String title= EditorMessages.Editor_error_save_outofsync_title;
-				String msg= EditorMessages.Editor_error_save_outofsync_message;
-
-				if (MessageDialog.openQuestion(shell, title, msg))
-					performSave(true, progressMonitor);
-				else {
-					/*
-					 * 1GEUPKR: ITPJUI:ALL - Loosing work with simultaneous edits
-					 * Set progress monitor to canceled in order to report back
-					 * to enclosing operations.
-					 */
-					if (progressMonitor != null)
-						progressMonitor.setCanceled(true);
-				}
-			} else {
-				String title= EditorMessages.Editor_error_save_title;
-				String msg= EditorMessages.Editor_error_save_message;
-				ErrorDialog.openError(shell, title, msg, exception.getStatus());
-
-				/*
-				 * 1GEUPKR: ITPJUI:ALL - Loosing work with simultaneous edits
-				 * Set progress monitor to canceled in order to report back
-				 * to enclosing operations.
-				 */
-				if (progressMonitor != null)
-					progressMonitor.setCanceled(true);
-			}
-		} finally {
-			-- fErrorCorrectionOnSave;
-		}
-	}
-	
-	/**
-	 * Tells whether the given core exception is exactly the
-	 * exception which is thrown for a non-synchronized element.
-	 * <p>
-	 * XXX: After 3.1 this method must be delegated to the document provider
-	 * 		see 
-	 * </p>
-	 * 
-	 * @param ex the core exception
-	 * @return <code>true</code> iff the given core exception is exactly the
-	 *			exception which is thrown for a non-synchronized element
-	 * 
-	 */
-	private boolean isNotSynchronizedException(CoreException ex) {
-		if (ex == null)
-			return false;
-		
-		IStatus status= ex.getStatus(); 
-		if (status == null || status instanceof MultiStatus)
-			return false;
-		
-		if (status.getException() != null)
-			return false;
-		
-		// Can't access IResourceStatus.OUT_OF_SYNC_LOCAL, using value: 274
-		return status.getCode() == 274;
-	}
-
-	/**
-	 * The <code>AbstractDiagramEditor</code> implementation of this
-	 * <code>IEditorPart</code> method returns <code>false</code>.
-	 * Subclasses may override.
-	 *
-	 * @return <code>false</code>
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	/*
-	 * @see EditorPart#isDirty()
-	 */
-	public boolean isDirty() {
-		IDocumentProvider p= getDocumentProvider();
-		return p == null ? false : p.canSaveDocument(getEditorInput());
-	}
-
-	/**
-	 * Performs any additional action necessary to perform after the input
-	 * document's content has been replaced.
-	 * <p>
-	 * Clients may extended this method.
-	 *
-	 * 
-	 */
-	protected void handleElementContentReplaced() {
-		initializeGraphicalViewerContents();
-	}
-
-	/**
-	 * Performs any additional action necessary to perform after the input
-	 * document's content has been replaced.
-	 * <p>
-	 * Clients may extended this method.
-	 *
-	 * 
-	 */
-	protected void handleElementContentAboutToBeReplaced() {
-		releaseInput();
-	}
-
-	/**
-	 * Returns the status line manager of this editor.
-	 * @return the status line manager of this editor
-	 * 
-	 */
-	private IStatusLineManager getStatusLineManager() {
-
-		IEditorActionBarContributor contributor= getEditorSite().getActionBarContributor();
-		if (!(contributor instanceof EditorActionBarContributor))
-			return null;
-
-		IActionBars actionBars= ((EditorActionBarContributor) contributor).getActionBars();
-		if (actionBars == null)
-			return null;
-
-		return actionBars.getStatusLineManager();
-	}
-	/**
-	 * Hook which gets called when the editor has been saved.
-	 * Subclasses may extend.
-	 * 
-	 */
-	protected void editorSaved() {
-		// nothing to do
-	}
-
-	/*
-	 * @see WorkbenchPart#firePropertyChange(int)
-	 */
-	protected void firePropertyChange(int property) {
-		super.firePropertyChange(property);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.diagramdocument.IDiagramEditor#isEditorInputReadOnly()
-	 */
-	public boolean isEditorInputReadOnly() {
-		IDocumentProvider provider= getDocumentProvider();
-		return provider.isReadOnly(getEditorInput());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.diagramdocument.IDiagramEditor#isEditorInputModifiable()
-	 */
-	public boolean isEditorInputModifiable() {
-		IDocumentProvider provider= getDocumentProvider();
-		return provider.isModifiable(getEditorInput());
-	}
-
-	/**
-	 * The editor's activation listener.
-	 * 
-	 */
-	private ActivationListener fActivationListener;
-//	private final String fReadOnlyLabel= EditorMessages.Editor_statusline_state_readonly_label;
-//	private final String fWritableLabel= EditorMessages.Editor_statusline_state_writable_label;
-	/** The error message shown in the status line in case of failed information look up. */
-	protected final String fErrorLabel= EditorMessages.Editor_statusline_error_label;
-	/** The editor's element state listener. */
-	private IElementStateListener fElementStateListener= new ElementStateListener();
-	/** The editor's explicit document provider. */
-	private IDocumentProvider fExplicitDocumentProvider;
-	/**
-	 * Indicates whether sanity checking in enabled.
-	 * 
-	 */
-	private boolean fIsSanityCheckEnabled= true;
-	/**
-	 * Indicates whether state validation is enabled.
-	 * 
-	 */
-	private boolean fIsStateValidationEnabled= true;
-	/**
-	 * Cached modification stamp of the editor's input.
-	 * 
-	 */
-	private long fModificationStamp= IResource.NULL_STAMP;
-	/**
-	 * Internal part and shell activation listener for triggering state validation.
-	 * 
-	 */
-	class ActivationListener implements IPartListener, IWindowListener {
-
-		/** Cache of the active workbench part. */
-		private IWorkbenchPart fActivePart;
-		/** Indicates whether activation handling is currently be done. */
-		private boolean fIsHandlingActivation= false;
-		/**
-		 * The part service.
-		 * 
-		 */
-		private IPartService fPartService;
-
-		/**
-		 * Creates this activation listener.
-		 *
-		 * @param partService the part service on which to add the part listener
-		 * 
-		 */
-		public ActivationListener(IPartService partService) {
-			fPartService= partService;
-		}
-		
-		/**
-		 * Disposes this activation listener.
-		 *
-		 * 
-		 */
-		public void dispose() {
-			fPartService= null;
-		}
-		
-		public void activate() {
-			fPartService.addPartListener(this);
-			PlatformUI.getWorkbench().addWindowListener(this);
-		}
-		
-		public void deactivate() {
-			fPartService.removePartListener(this);
-			PlatformUI.getWorkbench().removeWindowListener(this);
-		}
-
-		/*
-		 * @see IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partActivated(IWorkbenchPart part) {
-			fActivePart= part;
-			handleActivation();
-		}
-
-		/*
-		 * @see IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partBroughtToTop(IWorkbenchPart part) {
-			// nothing to do
-		}
-
-		/*
-		 * @see IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partClosed(IWorkbenchPart part) {
-			// nothing to do
-		}
-
-		/*
-		 * @see IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partDeactivated(IWorkbenchPart part) {
-			fActivePart= null;
-		}
-
-		/*
-		 * @see IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partOpened(IWorkbenchPart part) {
-			// nothing to do
-		}
-
-		/**
-		 * Handles the activation triggering a element state check in the editor.
-		 */
-		private void handleActivation() {
-			if (fIsHandlingActivation)
-				return;
-
-			if (fActivePart == DiagramDocumentEditor.this) {
-				fIsHandlingActivation= true;
-				try {
-					safelySanityCheckState(getEditorInput());
-				} finally {
-					fIsHandlingActivation= false;
-				}
-			}
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
-		 * 
-		 */
-		public void windowActivated(IWorkbenchWindow window) {
-			if (window == getEditorSite().getWorkbenchWindow()) {
-				/*
-				 * Workaround for problem described in
-				 * http://dev.eclipse.org/bugs/show_bug.cgi?id=11731
-				 * Will be removed when SWT has solved the problem.
-				 */
-				window.getShell().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						handleActivation();
-					}
-				});
-			}
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
-		 * 
-		 */
-		public void windowDeactivated(IWorkbenchWindow window) {
-			// nothing to do
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
-		 * 
-		 */
-		public void windowClosed(IWorkbenchWindow window) {
-			// nothing to do
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
-		 * 
-		 */
-		public void windowOpened(IWorkbenchWindow window) {
-			// nothing to do
-		}
-	}
-
-	/**
-	 * Internal element state listener.
-	 */
-	class ElementStateListener implements IElementStateListener {
-
-		/**
-		 * The display used for posting runnable into the UI thread.
-		 * 
-		 */
-		private Display fDisplay;
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.document.IElementStateListener#elementStateValidationChanged(java.lang.Object, boolean)
-		 */
-		public void elementStateValidationChanged(final Object element, final boolean isStateValidated) {
-			if (element != null && element.equals(getEditorInput())) {
-				Runnable r= new Runnable() {
-					public void run() {
-						enableSanityChecking(true);
-						if (isStateValidated) {
-							GraphicalViewer viewer= getGraphicalViewer();
-							if (viewer != null) {
-								enableStateValidation(false);
-							}
-						} else {
-							GraphicalViewer viewer= getGraphicalViewer();
-							if (viewer != null) {
-								enableStateValidation(true);
-							}
-						}
-					}
-				};
-				execute(r, false);
-			}
-		}
-
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.document.IElementStateListener#elementDirtyStateChanged(java.lang.Object, boolean)
-		 */
-		public void elementDirtyStateChanged(Object element, boolean isDirty) {
-			if (element != null && element.equals(getEditorInput())) {
-				Runnable r= new Runnable() {
-					public void run() {
-						enableSanityChecking(true);
-						firePropertyChange(PROP_DIRTY);
-					}
-				};
-				execute(r, false);
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.document.IElementStateListener#elementContentAboutToBeReplaced(java.lang.Object)
-		 */
-		public void elementContentAboutToBeReplaced(Object element) {
-			if (element != null && element.equals(getEditorInput())) {
-				Runnable r= new Runnable() {
-					public void run() {
-						enableSanityChecking(true);
-						handleElementContentAboutToBeReplaced();
-					}
-				};
-				execute(r, false);
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.document.IElementStateListener#elementContentReplaced(java.lang.Object)
-		 */
-		public void elementContentReplaced(Object element) {
-			if (element != null && element.equals(getEditorInput())) {
-				Runnable r= new Runnable() {
-					public void run() {
-						enableSanityChecking(true);
-						firePropertyChange(PROP_DIRTY);
-						handleElementContentReplaced();
-					}
-				};
-				execute(r, false);
-			}
-		}
-
-		/*
-		 * @see IElementStateListener#elementDeleted(Object)
-		 */
-		public void elementDeleted(Object deletedElement) {
-			if (deletedElement != null && deletedElement.equals(getEditorInput()) && !isHandlingElementDeletion) {
-				Runnable r= new Runnable() {
-					public void run() {
-						enableSanityChecking(true);
-						close(false);
-					}
-				};
-				execute(r, false);
-			}
-		}
-
-		/*
-		 * @see IElementStateListener#elementMoved(Object, Object)
-		 */
-		public void elementMoved(final Object originalElement, final Object movedElement) {
-			if (originalElement != null && originalElement.equals(getEditorInput())) {
-				final boolean doValidationAsync= Display.getCurrent() != null;
-				Runnable r= new Runnable() {
-					public void run() {
-						enableSanityChecking(true);
-
-						if (getGraphicalViewer() == null)
-							return;
-
-						if (!canHandleMove((IEditorInput) originalElement, (IEditorInput) movedElement)) {
-							close(true);
-							return;
-						}
-
-						if (movedElement == null || movedElement instanceof IEditorInput) {
-							final IDocumentProvider d= getDocumentProvider();
-							final Object previousContent;
-							IDocument changed= null;
-							IEditorInput oldInput= getEditorInput();
-                            final boolean initialDirtyState = isDirty();
-							if (initialDirtyState || reuseDiagramOnMove()) {
-								changed= d.getDocument(oldInput);
-								if (changed != null) {
-									if(changed instanceof IDiagramDocument)
-										previousContent = ((IDiagramDocument)changed).detachDiagram();
-									else
-										previousContent= changed.getContent();
-								} else
-									previousContent= null;
-							} else
-								previousContent= null;
-
-							try {
-								doSetInput((IEditorInput) movedElement, !(changed != null));
-							} catch (CoreException e) {
-								String title= EditorMessages.Editor_error_setinput_title;
-								String msg= EditorMessages.Editor_error_setinput_message;
-								Shell shell= getSite().getShell();
-								ErrorDialog.openError(shell, title, msg, e.getStatus());
-							}
-
-							if (changed != null && previousContent != null) {
-								Runnable r2= new Runnable() {
-									public void run() {
-										validateState(getEditorInput());
-										getDocumentProvider().getDocument(getEditorInput()).setContent(previousContent);
-                                        
-                                        if(reuseDiagramOnMove() && !initialDirtyState) {
-                                            try {
-                                                getDocumentProvider().resetDocument(getEditorInput());
-                                            } catch (CoreException e) {
-                                                String title= EditorMessages.Editor_error_setinput_title;
-                                                String msg= EditorMessages.Editor_error_setinput_message;
-                                                Shell shell= getSite().getShell();
-                                                ErrorDialog.openError(shell, title, msg, e.getStatus());
-                                            }
-                                        }
-									}
-								};
-								execute(r2, doValidationAsync);
-							}
-
-						}
-					}
-				};
-				execute(r, false);
-			}
-		}
-
-		/**
-		 * Returns whether this editor can handle the move of the original element
-		 * so that it ends up being the moved element. By default this method
-		 * returns <code>true</code>. Subclasses may reimplement.
-		 *
-		 * @param originalElement the original element
-		 * @param movedElement the moved element
-		 * @return whether this editor can handle the move of the original element
-		 *         so that it ends up being the moved element
-		 * 
-		 */
-		protected boolean canHandleMove(IEditorInput originalElement, IEditorInput movedElement) {
-			return true;
-		}
-
-		/*
-		 * @see IElementStateListenerExtension#elementStateChanging(Object)
-		 * 
-		 */
-		public void elementStateChanging(Object element) {
-			if (element != null && element.equals(getEditorInput()))
-				enableSanityChecking(false);
-		}
-
-		/*
-		 * @see IElementStateListenerExtension#elementStateChangeFailed(Object)
-		 * 
-		 */
-		public void elementStateChangeFailed(Object element) {
-			if (element != null && element.equals(getEditorInput()))
-				enableSanityChecking(true);
-		}
-
-		/**
-		 * Executes the given runnable in the UI thread.
-		 * <p>
-		 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=76765 for details
-		 * about why the parameter <code>postAsync</code> has been
-		 * introduced in the course of 3.1.
-		 *
-		 * @param runnable runnable to be executed
-		 * @param postAsync <code>true</code> if the runnable must be posted asynchronous, <code>false</code> otherwise
-		 * 
-		 */
-		private void execute(Runnable runnable, boolean postAsync) {
-			if (postAsync || Display.getCurrent() == null) {
-				if (fDisplay == null)
-					fDisplay= getSite().getShell().getDisplay();
-				fDisplay.asyncExec(runnable);
-			} else
-				runnable.run();
-		}
-	}
-	/** Title image to be disposed. */
-	private Image fTitleImage;
-	/**
-	 * Initializes the editor's title based on the given editor input.
-	 *
-	 * @param input the editor input to be used
-	 */
-	private void initializeTitle(IEditorInput input) {
-
-		Image oldImage= fTitleImage;
-		fTitleImage= null;
-		String title= ""; //$NON-NLS-1$
-
-		if (input != null) {
-			IEditorDescriptor editorDesc = getEditorDescriptor();
-			ImageDescriptor imageDesc= editorDesc != null ? editorDesc.getImageDescriptor() : null;
-
-			fTitleImage= imageDesc != null ? imageDesc.createImage() : null;
-			title= input.getName();
-		}
-
-		setTitleImage(fTitleImage);
-		setPartName(title);
-
-		firePropertyChange(PROP_DIRTY);
-
-		if (oldImage != null && !oldImage.isDisposed())
-			oldImage.dispose();
-	}
-
-	/**
-	 * Retrieves the descriptor for this editor
-	 * 
-	 * @return the editor descriptor
-	 */
-	final protected IEditorDescriptor getEditorDescriptor() {
-		IEditorRegistry editorRegistry= PlatformUI.getWorkbench().getEditorRegistry();
-		IEditorDescriptor editorDesc= editorRegistry.findEditor(getSite().getId());
-		return editorDesc;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		IDocumentProvider provider = getDocumentProvider();
-		IStatus status = provider.getStatus(getEditorInput());
-		if(status != null && !status.isOK())
-			throw new RuntimeException(new CoreException(status));
-		super.createPartControl(parent);
-	}
-    
-    // Documentation copied from superclass
-    public TransactionalEditingDomain getEditingDomain() {
-        return getEditorInput() instanceof MEditingDomainElement ? ((MEditingDomainElement)getEditorInput()).getEditingDomain() : super.getEditingDomain();
-    }
-    
-	/**
-     * Gets an editing domain from the editing domain registry using the id
-     * returned from {@link #getEditingDomainID()} if an editing domain has been
-     * registered already with this id. Use the
-     * <code>org.eclipse.emf.transaction.editingDomains</code> extension point
-     * to register a shared editing domain.
-     * <p>
-     * If an editing domain is not found for the id, then a new editing domain
-     * will be created per editor instance.
-     * </p>
-     * 
-     * @return the editing domain
-     */
-    protected TransactionalEditingDomain createEditingDomain() {
-        String editingDomainID = getEditingDomainID();
-        if (editingDomainID != null) {
-            TransactionalEditingDomain editingDomain = TransactionalEditingDomain.Registry.INSTANCE
-                .getEditingDomain(editingDomainID);
-            if (editingDomain != null) {
-                return editingDomain;
-            }
-        }
-
-        return DiagramEditingDomainFactory.getInstance().createEditingDomain();
-    }
-
-    /**
-     * Returns an editing domain id used to retrive an editing domain from the
-     * editing domain registry. Clients should override this if they wish to use
-     * a shared editing domain for this editor. If null is returned then a new
-     * editing domain will be created per editor instance.
-     * 
-     * @return the shared editing domain id if applicable
-     */
-    protected String getEditingDomainID() {
-        return null;
-    }
-    
-    protected boolean reuseDiagramOnMove() {
-        return false;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditorMatchingStrategy.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditorMatchingStrategy.java
deleted file mode 100644
index 2162083..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditorMatchingStrategy.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DocumentProviderRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DocumentProviderRegistry.IDocumentProviderSelector;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorMatchingStrategy;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PartInitException;
-
-/**
- * A matching strategy for <code>DiagramDocumentEditor</code>
- * 
- * @author mgoyal
- * 
- */
-public class DiagramDocumentEditorMatchingStrategy
-	implements IEditorMatchingStrategy {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorMatchingStrategy#matches(org.eclipse.ui.IEditorReference,
-	 *      org.eclipse.ui.IEditorInput)
-	 */
-	public boolean matches(IEditorReference editorRef, IEditorInput input) {
-        IEditorInput existingEditorInput;
-        IEditorPart editor = editorRef.getEditor(false);
-
-        try {
-            existingEditorInput = editorRef.getEditorInput();
-        } catch (PartInitException e) {
-            return false;
-        }
-
-        // If the ExistingEditorInput is same as the passed input,
-        // return true
-        if (existingEditorInput.equals(input))
-            return true;
-        else if (!(input instanceof MEditingDomainElement) && (editor instanceof DiagramDocumentEditor)) {
-            // If the input isn't an instanceof MEditingDomainElement, and the editor is instanceof DiagramDocumentEditor
-            // then don't match it, This indicates that the client shouldn't use this strategy for non-DiagramDocumentEditor.
-            IDiagramDocumentProvider docProvider = (IDiagramDocumentProvider) DocumentProviderRegistry
-            .getDefault().getDocumentProvider(input,
-                new IDocumentProviderSelector() {
-
-                public boolean select(String documentType) {
-                    // Only checking of the interface name
-                    return documentType.equals(IDiagramDocument.class
-                        .getName());
-                }
-            });
-
-            if (docProvider != null) {
-                IEditorInput editorInput = docProvider
-                .createInputWithEditingDomain(input,
-                    ((DiagramDocumentEditor) editor).getEditingDomain());
-                return existingEditorInput.equals(editorInput);
-            }
-        }
-        return false;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/util/DiagramFileCreator.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/util/DiagramFileCreator.java
deleted file mode 100644
index eda23a8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/util/DiagramFileCreator.java
+++ /dev/null

@@ -1,223 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.util;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorMessages;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author qili
- * @canBeSeenBy %level1
- *
- * Class used for the creation of diagram files.
- * 
- */
-public abstract class DiagramFileCreator {
-
-	public abstract String getExtension();
-
-	protected Plugin getPlugin() {
-		return EditorPlugin.getInstance();
-	}
-	
-	/**
-	 * Creates a file resource handle for the file with the given workspace path.
-	 * This method does not create the file resource; this is the responsibility
-	 * of <code>createFile</code>.
-	 *
-	 * @param filePath the path of the file resource to create a handle for
-	 * @return the new file resource handle
-	 * @see #createFile
-	 */
-	private IFile createFileHandle(IPath filePath) {
-		return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-	}
-
-	/**
-	 * Given a string representing the possible file name, this function will ensure the
-	 * proper extension is attached to it.
-	 * @param szFileName String representing the file name.
-	 * @return Corrected file name containing the file extension.
-	 */
-	public String appendExtensionToFileName(String szFileName) {
-		if (!szFileName.endsWith(getExtension())) {
-			return szFileName + getExtension();
-		} else
-			return szFileName;
-	}
-
-	/**
-	 * Returns a unique file name for a given path and file name
-	 * @param containerPath the container's full path
-	 * @param szFileName original file name
-	 * @return the unique file name with number attached in the event of multiple matches
-	 */
-	public String getUniqueFileName(
-		final IPath containerPath,
-		String szFileName) {
-		int nFileNumber = 1;
-
-		String szNewFileName = szFileName;
-		
-		IPath filePath = containerPath.append(appendExtensionToFileName(szNewFileName));
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		
-		while (workspaceRoot.exists(filePath)) {
-			nFileNumber++;
-			szNewFileName = szFileName + nFileNumber;
-			filePath = containerPath.append(appendExtensionToFileName(szNewFileName));
-		}
-		return szNewFileName;
-	}
-
-
-	/**
-	* Creates a file resource given the file handle and contents.
-	*
-	* @param fileHandle the file handle to create a file resource with
-	* @param contents the initial contents of the new file resource, or
-	*   <code>null</code> if none (equivalent to an empty stream)
-	* @param monitor the progress monitor to show visual progress with
-	* @exception CoreException if the operation fails
-	* @exception OperationCanceledException if the operation is canceled
-	*/
-	protected void createFile(
-		IFile fileHandle,
-		InputStream contents,
-		IProgressMonitor monitor)
-		throws CoreException {
-		if (contents == null)
-			contents = new ByteArrayInputStream(new byte[0]);
-
-		try {
-			// Create a new file resource in the workspace
-			fileHandle.create(contents, false, monitor);
-		} catch (CoreException e) {
-			// If the file already existed locally, just refresh to get contents
-			if (e.getStatus().getCode() == IResourceStatus.PATH_OCCUPIED)
-				fileHandle.refreshLocal(IResource.DEPTH_ZERO, null);
-			else {
-				Log.error(getPlugin(), IStatus.ERROR, e.getMessage(), e);
-				throw e;
-			}
-		}
-
-		if (monitor.isCanceled()) {
-			OperationCanceledException oce = new OperationCanceledException();
-			Log.error(getPlugin(), IStatus.ERROR, oce.getMessage(), oce);
-			throw oce;
-		}
-	}
-	
-	/**
-	 * This implementation creates the file in a NullProgressMonitor.
-	 * Superclasses may override and create the file in a runnable context.
-	 *  
-	 * @param fileHandle the file handle to create a file resource with
-	 * @param contents the initial contents of the new file resource, or
-	 * <code>null</code> if none (equivalent to an empty stream)
-	 * @param monitor the progress monitor to show visual progress with
-	 * @throws InterruptedException subclasses may throw this exception if running in a context which allows cancelling
-	 * @throws InvocationTargetException when an error occured while creating the file
-	 */
-	private void createFile(IFile fileHandle,
-			InputStream contents, IRunnableContext runContext) throws InterruptedException, InvocationTargetException {
-		try {
-		createFile(
-			fileHandle,
-			contents,
-			new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			Log.error(getPlugin(), IStatus.ERROR, e.getMessage(), e);
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	/**
-	 * Creates a new file cache given the name and containment path
-	 * @param containerPath - IPath Directory path where the file will be stored
-	 * @param fileName - IPath Name of the file to be created.
-	 * @param initialContents InputStream of the initial contents of the file if desired.
-	 * @param shell SWT Shell object as a context so that error messages / progress can be displayed.
-	 * @param runContext IRunnableContext object which will run the file creation operation.
-	 * @return IFile Resulting file that is created from the method logic.
-	 */
-	public IFile createNewFile(
-		final IPath containerPath,
-		final String fileName,
-		final InputStream initialContents,
-		Shell shell,
-		IRunnableContext runContext) {
-
-		IFile newFile;
-
-		// create the new file and cache it if successful
-		IPath newFilePath =
-			containerPath.append(appendExtensionToFileName(fileName));
-		final IFile newFileHandle = createFileHandle(newFilePath);
-
-		//this could modify the workspace
-		try {
-			createFile(newFileHandle, initialContents, runContext);
-
-		} catch (InterruptedException e) {
-			return null;
-		} catch (InvocationTargetException e) {
-			if (e.getTargetException() instanceof CoreException) {
-				ErrorDialog.openError(shell,
-				// Was Utilities.getFocusShell()
-					EditorMessages.Editor_error_create_file_title,
-				null, // no special message
-				 ((CoreException) e.getTargetException()).getStatus());
-			} else {
-				// CoreExceptions are handled above, but unexpected runtime exceptions and errors may still occur.
-				Log.error(EditorPlugin.getInstance(), EditorStatusCodes.ERROR, NLS.bind("Exception in {0}.getNewFile(): {1}", new Object[] { getClass().getName(), e.getTargetException()}), e);//$NON-NLS-1$				
-				MessageDialog.openError(shell,
-					EditorMessages.Editor_error_create_file_title, NLS.bind(
-						EditorMessages.Editor_error_create_file_message, e
-							.getTargetException().getMessage())); 
-			}
-			return null;
-		}
-
-		newFile = newFileHandle;
-
-		return newFile;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/util/EditorUtil.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/util/EditorUtil.java
deleted file mode 100644
index 10568bc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/util/EditorUtil.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.util;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-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.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Diagram Utility Class for Editor.
- *
- * @author qili
- * @canBeSeenBy %level1
- * 
- */
-public class EditorUtil {
-
-	/**
-	 * Creates a new diagram file resource in the selected container and with
-	 * the selected name. Creates any missing resource containers along the
-	 * path; does nothing if the container resources already exist. Creates a
-	 * new editing domain for this diagram.
-	 * <p>
-	 * In normal usage, this method is invoked after the user has pressed Finish
-	 * on the wizard; the enablement of the Finish button implies that all
-	 * controls on on this page currently contain valid values.
-	 * </p>
-	 * <p>
-	 * Note that this page caches the new file once it has been successfully
-	 * created; subsequent invocations of this method will answer the same file
-	 * resource without attempting to create it again.
-	 * </p>
-	 * <p>
-	 * This method should be called within a workspace modify operation since it
-	 * creates resources.
-	 * </p>
-	 * 
-	 * @param preferencesHint
-	 *            The preference hint that is to be used to find the appropriate
-	 *            preference store from which to retrieve diagram preference
-	 *            values. The preference hint is mapped to a preference store in
-	 *            the preference registry <@link DiagramPreferencesRegistry>.
-	 * 
-	 * @return the created file resource, or <code>null</code> if the file was
-	 *         not created
-	 */
-	public static IFile createNewDiagramFile(
-			DiagramFileCreator diagramFileCreator,
-			IPath containerFullPath, String fileName,
-			InputStream initialContents, final String kind,
-			Shell shell, final IProgressMonitor progressMonitor,
-			final PreferencesHint preferencesHint) {
-		/** cache of newly-created file */
-		final IFile newDiagramFile = diagramFileCreator.createNewFile(
-			containerFullPath, fileName, initialContents, shell,
-			new IRunnableContext() {
-
-				public void run(boolean fork, boolean cancelable,
-						IRunnableWithProgress runnable)
-					throws InvocationTargetException, InterruptedException {
-					runnable.run(progressMonitor);
-				}
-			});
-
-		// Fill the contents of the file dynamically
-		Resource notationModel = null;
-
-		try {
-			newDiagramFile.refreshLocal(IResource.DEPTH_ZERO, null); //RATLC00514368
-			InputStream stream = newDiagramFile.getContents();
-			String completeFileName = newDiagramFile.getFullPath().toString();
-
-			try {
-				// Empty file....
-                ResourceSet resourceSet = new ResourceSetImpl();
-                notationModel = resourceSet.createResource(URI
-                    .createPlatformResourceURI(completeFileName, true)); 
-			} finally {
-				stream.close();
-			}
-
-		} catch (Exception e) {
-			Trace.catching(EditorPlugin.getInstance(),
-				EditorDebugOptions.EXCEPTIONS_CATCHING,
-				EditorUtil.class, "createNewDiagramFile", //$NON-NLS-1$
-				e);
-		}
-
-		if (notationModel != null) {
-            View view = ViewService.createDiagram(kind, preferencesHint);
-
-            if (view != null) {
-                notationModel.getContents().add(view.getDiagram());
-                view.getDiagram().setName(newDiagramFile.getName());
-            }
-		}
-		try {
-            notationModel.save(Collections.EMPTY_MAP);
-        } catch (IOException e) {
-            Trace.catching(EditorPlugin.getInstance(),
-                EditorDebugOptions.EXCEPTIONS_CATCHING, EditorUtil.class,
-                "createNewDiagramFile", e); //$NON-NLS-1$
-            Log.error(EditorPlugin.getInstance(),
-                EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage());
-        }
- 		return newDiagramFile;
-	}
-
-	/**
-	 * Gets the default diagram path for a new diagram that will contain the
-	 * elements in <code>elements</code>. Returns <code>null</code> if
-	 * there is no IVizUIHandler to handle the visualization, or there is a
-	 * handler, but it has no default diagram path for the elements.
-	 * <P>
-	 *
-	 * @param elements
-	 *            the list of elements being visualized on a new class diagram
-	 * @param diagramKind
-	 *            the kind of diagram we want to create
-	 * @return the default diagram path for a new diagram that will contain the
-	 *         elements in <code>elements</code>. Returns <code>null</code>
-	 *         if there is no IVizUIHandler to handle the visualization, or
-	 *         there is a handler, but it has no default diagram path for the
-	 *         elements.
-	 */
-	public static IPath getDefaultDiagramPath(List elements,
-			String diagramKind) {
-
-		IPath path = null;
-
-		return path;
-	}
-
-	/**
-	 * Method getInitialContents. Gets the initial contents of the UML
-	 * Visualizer diagram file. Currently it returns an empty byte stream.
-	 *
-	 * @return Byte stream that will initially populate the UML
-	 *         Visualizer diagram file.
-	 */
-	public static InputStream getInitialContents() {
-		return new ByteArrayInputStream(new byte[0]);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/.classpath b/org.eclipse.gmf.runtime.draw2d.ui.render/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.draw2d.ui.render/.cvsignore b/org.eclipse.gmf.runtime.draw2d.ui.render/.cvsignore
deleted file mode 100644
index 4c5926f..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-*.settings
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/.options b/org.eclipse.gmf.runtime.draw2d.ui.render/.options
deleted file mode 100644
index 69f140c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.options
+++ /dev/null

@@ -1,17 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.draw2d.ui plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.draw2d.ui plug-in
-org.eclipse.gmf.runtime.draw2d.ui.render/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/exiting=false
-
-# Trace dnd
-org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing=false

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/.project b/org.eclipse.gmf.runtime.draw2d.ui.render/.project
deleted file mode 100644
index 9624587..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.draw2d.ui.render</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.draw2d.ui.render/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.draw2d.ui.render/META-INF/MANIFEST.MF
deleted file mode 100644
index bb986ee..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.draw2d.ui.render;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.draw2d.ui.render.internal.Draw2dRenderPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.draw2d.ui.render,
- org.eclipse.gmf.runtime.draw2d.ui.render.factory,
- org.eclipse.gmf.runtime.draw2d.ui.render.figures,
- org.eclipse.gmf.runtime.draw2d.ui.render.internal;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.draw2d.ui.render.awt,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.draw2d.ui.render.awt,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.draw2d.ui.render.awt,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.internal.image;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.draw2d.ui.render.awt,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.printing.render"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/about.html b/org.eclipse.gmf.runtime.draw2d.ui.render/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/build.properties b/org.eclipse.gmf.runtime.draw2d.ui.render/build.properties
deleted file mode 100644
index f7cd907..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               .options,\
-               META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html
-
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/plugin.properties b/org.eclipse.gmf.runtime.draw2d.ui.render/plugin.properties
deleted file mode 100644
index 8c582cd..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/plugin.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Presentation - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Draw2d Image Rendering Additions
-Plugin.providerName = Eclipse.org
-
-extPoint.renderedImageFactory = Rendered Image Factory
-
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/plugin.xml b/org.eclipse.gmf.runtime.draw2d.ui.render/plugin.xml
deleted file mode 100644
index 1023cd1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/plugin.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="renderedImageFactory" name="%extPoint.renderedImageFactory" schema="schema/renderedImageFactory.exsd"/>
-
-</plugin>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/schema/renderedImageFactory.exsd b/org.eclipse.gmf.runtime.draw2d.ui.render/schema/renderedImageFactory.exsd
deleted file mode 100644
index 8c0c878..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/schema/renderedImageFactory.exsd
+++ /dev/null

@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.draw2d.ui.render">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.draw2d.ui.render" id="renderedImageFactory" name="Rendered Image Factory"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define an image type to allow auto detection of an image buffer.  The image type can instantiate an (&lt;tt&gt;RenderedImage&lt;/tt&gt;) which can subsequently be rendered using the (&lt;tt&gt;ScalableImageFigure&lt;/tt&gt;) class.
-
-In the extension point, the client points to a factory class which they create implementing the (&lt;tt&gt;RenderedImageType&lt;/tt&gt;) interface.  The (&lt;tt&gt;RenderedImageFactory&lt;/tt&gt;) static class calls the extension point to compile a list of image types to query.  When the client calls the (&lt;tt&gt;RenderedImageFactory&lt;/tt&gt;) to retrieve the proper (&lt;tt&gt;RenderedImage&lt;/tt&gt;), it will ask each type whether it can handle the particular image buffer.  If the image buffer is auto-detected by the type, then the type will instatiate and return a (&lt;tt&gt;RenderedImage&lt;/tt&gt;) object.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="factory"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="factory">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageType"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         GMF 1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         An extension to the renderedImageFactory would require the implementation of the (&lt;tt&gt;RenderedImageType&lt;/tt&gt;) interface.    
-
-The following is an example plugin.xml entry for a renderedImageFactory extension:
-
-&lt;pre&gt;
-    &lt;extension 
-     point=&quot;org.eclipse.gmf.runtime.draw2d.ui.render.renderedImageFactory&quot;&gt;
-      &lt;factory 
-        class=&quot;org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.SVGImageType&quot;&gt;
-      &lt;/factory&gt; 
- &lt;/extension&gt;
- &lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         For API information, see the classes and interfaces defined in the &lt;tt&gt;org.eclipse.gmf.runtime.draw2d.ui.render&lt;/tt&gt; and &lt;tt&gt;org.eclipse.gmf.runtime.draw2d.ui.render.factory&lt;/tt&gt; packages.
-
-&lt;p&gt;
-Clients providing an extension to the renderedImageFactory extension point need to create classes that implement the following interfaces:
-&lt;/p&gt;
-&lt;p&gt;
-&lt;tt&gt;org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage&lt;/tt&gt;
-&lt;/p&gt;
-&lt;p&gt;
-&lt;tt&gt;org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageType&lt;/tt&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006  IBM Corporation and others.&lt;br&gt;
- 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 
- &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/RenderInfo.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/RenderInfo.java
deleted file mode 100644
index 5299858..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/RenderInfo.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render;
-
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * @author sshaw
- * 
- * Contains information needed by RenderedImage to perform the rendering of the
- * Vector graphics data.
- * 
- * IMPORTANT: This interface is <EM>not</EM> intended to be implemented by
- * clients. 
- * New methods may be added in the future.
- */
-public interface RenderInfo {
-
-	/**
-	 * Accessor method to return the width of the rendered image.
-	 * 
-	 * @return the width of the rendered image.
-	 */
-	public abstract int getWidth();
-
-	/**
-	 * Accessor method to return the height of the rendered image.
-	 * 
-	 * @return the height of the rendered image.
-	 */
-	public abstract int getHeight();
-
-	/**
-	 * Accessor method to return the fill color of the rendered image.
-	 * 
-	 * @return <code>RGB</code> value that is the fill color of the rendered
-	 *         image. Note: a <code>null</code> return value is valid and
-	 *         means that the fill color defaults to the values stored in the
-	 *         vector graphics file.
-	 */
-	public abstract RGB getBackgroundColor();
-
-	/**
-	 * Accessor method to return the outline color of the rendered image.
-	 * 
-	 * @return <code>RGB</code> value that is the outline color of the
-	 *         rendered image. Note: a <code>null</code> return value is valid
-	 *         and means that the outline color defaults to the values stored in
-	 *         the vector graphics file.
-	 */
-	public abstract RGB getForegroundColor();
-
-	/**
-	 * Accessor method to return whether or not the aspect ratio is maintained.
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if aspect ratio of
-	 *         original vector file is maintained, <code>false</code>
-	 *         otherwise.
-	 */
-	public abstract boolean shouldMaintainAspectRatio();
-
-	/**
-	 * Accessor method to return whether or not the vector data is anti-aliased.
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if vector graphic is
-	 *         to be rendered wih anti-aliasing, <code>false</code> otherwise.
-	 */
-	public abstract boolean shouldAntiAlias();
-
-	/**
-	 * Generic setter to set values in the RenderInfo data structure. This is
-	 * useful when retrieving a RenderInfo structure from a RenderedImage object
-	 * and then wishing to re-render the image with new values.
-	 * 
-	 * @param width
-	 *            the width of the rendered image to set
-	 * @param height
-	 *            the height of the rendered image to set
-	 * @param maintainAspectRatio
-	 *            <code>boolean</code> <code>true</code> if aspect ratio of
-	 *            original vector file is maintained, <code>false</code>
-	 *            otherwise
-	 * @param antialias
-	 *            <code>boolean</code> <code>true</code> if vector graphic
-	 *            is to be rendered wih anti-aliasing, <code>false</code>
-	 *            otherwise.
-	 * @param background
-	 *            <code>Color</code> fill color for the whole image: null
-	 *            value defaults to stored values for each element in the vector
-	 *            file.
-	 * @param outline
-	 *            <code>Color</code> outline color for the whole image: null
-	 *            value defaults to stored foreground for each element in the
-	 *            vector file.
-	 */
-	public abstract void setValues(int width, int height,
-			boolean maintainAspectRatio, boolean antialias, RGB background,
-			RGB foreground);
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/RenderedImage.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/RenderedImage.java
deleted file mode 100644
index bcef02a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/RenderedImage.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Interface to allow dynamic resizing of an Image.
- * 
- * IMPORTANT: This interface is <EM>not</EM> intended to be implemented by
- * clients. 
- * New methods may be added in the future.
- * 
- * @author sshaw
- */
-public interface RenderedImage extends IAdaptable {
-
-	/**
-	 * Accessor method to return information about the rendered image.
-	 * 
-	 * @return RenderInfo object that contains information about the rendered
-	 *         image.
-	 */
-	public RenderInfo getRenderInfo();
-
-	/**
-	 * Retrieves an equivalent image of the specified size as specified through
-	 * the parameters.
-	 * 
-	 * @param info
-	 *            <code>RenderInfo</code> object containing information about
-	 *            the size and general data regarding how the image will be
-	 *            rendered.
-	 * @return <code>RenderedImage</code> which is the equivalent image of the
-	 *         source based on the requested <code>RenderInfo</code>
-	 *         information source.
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo
-	 */
-	public RenderedImage getNewRenderedImage(RenderInfo info);
-
-	/**
-	 * Accessor for retrieving the SWT image for this ResizableImage. Typically,
-	 * this accessor should implemented for dynamic rendering of the image to an
-	 * SWT image. This avoid storing the heavy weight image buffer in memory
-	 * until it is needed.
-	 * 
-	 * @return SWT Image that this <code>RenderedImage</code> represents.
-	 */
-	public Image getSWTImage();
-	
-	/**
-	 * @return <code>true</code> if image has been fully rendered, <code>false</code> if
-	 * it needs to be rendered.
-	 */
-	public boolean isRendered();
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageFactory.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageFactory.java
deleted file mode 100644
index 2ca82e6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageFactory.java
+++ /dev/null

@@ -1,312 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.factory;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.net.URL;
-import java.security.InvalidParameterException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.zip.Adler32;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.AbstractRenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.Draw2dRenderDebugOptions;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.Draw2dRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory.RenderedImageKey;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.image.ImageRenderedImage;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * @author sshaw
- * 
- * Factory class for generating RenderedImage objects
- */
-public class RenderedImageFactory {
-
-	static private Map instanceMap = new WeakHashMap();
-
-	/**
-	 * createInfo static Utility to create a RenderInfo object.
-	 * 
-	 * @param width
-	 *            the width of the rendered image to set
-	 * @param height
-	 *            the height of the rendered image to set
-	 * @param maintainAspectRatio
-	 *            <code>boolean</code> <code>true</code> if aspect ratio of
-	 *            original vector file is maintained, <code>false</code>
-	 *            otherwise
-	 * @param antialias
-	 *            <code>boolean</code> <code>true</code> if the image is to
-	 *            be rendered using anti-aliasing (removing "jaggies" producing
-	 *            smoother lines), <code>false</code> otherwise
-	 * @param fill
-	 *            the <code>RGB</code> of the fill that could instrumented
-	 *            into image formats that support dynamic color replacement.
-	 *            Typically, this would replace colors in the image which are
-	 *            "white" i.e. RGB(255,255,255)
-	 * @param outline
-	 *            the <code>RGB</code> of the outline that could
-	 *            instrumented into image formats that support dynamic color
-	 *            replacement. Typically, this would replace colors in the image
-	 *            which are "black" i.e. RGB(0,0,0)
-	 * @return <code>RenderInfo</code> object that contains information about
-	 *         the rendered image.
-	 */
-	static public RenderInfo createInfo(int width, int height, boolean maintainAspectRatio, boolean antialias,
-			RGB fill, RGB outline ) {
-		RenderedImageKey svgInfo = new RenderedImageKey();
-		svgInfo.setValues(width, height, maintainAspectRatio,
-			antialias, fill, outline);
-		return svgInfo;
-	}
-	
-	/**
-	 * getInstance static constructor method for retrieving the appropriate
-	 * instance of the immutable class <code>RenderedImage</code>. This
-	 * method is used to read svg images from JARs.
-	 * 
-	 * @param theURL
-	 *            URL of the SVG image. Normally in a JAR
-	 * @return <code>RenderedImage</code> instance with the size dimensions
-	 *         requested.
-	 */
-	static public RenderedImage getInstance(URL theURL) {
-		return getInstance(theURL, new RenderedImageKey());
-	}
-
-	/**
-	 * getInstance static constructor method for retrieving the appropriate
-	 * instance of the immutable class <code>RenderedImage</code>. This
-	 * method is used to read svg images from JARs.
-	 * 
-	 * @param theURL
-	 *            URL of the SVG image.
-	 * @param info
-	 *            object containing information about the size and general data
-	 *            regarding how the image will be rendered.
-	 * 
-	 * @return <code>RenderedImage</code> instance with the size dimensions
-	 *         requested.
-	 */
-	static public RenderedImage getInstance(URL theURL, RenderInfo info) {
-
-		try {
-			InputStream is = theURL.openStream();
-
-			int size = is.available();
-			byte[] buffer = new byte[size];
-
-			is.read(buffer);
-			is.close();
-
-			return getInstance(buffer, info);
-
-		} catch (Exception e) {
-			Trace.throwing(Draw2dRenderPlugin.getInstance(),
-				Draw2dRenderDebugOptions.EXCEPTIONS_THROWING,
-				RenderedImage.class, "RenderedImageFactory.getInstance()", //$NON-NLS-1$
-				e);
-		}
-
-		return null;
-	}
-
-	/**
-	 * getInstance static constructor method for retrieving the appropriate
-	 * instance of the immutable class <code>RenderedImage</code>.
-	 * 
-	 * @param szFilePath
-	 *            <code>String</code> file path of svg file
-	 * @return <code>RenderedImage</code> instance with the size dimensions
-	 *         requested.
-	 */
-	static public RenderedImage getInstance(String szFilePath) {
-		return getInstance(szFilePath, new RenderedImageKey());
-	}
-
-	/**
-	 * getInstance static constructor method for retrieving the appropriate
-	 * instance of the immutable class <code>RenderedImage</code>.
-	 * 
-	 * @param szFilePath
-	 *            <code>String</code> file path of svg file
-	 * @param info
-	 *            <code>RenderInfo</code> object containing information about
-	 *            the size and general data regarding how the image will be
-	 *            rendered.
-	 * @return <code>RenderedImage</code> instance with the size dimensions
-	 *         requested.
-	 */
-	static public RenderedImage getInstance(String szFilePath, RenderInfo info) {
-		try {
-			FileInputStream fis = new FileInputStream(szFilePath);
-			int size = fis.available();
-			byte[] buffer = new byte[size];
-
-			fis.read(buffer);
-			fis.close();
-
-			return getInstance(buffer, info);
-
-		} catch (Exception e) {
-			Trace.throwing(Draw2dRenderPlugin.getInstance(),
-				Draw2dRenderDebugOptions.EXCEPTIONS_THROWING,
-				RenderedImageFactory.class,
-				"RenderedImageFactory.getInstance()", //$NON-NLS-1$
-				e);
-		}
-
-		return null;
-	}
-
-	/**
-	 * getInstance static constructor method for retrieving the appropriate
-	 * instance of the immutable class <code>RenderedImage</code>.
-	 * 
-	 * @param buffer
-	 *            <code>byte[]</code> array containing an cached SVG image
-	 *            file.
-	 * @return the <code>RenderedImage</code> that encapsulates the contents
-	 *         of the given byte buffer.
-	 */
-	static public RenderedImage getInstance(byte[] buffer) {
-		return getInstance(buffer, new RenderedImageKey());
-	}
-
-	/**
-	 * Returns a related instance of the given <code>RenderedImage</code> that
-	 * is based on the same byte stream or file info but instrumented for the
-	 * passed in <code>RenderInfo</code> object
-	 * 
-	 * @param image
-	 *            <code>RenderedImage</code> that is used as a base to
-	 *            retrieve the related instance.
-	 * @param info
-	 *            <code>RenderInfo</code> object containing information about
-	 *            the size and general data regarding how the image will be
-	 *            rendered.
-	 * @return <code>RenderedImage</code> instance with the size dimensions
-	 *         requested. May return <code>null</code> if no related instance
-	 *         can be found or if the original buffer cannot be retrieved.
-	 */
-	static public RenderedImage getRelatedInstance(RenderedImage image,
-			RenderInfo info) {
-		if (image instanceof AbstractRenderedImage) {
-			RenderedImageKey oldKey = ((AbstractRenderedImage) image).getKey();
-			RenderedImageKey key = new RenderedImageKey(info, oldKey.getChecksum(), oldKey.getExtraData());
-			WeakReference ref = (WeakReference) instanceMap.get(key);
-			if (ref != null) {
-				return (RenderedImage) ref.get();
-			} else {
-				return autodetectImage(((AbstractRenderedImage) image)
-					.getBuffer(), key);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * getInstance static constructor method for retrieving the appropriate
-	 * instance of the immutable class <code>RenderedImage</code>.
-	 * 
-	 * @param buffer
-	 *            byte[] array containing an cached SVG image file.
-	 * @param info
-	 *            object containing information about the size and general data
-	 *            regarding how the image will be rendered.
-	 * @return <code>RenderedImage</code> instance with the size dimensions
-	 *         requested.
-	 */
-	static public RenderedImage getInstance(byte[] buffer, RenderInfo info) {
-		if (buffer == null)
-			throw new InvalidParameterException();
-
-		Adler32 checksum = new Adler32();
-		checksum.update(buffer);
-		final RenderedImageKey key = new RenderedImageKey(info, checksum.getValue(), null);
-		WeakReference ref = (WeakReference) instanceMap.get(key);
-		RenderedImage image = null;
-		if (ref != null)
-			image = (RenderedImage) (((WeakReference) instanceMap.get(key))
-				.get());
-		else
-			image = autodetectImage(buffer, key);
-
-		return image;
-	}
-
-	private static final String E_MODIFIER_FACTORY = "factory"; //$NON-NLS-1$
-	private static final String A_CLASS = "class"; //$NON-NLS-1$
-
-	static private List imageTypes = null;
-	
-	static private RenderedImage autodetectImage(byte[] buffer,
-			final RenderedImageKey key) {
-		
-		if (imageTypes == null) {
-			imageTypes = new ArrayList();
-			
-			IExtensionPoint riExtensionPt = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.gmf.runtime.draw2d.ui.render", //$NON-NLS-1$
-															"renderedImageFactory");  //$NON-NLS-1$
-			IConfigurationElement[] configEls = riExtensionPt.getConfigurationElements();
-			for (int i = 0; i < configEls.length; i++) {
-				IConfigurationElement element = configEls[i];
-	
-				if (element.getName().equals(E_MODIFIER_FACTORY)) {
-					RenderedImageType imageType = null;
-					try {
-						imageType = (RenderedImageType)element.createExecutableExtension(A_CLASS);
-						if (imageType != null)
-							imageTypes.add(imageType);
-					} catch (CoreException e) {
-						continue;
-					}
-				}
-			}
-		}
-		
-		RenderedImage image = null;
-		ListIterator li = imageTypes.listIterator();
-		while (li.hasNext()) {
-			RenderedImageType imageType = (RenderedImageType)li.next();
-			image = imageType.autoDetect(buffer, key);
-			if (image != null)
-				break;
-		}
-
-		if (image == null) {
-			// can't create a RenderedImageType for image files until bugzilla 116227 is resolved.  Until then,
-			// assume, the fall through type is ImageRenderedImage.
-			image = new ImageRenderedImage(buffer, key);
-		}
-		
-		if (image != null) {
-			instanceMap.put(key, new WeakReference(image));
-		}
-		
-		return image;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageType.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageType.java
deleted file mode 100644
index 496ca12..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageType.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.factory;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory.RenderedImageKey;
-
-
-/**
- * This interface allows the RenderedImageFactory to auto-defect an image type through
- * an extension point.  Implementors need to know how to auto-defect the type of image
- * given a byte buffer representing the contents of the image.
- * 
- * @author sshaw
- */
-public interface RenderedImageType {
-
-	/**
-	 * @param buffer the <code>byte[]</code> array that is the contents of the image file.
-	 * This is used as the input in order to detect the type of file format.
-	 * @param key the <code>RenderedImageKey</code> that defines the parameters of how
-	 * to render the particular image.
-	 * @return a <code>RenderedImage</code> if the <code>buffer</code> was auto-detected as
-	 * being this type.  <code>null</code> is returned if the buffer stream is not detected
-	 * as this type.
-	 */
-	public RenderedImage autoDetect(byte[] buffer,
-			final RenderedImageKey key);
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/package.html
deleted file mode 100644
index a3e92ed..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Contains the factory class and supporting classes.  The factory class may have dependencies into all the
-different supported files formats hence it is separated into it's own package namespace.  The factory class should 
-be the central location where specific variants of the <code>RenderedImage</code> implementors are created.  This
-allows clients to make generic calls to the factory with a file buffer and have it return a valid instance or not.
-Clients therefore don't have to assume any knowledge of a specific image file type.
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java
deleted file mode 100644
index 460cbf2..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java
+++ /dev/null

@@ -1,403 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.figures;
-
-import java.io.ByteArrayOutputStream;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.ImageFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.DiagramMapModeUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * An implementation of {@link org.eclipse.draw2d.ImageFigure} that allows
- * scaling the underlying image to the containing Figure's bounds, rather then
- * being fixed to the image size.
- * 
- * <p>
- * Any image that can be implemented inside the RenderedImage interface can be
- * supported.
- * </p>
- * 
- * @author jcorchis / sshaw
- */
-public class ScalableImageFigure
-	extends ImageFigure {
-
-	private RenderingListenerImpl renderingListener = new RenderingListenerImpl();
-
-	private class RenderingListenerImpl
-		implements RenderingListener {
-
-		public RenderingListenerImpl() {
-			super();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener#paintFigureWhileRendering(org.eclipse.draw2d.Graphics)
-		 */
-		public void paintFigureWhileRendering(Graphics g) {
-			ScalableImageFigure.this.paintFigureWhileRendering(g);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderingListener#imageRendered(org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage)
-		 */
-		public void imageRendered(RenderedImage rndImg) {
-			if (ScalableImageFigure.this.getParent() != null) {
-				ScalableImageFigure.this.setRenderedImage(rndImg);
-				ScalableImageFigure.this.repaint();
-			}
-		}
-
-		/**
-		 * @return <code>IFigure</code> that the listener wraps
-		 */
-		public ScalableImageFigure getFigure() {
-			return ScalableImageFigure.this;
-		}
-		
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (obj instanceof RenderingListenerImpl) {
-				return ((RenderingListenerImpl) obj).getFigure().equals(
-					getFigure());
-			}
-
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.Object#hashCode()
-		 */
-		public int hashCode() {
-			return ScalableImageFigure.this.hashCode();
-		}
-
-	}
-
-	/** The preferred size of the image */
-	private Dimension preferredSize = new Dimension(-1, -1);
-
-	private static final int FLAG_USE_DEFAULT_IMAGESIZE = MAX_FLAG << 1,
-			FLAG_MAINTAIN_ASPECT_RATIO = MAX_FLAG << 2,
-			FLAG_ANTI_ALIAS = MAX_FLAG << 3,
-			FLAG_USE_ORIGINAL_COLORS = MAX_FLAG << 4;
-
-	/** The last rendered <code>RenderedImage</code> */
-	private RenderedImage lastRenderedImage = null;
-
-	/**
-	 * Accessor to determine if the rendered image will be anti-aliased (if
-	 * possible).
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if anti aliasing is
-	 *         on, <code>false</code> otherwise.
-	 */
-	public boolean isAntiAlias() {
-		return getFlag(FLAG_ANTI_ALIAS);
-	}
-
-	/**
-	 * Sets a property to determine if the rendered image will be anti-aliased
-	 * (if possible).
-	 * 
-	 * @param antiAlias
-	 *            <code>boolean</code> <code>true</code> if anti-aliasing is
-	 *            to be turned on, <code>false</code> otherwise
-	 */
-	public void setAntiAlias(boolean antiAlias) {
-		setFlag(FLAG_ANTI_ALIAS, antiAlias);
-		invalidate();
-	}
-
-	/**
-	 * Accessor to determine if the rendered image will respect the original
-	 * aspect ratio of the default image when resized.
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if maintain aspect
-	 *         ratio is on, <code>false</code> otherwise.
-	 */
-	public boolean isMaintainAspectRatio() {
-		return getFlag(FLAG_MAINTAIN_ASPECT_RATIO);
-	}
-
-	/**
-	 * Sets a property to determine if the rendered image will respect the
-	 * original aspect ratio of the default image when resized.
-	 * 
-	 * @param maintainAspectRatio
-	 *            <code>boolean</code> <code>true</code> if maintain aspect
-	 *            ratio is to be turned on, <code>false</code> otherwise
-	 */
-	public void setMaintainAspectRatio(boolean maintainAspectRatio) {
-		setFlag(FLAG_MAINTAIN_ASPECT_RATIO, maintainAspectRatio);
-		invalidate();
-	}
-
-	/**
-	 * @param img
-	 *            the <code>Image</code> to render
-	 */
-	public ScalableImageFigure(Image img) {
-		ImageLoader imageLoader = new ImageLoader();
-		ByteArrayOutputStream byteOS = new ByteArrayOutputStream();
-		imageLoader.data = new ImageData[] {img.getImageData()};
-		imageLoader.logicalScreenHeight = img.getBounds().width;
-		imageLoader.logicalScreenHeight = img.getBounds().height;
-		imageLoader.save(byteOS, SWT.IMAGE_BMP);
-		this.lastRenderedImage = RenderedImageFactory.getInstance(byteOS
-			.toByteArray());
-
-		setFlag(FLAG_USE_DEFAULT_IMAGESIZE, false);
-		setFlag(FLAG_USE_ORIGINAL_COLORS, false);
-		setFlag(FLAG_MAINTAIN_ASPECT_RATIO, true);
-		setFlag(FLAG_ANTI_ALIAS, true);
-	}
-
-	/**
-	 * @param renderedImage
-	 */
-	public ScalableImageFigure(RenderedImage renderedImage) {
-		this(renderedImage, false, false, true);
-	}
-
-	/**
-	 * Constructor for meta image sources.
-	 * 
-	 * @param renderedImage
-	 *            the <code>RenderedImage</code> that is used for rendering
-	 *            the image.
-	 */
-	public ScalableImageFigure(RenderedImage renderedImage, boolean antiAlias) {
-		this(renderedImage, false, false, antiAlias);
-	}
-
-	/**
-	 * Constructor for meta image sources.
-	 * 
-	 * @param renderedImage
-	 *            the <code>RenderedImage</code> that is used for rendering
-	 *            the image.
-	 * @param useDefaultImageSize
-	 *            <code>boolean</code> indicating whether to initialize the
-	 *            preferred size with the default image size. Otherwise, a set
-	 *            default will be used instead.
-	 * @param useOriginalColors
-	 *            <code>boolean</code> indicating whether to use the original
-	 *            colors of the <code>RenderedImage</code> or to replace black
-	 *            with outline color and white with the fill color.
-	 */
-	public ScalableImageFigure(RenderedImage renderedImage,
-			boolean useDefaultImageSize, boolean useOriginalColors,
-			boolean antiAlias) {
-		lastRenderedImage = renderedImage;
-		setFlag(FLAG_USE_DEFAULT_IMAGESIZE, useDefaultImageSize);
-		setFlag(FLAG_USE_ORIGINAL_COLORS, useOriginalColors);
-		setFlag(FLAG_MAINTAIN_ASPECT_RATIO, true);
-		setFlag(FLAG_ANTI_ALIAS, antiAlias);
-	}
-
-	/**
-	 * Sets the preferred size of the image figure.
-	 * 
-	 * @param w
-	 *            the preferred width of the image
-	 * @param h
-	 *            the preferred height of the image
-	 */
-	public void setPreferredImageSize(int w, int h) {
-		preferredSize = new Dimension(w, h);
-	}
-
-	/**
-	 * Returns the size set specified by setPreferredImageSize() or the size
-	 * specified by the image. In the case of meta-images a preferred size of
-	 * 32x32 is returned.
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		if (preferredSize.height == -1 && preferredSize.width == -1) {
-			int extent = MapModeUtil.getMapMode(this).DPtoLP(32);
-			preferredSize = new Dimension(extent, extent);
-			if (getFlag(FLAG_USE_DEFAULT_IMAGESIZE)) {
-				if (getRenderedImage() != null) {
-					setRenderedImage(getRenderedImage(new Dimension(0, 0)));
-					Image swtImage = null;
-					if (getRenderedImage() != null)
-						swtImage = getRenderedImage().getSWTImage();
-					if (swtImage != null) {
-						org.eclipse.swt.graphics.Rectangle imgRect = swtImage
-							.getBounds();
-						preferredSize.width = MapModeUtil.getMapMode(this)
-							.DPtoLP(imgRect.width);
-						preferredSize.height = MapModeUtil.getMapMode(this)
-							.DPtoLP(imgRect.height);
-					}
-				}
-			}
-		}
-		return preferredSize;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Figure#setBounds(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	public void setBounds(Rectangle rect) {
-		Dimension devDim = new Dimension(rect.getSize());
-		MapModeUtil.getMapMode(this).LPtoDP(devDim);
-		setRenderedImage(getRenderedImage(devDim));
-
-		super.setBounds(rect);
-	}
-
-	/**
-	 * Override to return an image that is scaled to fit the bounds of the
-	 * figure.
-	 */
-	public Image getImage() {
-		if (getRenderedImage() == null)
-			return null;
-
-		return getRenderedImage().getSWTImage();
-	}
-
-	/**
-	 * Gets the <code>RenderedImage</code> that is the for the specified
-	 * <code>Dimension</code>
-	 * 
-	 * @param dim
-	 * @return the <code>RenderedImage</code>
-	 */
-private RenderedImage getRenderedImage(Dimension dim) {
-		Color fill = getBackgroundColor();
-		Color outline = getForegroundColor();
-		RenderInfo newRenderInfo = getRenderedImage().getRenderInfo();
-		newRenderInfo.setValues(dim.width,
-			dim.height,  
-			isMaintainAspectRatio(), // maintain aspect ratio
-			isAntiAlias(),
-			useOriginalColors() ? (RGB)null
-				: new RGB(fill.getRed(), fill.getGreen(), fill.getBlue()),
-			useOriginalColors() ? (RGB)null
-				: new RGB(outline.getRed(), outline.getGreen(), outline.getBlue())); // antialias
-
-		RenderedImage newRenderedImage = getRenderedImage()
-			.getNewRenderedImage(newRenderInfo);
-		return newRenderedImage;
-	}
-	/**
-	 * @return a <code>boolean</code> <code>true</code> if the original
-	 *         colors of the image should be used for rendering, or
-	 *         <code>false</code> indicates that black and white colors can
-	 *         replaced by the specified outline and fill colors respectively of
-	 *         the <code>RenderInfo</code>.
-	 */
-	public boolean useOriginalColors() {
-		return getFlag(FLAG_USE_ORIGINAL_COLORS);
-	}
-
-	/**
-	 * If the rendering is occuring on a separate thread, this method is a hook to draw a temporary
-	 * image onto the drawing surface.
-	 * 
-	 * @param g the <code>Graphics</code> object to paint the temporary image to
-	 */
-	protected void paintFigureWhileRendering(Graphics g) {
-		Rectangle area = getClientArea().getCopy();
-		
-		g.pushState();
-		g.setBackgroundColor(ColorConstants.white);
-		g.fillRectangle(area.x, area.y, area.width - 1, area.height - 1);
-		g.setForegroundColor(ColorConstants.red);
-		g.drawRectangle(area.x, area.y, area.width - 1, area.height - 1);
-		g.setLineStyle(SWT.LINE_DOT);
-		g.drawLine(area.x, area.y, area.x + area.width, area.y
-			+ area.height);
-		g.drawLine(area.x + area.width, area.y, area.x, area.y
-			+ area.height);
-		g.popState();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		Rectangle area = getClientArea().getCopy();
-
-		RenderInfo rndInfo = getRenderedImage().getRenderInfo();
-		if (!useOriginalColors()) {
-			if (rndInfo.getBackgroundColor() != getBackgroundColor().getRGB() ||
-				rndInfo.getForegroundColor() != getForegroundColor().getRGB()) {
-				rndInfo.setValues(rndInfo.getWidth(), rndInfo.getHeight(), 
-						rndInfo.shouldMaintainAspectRatio(), 
-						rndInfo.shouldAntiAlias(), getBackgroundColor().getRGB(), getForegroundColor().getRGB());
-				setRenderedImage(getRenderedImage().getNewRenderedImage(rndInfo));
-			}
-		}
-		
-		setRenderedImage(RenderHelper.getInstance(
-			DiagramMapModeUtil.getScale(MapModeUtil.getMapMode(this)), false,
-			false, null).drawRenderedImage(graphics, getRenderedImage(), area,
-			renderingListener));
-	}
-	
-	
-
-	/**
-	 * Gets the <code>RenderedImage</code> that is being displayed by this
-	 * figure.
-	 * 
-	 * @return <code>RenderedImage</code> that is being displayed by this
-	 *         figure.
-	 */
-	public RenderedImage getRenderedImage() {
-		return lastRenderedImage;
-	}
-
-	/**
-	 * Sets the <code>RenderedImage</code> that is to be displayed by this
-	 * figure
-	 * 
-	 * @param the
-	 *            <code>RenderedImage</code> that is to being displayed by
-	 *            this figure
-	 */
-	public void setRenderedImage(RenderedImage renderedImage) {
-		this.lastRenderedImage = renderedImage;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/package.html
deleted file mode 100644
index e13120c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-All <code>IFigure</code> implementors that depend on the <code>RenderedImage</code> interface reside in this 
-package.  The <code>ScaleableImageFigure</code> class is example that extends from <code>ImageFigure</code>
-to allow rendering of any <code>RenderedImage</code> object.
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/AbstractRenderedImage.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/AbstractRenderedImage.java
deleted file mode 100644
index 192ed87..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/AbstractRenderedImage.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-import java.security.InvalidParameterException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory.RenderedImageKey;
-import org.eclipse.swt.graphics.Image;
-
-/**
-* Abstract class for RenderedImage interface.
-*  
-* @author sshaw
-* @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
-*/
-abstract public class AbstractRenderedImage implements RenderedImage {
-	
-	/**
-	 * Constructor for AbstractRenderedImage
-	 * 
-	 * @param buffer
-	 *            byte[] array containing an cached SVG image file.
-	 * @param key
-	 *            ImageKey instance which is unique for the byte array.
-	 */
-	public AbstractRenderedImage(final byte[] buff, RenderedImageKey key) { 
-		if (buff == null || key == null)
-			throw new InvalidParameterException();
-
-		this.buffer = buff;
-		this.key = key;
-	}
-
-	private byte[] buffer = null;
-	private RenderedImageKey key = null;
-	private Image img = null;
-	
-	/**
-	 * @return Returns the buffer.
-	 */
-	public byte[] getBuffer() {
-		return buffer;
-	}
-	
-	/**
-	 * @return Returns the key.
-	 */
-	public RenderedImageKey getKey() {
-		return new RenderedImageKey(key, key.getChecksum(), key.getExtraData());
-	}
-	
-	/**
-	 * Overridden so that image can be disposed.
-	 * 
-	 * @see java.lang.Object#finalize()
-	 */
-	protected void finalize() throws Throwable {
-		if (img != null) {
-			img.dispose();
-			img = null;
-		}
-		key = null;
-
-		super.finalize();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.render.RenderedImage#getRenderInfo()
-	 */
-	public RenderInfo getRenderInfo() {
-		return getKey();
-	} 
-
-	/**
-     *Implementation of the ResizableImage interface that will allow the SVG
-     * to be re-rendered into a different ImageSize.
-     * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage#getNewRenderedImage(org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo)
-	 */
-	public RenderedImage getNewRenderedImage(RenderInfo info) {
-		if (!getRenderInfo().equals(info)) { 
-			RenderedImage rndImg = RenderedImageFactory.getRelatedInstance(this, info);
-			if (rndImg != null) {
-				return rndImg;
-			} else {
-				return RenderedImageFactory.getInstance(getBuffer(), info);
-			}
-		}
-
-		return this;
-	}
-
-	/**
-	 * @return <code>true</code> if image has been fully rendered, <code>false</code> if
-	 * it needs to be rendered.
-	 */
-	public boolean isRendered() {
-		if (img != null)
-			return true;
-		
-		return false;
-	}
-
-	/**
-     * Accessor for retrieving the default image for the rendered SVG data.
-     * This method will render the image if it doesn't exist yet. This allows
-     * for "on-demand" loading. If no-one accesses the image, then it will not
-     * be rendered.
-     * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage#getSWTImage()
-	 */
-	synchronized final public Image getSWTImage() {
-		if (img != null)
-			return img;
-
-		img = renderImage();
-
-		return img;
-	}
-	
-	/**
-	 * @return the new <code>Image</code> rendered to the specification of the
-	 * <code>RenderInfo</code> structure stored with the this <code>RenderedImage</code>
-	 */
-	abstract protected Image renderImage();
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(Image.class)) {
-			return getSWTImage();
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderDebugOptions.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderDebugOptions.java
deleted file mode 100644
index 654b5c1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderDebugOptions.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
- *
- */
-public final class Draw2dRenderDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private Draw2dRenderDebugOptions() {
-		// empty constructor
-	}
-
-	public static final String DEBUG = Draw2dRenderPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-    public static final String DND = DEBUG + "/dnd/tracing"; //$NON-NLS-1$  
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderPlugin.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderPlugin.java
deleted file mode 100644
index 90a706a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderPlugin.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author melaasar
- */
-public class Draw2dRenderPlugin
-	extends AbstractUIPlugin {
-
-	/** the plugin singleton */
-	private static Plugin singleton;
-
-	/**
-	 * Method getInstance.
-	 * 
-	 * @return Plugin
-	 */
-	public static Plugin getInstance() {
-		return singleton;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-	public Draw2dRenderPlugin() {
-		super();
-		if (singleton == null)
-			singleton = this;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderStatusCodes.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderStatusCodes.java
deleted file mode 100644
index 34e1afd..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderStatusCodes.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
- *
- */
-public final class Draw2dRenderStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private Draw2dRenderStatusCodes() {
-		// empty constructor
-	}
-
-	public static final int OK = 0;
-
-    /**
-     * Status code indicating that an error occurred while generating an
-     * SVG document file
-     */
-    public static final int SVG_GENERATION_FAILURE = 2;
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/DrawableRenderedImage.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/DrawableRenderedImage.java
deleted file mode 100644
index a94d723..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/DrawableRenderedImage.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
- *
- * Interface for drawing a rendered image.
- */
-public interface DrawableRenderedImage {
-	
-	/**
-	 * @return <code>true</code> if the implementor can support a delayed rendering
-	 * of the <code>RenderedImage</code>.  Implementors should return <code>false</code>
-	 * if they need the rendering to occur immediately.
-	 */
-	public boolean shouldAllowDelayRender();
-	
-	/**
-	 * @return <code>Dimension<code> that is the maximum size in pixels
-	 * that a rendered image will be rendered at.  This is useful to 
-	 * ensure adequate performance for display.  If <code>null</code>
-	 * is returned, then this means no maximum render size is imposed.
-	 */
-	public Dimension getMaximumRenderSize();
-	
-	/**
-	 * Draws the given RenderedImage at the location (x,y) with a
-	 * width and height.
-	 * @param srcImage the Image
-	 * @param area the <code>Rectangle</code> in logical units to draw the image in
-	 * @return the <code>RenderedImage</code> that was finally rendered to the device
-	 */
-	public abstract RenderedImage drawRenderedImage(
-		RenderedImage srcImage, Rectangle area, RenderingListener listener);
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderHelper.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderHelper.java
deleted file mode 100644
index 6e811ec..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderHelper.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author sshaw
- */
-public class RenderHelper {
-
-	double scale = 1.0;
-
-	boolean scaleTargetCoordinates = true;
-
-	boolean allowDelayRender = false;
-	
-	private Dimension maximumRenderSize = null;
-
-	private RenderHelper(double scale, boolean scaleTargetCoordinates,
-			boolean allowDelayRender, Dimension maximumRenderSize) {
-		super();
-		this.scale = scale;
-		this.allowDelayRender = allowDelayRender;
-		this.scaleTargetCoordinates = scaleTargetCoordinates;
-		this.maximumRenderSize = maximumRenderSize;
-	}
-
-	static public RenderHelper getInstance(double scale,
-			boolean scaleDrawable, boolean allowDelayRender, Dimension maximumRenderSize) {
-		return new RenderHelper(scale, scaleDrawable,
-			allowDelayRender, maximumRenderSize);
-	}
-
-	private boolean shouldScaleTargetCoordinates() {
-		return scaleTargetCoordinates;
-	}
-
-	private boolean shouldAllowDelayRender() {
-		return allowDelayRender;
-	}
-
-	private double getScale() {
-		return scale;
-	}
-	
-	/**
-	 * @return Returns the maximumRenderSize.
-	 */
-	private Dimension getMaximumRenderSize() {
-		return maximumRenderSize;
-	}
-
-	private static Map threadMap = new HashMap();
-	
-	/**
-	 * Allows for asynchronous execution of the rendering. The
-	 * <code>RenderingListener</code
-	 * will be notified when the rendering operation has been completed.
-	 * 
-	 * @param srcImage the <code>RenderedImage that is to be rendered into an <code>Image</code>
-	 * @param listener the <code>RenderingListener</code
-	 * that be notified when the rendering operation has been completed.
-	 * @return <code>true</code> if rendering is already completed and clients can simply call
-	 * <code>getSWTImage</code> to retrieve image immediately, <code>false</code>
-	 * if it has to be calculated and has spawned a thread to do the rendering.  After the rendering
-	 * is completed the <code>RenderingListener</code> listener will be notified
-	 */
-	private boolean renderSWTImage(RenderedImage srcImage,
-			final RenderingListener listener) {
-		if (srcImage.isRendered())
-			return true;
-
-		Thread existingThread = (Thread)threadMap.get(listener);
-		if (existingThread != null) {
-			existingThread.interrupt();
-			threadMap.remove(listener);
-		}
-		
-		final RenderedImage rndImg = srcImage;
-		final Thread renderThread = new Thread(new Runnable() {
-			public void run() {
-				
-				Image img = null;
-				try {
-					img = rndImg.getSWTImage();
-				} catch (RuntimeException e) {
-					threadMap.remove(listener);
-					throw e;
-				}
-				
-				if (img != null)
-					listener.imageRendered(rndImg);
-					threadMap.remove(listener);
-			}
-		});
-		
-		threadMap.put(listener, renderThread);
-		renderThread.start();
-
-		return false;
-	}
-
-	private static final int RENDER_TOLERANCE = 5;
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#drawRenderedImage(org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage,
-	 *      int, int, int, int)
-	 */
-	public RenderedImage drawRenderedImage(Graphics g, RenderedImage srcImage,
-			Rectangle rect, RenderingListener listener) {
-		Rectangle targetRect = rect.getCopy();
-		if (shouldScaleTargetCoordinates())
-			targetRect.performScale(getScale());
-		
-		if (g instanceof DrawableRenderedImage) {
-			return ((DrawableRenderedImage) g).drawRenderedImage(srcImage, targetRect,
-				listener);
-		} else {
-			Rectangle sourceRect = rect.getCopy();
-			sourceRect.performScale(getScale());
-			
-			RenderedImage trgImage = calculateTargetImage(srcImage, sourceRect);
-			
-			if (!shouldAllowDelayRender() || renderSWTImage(trgImage, listener)) {
-				Image swtImg = trgImage.getSWTImage();
-				if (swtImg != null) {
-					org.eclipse.swt.graphics.Rectangle imgBox = swtImg.getBounds();
-					g.drawImage(swtImg, 0, 0, imgBox.width, imgBox.height, 
-						targetRect.x, targetRect.y, targetRect.width, targetRect.height);
-				}
-			} else {
-				// check if the srcImage is rendered and if so scale it's image for
-				// display
-				if (srcImage.isRendered()) {
-					Image swtImg = srcImage.getSWTImage();
-					
-					org.eclipse.swt.graphics.Rectangle imgBox = swtImg.getBounds();
-					g.drawImage(swtImg, 0, 0, imgBox.width, imgBox.height, 
-						targetRect.x, targetRect.y, targetRect.width, targetRect.height);
-					return srcImage;
-				} 
-				else {
-					listener.paintFigureWhileRendering(g);
-				}
-			}
-
-			return trgImage;
-		}
-	}
-
-	/**
-	 * @param srcImage
-	 * @param sourceRect
-	 * @return
-	 */
-	private RenderedImage calculateTargetImage(RenderedImage srcImage, Rectangle sourceRect) {
-		RenderedImage trgImage = srcImage;
-		RenderInfo info = trgImage.getRenderInfo();
-		// Account for rounding errors - if the size of the image and source rectangle
-		// are within a tolerance, don't re-render the image.
-		if (Math.abs(sourceRect.width - info.getWidth()) > RENDER_TOLERANCE ||
-			Math.abs(sourceRect.height - info.getHeight()) > RENDER_TOLERANCE) {
-			info.setValues(sourceRect.width, sourceRect.height, info.shouldMaintainAspectRatio(), info
-				.shouldAntiAlias(), info.getBackgroundColor(), info
-				.getForegroundColor());
-
-			trgImage = srcImage.getNewRenderedImage(info);
-			info = trgImage.getRenderInfo();
-		}
-		
-		// test for maximum rendering size
-		if (getMaximumRenderSize() == null)
-			return trgImage;
-		
-		if (sourceRect.width > getMaximumRenderSize().width || 
-			sourceRect.height > getMaximumRenderSize().height) {
-			if (sourceRect.width > getMaximumRenderSize().width) {
-				double ratio = (double)sourceRect.height / sourceRect.width;
-				sourceRect.width = getMaximumRenderSize().width;
-				sourceRect.height = (int)Math.round(sourceRect.width * ratio);
-			}
-			
-			if (sourceRect.height > getMaximumRenderSize().height) {
-				double ratio = (double)sourceRect.width / sourceRect.height;
-				sourceRect.height = getMaximumRenderSize().height;
-				sourceRect.width = (int)Math.round(sourceRect.height * ratio);
-			}
-			
-			info.setValues(sourceRect.width, sourceRect.height, info.shouldMaintainAspectRatio(), info
-				.shouldAntiAlias(), info.getBackgroundColor(), info
-				.getForegroundColor());
-
-			trgImage = srcImage.getNewRenderedImage(info);
-			info = trgImage.getRenderInfo();
-		}
-		
-		return trgImage;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderedImageDescriptor.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderedImageDescriptor.java
deleted file mode 100644
index 01c218f..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderedImageDescriptor.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-
-
-/**
- * Image Descriptor class that encapsulates an RenderedImage object.
- *
- * @author sshaw
- */
-public class RenderedImageDescriptor extends ImageDescriptor {
-	
-	/**
-	 * Creates and returns a new image descriptor from a RenderedImage.
-	 *
-	 * @param renderedImage RenderedImage to be encapsulated with-in the image descriptor.
-	 * @return a new image descriptor
-	 */
-	public static ImageDescriptor createFromRenderedImage(RenderedImage renderedImage) {
-		return new RenderedImageDescriptor(renderedImage);
-	}
-	
-	private RenderedImage renderedImage;
-	
-	private RenderedImageDescriptor(RenderedImage renderedImage) {
-		this.renderedImage = renderedImage;
-	}
-	
-	/* (
-	 * non-Javadoc)
-	 * @see org.eclipse.jface.resource.ImageDescriptor#getImageData()
-	 */
-	public ImageData getImageData() {
-		Image image = renderedImage.getSWTImage();
-		return image.getImageData();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderingListener.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderingListener.java
deleted file mode 100644
index f39fb1e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderingListener.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-
-/**
- * A listener interface for receiving notification that an RenderedImage has completed 
- * rendering.
- */
-public interface RenderingListener {
-
-	/**
-	 * While the rendering is occuring on a separate thread, this method is a hook to draw a temporary
-	 * image onto the drawing surface.
-	 * 
-	 * @param g the <code>Graphics</code> object to paint the temporary image to
-	 */
-	public void paintFigureWhileRendering(Graphics g);
-	
-	/**
-	 * Called when the given <code>RenderedImage</code> has completed rendering
-	 * to the swt image.
-	 * 
-	 * @param source The <code>RenderedImage</code> that was being rendered.
-	 */
-	public void imageRendered(RenderedImage rndImg);
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderInfoImpl.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderInfoImpl.java
deleted file mode 100644
index 910b455..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderInfoImpl.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
- * 
- * Contains information needed by RenderedImage to perform the rendering of the
- * graphics data.
- */
-class RenderInfoImpl
-	implements RenderInfo {
-
-	private boolean maintainAspectRatio;
-
-	private boolean antialias;
-
-	private int width;
-
-	private int height;
-
-	private RGB fill = null;
-
-	private RGB outline = null;
-
-	/**
-	 * getWidth Accessor method to return the width of the rendered image.
-	 * 
-	 * @return int width of the rendered image.
-	 */
-	public int getWidth() {
-		return width;
-	}
-
-	/**
-	 * getHeight Accessor method to return the height of the rendered image.
-	 * 
-	 * @return int height of the rendered image.
-	 */
-	public int getHeight() {
-		return height;
-	}
-
-	/**
-	 * shouldMaintainAspectRatio Accessor method to return whether or not the
-	 * aspect ratio is maintained.
-	 * 
-	 * @return boolean true if aspect ratio of original vector file is
-	 *         maintained, false otherwise.
-	 */
-	public boolean shouldMaintainAspectRatio() {
-		return maintainAspectRatio;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.render.RenderInfo#shouldAntiAlias()
-	 */
-	public boolean shouldAntiAlias() {
-		return antialias;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo#getBackgroundColor()
-	 */
-	public RGB getBackgroundColor() {
-		if (fill == null)
-			return null;
-		return new RGB(fill.red, fill.green, fill.blue);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo#getForegroundColor()
-	 */
-	public RGB getForegroundColor() {
-		if (outline == null)
-			return null;
-		return new RGB(outline.red, outline.green, outline.blue);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo#setValues(int, int, boolean, boolean, org.eclipse.swt.graphics.RGB, org.eclipse.swt.graphics.RGB)
-	 */
-	public void setValues(int width, int height,
-			boolean maintainAspectRatio, boolean antialias, RGB fill, RGB outline) {
-		this.width = width;
-		this.height = height;
-		this.fill = fill == null ? null : new RGB(fill.red, fill.green, fill.blue);
-		this.outline = outline == null ? null : new RGB(outline.red, outline.green, outline.blue);
-		this.maintainAspectRatio = maintainAspectRatio;
-		this.antialias = antialias;
-	}
-
-	/**
-	 * Default Constructor for the SVGInfo class
-	 */
-	public RenderInfoImpl() {
-		super();
-
-		this.width = 0;
-		this.height = 0;
-		this.fill = null;
-		this.outline = null;
-		this.maintainAspectRatio = true;
-		this.antialias = true;
-	}
-
-	/**
-	 * Copy Constructor for the SVGInfo class
-	 */
-	public RenderInfoImpl(RenderInfo info) {
-		super();
-
-		this.width = info.getWidth();
-		this.height = info.getHeight();
-		this.fill = info.getBackgroundColor();
-		this.outline = info.getForegroundColor();
-		this.maintainAspectRatio = info.shouldMaintainAspectRatio();
-		this.antialias = info.shouldAntiAlias();
-	}
-
-	/**
-	 * Retrieves a hash code value for this output operation. This method is
-	 * supported for the benefit of hashtables such as those provided by
-	 * <code>java.util.Hashtable</code>.
-	 * 
-	 * @return A hash code value for this output operation.
-	 * 
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		int hashCode = (new Integer(width)).hashCode();
-		hashCode = hashCode + (new Integer(height)).hashCode();
-		hashCode = hashCode + (Boolean.valueOf(maintainAspectRatio)).hashCode();
-		hashCode = hashCode + (Boolean.valueOf(antialias)).hashCode();
-		if (fill != null)
-			hashCode = hashCode + fill.hashCode();
-		if (outline != null)
-			hashCode = hashCode + outline.hashCode();
-		return hashCode;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {
-
-		RenderInfoImpl info = null;
-		if (object instanceof RenderInfoImpl) {
-			info = (RenderInfoImpl) object;
-		}
-
-		if (info != null
-			&& (getWidth() == info.getWidth()
-				&& getHeight() == info.getHeight()
-				&& shouldMaintainAspectRatio() == info
-					.shouldMaintainAspectRatio() && shouldAntiAlias() == info
-				.shouldAntiAlias())) {
-
-			if (getBackgroundColor() == null) {
-				if (info.getBackgroundColor() != null)
-					return false;
-			} else if (!getBackgroundColor().equals(info.getBackgroundColor()))
-				return false;
-
-			if (getForegroundColor() == null) {
-				if (info.getForegroundColor() != null)
-					return false;
-			} else if (!getForegroundColor().equals(info.getForegroundColor()))
-				return false;
-
-			return true;
-		}
-
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderedImageKey.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderedImageKey.java
deleted file mode 100644
index 3ac3807..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderedImageKey.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
- *
- * This class defines the unique key used to get the appropriate RenderedImage from the map.
- */
-public final class RenderedImageKey extends RenderInfoImpl {
-
-	public RenderedImageKey() {
-		super();
-	}
-
-	public RenderedImageKey(RenderInfo info) {
-		this(info, 0, null);
-	}
-
-	public RenderedImageKey(RenderInfo info, long checksum, Object extraData) {
-		super(info);
-		this.checksum = checksum;
-		this.extraData = extraData;
-	}
-
-	private long checksum = 0;
-	private Object extraData = null;
-
-	/**
-	 * @return Long value that is the checksum
-	 */
-	public long getChecksum() {
-		return checksum;
-	}
-
-	/**
-	 * @return <code>Object</code> that is extra data to be cached for the rendered image.  The
-	 * extra data is always unique with respect to the checksum so it doesn't have to be
-	 * considered in the hashcode calculation.
-	 */
-	public Object getExtraData() {
-		return extraData;
-	}
-
-	/**
-	 * Sets the extra data to bee cached for the rendered image.  The
-	 * extra data should always unique with respect to the checksum so it doesn't have to be
-	 * considered in the hashcode calculation.
-	 * @param extraData
-	 */
-	public void setExtraData(Object extraData) {
-		this.extraData = extraData;
-	}
-
-	/**
-	 * Retrieves a hash code value for this output operation. This method is 
-	 * supported for the benefit of hashtables such as those provided by 
-	 * <code>java.util.Hashtable</code>.
-	 * 
-	 * @return A hash code value for this output operation.
-	 * 
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		int hashCode = new Long(getChecksum()).hashCode();
-		hashCode += super.hashCode();
-
-		return hashCode;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {
-
-		RenderedImageKey imagekey = null;
-		if (object instanceof RenderedImageKey) {
-			imagekey = (RenderedImageKey) object;
-		}
-
-		if (imagekey != null
-			&& getChecksum() == imagekey.getChecksum()
-			&& super.equals(imagekey)) {
-			return true;
-		}
-
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/package.html
deleted file mode 100644
index 17a73e9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedMapModeGraphics.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedMapModeGraphics.java
deleted file mode 100644
index 2cd9132..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedMapModeGraphics.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.MapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.DiagramMapModeUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener;
-
-/**
- * Overridden to implement DrawableRenderedImage interface
- * 
- * @author sshaw
- */
-public class RenderedMapModeGraphics
-	extends MapModeGraphics
-	implements DrawableRenderedImage {
-
-	boolean allowDelayRender = false;
-	Dimension maximumRenderSize = null;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#allowDelayRender()
-	 */
-	public boolean shouldAllowDelayRender() {
-		return allowDelayRender;
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param g
-	 *            <code>Graphics</code> element to delegate render to
-	 * @param mm
-	 *            <code>IMapMode</code> to retrieve the scale factor from.
-	 */
-	public RenderedMapModeGraphics(Graphics g, IMapMode mm) {
-		this(g, mm, false, null);
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param g
-	 *            <code>Graphics</code> element to delegate render to
-	 * @param mm
-	 *            <code>IMapMode</code> to retrieve the scale factor from.
-	 * @param allowDelayRender
-	 */
-	public RenderedMapModeGraphics(Graphics g, IMapMode mm,
-			boolean allowDelayRender, Dimension maximumRenderSize) {
-		super(g, mm);
-		this.allowDelayRender = allowDelayRender;
-		this.maximumRenderSize = maximumRenderSize;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#drawRenderedImage(org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage,
-	 *      org.eclipse.draw2d.geometry.Rectangle,
-	 *      org.eclipse.gmf.runtime.draw2d.ui.render.RenderingListener)
-	 */
-	public RenderedImage drawRenderedImage(RenderedImage srcImage,
-			Rectangle rect, RenderingListener listener) {
-		return RenderHelper.getInstance(
-			DiagramMapModeUtil.getScale(getMapMode()), true, shouldAllowDelayRender(), getMaximumRenderSize()).drawRenderedImage(getGraphics(),
-			srcImage, rect, listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#getMaximumRenderSize()
-	 */
-	public Dimension getMaximumRenderSize() {
-		// TODO Auto-generated method stub
-		return maximumRenderSize;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedPrinterGraphics.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedPrinterGraphics.java
deleted file mode 100644
index 47994b5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedPrinterGraphics.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.PrinterGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.printing.Printer;
-
-/**
- * Created on May 8, 2003
- *
- * @author sshaw
- * @version 1.0
- * 
- * Overridden to handle printing problem with transparencies.  Specifically,
- * dropshadows print with as a black bar (RATLC00513998)
- */
-public class RenderedPrinterGraphics extends PrinterGraphics 
-								implements DrawableRenderedImage {
-	
-    /* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#allowDelayRender()
-	 */
-	public boolean shouldAllowDelayRender() {
-		return false;
-	}
-	
-    /**
-	* Creates a new PrinterGraphics with Graphics g, using Printer p
-	* @param g Graphics object to draw with
-	* @param p Printer to print to
-	* @param roundFonts the <code>boolean</code> if <code>true</code> indicates that fonts 
-	* should be rounded to account for printer font scaling errors.
-	*/
-	public RenderedPrinterGraphics(Graphics g, Printer p, boolean roundFonts) {
-		super(g, p, roundFonts);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#drawRenderedImage(org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage, org.eclipse.draw2d.geometry.Rectangle, org.eclipse.gmf.runtime.draw2d.ui.render.RenderingListener)
-	 */
-	public RenderedImage drawRenderedImage(RenderedImage srcImage, Rectangle rect, RenderingListener listener) {
-        int nNewWidth = (int)Math.round(rect.width * getPrintScale());
-        int nNewHeight = (int)Math.round(rect.height * getPrintScale());
-            
-        RenderInfo info = srcImage.getRenderInfo();
-        info.setValues(nNewWidth, nNewHeight, 
-                        info.shouldMaintainAspectRatio(), false, 
-                        info.getBackgroundColor(), info.getForegroundColor());
-            
-        RenderedImage img = srcImage.getNewRenderedImage(info);
-        
-        Image swtImg = null;
-        try {
-            swtImg = img.getSWTImage();
-        }
-        catch (OutOfMemoryError e) {
-            // don't do any scaling and rerender with anti-aliasing on
-            nNewWidth = rect.width;
-            nNewHeight = rect.height;
-            info.setValues(nNewWidth, nNewHeight, 
-                info.shouldMaintainAspectRatio(), true, 
-                info.getBackgroundColor(), info.getForegroundColor());
-            img = srcImage.getNewRenderedImage(info);
-            swtImg = img.getSWTImage();
-        }
-        catch (Exception ex) {
-            // don't do any scaling and rerender with anti-aliasing on
-            nNewWidth = rect.width;
-            nNewHeight = rect.height;
-            info.setValues(nNewWidth, nNewHeight, 
-                info.shouldMaintainAspectRatio(), true, 
-                info.getBackgroundColor(), info.getForegroundColor());
-            img = srcImage.getNewRenderedImage(info);
-            swtImg = img.getSWTImage();
-        }
-        
-        drawImage(swtImg, 0, 0, nNewWidth, nNewHeight, 
-                rect.x, rect.y, rect.width, rect.height);
-        
-        return img;
-	}
-	
-    /* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#getMaximumRenderSize()
-	 */
-	public Dimension getMaximumRenderSize() {
-        return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedScaledGraphics.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedScaledGraphics.java
deleted file mode 100644
index 71df202..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedScaledGraphics.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
- * 
- * Subclass to allow implementation of the DrawableRenderedImage interface
- */
-public class RenderedScaledGraphics
-	extends org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics
-	implements DrawableRenderedImage {
-
-	boolean allowDelayRender = false;
-	Dimension maximumRenderSize = null;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#allowDelayRender()
-	 */
-	public boolean shouldAllowDelayRender() {
-		return allowDelayRender;
-	}
-
-	/**
-	 * Constructs a new ScaledGraphics based on the given Graphics object.
-	 * 
-	 * @param g
-	 *            the base graphics object
-	 */
-	public RenderedScaledGraphics(Graphics g) {
-		this(g, false, null);
-	}
-
-	/**
-	 * Constructs a new ScaledGraphics based on the given Graphics object.
-	 * 
-	 * @param g
-	 *            the base graphics object
-	 * @param allowDelayRender
-	 */
-	public RenderedScaledGraphics(Graphics g, boolean allowDelayRender, Dimension maximumRenderSize) {
-		super(g);
-		this.allowDelayRender = allowDelayRender;
-		this.maximumRenderSize = maximumRenderSize;
-	}
-
-	private double scale = 1.0;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#scale(double)
-	 */
-	public void scale(double amount) {
-		scale = amount;
-		super.scale(amount);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#drawRenderedImage(org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage,
-	 *      org.eclipse.draw2d.geometry.Rectangle,
-	 *      org.eclipse.gmf.runtime.draw2d.ui.render.RenderingListener)
-	 */
-	public RenderedImage drawRenderedImage(RenderedImage srcImage,
-			Rectangle rect, RenderingListener listener) {
-		return RenderHelper.getInstance(scale, true, shouldAllowDelayRender(), getMaximumRenderSize())
-			.drawRenderedImage(getGraphics(), srcImage, rect, listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage#getMaximumRenderSize()
-	 */
-	public Dimension getMaximumRenderSize() {
-		// TODO Auto-generated method stub
-		return maximumRenderSize;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/package.html
deleted file mode 100644
index 17a73e9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/image/ImageRenderedImage.java b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/image/ImageRenderedImage.java
deleted file mode 100644
index c2bf9dd..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/image/ImageRenderedImage.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.internal.image;
-
-import java.io.ByteArrayInputStream;
-import java.security.InvalidParameterException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.AbstractRenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.Draw2dRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory.RenderedImageKey;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.ui.PlatformUI;
-
-/**
-* Class that represents a Image image. This is a useful abstraction so that it
-* can be used similar to an SWT Image object.
-*  
-* @author sshaw
-* @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
-*/
-public final class ImageRenderedImage extends AbstractRenderedImage {
-
-	/**
-	 * Constructor for SVGImage
-	 * 
-	 * @param buffer
-	 *            byte[] array containing an cached SVG image file.
-	 * @param key
-	 *            ImageKey instance which is unique for the byte array.
-	 */
-	public ImageRenderedImage(byte[] buff, RenderedImageKey key) { 
-		super(buff, key); 
-	}
-
-	/**
-	 * loadImageFromBuffer
-	 * Utility to load the image file.  Throws an exception if the image
-	 * buffer is not legitimate.
-	 * 
-	 * @throws Exception indicating that the buffer is not a legitimate or recognizable
-	 * to the SWT ImageLoader class.
-	 */
-	protected Image renderImage() {
-		try {
-			ImageLoader loader = new ImageLoader();
-			ByteArrayInputStream byteIS = new ByteArrayInputStream(getBuffer());
-			// otherwise render the image.
-			ImageData[] imgData = loader.load(byteIS);
-			if (imgData == null)
-				throw new InvalidParameterException();
-				
-			int origWidth = imgData[0].width;
-			int origHeight = imgData[0].height;
-			
-			int bufferWidth = getKey().getWidth() == 0 ? origWidth : getKey().getWidth();
-			int bufferHeight = getKey().getHeight() == 0 ? origHeight : getKey().getHeight();
-			
-			int newWidth = bufferWidth;
-            int newHeight = bufferHeight;
-            
-            if (getKey().shouldMaintainAspectRatio()) {
-                double origAspectRatio = origHeight / (double)origWidth;
-                if (origAspectRatio > newHeight / (double)newWidth) {
-                    newWidth = (int)Math.round(newHeight / origAspectRatio);
-                } else {
-                    newHeight = (int)Math.round(newWidth * origAspectRatio);
-                }
-				
-				double scale = 1.0;
-				if (newWidth > bufferWidth)
-					scale = bufferWidth / newWidth;
-				if (newHeight > bufferHeight)
-					scale = Math.min(scale, bufferHeight / (double)newHeight);
-				
-				newWidth *= scale;
-				newHeight *= scale;
-				
-				Image origImage = new Image(PlatformUI.getWorkbench().getDisplay(), imgData[0]);
-				Image image = new Image(PlatformUI.getWorkbench().getDisplay(), new Rectangle(0, 0, bufferWidth, bufferHeight));
-				GC gc = new GC(image);
-				SWTGraphics swtG = new SWTGraphics(gc);
-				swtG.drawImage(origImage, 0, 0, origWidth, origHeight, (bufferWidth - newWidth) / 2, (bufferHeight - newHeight) / 2, newWidth, newHeight);
-				swtG.dispose();
-				gc.dispose();
-				origImage.dispose();
-				
-				return image;
-			}
-			else {
-				ImageData scaledImgData = imgData[0].scaledTo(newWidth, newHeight);
-				return new Image(PlatformUI.getWorkbench().getDisplay(), scaledImgData);
-			}
-		} catch (Exception e) {
-            Log.error(Draw2dRenderPlugin.getInstance(),
-                IStatus.ERROR, e.toString(), e);
-			return null;
-		}
-
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/image/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/image/package.html
deleted file mode 100644
index 17a73e9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/image/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/package.html
deleted file mode 100644
index 67ba89a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.render.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/package.html
deleted file mode 100644
index 049e66b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-This package contains the default interfaces for defining and using a <code>RenderedImage</code>.  
-The concept of a RenderedImage is to encapsulate the image format from the clients.  
-It also allows for dynamic rendering of the image format based on the current resolution of the 
-device or scale factor.  Vector formats can then be taken advantage of since this can provide more 
-or less detail depending on the target resolution.
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/.classpath b/org.eclipse.gmf.runtime.draw2d.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.draw2d.ui/.cvsignore b/org.eclipse.gmf.runtime.draw2d.ui/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/.options b/org.eclipse.gmf.runtime.draw2d.ui/.options
deleted file mode 100644
index 2040d43..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.options
+++ /dev/null

@@ -1,17 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.draw2d.ui plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.draw2d.ui plug-in
-org.eclipse.gmf.runtime.draw2d.ui.figures/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting=false
-
-# Trace dnd
-org.eclipse.gmf.runtime.draw2d.ui.figures/debug/dnd/tracing=false

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/.project b/org.eclipse.gmf.runtime.draw2d.ui/.project
deleted file mode 100644
index 248e188..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.draw2d.ui</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.draw2d.ui/.settings/.cvsignore b/org.eclipse.gmf.runtime.draw2d.ui/.settings/.cvsignore
deleted file mode 100644
index 5983f92..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.settings/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-*.prefs

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.draw2d.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index dc13f53..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.draw2d.ui
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.draw2d.ui.figures,
- org.eclipse.gmf.runtime.draw2d.ui.geometry,
- org.eclipse.gmf.runtime.draw2d.ui.graphics,
- org.eclipse.gmf.runtime.draw2d.ui.internal;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.printing",
- org.eclipse.gmf.runtime.draw2d.ui.internal.figures;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.printing",
- org.eclipse.gmf.runtime.draw2d.ui.internal.graph;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.printing",
- org.eclipse.gmf.runtime.draw2d.ui.internal.graphics;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.printing,org.eclipse.gmf.runtime.draw2d.ui.render.awt",
- org.eclipse.gmf.runtime.draw2d.ui.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.printing",
- org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.printing",
- org.eclipse.gmf.runtime.draw2d.ui.internal.routers;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.printing",
- org.eclipse.gmf.runtime.draw2d.ui.mapmode
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/about.html b/org.eclipse.gmf.runtime.draw2d.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/build.properties b/org.eclipse.gmf.runtime.draw2d.ui/build.properties
deleted file mode 100644
index 94dac1c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = icons/,\
-               plugin.properties,\
-               .options,\
-               META-INF/,\
-               .,\
-               about.html
-
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/bottom.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/bottom.gif
deleted file mode 100644
index 6174ff1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/bottom.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/downarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/downarrow.gif
deleted file mode 100644
index e5df847..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/downarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/downgrayarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/downgrayarrow.gif
deleted file mode 100644
index 8111efc..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/downgrayarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/downpressedarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/downpressedarrow.gif
deleted file mode 100644
index e5cf0c3..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/downpressedarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/leftarrow.gif
deleted file mode 100644
index 05b3a24..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftbottom.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/leftbottom.gif
deleted file mode 100644
index 87d13b9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftbottom.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftgrayarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/leftgrayarrow.gif
deleted file mode 100644
index 9922273..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftgrayarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftpressedarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/leftpressedarrow.gif
deleted file mode 100644
index cd1a3cb..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/leftpressedarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/right.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/right.gif
deleted file mode 100644
index 9a6a210..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/right.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/rightarrow.gif
deleted file mode 100644
index c003239..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightbottom.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/rightbottom.gif
deleted file mode 100644
index 9b32f4c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightbottom.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightgrayarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/rightgrayarrow.gif
deleted file mode 100644
index 0123060..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightgrayarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightpressedarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/rightpressedarrow.gif
deleted file mode 100644
index d9e7d0b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/rightpressedarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/topright.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/topright.gif
deleted file mode 100644
index 316cbdc..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/topright.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/uparrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/uparrow.gif
deleted file mode 100644
index 6d242b7..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/uparrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/upgrayarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/upgrayarrow.gif
deleted file mode 100644
index b2ef8d6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/upgrayarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/icons/uppressedarrow.gif b/org.eclipse.gmf.runtime.draw2d.ui/icons/uppressedarrow.gif
deleted file mode 100644
index fcdc3c4..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/icons/uppressedarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/plugin.properties b/org.eclipse.gmf.runtime.draw2d.ui/plugin.properties
deleted file mode 100644
index 9619653..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/plugin.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Presentation - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Draw2d Additions
-Plugin.providerName = Eclipse.org
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/BaseSlidableAnchor.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/BaseSlidableAnchor.java
deleted file mode 100644
index 76fb0af..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/BaseSlidableAnchor.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-
-/**
- * Provides the implementation of Slidable anchor
- * 
- * @author oboyko / sshaw
- *
- */
-public class BaseSlidableAnchor
-	extends AbstractConnectionAnchor {
-	
-	final private static char TERMINAL_START_CHAR = '(';
-	final private static char TERMINAL_DELIMITER_CHAR = ',';
-	final private static char TERMINAL_END_CHAR = ')'; 
-
-	// The connection anchor refrence point (sometimes the same as anchor location)
-	private PrecisionPoint relativeReference;
-
-	/**
-	 * Empty constructor 
-	 */
-	public BaseSlidableAnchor() {
-		// empty constructor
-	}
-	
-	/**
-	 * Default constructor. The anchor will have the center of the figure as the
-	 * reference point 
-	 * 
-	 * @param f <code>IFigure</code> that this anchor is associated with.
-	 */
-	public BaseSlidableAnchor(IFigure f) {
-		super(f);
-	}
-
-	/**
-	 * Constructor. Takes point p to store the reference point 
-	 * 
-	 * @param f <code>IFigure</code> that this anchor is associated with.
-	 * @param p the <code>PrecisionPoint</code> that the anchor will initially attach to.
-	 */
-	public BaseSlidableAnchor(IFigure f, PrecisionPoint p) {
-		super(f);
-		this.relativeReference = new PrecisionPoint(p.preciseX, p.preciseY);
-	}
-	
-	/**
-	 * Creates terminal string for slidable anchor
-	 * 
-	 * @return <code>String</code> terminal for slidable anchor
-	 */
-	public String getTerminal() {
-		if (isDefaultAnchor())
-			return StringStatics.BLANK;
-		return composeTerminalString(relativeReference);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.ConnectionAnchor#getReferencePoint()
-	 */
-	public Point getReferencePoint() {
-		return getAnchorPosition();
-	}
-	
-	/**
-	 * Creates a terminal string for any reference point passed in the format understandable by
-	 * slidable anchors
-	 * 
-	 * @param p - a <Code>PrecisionPoint</Code> that must be represented as a unique
-	 * <Code>String</Code>, namely as "(preciseX,preciseY)"
-	 * @return <code>String</code> terminal composed from specified <code>PrecisionPoint</code>  
-	 */
-	private String composeTerminalString(PrecisionPoint p) {
-		StringBuffer s = new StringBuffer(24);
-		s.append(TERMINAL_START_CHAR); 		// 1 char
-		s.append((float)p.preciseX);		// 10 chars
-		s.append(TERMINAL_DELIMITER_CHAR);	// 1 char
-		s.append((float)p.preciseY);		// 10 chars
-		s.append(TERMINAL_END_CHAR);		// 1 char
-		return s.toString();				// 24 chars max (+1 for safety, i.e. for string termination)
-	}
-
-	/**
-	 * From relative reference returns the relative coordinates of the anchor
-	 * Method's visibility can be changed as needed
-	 */
-	private Point getAnchorPosition() {
-		Rectangle rBox = getBox();
-		if (isDefaultAnchor())
-			return rBox.getCenter();
-		return new Point(Math.round(relativeReference.preciseX * rBox.width
-			+ rBox.x), Math.round(relativeReference.preciseY
-			* rBox.height + rBox.y));
-	}
-	
-	/**
-	 * Calculates the location of the anchor depending on the anchors own reference
-	 * and foreign reference points
-	 * 
-	 * @param ownReference - the own reference of the anchor
-	 * @param foreignReference - foreign reference that comes in 
-	 * @return the location of the anchor depending on the anchors own reference
-	 * and foreign reference points
-	 */
-	protected Point getLocation(Point ownReference, Point foreignReference) {
-		PointList intersections = getIntersectionPoints(ownReference, foreignReference);
-		if (intersections!=null && intersections.size()!=0) {
-			Point location = PointListUtilities.pickClosestPoint(intersections, foreignReference);
-			return location;
-		}
-		return null;
-	}
-
-	static private int STRAIGHT_LINE_TOLERANCE = 10;
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.ConnectionAnchor#getLocation(org.eclipse.draw2d.geometry.Point)
-	 */
-	public Point getLocation(Point reference) {
-		Point foreignReference = reference.getCopy();
-		Point ownReference = getReferencePoint().getCopy();
-		
-		ownReference = normalizeToStraightlineTolerance(foreignReference, ownReference, STRAIGHT_LINE_TOLERANCE);
-		
-		Point location = getLocation(ownReference, foreignReference);
-		if (location == null || 
-			getBox().expand(1, 1).contains(foreignReference) &&
-			!getBox().shrink(1, 1).contains(foreignReference))
-			location = getLocation(getBox().getCenter(), foreignReference);
-		
-		if (location==null) {
-			location = getBox().getCenter();
-		}
-		
-		return location;
-	}	
-	
-	
-	/**
-	 * Returns a new owned reference point that is normalized to be with-in a straight-line 
-	 * tolerance value.
-	 * 
-	 * @param foreignReference <code>Point</code> that is the foreign reference point used to calculate
-	 * the interfection anchor point on the shape in absolute coordinates.
-	 * @param ownReference <code>Point</code> that is the reference point with-in the shape in 
-	 * absolute coordinates
-	 * @param tolerance <code>int</code> value that is the difference in absolute coordinates where the
-	 * two points would be considered straight and then adjusted.
-	 * @return <code>Point</code> that is the normalized owned reference to be with-in a given
-	 * straight-line tolerance value of the foreign reference point.
-	 */
-	protected Point normalizeToStraightlineTolerance(Point foreignReference, Point ownReference, int tolerance) {
-		Point normalizedReference = ownReference.getCopy();
-		if (Math.abs(foreignReference.x - ownReference.x) < tolerance || 
-			Math.abs(foreignReference.y - ownReference.y) < tolerance) {
-			LineSeg lineSeg = new LineSeg(ownReference, foreignReference);
-				
-			normalizedReference = lineSeg.perpIntersect(ownReference.x, ownReference.y);
-			
-			// account for possible rounding errors and ensure the
-			// resulting line is straight
-			if (Math.abs(normalizedReference.x - foreignReference.x) < Math.abs(normalizedReference.y - foreignReference.y))
-				normalizedReference.x = foreignReference.x;
-			else
-				normalizedReference.y = foreignReference.y;
-		}
-		return normalizedReference;
-	}
-
-	/**
-	 * Calculates intersection points of the figure and the line that passes through 
-	 * ownReference and foreignReference points
-	 * 
-	 * @param ownReference the reference <code>Point</code> on or inside the shape that is being
-	 * anchored to.
-	 * @param foreignReference the outside reference <code>Point</code> point that is the terminal
-	 * end of the line formed by the two parameters.
-	 * @return intersection points of the figure and the line that passes through 
-	 * ownReference and foreignReference points
-	 */
-	protected PointList getIntersectionPoints(Point ownReference, Point foreignReference) {
-		final PointList polygon = getPolygonPoints();
-		return (new LineSeg(ownReference,foreignReference)).getLineIntersectionsWithLineSegs(polygon);
-	}
-
-	
-	/**
-	 * Returns the list of all the vertices of the figure.
-	 * The created list must form a polygon, i.e. closed polyline, for figures
-	 * hence the starting and ending points must be the same
-	 * 
-	 * @return the <code>PointList</code> list of all the vertices of the figure.
-	 */
-	protected PointList getPolygonPoints() {
-		if (getOwner() instanceof IPolygonAnchorableFigure) {
-			PointList polyList = ((IPolygonAnchorableFigure) getOwner()).getPolygonPoints();
-			getOwner().translateToAbsolute(polyList);
-			return polyList;
-		}
-		Rectangle rBox = getBox();
-		PointList ptList = new PointList();
-		ptList.addPoint(rBox.getTopLeft());
-		ptList.addPoint(rBox.getTopRight());
-		ptList.addPoint(rBox.getBottomRight());
-		ptList.addPoint(rBox.getBottomLeft());
-		ptList.addPoint(rBox.getTopLeft());
-		return ptList;
-	}
-
-	/**
-	 * Calculates the relative location of the reference point with respect to the bounds
-	 * of the figure. If point p is not inside of the figure's bounds then the point
-	 * is mapped on the bounds and the point relative location is calculated 
-	 * 
-	 * @param p the <code>Point</code> that is relative coordinates of the point
-	 * @return <Code>PrecisionPoint</Code>, i.e. the relative reference for
-	 * <Code>SlidableAnchor</Code>
-	 */
-	static public PrecisionPoint getAnchorRelativeLocation(Point p, Rectangle bounds) {
-		PrecisionPoint relLocation;
-		Point temp = new Point(p);
-		if (p.x < bounds.x || p.x > bounds.x + bounds.width
-			|| p.y < bounds.y || p.y > bounds.y + bounds.height) {
-			if (p.x < bounds.x || p.x > bounds.x + bounds.width) {
-				temp.x = p.x < bounds.x ? bounds.x
-					: bounds.x + bounds.width;
-			}
-			if (p.y < bounds.y || p.y > bounds.y + bounds.height) {
-				temp.y = p.y < bounds.y ? bounds.y
-					: bounds.y + bounds.height;
-			}
-			relLocation = new PrecisionPoint((double) (temp.x - bounds.x)
-				/ bounds.width, (double) (temp.y - bounds.y)
-				/ bounds.height);
-		} else {
-
-		relLocation = new PrecisionPoint((double) (temp.x - bounds.x)
-				/ bounds.width, (double) (temp.y - bounds.y)
-				/ bounds.height);
-		}
-		return relLocation;
-	}
-	
-	/**
-	 * Gets the anchors associated figure's bounding box in absolute coordinates.
-	 * 
-	 * @return a <code>Rectangle</code> that is the bounding box of the owner figure 
-	 * in absolute coordinates
-	 */
-	protected Rectangle getBox() {
-        Rectangle rBox = (getOwner() instanceof Connection) ? ((Connection) getOwner())
-            .getPoints().getBounds().getCopy()
-            : getOwner().getBounds().getCopy();
-        getOwner().translateToAbsolute(rBox);
-        return rBox;
-    }
-	
-	/**
-	 * Returns true if the <Code>SlidableAnchor</Code> is default one with a reference at the center
-	 * 
-	 * @return <code>boolean</code> <code>true</code> is the <code>SlidableAnchor</code> is default one, <code>false</code> otherwise
-	 */
-	public boolean isDefaultAnchor() {
-		return relativeReference == null;
-	}
-	
-	/**
-	 * Parses anchors terminal string and returns the relative reference icorporated
-	 * in the terminal string
-	 * 
-	 * @param terminal - the terminal string containing relative reference
-	 * @return returns the relative reference incorporated in the terminal string
-	 */
-	public static PrecisionPoint parseTerminalString(String terminal) {
-		try {
-			return new PrecisionPoint(Float.parseFloat(terminal.substring(
-				terminal.indexOf(BaseSlidableAnchor.TERMINAL_START_CHAR) + 1,
-				terminal.indexOf(BaseSlidableAnchor.TERMINAL_DELIMITER_CHAR))),
-				Float.parseFloat(terminal.substring(terminal
-					.indexOf(BaseSlidableAnchor.TERMINAL_DELIMITER_CHAR) + 1,
-					terminal.indexOf(BaseSlidableAnchor.TERMINAL_END_CHAR))));
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ConstrainedToolbarLayout.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ConstrainedToolbarLayout.java
deleted file mode 100644
index 73d97d5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ConstrainedToolbarLayout.java
+++ /dev/null

@@ -1,417 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * An extended toolbar layout that supports the following additional features:
- * 1- The ability to stretch the major axis
- * 2- The ability to reverse the children in layout
- * 3- The ability to ignore invisible children
- * 4- The ability to set ratio constraints on children (in major axis)
- * 
- * @author melaasar
- */
-public class ConstrainedToolbarLayout extends ToolbarLayout {
-
-	/**
-	 * Whether to stretch the major axis
-	 */
-	private boolean stretchMajorAxis = true;
-	/**
-	 * Whether to reverse children for layout
-	 */
-	private boolean reversed = false;
-	/**
-	 * Whether to ignore invisible children
-	 */
-	private boolean ignoreInvisibleChildren = true;
-	/**
-	 * The constrains map
-	 */
-	private Map constraints;
-
-	/**
-	 * Creates a new vertical ConstrainedToolbarLayout
-	 */
-	public ConstrainedToolbarLayout() {
-		this(false);
-	}
-
-	/**
-	 * Creates a new ConstrainedToolbarLayout with a given orientation
-	 * 
-	 * @param isHorizontal Whether the layout is horizontal
-	 */
-	public ConstrainedToolbarLayout(boolean isHorizontal) {
-		super(isHorizontal);
-		setStretchMinorAxis(true);
-		setStretchMajorAxis(true);
-		setMinorAlignment(ALIGN_CENTER);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.AbstractLayout#calculatePreferredSize(org.eclipse.draw2d.IFigure, int, int)
-	 */
-	protected Dimension calculatePreferredSize(
-		IFigure container,
-		int wHint,
-		int hHint) {
-		Insets insets = container.getInsets();
-		if (!container.isVisible())
-			return new Dimension(insets.getWidth(),insets.getHeight());
-		if (isHorizontal()) {
-			wHint = -1;
-			if (hHint >= 0)
-				hHint = Math.max(0, hHint - insets.getHeight());
-		} else {
-			hHint = -1;
-			if (wHint >= 0)
-				wHint = Math.max(0, wHint - insets.getWidth());
-		}
-
-		List children = getChildren(container);
-		Dimension prefSize =
-			calculateChildrenSize(children, wHint, hHint, true);
-		// Do a second pass, if necessary
-		if (wHint >= 0 && prefSize.width > wHint) {
-			prefSize =
-				calculateChildrenSize(children, prefSize.width, hHint, true);
-		} else if (hHint >= 0 && prefSize.width > hHint) {
-			prefSize =
-				calculateChildrenSize(children, wHint, prefSize.width, true);
-		}
-
-		prefSize.height += Math.max(0, children.size() - 1) * spacing;
-		return transposer
-			.t(prefSize)
-			.expand(insets.getWidth(), insets.getHeight())
-			.union(getBorderPreferredSize(container));
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.AbstractHintLayout#calculateMinimumSize(org.eclipse.draw2d.IFigure, int, int)
-	 */
-	public Dimension calculateMinimumSize(
-		IFigure container,
-		int wHint,
-		int hHint) {
-		Insets insets = container.getInsets();
-		if (!container.isVisible())
-			return new Dimension(insets.getWidth(),insets.getHeight());
-		
-		if (isHorizontal()) {
-			wHint = -1;
-			if (hHint >= 0)
-				hHint = Math.max(0, hHint - insets.getHeight());
-		} else {
-			hHint = -1;
-			if (wHint >= 0)
-				wHint = Math.max(0, wHint - insets.getWidth());
-		}
-
-		List children = getChildren(container);
-		Dimension minSize =
-			calculateChildrenSize(children, wHint, hHint, false);
-		// Do a second pass, if necessary
-		if (wHint >= 0 && minSize.width > wHint) {
-			minSize =
-				calculateChildrenSize(children, minSize.width, hHint, false);
-		} else if (hHint >= 0 && minSize.width > hHint) {
-			minSize =
-				calculateChildrenSize(children, wHint, minSize.width, false);
-		}
-
-		minSize.height += Math.max(0, children.size() - 1) * spacing;
-		return transposer
-			.t(minSize)
-			.expand(insets.getWidth(), insets.getHeight())
-			.union(getBorderPreferredSize(container));
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.LayoutManager#layout(IFigure)
-	 */
-	public void layout(IFigure parent) {
-		if (!parent.isVisible())
-			return;
-		List children = getChildren(parent);
-		int numChildren = children.size();
-		Rectangle clientArea = transposer.t(parent.getClientArea());
-		int x = clientArea.x;
-		int y = clientArea.y;
-		int availableHeight = clientArea.height;
-
-		Dimension prefSizes[] = new Dimension[numChildren];
-		Dimension minSizes[] = new Dimension[numChildren];
-		Dimension maxSizes[] = new Dimension[numChildren];
-
-		// Calculate the width and height hints.  If it's a vertical ToolBarLayout,
-		// then ignore the height hint (set it to -1); otherwise, ignore the 
-		// width hint.  These hints will be passed to the children of the parent
-		// figure when getting their preferred size. 
-		int wHint = -1;
-		int hHint = -1;
-		if (isHorizontal()) {
-			hHint = parent.getClientArea(Rectangle.SINGLETON).height;
-		} else {
-			wHint = parent.getClientArea(Rectangle.SINGLETON).width;
-		}
-
-		/*		
-		 * Calculate sum of preferred heights of all children(totalHeight). 
-		 * Calculate sum of minimum heights of all children(minHeight).
-		 * Cache Preferred Sizes and Minimum Sizes of all children.
-		 *
-		 * totalHeight is the sum of the preferred heights of all children
-		 * totalMinHeight is the sum of the minimum heights of all children
-		 * prefMinSumHeight is the sum of the difference between all children's
-		 * preferred heights and minimum heights. (This is used as a ratio to 
-		 * calculate how much each child will shrink). 
-		 */
-		IFigure child;
-		int totalHeight = 0;
-		int totalMinHeight = 0;
-		double totalMaxHeight = 0;
-		int prefMinSumHeight = 0;
-		double prefMaxSumHeight = 0;
-
-		for (int i = 0; i < numChildren; i++) {
-			child = (IFigure) children.get(i);
-
-			prefSizes[i] = transposer.t(child.getPreferredSize(wHint, hHint));
-			minSizes[i] = transposer.t(child.getMinimumSize(wHint, hHint));
-			maxSizes[i] = transposer.t(child.getMaximumSize());
-
-			if (getConstraint(child) != null) {
-				double ratio = ((Double) getConstraint(child)).doubleValue();
-				int prefHeight = (int) (ratio * availableHeight);
-				prefHeight = Math.max(prefHeight, minSizes[i].height);
-				prefHeight = Math.min(prefHeight, maxSizes[i].height);
-				prefSizes[i].height = prefHeight;
-			}
-
-			totalHeight += prefSizes[i].height;
-			totalMinHeight += minSizes[i].height;
-			totalMaxHeight += maxSizes[i].height;
-		}
-		totalHeight += (numChildren - 1) * spacing;
-		totalMinHeight += (numChildren - 1) * spacing;
-		totalMaxHeight += (numChildren - 1) * spacing;
-		prefMinSumHeight = totalHeight - totalMinHeight;
-		prefMaxSumHeight = totalMaxHeight - totalHeight;
-
-		/* 
-		 * The total amount that the children must be shrunk is the 
-		 * sum of the preferred Heights of the children minus  
-		 * Max(the available area and the sum of the minimum heights of the children).
-		 *
-		 * amntShrinkHeight is the combined amount that the children must shrink
-		 * amntShrinkCurrentHeight is the amount each child will shrink respectively  
-		 */
-		int amntShrinkHeight =
-			totalHeight - Math.max(availableHeight, totalMinHeight);
-
-		for (int i = 0; i < numChildren; i++) {
-			int amntShrinkCurrentHeight = 0;
-			int prefHeight = prefSizes[i].height;
-			int minHeight = minSizes[i].height;
-			int maxHeight = maxSizes[i].height;
-			int prefWidth = prefSizes[i].width;
-			int minWidth = minSizes[i].width;
-			int maxWidth = maxSizes[i].width;
-			Rectangle newBounds = new Rectangle(x, y, prefWidth, prefHeight);
-
-			child = (IFigure) children.get(i);
-			if (getStretchMajorAxis()) {
-				if (amntShrinkHeight > 0 && prefMinSumHeight != 0)
-					amntShrinkCurrentHeight =
-						(prefHeight - minHeight)
-							* amntShrinkHeight
-							/ (prefMinSumHeight);
-				else if (amntShrinkHeight < 0 && totalHeight != 0)
-					amntShrinkCurrentHeight =
-						(int) (((maxHeight - prefHeight) / prefMaxSumHeight)
-							* amntShrinkHeight);
-			}
-
-			int width = Math.min(prefWidth, maxWidth);
-			if (matchWidth)
-				width = maxWidth;
-			width = Math.max(minWidth, Math.min(clientArea.width, width));
-			newBounds.width = width;
-
-			int adjust = clientArea.width - width;
-			switch (minorAlignment) {
-				case ALIGN_TOPLEFT :
-					adjust = 0;
-					break;
-				case ALIGN_CENTER :
-					adjust /= 2;
-					break;
-				case ALIGN_BOTTOMRIGHT :
-					break;
-			}
-			newBounds.x += adjust;
-			if (newBounds.height - amntShrinkCurrentHeight > maxHeight)
-				amntShrinkCurrentHeight = newBounds.height - maxHeight;
-			newBounds.height -= amntShrinkCurrentHeight;
-			child.setBounds(transposer.t(newBounds));
-
-			amntShrinkHeight -= amntShrinkCurrentHeight;
-			prefMinSumHeight -= (prefHeight - minHeight);
-			prefMaxSumHeight -= (maxHeight - prefHeight);
-			totalHeight -= prefHeight;
-			y += newBounds.height + spacing;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.LayoutManager#getConstraint(org.eclipse.draw2d.IFigure)
-	 */
-	public Object getConstraint(IFigure child) {
-		if (constraints != null)
-			return constraints.get(child);
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.LayoutManager#setConstraint(org.eclipse.draw2d.IFigure, java.lang.Object)
-	 */
-	public void setConstraint(IFigure child, Object constraint) {
-		if (!(constraint instanceof Double))
-			return;
-		if (constraint instanceof Double) {
-			Double c = (Double) constraint;
-			super.setConstraint(child, constraint);
-			if (constraints == null)
-				constraints = new HashMap();
-			if (constraint == null || c.doubleValue() <= 0) {
-				if (constraints.containsKey(child))
-					constraints.remove(child);
-			} else
-				constraints.put(child, constraint);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.LayoutManager#remove(org.eclipse.draw2d.IFigure)
-	 */
-	public void remove(IFigure child) {
-		super.remove(child);
-		setConstraint(child, null);
-	}
-
-	/**
-	 * Sets whether to stretch the major axis or not
-	 *  
-	 * @param stretch Whether to stretch the major axis or not
-	 */
-	public void setStretchMajorAxis(boolean stretch) {
-		stretchMajorAxis = stretch;
-	}
-
-	/**
-	 * @return Whether the stretch major axis is on
-	 */
-	public boolean getStretchMajorAxis() {
-		return stretchMajorAxis;
-	}
-
-	/**
-	 * Sets whether to reverse children or not
-	 * 
-	 * @param reversed Whether to reverse children or not
-	 */
-	public void setReversed(boolean reversed) {
-		this.reversed = reversed;
-	}
-
-	/**
-	 * @return Whether the reverse children or not
-	 */
-	public boolean isReversed() {
-		return reversed;
-	}
-
-	/**
-	 * Sets whether to ignore invisible children or not
-	 * 
-	 * @param ignoreInvisibleChildren Whether to ignore invisible children or not
-	 */
-	public void setIgnoreInvisibleChildren(boolean ignoreInvisibleChildren) {
-		this.ignoreInvisibleChildren = ignoreInvisibleChildren;
-	}
-
-	/**
-	 * @return Whether to ignore invisible children or not
-	 */
-	public boolean getIgnoreInvisibleChildren() {
-		return ignoreInvisibleChildren;
-	}
-
-	/**
-	 * Calculates either the preferred or minimum children size
-	 */
-	private Dimension calculateChildrenSize(
-		List children,
-		int wHint,
-		int hHint,
-		boolean preferred) {
-		Dimension childSize;
-		IFigure child;
-		int height = 0, width = 0;
-		for (int i = 0; i < children.size(); i++) {
-			child = (IFigure) children.get(i);
-			childSize =
-				transposer.t(
-					preferred
-						? child.getPreferredSize(wHint, hHint)
-						: child.getMinimumSize(wHint, hHint));
-			height += childSize.height;
-			width = Math.max(width, childSize.width);
-		}
-		return new Dimension(width, height);
-	}
-
-	/**
-	 * Gets the list of children after applying the layout options of
-	 * ignore invisible children & reverse children
-	 */
-	private List getChildren(IFigure container) {
-		List children = new ArrayList(container.getChildren());
-		if (getIgnoreInvisibleChildren()) {
-			Iterator iter = children.iterator();
-			while (iter.hasNext()) {
-				IFigure f = (IFigure) iter.next();
-				if (!f.isVisible())
-					iter.remove();
-			}
-		}
-		if (isReversed())
-			Collections.reverse(children);
-		return children;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/DropShadowBorder.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/DropShadowBorder.java
deleted file mode 100644
index d891ee6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/DropShadowBorder.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.Border;
-
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.TransparentBorder;
-
-/**
- * @author choang
- *
- * Interface to define all border that have the ability to draw a shadow
- * provides ability for client to toggle whether on not the shadow should be 
- * drawn
- */
-public interface DropShadowBorder extends TransparentBorder, Border {
-
-	
-	/**
-	 * Sets whether the border will draw a drop shadow with the border edge.
-	 * @param drawDropShadow 
-	 */
-	public void setShouldDrawDropShadow(boolean drawDropShadow);
-	
-	/**
-	 * @return true iff the border painting method will draw a shadow
-	 */
-	public boolean shouldDrawDropShadow();
-	
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/FigureUtilities.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/FigureUtilities.java
deleted file mode 100644
index 65900fe..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/FigureUtilities.java
+++ /dev/null

@@ -1,237 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * A set of methods that are useful when manipulating figures.  These are often
- * used in the paint routines or locators of IFigure implementors to do complex 
- * geometry calculations that may be common across different parts of a hierarchy.
- * 
- * @author sshaw
- * @canBeSeenBy %partners
- */
-public class FigureUtilities extends org.eclipse.draw2d.FigureUtilities {
-
-	/**
-	 * Method colorToInteger.
-	 * converts from a Color to an Integer representation
-	 * @param c
-	 * @return Integer
-	 */
-	public static Integer colorToInteger(Color c) {
-		return new Integer(
-			(c.getBlue() << 16) | (c.getGreen() << 8) | c.getRed());
-	}
-
-	/**
-	 * Method integerToColor.
-	 * converts from an Integer to a Color representation
-	 * 
-	 * Note: Normally, colors should be instantiated 
-	 * using the AbstractResourceManager.
-	 * 
-	 * @param i
-	 * @return Color
-	 */
-	public static Color integerToColor(Integer i) {
-		if (i == null)
-			return null;
-		int color = i.intValue();
-		return new Color(
-			null,
-			(color & 0x000000FF),
-			(color & 0x0000FF00) >> 8,
-			(color & 0x00FF0000) >> 16);
-	}
-
-	/**
-	 * Method RGBToInteger
-	 * converts from an RGB to an Integer representation
-	 * @param rgb
-	 * @return Integer
-	 */
-	public static Integer RGBToInteger(RGB rgb) {
-		return new Integer((rgb.blue << 16) | (rgb.green << 8) | rgb.red);
-	}
-
-
-	/**
-	 * Method integerToRGB
-	 * converts from an Integer to an RGB representation
-	 * @param color
-	 * @return RGB
-	 */
-	public static RGB integerToRGB(Integer color) {
-		int n = color.intValue();
-		return new RGB(			
-				(n & 0x000000FF),
-				(n & 0x0000FF00) >> 8,
-				(n & 0x00FF0000) >> 16);
-	}
-
-	/** 
-	 * Return the location within the supplied constraint the supplied rectangle requires to be
-	 * positioned according to the alignment parameter <i>pos</i>.  
-	 * 
-	 * <pre>
-	 * NW-----N------NE
-	 * |              |
-	 * W    NS/EW     E
-	 * |              |
-	 * SW-----S------SE
-	 * 
-	 * </pre>
-	 * <P>
-	 * @param pos a geographic PositionConstant (N,E,W,S,NW,NW,NS,EW)
-	 * @param topos the rectangle to be (re)positioned.
-	 * @param constraint the containing bounds.
-	 * @return a new location.
-	 */
-	public static Point getLocation(
-		int pos,
-		final Rectangle topos,
-		final Rectangle constraint) {
-		Rectangle b = constraint.getCopy();
-		Point svb = new Point(b.x, b.y);
-
-		switch (pos) {
-			case PositionConstants.NORTH :
-				svb.x += b.width / 2;
-				break;
-
-			case PositionConstants.SOUTH :
-				svb.x += b.width / 2;
-				svb.y += b.height;
-				break;
-
-			case PositionConstants.WEST :
-				svb.y += b.height / 2 - topos.height / 2;
-				break;
-
-			case PositionConstants.EAST :
-				svb.x += b.width;
-				svb.y += b.height / 2 - topos.height / 2;
-				break;
-
-			case PositionConstants.NORTH_EAST : //top right
-				svb.x += b.width - topos.width;
-				break;
-
-			case PositionConstants.SOUTH_EAST : //bottom right
-				svb.x += b.width - topos.width;
-				svb.y += b.height - topos.height;
-				break;
-
-			case PositionConstants.SOUTH_WEST : //bottom left
-				svb.x += b.width;
-				svb.y += topos.height;
-				break;
-
-			case PositionConstants.NORTH_SOUTH : // center of bounds area
-			case PositionConstants.EAST_WEST :
-				svb.x += b.width / 2 - topos.width / 2;
-				svb.y += b.height / 2 - topos.height / 2;
-				break;
-
-			case PositionConstants.NORTH_WEST : //top left
-			default :
-				break;
-		}
-		return svb;
-	}
-
-	/**
-	 * Return the location within the supplied constraint of an object of dimension  <i>dim</i> 
-	 * according to the alignment parameter. 
-	 * @see #getLocation(int, Rectangle, Rectangle)
-	 * @param pos a geographic PositionConstant (N,E,W,S,NW,NW,NS,EW)
-	 * @param dim some dimension.
-	 * @param constraint the containing bounds.
-	 * @return a new location.
-	 */
-	public static Point getLocation(
-		int pos,
-		final Dimension dim,
-		final Rectangle constraint) {
-		return getLocation(
-			pos,
-			new Rectangle(0, 0, dim.width, dim.height),
-			constraint);
-	}
-
-	
-	/**
-	 * Helper method to paint a grid.  Painting is optimized as it is restricted to the
-	 * Graphics' clip.
-	 * 
-	 * @param	g			The Graphics object to be used for painting
-	 * @param	f			The figure in which the grid is to be painted
-	 * @param	origin		Any point where the grid lines are expected to intersect
-	 * @param	distanceX	Distance between vertical grid lines; if 0 or less, vertical grid
-	 * 						lines will not be drawn
-	 * @param	distanceY	Distance between horizontal grid lines; if 0 or less, horizontal
-	 * 						grid lines will not be drawn
-	 * @param	lineStyle   Line style to be used for painting the grid lines
-	 * @param   dashes      Dash pattern to be used for the grid line (ignored if lineStyle != LINE_CUSTOM)
-	 * 
-	 */
-	public static void paintGridWithStyle(Graphics g, IFigure f, 
-			org.eclipse.draw2d.geometry.Point origin, int distanceX, int distanceY, int lineStyle, int[] dashes) {
-		Rectangle clip = g.getClip(Rectangle.SINGLETON);
-		
-		int origLineStyle = g.getLineStyle();		
-		
-		if (distanceX > 0) {
-			if (origin.x >= clip.x)
-				while (origin.x - distanceX >= clip.x)
-					origin.x -= distanceX;
-			else
-				while (origin.x < clip.x)
-					origin.x += distanceX;
-			for (int i = origin.x; i < clip.x + clip.width; i += distanceX) {
-				g.setLineStyle(lineStyle);
-				if ((dashes != null) && (lineStyle == SWT.LINE_CUSTOM)) g.setLineDash(dashes);
-				g.drawLine(i, clip.y, i, clip.y + clip.height);
-				g.setLineStyle(origLineStyle);
-			}
-		}
-		
-		if (distanceY > 0) {
-			if (origin.y >= clip.y)
-				while (origin.y - distanceY >= clip.y)
-					origin.y -= distanceY;
-			else
-				while (origin.y < clip.y)
-					origin.y += distanceY;
-			for (int i = origin.y; i < clip.y + clip.height; i += distanceY) {
-				g.setLineStyle(lineStyle);
-				if ((dashes != null) && (lineStyle == SWT.LINE_CUSTOM)) g.setLineDash(dashes);
-				g.drawLine(clip.x, i, clip.x + clip.width, i);
-				g.setLineStyle(origLineStyle);
-			}
-		}
-	}
-
-	
-	
-	
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/GravityConstrainedFlowLayout.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/GravityConstrainedFlowLayout.java
deleted file mode 100644
index 74e566b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/GravityConstrainedFlowLayout.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-/**
- * @author choang
- *
- *<br>Implements the ILayoutManager interface using the gravity Layout
- *<br>algorithm.   The first child in the parent figure will be laid out
- *<br>in the direction of the gravity.  @see #setGravity(GravityDirection)
- *<br> for more details.
- * 
- */
-public class GravityConstrainedFlowLayout extends ConstrainedToolbarLayout {
-
-	GravityDirectionType gravity = GravityDirectionType.WEST;
-
-
-    /**
-	* Method setGravity will update the gravity used for the layout.
-	* <br>For example if the gravity is set to EAST for a figure that has 3 
-	* <br>children [1][2][3] then the children
-	* <br>will be layout out as follows [3][2][1].  If ther gravity is North then
-	* <br>the same figure children wil be laid out as follow:<br>
-	* <br>[1]
-	* <br>[2]
-	* <br>[3]
-	* <br>with the child figure [1] at the top.
-	* 
-	* @param gravity the enumeration <code>GravityDirectionType</code> indicating 
-	* which direction the flow layout is oriented.
-	*/
-	public void setGravity(GravityDirectionType gravity) {
-		this.gravity = gravity;
-
-		if (gravity == GravityDirectionType.SOUTH) {
-			setVertical(true);
-			setReversed(true);
-		} else if (gravity == GravityDirectionType.EAST) {
-			setVertical(false);
-			setReversed(true);
-		} else if (gravity == GravityDirectionType.NORTH) {
-			setVertical(true);
-			setReversed(false);
-		} else if (gravity == GravityDirectionType.WEST) {
-			setVertical(false);
-			setReversed(false);
-		}
-
-	}
-
-	/**
-	 * Method getGravity used for this layout
-	 * @return GravityDirectionType
-	 */
-	public GravityDirectionType getGravity() {
-		return this.gravity;
-	}	
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/GravityDirectionType.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/GravityDirectionType.java
deleted file mode 100644
index 47f1c15..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/GravityDirectionType.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * An enumeration of Gravity Direction types.
- * 
- * @author choang
- */
-public class GravityDirectionType extends EnumeratedType {
-
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	private static int nextOrdinal = 0;
-
-    /**
-     * Constant for a north orientation
-     */
-    public static final GravityDirectionType NORTH = new GravityDirectionType("North"); //$NON-NLS-1$
-
-    /**
-     * Constant for a east orientation
-     */
-    
-    public static final GravityDirectionType EAST = new GravityDirectionType("East"); //$NON-NLS-1$
-
-    /**
-     * Constant for a south orientation
-     */
-    public static final GravityDirectionType SOUTH = new GravityDirectionType("South"); //$NON-NLS-1$
-    
-    /**
-     * Constant for a west orientation
-     */
-    public static final GravityDirectionType WEST = new GravityDirectionType("West"); //$NON-NLS-1$
-
-    /**
-     * The list of values for this enumerated type.
-     */
-    private static final GravityDirectionType[] VALUES =
-        { NORTH, EAST, SOUTH, WEST };
-
-    /**
-     * Constructs a new gravity direction kind type with the specified name and
-     * ordinal.
-     * 
-     * @param name The name of the new gravity direction kind type.
-     * @param ordinal The ordinal for the new gravity direction kind type.
-     */
-    protected GravityDirectionType(String name, int ordinal) {
-        super(name, ordinal);
-    }
-
-    /**
-     * Constructs a new gravity direction type with the specified name.
-     * 
-     * @param name The name of the new gravity direction kind type.
-     */
-    private GravityDirectionType(String name) {
-        this(name, nextOrdinal++);
-    }
-
-    /**
-     * Retrieves the list of constants for this enumerated type.
-     * 
-     * @return The list of constants for this enumerated type.
-     * 
-     * @see EnumeratedType#getValues()
-     */
-    protected List getValues() {
-        return Collections.unmodifiableList(Arrays.asList(VALUES));
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/HashedCircle.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/HashedCircle.java
deleted file mode 100644
index 52a20e0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/HashedCircle.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.Ellipse;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-
-/**
- * A circle figure with hashed lines.
- * 
- * @author cmahoney
- */
-public class HashedCircle extends Ellipse {
-
-    /**
-     * An enumeration describing the hash lines inside the circle.
-     */
-    public static final class HashType {
-        private HashType() {
-        	// empty constructor
-        }
-
-        /** Draws an 'X' through the circle */
-        public static final HashType X = new HashType();
-
-        /** Draws a '\' through the circle */
-        public static final HashType BACKSLASH = new HashType();
-    }
-
-    /** The type of hash lines to draw - default 'X' */
-    private HashType hashType = HashType.X;
-
-	/**
-	 * Creates a <code>HashedCircle</code>.
-     * @param hashType The hashType to set
-     * @param radius The radius to set
-	 */
-	public HashedCircle(HashType hashType, int radius) {
-		super();
-		this.hashType = hashType;
-		int width = radius * 2;
-		setSize(new Dimension(width, width));
-		setMaximumSize(new Dimension(width, width));
-	}
-
-    protected void outlineShape(Graphics graphics) {
-        // draw the circle
-        super.outlineShape(graphics);
-
-        // calculate the x and y shift from the center to the corners of the circle
-        double radius = getBounds().width / 2.0;
-        int xyShift = new Double(radius / Math.sqrt(2.0)).intValue();
-
-        Point center = getBounds().getCenter();
-
-        if (hashType == HashType.X || hashType == HashType.BACKSLASH) {
-            Point topLeft = center.getTranslated(-xyShift, -xyShift);
-            Point bottomRight = center.getTranslated(xyShift, xyShift);
-            graphics.drawLine(topLeft, bottomRight);
-        }
-
-        if (hashType == HashType.X) {
-            Point topRight = center.getTranslated(xyShift, -xyShift);
-            Point bottomLeft = center.getTranslated(-xyShift, xyShift);
-            graphics.drawLine(bottomLeft, topRight);
-        }
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IAnchorableFigure.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IAnchorableFigure.java
deleted file mode 100644
index 69115ab..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IAnchorableFigure.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Point;
-
-/**
- * Interface class for figures that are anchorable to other figures.
- * @author sshaw
- */
-public interface IAnchorableFigure {
-	/**
-	 * Given a string identifier, return the associated anchor for that identifier
-	 * 
-	 * @param terminal <code>String</code> identifier associated with the anchor
-	 * @return <code>ConnectionAnchor</code> that is associated with the given string.
-	 */
-	public ConnectionAnchor getConnectionAnchor(String terminal);
-
-	/**
-	 * Dynamically allocates a new anchor if needed.  Otherwise, recycles old anchors
-	 * no longer in use.
-	 * 
-	 * @param c the <code>ConnectionAnchor</code> reference to an anchor associated with the 
-	 * given point on the figure
-	 * @return a <code>String</code> that represents the anchor identifier.
-	 */
-	public String getConnectionAnchorTerminal(ConnectionAnchor c);
-
-	/** 
-	 * Gets the source connection anchor at a given point on the figure.
-	 * 
-	 * @param p <code>Point</code> on the figure that gives a hint which anchor to return.
-	 * @return a <code>ConnectionAnchor</code> reference to an anchor associated with the given 
-	 * point on the figure.
-	 */
-	public ConnectionAnchor getSourceConnectionAnchorAt(Point p);
-
-	/** 
-	 * Gets the target connection anchor at a given point on the figure.
-	 * 
-	 * @param p <code>Point</code> on the figure that gives a hint which anchor to return.
-	 * @return <code>ConnectionAnchor</code> reference to an anchor associated with the 
-	 * given point on the figure.
-	 */
-	public ConnectionAnchor getTargetConnectionAnchorAt(Point p);
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IOvalAnchorableFigure.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IOvalAnchorableFigure.java
deleted file mode 100644
index 566dd65..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IOvalAnchorableFigure.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author choang
- *
- * Defines interface for any figure whose shape is oval or circular.  This is commonly used to provide
- * an anchor with type information that it can restrict itself to figures that support the oval shape.
- */
-public interface IOvalAnchorableFigure extends IFigure {
-	
-	/**
-	 * Gets the rectangular boundary for the oval shape that implements this interface.
-	 * @return the <code>Rectangle</code> that is the boundary rectangle for the oval shape.
-	 */
-	public Rectangle getOvalBounds();
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IPolygonAnchorableFigure.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IPolygonAnchorableFigure.java
deleted file mode 100644
index dd1eb93..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IPolygonAnchorableFigure.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.geometry.PointList;
-
-/**
- * @author jschofie
- *
- * This interface is used by the Polygon Connection Anchor to obtain
- * the list of points that form a polygon.
- */
-public interface IPolygonAnchorableFigure extends IAnchorableFigure {
-
-	/**
-	 * This method allows the implementing class to return a
-	 * list of points that represent the polygon to be connected
-	 * to.
-	 * @return a list of points forming the polygon
-	 */
-	public PointList getPolygonPoints();
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java
deleted file mode 100644
index 1504ffb..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.ChangeEvent;
-import org.eclipse.draw2d.ChangeListener;
-import org.eclipse.draw2d.Clickable;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Panel;
-import org.eclipse.draw2d.SchemeBorder;
-import org.eclipse.draw2d.ScrollBar;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gmf.runtime.draw2d.ui.graphics.GCUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.DropShadowButtonBorder;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ImageFigureEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.l10n.Draw2dUIPluginImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * 
- * @author sshaw
- *
- */
-public class ListScrollBar extends ScrollBar {
-
-	static private ImageConstants icons = new ImageConstants();
-	private Image upIcon, upPressedIcon, upGrayedIcon, downIcon, downPressedIcon, downGrayedIcon;
-
-	private ImageFigureEx upLabel;
-	private ImageFigureEx downLabel;
-
-	private static Border dropshadow = new DropShadowButtonBorder();
-
-	/**
-	 * Constructor
-	 * 
-	 * @param orientation int that is a define from <code>Orientable</code>
-	 * @param insets the <code>Insets> that represents the white space buffer around the scroll bar in 
-	 * logical coordinates.
-	 * @param size the <code>Dimension</code> that is the size of the scroll bar end boxes in 
-	 * logical coordinates
-	 * @param stepInc the <code>int</code> space to jump when incrementing the scroll bar one step in
-	 * logical coordinates
-	 * @param pageInc the <code>int</code> space to jump when paging the scroll bar up or down in
-	 * logical coordinates.
-	 */
-	public ListScrollBar(int orientation, Insets insets, Dimension size, int stepInc, int pageInc) {
-		setOrientation(orientation);
-		
-		Border margin = new MarginBorder(insets.top, insets.left, insets.bottom, insets.right);
-		
-		setBorder(margin);
-		setPreferredSize(size.width, size.height);
-		setStepIncrement(stepInc);
-		setPageIncrement(pageInc);
-
-		upIcon = isHorizontal()? icons.left : icons.up;
-		upPressedIcon = isHorizontal()? icons.leftPressed : icons.upPressed;
-		upGrayedIcon = isHorizontal()? icons.leftGrayed : icons.upGrayed;
-		downIcon = isHorizontal()? icons.right : icons.down;
-		downPressedIcon = isHorizontal()? icons.rightPressed : icons.downPressed;
-		downGrayedIcon = isHorizontal()? icons.rightGrayed : icons.downGrayed;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#createDefaultDownButton()
-	 */
-	protected Clickable createDefaultDownButton() {
-		downLabel = new ImageFigureEx(downIcon);
-		downLabel.setOpaque(true);
-		addPropertyChangeListener(new PropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				updateDownLabel();
-			}
-		});
-		Clickable button = new Clickable(downLabel);
-		button.getModel().addChangeListener(new ChangeListener() {
-			public void handleStateChanged(ChangeEvent event) {
-				updateDownLabel();
-			}
-		});
-
-		button.setFiringMethod(Clickable.REPEAT_FIRING);
-		button.setRolloverEnabled(true);
-		button.setBorder(dropshadow);
-		button.setOpaque(false);
-		return button;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#createDefaultUpButton()
-	 */
-	protected Clickable createDefaultUpButton() {
-		upLabel = new ImageFigureEx(upIcon);
-		upLabel.setOpaque(true);
-		addPropertyChangeListener(new PropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				updateUpLabel();
-			}
-		});
-		Clickable button = new Clickable(upLabel);
-		button.getModel().addChangeListener(new ChangeListener() {
-			public void handleStateChanged(ChangeEvent event) {
-				updateUpLabel();
-			}
-		});
-
-		button.setFiringMethod(Clickable.REPEAT_FIRING);
-		button.setRolloverEnabled(true);
-		button.setBorder(dropshadow);
-		button.setOpaque(false);
-		return button;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#initialize()
-	 */
-	protected void initialize() {
-		super.initialize();
-		setPageUp(null);
-		setPageDown(null);
-		setOpaque(false);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#createDefaultThumb()
-	 */
-	protected IFigure createDefaultThumb() {
-		Panel thumb = new Panel() {
-
-			public void paint(Graphics graphics) {
-				if (GCUtilities.supportsAdvancedGraphics()){
-					graphics.setAlpha(128);
-				}
-				super.paint(graphics);
-			}
-			
-		};
-		thumb.setMinimumSize(new Dimension(6, 6));
-		thumb.setBackgroundColor(ColorConstants.button);
-
-		thumb.setBorder(new SchemeBorder(SchemeBorder.SCHEMES.RIDGED));
-		return thumb;
-	}
-
-
-	private void updateDownLabel() {
-		Image icon = null;
-		if (((Clickable) getButtonDown()).getModel().isPressed()
-			|| !((Clickable) getButtonDown()).getModel().isMouseOver())
-			icon = downPressedIcon;
-		if (getValue() >= (getMaximum() - getExtent())) {
-			icon = downGrayedIcon;
-			getButtonDown().setEnabled(false);
-		} else {
-			getButtonDown().setEnabled(true);
-			if (icon == null)
-				icon = downIcon;
-		}
-		downLabel.setImage(icon);
-	}
-
-	private void updateUpLabel() {
-		Image icon = null;
-		if (((Clickable) getButtonUp()).getModel().isPressed()
-			|| !((Clickable) getButtonUp()).getModel().isMouseOver())
-			icon = upPressedIcon;
-		if (getValue() <= getMinimum()) {
-			icon = upGrayedIcon;
-			getButtonUp().setEnabled(false);
-		} else {
-			getButtonUp().setEnabled(true);
-			if (icon == null)
-				icon = upIcon;
-		}
-		upLabel.setImage(icon);
-	}
-
-	/**
-	 * @author sshaw
-	 *
-	 */
-	static private class ImageConstants {
-
-		private final Image up, upPressed, upGrayed,
-						   down, downPressed, downGrayed,
-						   left, leftPressed, leftGrayed,
-						   right, rightPressed, rightGrayed;
-		/**
-		 * 
-		 */
-		public ImageConstants() {
-			RGB[] palette2 = new RGB[] { FigureUtilities.integerToColor(new Integer(SWT.COLOR_LIST_BACKGROUND)).getRGB(), new RGB(0, 0, 0), new RGB(0, 0, 0), new RGB(0, 0, 0) };
-			RGB[] palette1 = new RGB[] { FigureUtilities.integerToColor(new Integer(SWT.COLOR_LIST_FOREGROUND)).getRGB(), new RGB(0, 0, 0)};
-
-			ImageData image;
-
-			// normal images
-			image = 
-				Draw2dUIPluginImages.DESC_DOWN_ARROW.getImageData();
-			down = convert(image, palette2);
-
-			image = 
-				Draw2dUIPluginImages.DESC_UP_ARROW.getImageData();
-			up = convert(image, palette2);
-
-			image = 
-				Draw2dUIPluginImages.DESC_LEFT_ARROW.getImageData();
-			left = convert(image, palette2);
-
-			image = 
-				Draw2dUIPluginImages.DESC_RIGHT_ARROW.getImageData();
-			right = convert(image, palette2);
-
-			// pressed images
-			upPressed = Draw2dUIPluginImages
-				.get(Draw2dUIPluginImages.IMG_UP_PRESSED_ARROW);
-
-			downPressed = Draw2dUIPluginImages
-				.get(Draw2dUIPluginImages.IMG_DOWN_PRESSED_ARROW);
-
-			leftPressed = Draw2dUIPluginImages
-				.get(Draw2dUIPluginImages.IMG_LEFT_PRESSED_ARROW);
-
-			rightPressed = Draw2dUIPluginImages
-				.get(Draw2dUIPluginImages.IMG_RIGHT_PRESSED_ARROW);
-
-			// grayed images
-			image = 
-				Draw2dUIPluginImages.DESC_UP_GRAY_ARROW.getImageData();
-			upGrayed = convert(image, palette1);
-
-			image = 
-				Draw2dUIPluginImages.DESC_DOWN_GRAY_ARROW.getImageData();
-			downGrayed = convert(image, palette1);
-
-			image = 
-				Draw2dUIPluginImages.DESC_LEFT_GRAY_ARROW.getImageData();
-			leftGrayed = convert(image, palette1);
-
-			image = 
-				Draw2dUIPluginImages.DESC_RIGHT_GRAY_ARROW.getImageData();
-			rightGrayed = convert(image, palette1);
-			
-			palette1 = null;
-			palette2 = null;
-		}
-
-		private Image convert(ImageData theData, RGB[] colors) {
-			//theData.palette = new PaletteData(colors);
-			return new Image(Display.getCurrent(), theData);
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java
deleted file mode 100644
index 0cd57c7..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * This is a border that only draws a line at one position around the shape based on a position 
- * constant.  This is useful for cases where it may be necessary to draw a separator between shapes
- * without instantiating a new figure.
- * 
- * @author sshaw
- * @canBeSeenBy %partners
- */
-public class OneLineBorder extends LineBorder {
-
-	private int position = PositionConstants.TOP;
-
-	/**
-	 * 
-	 */
-	public OneLineBorder() {
-		super();
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param width the width of the line in relative coordinates
-	 * @param position the value should be one of <code>PositionConstants.TOP</code>, <code>PositionConstants.BOTTOM</code>,
-	 * <code>PositionConstants.LEFT</code>, <code>PositionConstants.RIGHT</code>
-	 */
-	public OneLineBorder(int width, int position) {
-		super(width);
-		this.position = position;
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param color The color of the border.
-	 */
-	public OneLineBorder(Color color) {
-		super(color);
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param color The color of the border.
-	 * @param width the width of the line in relative coordinates
-	 * @param position the value should be one of <code>PositionConstants.TOP</code>, <code>PositionConstants.BOTTOM</code>,
-	 * <code>PositionConstants.LEFT</code>, <code>PositionConstants.RIGHT</code>
-	 */
-	public OneLineBorder(Color color, int width, int position) {
-		super(color, width);
-		this.position = position;
-	}
-
-	/**
-	 * @return Returns the position.
-	 */
-	public int getPosition() {
-		return position;
-	}
-
-	/**
-	 * @param position The position to set.
-	 */
-	public void setPosition(int position) {
-		this.position = position;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.Border#getInsets(org.eclipse.draw2d.IFigure)
-	 */
-	public Insets getInsets(IFigure figure) {
-		switch (position) {
-			case PositionConstants.TOP :
-				return new Insets(getWidth(), 0, 0, 0);
-			case PositionConstants.LEFT :
-				return new Insets(0, getWidth(), 0, 0);
-			case PositionConstants.BOTTOM :
-				return new Insets(0, 0, getWidth(), 0);
-			case PositionConstants.RIGHT :
-				return new Insets(0, 0, 0, getWidth());
-			default :
-				return IFigure.NO_INSETS;
-		}
-	}
-
-	/**
-	 * Paints the border based on the inputs given. 
-	 *
-	 * @param figure  <code>IFigure</code> for which this is the border.
-	 * @param graphics  <code>Graphics</code> handle for drawing the border.
-	 * @param insets  Space to be taken up by this border.
-	 */
-	public void paint(IFigure figure, Graphics graphics, Insets insets) {
-		tempRect.setBounds(getPaintRectangle(figure, insets));
-		if (getWidth() % 2 == 1) {
-			tempRect.width--;
-			tempRect.height--;
-		}
-		tempRect.shrink(getWidth() / 2, getWidth() / 2);
-		graphics.setLineWidth(getWidth());
-		switch (position) {
-			case PositionConstants.TOP :
-				graphics.drawLine(tempRect.getTopLeft(), tempRect.getTopRight());
-				break;
-			case PositionConstants.BOTTOM :
-				graphics.drawLine(tempRect.getBottomLeft(), tempRect.getBottomRight());
-				break;
-			case PositionConstants.LEFT :
-				graphics.drawLine(tempRect.getTopLeft(), tempRect.getBottomLeft());
-				break;
-			case PositionConstants.RIGHT :
-				graphics.drawLine(tempRect.getTopRight(), tempRect.getBottomRight());
-				break;
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
deleted file mode 100644
index 8064bb1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
+++ /dev/null

@@ -1,1261 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.ArrowLocator;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.RoutingAnimator;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ConnectionLayerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.DelegatingLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * This is an extension of the <code>PolylineConnection</code> class to support avoid obstructions, smoothness
- * and jump-links behavior.
- * 
- * @author sshaw
- * @canBeSeenBy %partners
- */
-public class PolylineConnectionEx extends PolylineConnection implements IPolygonAnchorableFigure {
-	
-	private RotatableDecoration startDecoration, endDecoration;
-
-    private static Rectangle LINEBOUNDS = Rectangle.SINGLETON;
-    private static int TOLERANCE = 3;
-    
-    /**
-     * No smoothness
-     */
-    public static final int SMOOTH_NONE = 0x0000;
-    
-    /**
-     * Some smoothness
-     */
-    public static final int SMOOTH_LESS = 0x0010;
-    
-    /**
-     * Normal smoothness
-     */
-    public static final int SMOOTH_NORMAL = 0x0020;
-    
-    /**
-     * More exagerated smoothness
-     */
-    public static final int SMOOTH_MORE = 0x0040;
-
-    /**
-     * Flag indicates whether the connection will attempt to "jump"
-     * other connection below it in the z-order.
-     */
-    public static final int JUMPLINK_FLAG_BELOW = 0x4000; // jump links below
-    
-    /**
-     * Flag indicates whether the connection will attempt to "jump"
-     * other connection above it in the z-order.
-     */
-    public static final int JUMPLINK_FLAG_ABOVE = 0x8000; // jump links above
-    
-    /**
-     * Flag indicates whether the connection will attempt to "jump"
-     * all other connections regardless of z-order.
-     */
-    public static final int JUMPLINK_FLAG_ALL =
-        JUMPLINK_FLAG_BELOW | JUMPLINK_FLAG_ABOVE;
-
-    private static final int SMOOTH_FACTOR_LESS = 15;
-    private static final int SMOOTH_FACTOR_NORMAL = 30;
-    private static final int SMOOTH_FACTOR_MORE = 50;
-
-    // extra routing styles
-    private static final int ROUTE_AVOID_OBSTACLE = 0x0100;
-    // avoid intersection with other nodes
-    private static final int ROUTE_CLOSEST_ROUTE = 0x0200;
-    // always use closest route to the destination
-    private static final int ROUTE_JUMP_LINKS = 0x0400; // jump other links
-
-    // jump link flags
-    private static final int JUMPLINK_FLAG_SMOOTH = 0x0800;
-    // indicates whether the jump links are smooth or not
-    private static final int JUMPLINK_FLAG_ANGLEIN = 0x1000;
-    // indicates whether the link is angled inwards
-    private static final int JUMPLINK_FLAG_ONBOTTOM = 0x2000;
-
-    private static final int JUMPLINK_DEFAULT_SMOOTHNESS = 30;
-    
-    private long styleBits;
-    private JumpLinkSet jumpLinkSet;
-    private Hashtable connectionAnchors;
-	
-    static private final String szAnchor = ""; //$NON-NLS-1$
-    
-    /**
-     * A dimension used by the isFeedbackLayer() method to check if we are
-     * on a feedback layer.
-     */
-    private static final Dimension dimCheck = new Dimension(100, 100);
-    
-    /**
-     * This method checks if we are on a feedback layer by comparing
-     * the value of a Dimension with the value after translating it
-     * into relative coordinates.
-     * 
-     * @return true if we are on a feedback layer, which means the
-     * results after translating were the same as not translating, or false
-     * if we are not on a feedback layer.
-     */
-    private boolean isFeedbackLayer() {
-    	Dimension copied = dimCheck.getCopy();
-    	translateToRelative(copied);
-    	return dimCheck.equals(copied);
-    }
-    
-    /**
-     * 
-     */
-    public PolylineConnectionEx() {
-        styleBits =
-                JUMPLINK_FLAG_BELOW
-                | JUMPLINK_FLAG_SMOOTH
-                | JUMPLINK_FLAG_ANGLEIN;            
-        setLayoutManager(new DelegatingLayout());
-        addRoutingListener(RoutingAnimator.getDefault());
-    }
-    
-    /**
-     * Provides a utility function for dirtying the jump links and repainting the line.
-     */
-    public void refreshLine() {
-        dirtyJumpLinks();
-        repaint();
-    }
-
-    /**
-     * Add a point to the polyline connection.
-     */
-    public void addPoint(Point pt) {
-        super.addPoint(pt);
-        refreshLine();
-    }
-
-    /**
-     * Calculate and store the tolerance value for determining whether the line contains a point or not.
-     * 
-     * @param isFeedbackLayer  see the isFeedbackLayer() method
-     */
-    private int calculateTolerance(boolean isFeedbackLayer) {
-		Dimension absTol = new Dimension(TOLERANCE + lineWidth / 2, 0);
-		
-    	if (!isFeedbackLayer) {
-    		MapModeUtil.getMapMode(this).DPtoLP(absTol);
-    	}
-
-    	return absTol.width;
-    }
-    
-    /**
-     * Returns the bounds which holds all the points in this
-     * polyline connection. Returns any previously existing
-     * bounds, else calculates by unioning all the children's
-     * dimensions.
-     *
-     * @return  Bounds to hold all the points.
-     */
-    public Rectangle getBounds(){
-        if (bounds == null) {
-            if (getSmoothFactor() != 0) {
-                bounds = getSmoothPoints().getBounds();
-                bounds.expand(lineWidth/2, lineWidth/2);
-                
-                for(int i=0; i<getChildren().size(); i++) {
-                    IFigure child = (IFigure)getChildren().get(i);
-                    bounds.union(child.getBounds());
-                }
-            }
-            else
-                super.getBounds();
-            
-            boolean isFeedbackLayer = isFeedbackLayer();
-            int calculatedTolerance = calculateTolerance(isFeedbackLayer);
-            Dimension jumpLinkSize = calculateJumpLinkSize(isFeedbackLayer);
-            
-            // extend the boundary slightly by the jumplinks height value
-            bounds.expand(jumpLinkSize.height + calculatedTolerance, jumpLinkSize.height + calculatedTolerance);
-        }
-        return bounds;
-    }
-
-    /**
-     * Method getShallowBounds.
-     * @return Rectangle
-     */
-    public Rectangle getSimpleBounds(){
-        Point s = getStart();
-        Point e = getEnd();
-        Point start = new Point(Math.min(s.x, e.x), Math.min(s.y, e.y));
-        Dimension d = new Dimension(Math.abs(s.x-e.x), Math.abs(s.y-e.y));
-        return new Rectangle(start.x, start.y, d.width, d.height);
-    }
-
-    /**
-     * Determine if the polyline connection contains a given point.
-     * @param x int value of the point to check containment of
-     * @param y int value of the point to check containment of.
-     * @return boolean true indicating containment, false otherwise.
-     */
-    public boolean containsPoint(int x, int y) {
-    
-    	boolean isFeedbackLayer = isFeedbackLayer();
-    	int calculatedTolerance = calculateTolerance(isFeedbackLayer);
-    
-        LINEBOUNDS.setBounds(getBounds());
-        LINEBOUNDS.expand(calculatedTolerance,calculatedTolerance);
-        if (!LINEBOUNDS.contains(x, y))
-            return false;
-    
-    	int ints[] = getSmoothPoints().toIntArray();
-    	for (int index = 0; index < ints.length - 3; index  += 2) {
-    		if (lineContainsPoint(ints[index], ints[index + 1],
-    			ints[index + 2], ints[index + 3], x, y,
-				isFeedbackLayer))
-    			return true;
-    	}
-    	List children = getChildren();
-    	for (int i = 0; i < children.size(); i++) {
-    		if (((IFigure)children.get(i)).containsPoint(x, y))
-    			return true;
-    	}
-    	
-        return false;
-    }
-    
-    private boolean lineContainsPoint(
-        int x1, int y1,
-        int x2, int y2,
-        int px, int py,
-		boolean isFeedbackLayer) {
-        LINEBOUNDS.setSize(0,0);
-        LINEBOUNDS.setLocation(x1,y1);
-        LINEBOUNDS.union(x2,y2);
-        int calculatedTolerance = calculateTolerance(isFeedbackLayer);
-        LINEBOUNDS.expand(calculatedTolerance,calculatedTolerance);
-        if (!LINEBOUNDS.contains(px,py))
-            return false;
-    
-        double v1x, v1y, v2x, v2y;
-        double numerator, denominator;
-        double result = 0;
-    
-        if( x1 != x2 && y1 != y2 ) {
-            v1x = (double)x2 - x1;
-            v1y = (double)y2 - y1;
-            v2x = (double)px - x1;
-            v2y = (double)py - y1;
-            
-            numerator = v2x * v1y - v1x * v2y;
-            
-            denominator = v1x * v1x + v1y * v1y;
-    
-            result = numerator * numerator / denominator;
-        }
-        
-        // if it is the same point, and it passes the bounding box test,
-        // the result is always true.
-        return result <= calculatedTolerance * calculatedTolerance;
-                             
-    }
-    
-    /**
-     * Calculate the line segment index for a given point.  This is important
-     * for the drag tracker that add's bendpoints on a connection.
-     * 
-     * @param x the x value in relative coordinates
-     * @param y the y value in relative coordinates
-     * @return the index of the line segment that is nearest to the given point.
-     */
-    public int findLineSegIndexOfPoint(int x, int y) {
-        calculateTolerance(isFeedbackLayer());
-
-        return PointListUtilities.findNearestLineSegIndexOfPoint(getPoints(), new Point(x, y));
-    }
-    
-    /**
-     * If the smooth factor is turned on, then calculate the approximated smooth polyline for display
-     * or other purposes.  It is important to note that the smoothed points are not persisted.
-     * 
-     * @return <code>PointList</code> that is a polyline approximation of a bezier curve calculated based 
-     * on the smoothness factor.
-     */
-    public PointList getSmoothPoints() {
-        if (getSmoothFactor() > 0) {
-            return PointListUtilities.calcSmoothPolyline(getPoints(), getSmoothFactor(), PointListUtilities.DEFAULT_BEZIERLINES);
-        } else {
-            return PointListUtilities.copyPoints(getPoints());
-        }
-    }
-
-    /**
-     * Insert a point at the given index into the polyline connection.
-     */
-    public void insertPoint(Point pt, int index) {
-        super.insertPoint(pt, index);
-        refreshLine();
-    }
-
-    /**
-     * Override the figure method "outlineShape" to draw the actual polyline connection shape.
-     * Special code to regenerate the jumplinks and to draw the polyline smooth is also done
-     * during this method call.
-     */
-    protected void outlineShape(Graphics g) {
-
-        PointList displayPoints = getSmoothPoints();
-        int incline = calculateJumpLinkIncline(isFeedbackLayer());
-        
-        if (shouldJumpLinks()) {
-            regenerateJumpLinks();
-
-            JumpLinkSet pJumpLinkSet = getJumpLinkSet();
-            if (pJumpLinkSet != null && pJumpLinkSet.m_pJumpLinks != null) {
-                int nSmoothNess = 0;
-                if (isJumpLinksSmooth())
-                    nSmoothNess = JUMPLINK_DEFAULT_SMOOTHNESS;
-
-                boolean bOnBottom = isJumpLinksOnBottom();
-
-                ListIterator linkIter = pJumpLinkSet.m_pJumpLinks.listIterator();
-                while (linkIter.hasNext()) {
-                    JumpLink pJumpLink = (JumpLink) linkIter.next();
-
-                    PointList jumpLinkPoints = PointListUtilities.routeAroundPoint(
-                        displayPoints,
-                        pJumpLink.m_ptIntersect,
-                        pJumpLink.m_nHeight,
-                        pJumpLink.m_nWidth,
-                        nSmoothNess,
-                        incline,
-                        !bOnBottom);
-                    if (jumpLinkPoints != null)
-                    	displayPoints = jumpLinkPoints;
-                }
-            }
-        }
-
-        g.drawPolyline(displayPoints);
-    }
-    
-    /**
-     * Set the line width of the polyline connection.
-     */
-    public void setLineWidth(int w) {
-        bounds = null;
-        super.setLineWidth(w);
-    }
-
-    /**
-     * Sets the list of points to be used by this polyline connection.
-     * Removes any previously existing points. 
-     *
-     * @param points  New set of points.
-     */
-    public void setPoints(PointList points) {
-        super.setPoints(points);
-
-        dirtyAllJumpLinks();
-        refreshLine();
-    }
-    
-    /**
-     * Calculate the jumplink dimensions.
-     */
-    private static final int JUMPLINK_DEFAULT_WIDTH = 25;
-    private static final int JUMPLINK_DEFAULT_HEIGHT = 10;
-   
-    /**
-     * Calculate the size of the jump link.
-     * 
-     * @param isFeedbackLayer the <code>boolean</code> that determines if mapping of the coordinates will occur.  
-     * This is necessary since the feedback layer doesn't not go through the zooming or mapmode scaling.
-     * 
-     * @return <code>Dimension</code> that is the jump link size
-     */
-    private Dimension calculateJumpLinkSize(boolean isFeedbackLayer) {
-    	Dimension jumpDim = new Dimension(JUMPLINK_DEFAULT_WIDTH, JUMPLINK_DEFAULT_HEIGHT);
-    	
-    	if (!isFeedbackLayer) {
-    		MapModeUtil.getMapMode(this).DPtoLP(jumpDim);
-    	}
-    	
-        return jumpDim;
-    }
-    
-    /**
-     * Calculate the jumplink incline
-     * 
-     * @param isFeedbackLayer the <code>boolean</code> that determines if mapping of the coordinates will occur.  
-     * This is necessary since the feedback layer doesn't not go through the zooming or mapmode scaling.
-     */
-    private int calculateJumpLinkIncline(boolean isFeedbackLayer) {
-    	if (isJumpLinksAngledIn())
-        	return calculateJumpLinkSize(isFeedbackLayer).width / 5;
-    	
-    	return 0;
-    }
-    
-    /**
-     * Dirty all connection jump links in the diagram
-     */
-    public void dirtyAllJumpLinks()
-    {
-        IFigure pParent = getParent();
-        if (pParent instanceof ConnectionLayerEx)
-            ((ConnectionLayerEx)pParent).dirtyJumpLinks(getBounds());
-    }
-     
-    /**
-     * Inner class for storing the specific JumpLink information.
-     */
-    protected class JumpLink {
-        
-        /**
-         * intersection point value
-         */
-        public Point m_ptIntersect;
-        
-        /**
-         * width of the jump link
-         */
-        public int m_nWidth;
-        
-        /**
-         * height of the jump link
-         */
-        public int m_nHeight;
-  
-        /**
-         * distance along the polyline
-         */
-        public int m_nDistance;
-    }
-
-    /**
-     * Inner class for storing the set of JumpLink's associated with the
-     * polyline connection.
-     */
-    protected class JumpLinkSet {
-
-        /**
-         * Default constructor
-         */
-        public JumpLinkSet() {
-            m_bDirty = true;
-            m_pJumpLinks = null;
-        }
-        
-        /**
-         * Determines if the jump links need to be regenerated.
-         * 
-         * @return <code>boolean</code> <code>true</code> if jump links need to be regenerated, <code>false</code> otherwise.
-         */
-        public boolean isDirty() {
-            return m_bDirty;
-        }
-        
-        /**
-         * Sets the dirty flag back to false and notifies the connection layer
-         * that it has been cleaned.
-         * 
-         * @param connect <code>Connection</code> whose jump links need to be regenerated.
-         */
-        protected void cleanJumpLinks(Connection connect) {
-            m_bDirty = false;
-            
-            IFigure pParent = connect.getParent();
-            if (pParent instanceof ConnectionLayerEx)
-                ((ConnectionLayerEx)pParent).cleanJumpLinks();
-        }
-        
-        /** 
-         * Sets the jump links set as being dirty so that they will be regenerated
-         * again at display time.
-         */
-        public void dirtyJumpLinks() {
-            m_bDirty = true;
-        }
-        
-        /**
-         * Regenerates the jump links again according to the current arrangement of connections
-         * on the diagram.
-         * 
-         * @param connect <code>Connection</code> whose jump links need to be regenerated.
-         * @return <code>boolean</code> <code>true</code> if jump links were regenerated, <code>false</code> otherwise.
-         */
-        public boolean regenerateJumpLinks(Connection connect) {
-            // check if we need to regenerate the jump link info
-            if (isDirty()) {
-                // regenerate the points where jump links will occur    
-                calculateIntersections(connect);
-
-                cleanJumpLinks(connect);
-                
-                return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * Inner class useed to compare two jump links to see which is further
-         * along the polyline connection.
-         */
-        private class CompareDistance implements Comparator {
-           
-            public int compare(Object obj1, Object obj2) {
-                JumpLink j1 = (JumpLink) obj1;
-                JumpLink j2 = (JumpLink) obj2;
-
-                if (j1.m_nDistance < j2.m_nDistance)
-                    return -1;
-                else
-                    if (j1.m_nDistance > j2.m_nDistance)
-                        return 1;
-
-                return 0;
-            }
-        }
-
-        /**
-         * Sort the jump links according to their distance along the polyline
-         * connection line.
-         */
-        private void sortByDistance() {
-
-            Object[] jumpArray = m_pJumpLinks.toArray();
-            Arrays.sort(jumpArray, new CompareDistance());
-
-            for (int i = 0; i < m_pJumpLinks.size(); i++)
-                m_pJumpLinks.set(i, jumpArray[i]);
-        }
-        
-        /**
-         * Calculate the intersections that occur between this connection and all the
-         * other connections on the diagram.
-         * 
-         * @param connect <code>Connection</code> to calculate intersections with other connections in the layer.
-         */
-        private void calculateIntersections(Connection connect) {
-            // regenerate the points where jump links will occur
-            IFigure pParent = connect.getParent();
-
-            if (m_pJumpLinks != null)
-                m_pJumpLinks = null;
-
-            PointList tmpLine = getSmoothPoints();
-
-            long jumpType = (styleBits & JUMPLINK_FLAG_ALL);
-
-            // only check intersections with connect views which are below this one.
-            List children = pParent.getChildren();
-            int nIndex = children.indexOf(connect);
-
-            ListIterator childIter = children.listIterator();
-            boolean bForwards = true;
-            if (jumpType != JUMPLINK_FLAG_ALL)
-            {
-                childIter = children.listIterator(nIndex);
-                if (jumpType == JUMPLINK_FLAG_BELOW)
-                    bForwards = false;
-            }
-            
-            boolean isFeedbackLayer = isFeedbackLayer();
-            Dimension jumpLinkSize = calculateJumpLinkSize(isFeedbackLayer);
-            
-            while (bForwards ? childIter.hasNext() : childIter.hasPrevious()) {
-                IFigure figure =
-                    (IFigure) (bForwards ? childIter.next() : childIter.previous());
-                PointList checkLine = null;
-
-                if (figure != connect) {
-                    if (figure instanceof PolylineConnectionEx)
-                        checkLine = ((PolylineConnectionEx) figure).getSmoothPoints();
-                    else
-                        if (figure instanceof Connection)
-                            checkLine = PointListUtilities.copyPoints(((Connection) figure).getPoints());
-
-                    if (checkLine != null) {
-                        PointList intersections = new PointList();
-                        PointList distances = new PointList();
-    
-                        if (m_pJumpLinks == null)
-                            m_pJumpLinks = new ArrayList(intersections.size());
-    
-                        if (PointListUtilities.findIntersections(tmpLine, checkLine, intersections, distances)) {
-                            for (int i = 0; i < intersections.size(); i++) {
-                                double dist1 = intersections.getPoint(i).getDistance(tmpLine.getFirstPoint());
-                                double dist2 = intersections.getPoint(i).getDistance(tmpLine.getLastPoint());
-                                double dist3 = intersections.getPoint(i).getDistance(checkLine.getFirstPoint());
-                                double dist4 = intersections.getPoint(i).getDistance(checkLine.getLastPoint());
-                                double minDist = Math.min(Math.min(dist1,dist2), Math.min(dist3,dist4));
-                                if (minDist > jumpLinkSize.width/2){
-                                    addJumpLink(intersections.getPoint(i), distances.getPoint(i).x, isFeedbackLayer);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            // check to see if we need to combine intersects that are close together
-            combineCloseLinks(tmpLine);
-        }
-
-        /**
-         * Add a new jump with the given intersection point and distance along the polyline
-         * connection line.
-         * @param ptIntersect
-         * @param nDistance
-         * @param isFeedbackLayer see the isFeedbackLayer() method
-         */
-        private void addJumpLink(Point ptIntersect, int nDistance, boolean isFeedbackLayer) {
-            JumpLink pNewJumpLink = new JumpLink();
-            pNewJumpLink.m_ptIntersect = new Point(ptIntersect);
-            
-            Dimension jumpLinkSize = calculateJumpLinkSize(isFeedbackLayer);
-            
-            pNewJumpLink.m_nWidth = jumpLinkSize.width;
-            pNewJumpLink.m_nHeight = jumpLinkSize.height;
-            pNewJumpLink.m_nDistance = nDistance;
-
-            m_pJumpLinks.add(pNewJumpLink);
-        }
-
-        /**
-         * If there are two consecutive jump links that are close together with a certain
-         * tolerance value, then combine them into one larger jump link.
-         * 
-         * @param tmpLine the <code>PointList</code> 
-         */
-        private void combineCloseLinks(PointList tmpLine) {
-
-            if (m_pJumpLinks == null || m_pJumpLinks.size() < 2)
-                return;
-
-            Dimension jumpLinkSize = calculateJumpLinkSize(isFeedbackLayer());
-            int nCurrentWidth = jumpLinkSize.width;
-            ArrayList jumpLinks = new ArrayList(m_pJumpLinks.size());
-
-            // sort the jump links by distance
-            sortByDistance();
-
-            jumpLinks.addAll(m_pJumpLinks);
-            m_pJumpLinks.clear();
-
-            ListIterator linkIter = jumpLinks.listIterator();
-
-            // combine intersects that are close together and increase jump link width
-            JumpLink pLastJumpLink = (JumpLink) linkIter.next();
-            JumpLink pPrevJumpLink = null;
-
-            final int nDeltaMin = jumpLinkSize.width * 4 / 3;
-
-            while (pLastJumpLink != null) {
-                JumpLink pJumpLink = null;
-                int nDelta = 0;
-
-                if (linkIter.hasNext()) {
-                    pJumpLink = (JumpLink) linkIter.next();
-                    nDelta = pJumpLink.m_nDistance - pLastJumpLink.m_nDistance;
-                }
-
-                if ((nDelta > nDeltaMin) || pJumpLink == null) {
-                    JumpLink pNewJumpLink = new JumpLink();
-
-                    pNewJumpLink.m_nHeight = jumpLinkSize.height;
-                    pNewJumpLink.m_nWidth = nCurrentWidth;
-                    pNewJumpLink.m_nDistance = 0;
-                    pNewJumpLink.m_ptIntersect = new Point(pLastJumpLink.m_ptIntersect);
-
-                    if (pPrevJumpLink != null) {
-                        // need to recalc the intersection point
-                        long nNewDistance =
-                            pPrevJumpLink.m_nDistance
-                                + ((pLastJumpLink.m_nDistance - pPrevJumpLink.m_nDistance) / 2);
-                        pNewJumpLink.m_ptIntersect = new Point();
-                        PointListUtilities.pointOn(tmpLine, nNewDistance, LineSeg.KeyPoint.ORIGIN, pNewJumpLink.m_ptIntersect);
-                    }
-
-                    m_pJumpLinks.add(pNewJumpLink);
-                    nCurrentWidth = jumpLinkSize.width;
-                    pPrevJumpLink = null;
-                } else {
-                    if (pPrevJumpLink == null)
-                        pPrevJumpLink = pLastJumpLink;
-                    nCurrentWidth += jumpLinkSize.width - (nDeltaMin - nDelta);
-                }
-
-                pLastJumpLink = pJumpLink;
-            }
-        }
-
-        private boolean m_bDirty;
-        
-        private List m_pJumpLinks;
-    }
-
-    /**
-     * Get the smoothness factor for the polyline connection.  A value of 0
-     * indicates that there is no smoothness.
-     * 
-     * @return the value is one of 0 - no smoothing, SMOOTH_FACTOR_LESS - rounded edges, 
-     * SMOOTH_FACTOR_NORMAL - more curved look, SMOOTH_FACTOR_MORE - exagerated curving
-     */
-    private final int getSmoothFactor() {
-        int smoothStyle = getSmoothness();
-
-        if (smoothStyle == SMOOTH_LESS)
-            return SMOOTH_FACTOR_LESS;
-        else
-            if (smoothStyle == SMOOTH_NORMAL)
-                return SMOOTH_FACTOR_NORMAL;
-            else
-                if (smoothStyle == SMOOTH_MORE)
-                    return SMOOTH_FACTOR_MORE;
-
-        return 0;
-    }
-
-    /**
-     * Sets the smoothness factor of this Connection that is reflected when the polyline is rendered. 
-     * 
-     * @param smooth the value is one of SMOOTH_NONE - no smoothing, SMOOTH_LESS - rounded edges, 
-     * SMOOTH_NORMAL - more curved look, SMOOTH_MORE - exagerated curving.
-     */
-    public final void setSmoothness(int smooth) {
-        // always turn off all smoothing
-        styleBits &= ~(SMOOTH_LESS | SMOOTH_NORMAL | SMOOTH_MORE);
-
-        if (smooth == SMOOTH_LESS
-            || smooth == SMOOTH_NORMAL
-            || smooth == SMOOTH_MORE) {
-            styleBits |= smooth;
-        }
-    }
-
-    /**
-     * Gets the smoothness factor.  
-     * 
-     * @return the value is one of SMOOTH_NONE - no smoothing, SMOOTH_LESS - rounded edges, 
-     * SMOOTH_NORMAL - more curved look, SMOOTH_MORE - exagerated curving.
-     */
-    public final int getSmoothness() {
-        if ((styleBits & SMOOTH_LESS) != 0)
-            return SMOOTH_LESS;
-        else
-            if ((styleBits & SMOOTH_NORMAL) != 0)
-                return SMOOTH_NORMAL;
-            else
-                if ((styleBits & SMOOTH_MORE) != 0)
-                    return SMOOTH_MORE;
-
-        return 0;
-    }
-
-    /**
-     * Determines if this polyline connection is using closest distance routing or not.
-     * 
-     * @return <code>boolean</code> <code>true</code> if it should be using closest distance routing, 
-     * <code>false</code otherwise.
-     */
-    public final boolean isClosestDistanceRouting() {
-        return ((styleBits & ROUTE_CLOSEST_ROUTE) != 0);
-    }
-
-    /**
-     * Determines if this polyline connection is using avoid obstruction routing or not.
-     * 
-     * @return <code>boolean</code> <code>true</code> if it should be using avoid obstruction routing, 
-     * <code>false</code otherwise.
-     */
-    public final boolean isAvoidObstacleRouting() {
-        return ((styleBits & ROUTE_AVOID_OBSTACLE) != 0);
-    }
-
-    /**
-     * Set the overall routing styles for this polyline connection.
-     *
-     * @param closestDistance <code>boolean</code> <code>true</code> if it should be using closest distance routing, 
-     * <code>false</code otherwise
-     * @param avoidObstacles <code>boolean</code> <code>true</code> if it should be using avoid obstruction routing, 
-     * <code>false</code otherwise
-     */
-    public void setRoutingStyles(
-        final boolean closestDistance,
-        final boolean avoidObstacles) {
-        
-        if (closestDistance)
-            styleBits |= ROUTE_CLOSEST_ROUTE;
-        else {
-            styleBits &= ~ROUTE_CLOSEST_ROUTE;
-        }
-
-        if (avoidObstacles) {
-            if (!closestDistance)
-                styleBits |= ROUTE_CLOSEST_ROUTE;
-
-            styleBits |= ROUTE_AVOID_OBSTACLE;
-        } else
-            styleBits &= ~ROUTE_AVOID_OBSTACLE;
-    }
-
-    /**
-     * Determines if this polyline connection should use the jump links methodology
-     * or not.
-     * 
-     * @return <code>boolean</code> <code>true</code> if this connection should support jump links, 
-     * <code>false</code> otherwise.
-     */
-    public final boolean shouldJumpLinks() {
-        if ((styleBits & ROUTE_JUMP_LINKS) != 0) {
-            IFigure pParent = getParent();
-            if (pParent instanceof ConnectionLayerEx)
-                return ConnectionLayerEx.shouldJumpLinks();
-            
-            return true;
-        }
-
-        return false;
-    }
-
-    /** 
-     * Turns on or off the jump links functionality.
-     * 
-     * @param on the <code>boolean</code> <code>true</code> if this connection should support jump links, 
-     * <code>false</code> otherwise.
-     */
-    public void setJumpLinks(boolean on) {
-        if (on)
-            styleBits |= ROUTE_JUMP_LINKS;
-        else
-            styleBits &= ~ROUTE_JUMP_LINKS;
-    }
-
-    /**
-     * Set the jump links styles associated with the jump links functionality.
-     *
-     * @param jumpType value can be one of <code>PolylineConnectionEx.JUMPLINK_FLAG_BELOW</code>, 
-     * <code>PolylineConnectionEx.JUMPLINK_FLAG_ABOVE</code> or <code>PolylineConnectionEx.JUMPLINK_FLAG_ALL</code>
-     * @param curved the <code>boolean</code> indicating if <code>true</code> the jump link should be curved (semi-circle) 
-     * or if <code>false</code> it should be straight (rectangular).
-     * @param angleIn the <code>boolean</code> if <code>true</code> indicating the sides of the jump link are angled or 
-     * if <code>false</code> then the sides of the jump link are straight.
-     * @param onBottom the <code>boolean</code> <code>true</code> it will be oriented on the bottom of the connection,
-     * <code>false</code> it will oriented on top.
-     */
-    public void setJumpLinksStyles(
-        int jumpType,
-        boolean curved,
-        boolean angleIn,
-        boolean onBottom) {
-
-        styleBits &= ~JUMPLINK_FLAG_ALL;
-        styleBits |= jumpType;
-
-        if (curved)
-            styleBits |= JUMPLINK_FLAG_SMOOTH;
-        else
-            styleBits &= ~JUMPLINK_FLAG_SMOOTH;
-
-        if (angleIn)
-            styleBits |= JUMPLINK_FLAG_ANGLEIN;
-        else
-            styleBits &= ~JUMPLINK_FLAG_ANGLEIN;
-
-        if (onBottom)
-            styleBits |= JUMPLINK_FLAG_ONBOTTOM;
-        else
-            styleBits &= ~JUMPLINK_FLAG_ONBOTTOM;
-            
-        dirtyJumpLinks();
-    }
-
-    /**
-     * Determines if the jump links are smooth or not.
-     * 
-     * @return <code>boolean</code> indicating if <code>true</code> the jump link should be curved (semi-circle) or 
-     * if <code>false</code> it should be straight (rectangular).
-     */
-    public final boolean isJumpLinksSmooth() {
-        return ((styleBits & JUMPLINK_FLAG_SMOOTH) != 0);
-    }
-
-    /**
-     * Determines if the jump links are angled in or not.
-     * 
-     * @return <code>boolean</code> if <code>true</code> indicating the sides of the jump link are angled or 
-     * if <code>false</code> then the sides of the jump link are straight.
-     */
-    public final boolean isJumpLinksAngledIn() {
-        return ((styleBits & JUMPLINK_FLAG_ANGLEIN) != 0);
-    }
-
-    /**
-     * Determines if the jump links are on the bottom of the polyline connection or not.
-     * 
-     * @return <code>boolean</code> <code>true</code> it will be oriented on the bottom of the connection,
-     * <code>false</code> it will oriented on top.
-     */
-    public final boolean isJumpLinksOnBottom() {
-        return ((styleBits & JUMPLINK_FLAG_ONBOTTOM) != 0);
-    }
-
-    /**
-     * Dirty the jump links in this polyline connection.
-     */
-    void dirtyJumpLinks() {
-        JumpLinkSet pJumpLinkSet = getJumpLinkSet();
-        if (pJumpLinkSet != null) {
-            pJumpLinkSet.dirtyJumpLinks();
-        }
-    }
-
-    /**
-     * Regenerate all the jump links in this polyline connection.
-     */
-    private boolean regenerateJumpLinks() {
-        JumpLinkSet pJumpLinkSet = getJumpLinkSet();
-        if (pJumpLinkSet != null) {
-            return pJumpLinkSet.regenerateJumpLinks(this);
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the set of all the jump links in this polyline connection.
-     */
-    private JumpLinkSet getJumpLinkSet() {
-        if (shouldJumpLinks()) {
-            if (jumpLinkSet == null) {
-                jumpLinkSet = new JumpLinkSet();
-            }
-        } else {
-            jumpLinkSet = null;
-        }
-
-        return jumpLinkSet;
-    }
-    
-    /* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure#getPolygonPoints()
-	 */
-	public PointList getPolygonPoints() {
-		return getSmoothPoints();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
-	 */
-	public ConnectionAnchor getConnectionAnchor(String terminal) {
-
-		ConnectionAnchor connectAnchor =
-			(ConnectionAnchor) getConnectionAnchors().get(terminal);
-		if (connectAnchor == null) {
-			if (terminal.equals(szAnchor)) {
-				// get a new one - this figure doesn't support static anchors
-				connectAnchor = createDefaultAnchor();
-				getConnectionAnchors().put(terminal,connectAnchor);
-			}
-			else {
-				connectAnchor = createAnchor(BaseSlidableAnchor.parseTerminalString(terminal));
-			}
-		}
-
-		return connectAnchor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchorTerminal(org.eclipse.draw2d.ConnectionAnchor)
-	 */
-	public String getConnectionAnchorTerminal(ConnectionAnchor c) {
-		if (c instanceof BaseSlidableAnchor) {
-			return ((BaseSlidableAnchor) c).getTerminal();
-		}
-		if (getConnectionAnchors().containsValue(c)) {
-			Iterator iter = getConnectionAnchors().keySet().iterator();
-			String key;
-			while (iter.hasNext()) {
-				key = (String) iter.next();
-				if (getConnectionAnchors().get(key).equals(c))
-					return key;
-			}
-		}
-		getConnectionAnchor(szAnchor);
-		return szAnchor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getSourceConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
-		return createConnectionAnchor(p);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getTargetConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
-		return createConnectionAnchor(p);
-	}
-	
-	/**
-	 * Creates the default Slidable anchor with a reference point at the center
-	 * of the figure's bounds
-	 * 
-	 * @return - default SlidableAnchor, relative reference the center of the figure
-	 */
-	protected ConnectionAnchor createDefaultAnchor() {
-		return new BaseSlidableAnchor(this);
-	}
-	
-	/**
-	 * Creates a slidable anchor at the specified point (from the ratio of the
-	 * reference's coordinates and bounds of the figure
-	 * 
-	 * @param p - relative reference for the <Code>SlidableAnchor</Code>
-	 * @return a <code>SlidableAnchor</code> for this figure with relative reference at p
-	 */
-	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
-		if (p==null)
-			// If the old terminal for the connection anchor cannot be resolved (by SlidableAnchor) a null
-			// PrecisionPoint will passed in - this is handled here
-			return createDefaultAnchor();
-		return new BaseSlidableAnchor(this, p);
-	}
-
-	/**
-	 * Returns a new anchor for this node figure.
-	 * 
-	 * @param p <code>Point</code> on the figure that gives a hint which anchor to return.
-	 * @return <code>ConnectionAnchor</code> reference to an anchor associated with the 
-	 * given point on the figure.
-	 */
-	protected ConnectionAnchor createConnectionAnchor(Point p) {
-		if (p == null) {
-			return getConnectionAnchor(szAnchor);
-		}
-		else {
-			Point temp = p.getCopy();
-			translateToRelative(temp);
-			PrecisionPoint pt = BaseSlidableAnchor.getAnchorRelativeLocation(temp, getBounds());
-			return createAnchor(pt);
-		}
-	} 
-	
-	/**
-	 * Checks whether the <PrecisionPoint> p which is a candidate for a relative reference
-	 * for the <Code>SlidableAnchor</Code> belongs to the area where the default anchor
-	 * must be created
-	 * 
-	 * @param p
-	 * @return <code>boolean</code> <code>true</code> if <PrecisionPoint> belongs to the area where the default anchor must be 
-	 * created, <code>false</code> otherwise
-	 */
-	protected boolean isDefaultAnchorArea(PrecisionPoint p) {
-		return p.preciseX >= getSlidableAnchorArea()/2 && p.preciseX <= 1 - getSlidableAnchorArea()/2 &&
-			p.preciseY >= getSlidableAnchorArea()/2 && p.preciseY <= 1 - getSlidableAnchorArea()/2;
-	}
-	
-	/**
-	 * Returns the connectionAnchors.
-	 * @return Hashtable
-	 */
-	protected Hashtable getConnectionAnchors() {
-		if (connectionAnchors == null)
-			connectionAnchors = new Hashtable(1);
-		return connectionAnchors;
-	}
-	
-	/**
-	 * Specifies how large the area of the figure's bounds where <Code>SlidableAnchor</Code>
-	 * will be created. The result number: 0<=result<=1
-	 * 
-	 * @return  the size of the area of the figure's bounds
-	 */
-	protected double getSlidableAnchorArea() {
-		return 0.25;
-	}
-
-    /* 
-     * (non-Javadoc)
-     * @see org.eclipse.draw2d.IFigure#setForegroundColor(org.eclipse.swt.graphics.Color)
-     */
-    public void setForegroundColor(Color fg) {
-        super.setForegroundColor(fg);
-        if (getTargetDecoration() != null){
-            getTargetDecoration().setForegroundColor(fg);
-        }
-        if (getSourceDecoration() != null){
-            getSourceDecoration().setForegroundColor(fg);
-        }
-    }
-    
-    
-    /**
-     * Sets the decoration to be used at the start of the {@link Connection}.
-     * 
-     * @param dec the new source decoration
-     * @param locator the <code>ConnectionLocator</code> that allows placement of the source
-     * <code>RotableDecoration</code>.
-     */
-    public void setSourceDecoration(RotatableDecoration dec, ConnectionLocator locator) {
-    	if (getSourceDecoration() != null)
-    		remove(getSourceDecoration());
-    	startDecoration = dec;
-    	if (dec != null) {
-    		add(dec, locator);
-    	}
-    }
-    
-    /**
-     * Sets the decoration to be used at the end of the {@link Connection}.
-     * 
-     * @param dec the new target decoration
-     * @param locator the <code>ConnectionLocator</code> that allows placement of the target
-     * <code>RotableDecoration</code>.
-     */
-    public void setTargetDecoration(RotatableDecoration dec, ConnectionLocator locator) {
-    	if (getTargetDecoration() != null)
-    		remove(getTargetDecoration());
-    	endDecoration = dec;
-    	if (dec != null) {
-    		add(dec, locator);
-    	} 
-    		
-    } 
-    
-    /**
-     * @return the target decoration - possibly null
-     */
-    protected RotatableDecoration getTargetDecoration() {
-    	return endDecoration;
-    }    
-    
-    /**
-     * @return the source decoration - possibly null
-     */
-    protected RotatableDecoration getSourceDecoration() {
-    	return startDecoration;
-    }
-    
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.PolylineConnection#setTargetDecoration(org.eclipse.draw2d.RotatableDecoration)
-	 */
-	public void setTargetDecoration(RotatableDecoration dec) {
-		if (getTargetDecoration() != null)
-    		remove(getTargetDecoration());
-    	endDecoration = dec;
-    	if (dec != null) {
-    		add(dec, new ArrowLocator(this, ConnectionLocator.TARGET));
-    	} 
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.PolylineConnection#setSourceDecoration(org.eclipse.draw2d.RotatableDecoration)
-	 */
-	public void setSourceDecoration(RotatableDecoration dec) {
-		if (getSourceDecoration() != null)
-    		remove(getSourceDecoration());
-    	startDecoration = dec;
-    	if (dec != null) {
-    		add(dec, new ArrowLocator(this, ConnectionLocator.SOURCE));
-    	}
-	}
-    
-	private int[] dashes = null;
-	
-	/**
-	 * Workaround for bugzilla 105358
-	 * @param dashes <code>int[]</code> array of dash lengths
-	 * @see Graphics#setLineDash(int[])
-	 */
-	public void setLineDash(int[] dashes) {
-		if (dashes != null) {
-			this.dashes = new int[dashes.length];
-			for (int i = 0; i < dashes.length; i++) {
-				int dash = dashes[i];
-				if (dash <= 0)
-					SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-				this.dashes[i] = dash;
-			}
-		}
-		else {
-			this.dashes = null;
-		}
-	}
-
-	/** 
-	 * Overriden to workaround bugzilla 105358
-	 */
-	public void paintFigure(Graphics graphics) {
-		graphics.pushState();
-		if (dashes != null && getLineStyle() == SWT.LINE_CUSTOM)
-			graphics.setLineDash(dashes);
-		super.paintFigure(graphics);
-		graphics.popState();
-	}
-	
-	/**
-	* Currently we cannot create bendpoints with avoid obstructions 
-	* routing style turned on. Hence we need to define a special cursor
-	* to give user feedback about the disabled bendpoint editing 
-	*/
-	static private final Cursor NO_COMMAND_SPECIAL_CURSOR = 
-		new Cursor(Display.getDefault(), SWT.CURSOR_ARROW);
-
-	/**
-	 * Overriden to display special cursor when needed. Fix for bug #145467 
-	 */
-	public Cursor getCursor() {
-		if (isAvoidObstacleRouting())
-			return NO_COMMAND_SPECIAL_CURSOR;
-		return super.getCursor();
-	}
-	
-}
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadow.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadow.java
deleted file mode 100644
index 4ddde1f..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadow.java
+++ /dev/null

@@ -1,294 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.l10n.Draw2dUIPluginImages;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author choang
- *
- * Drop Shadow Helper Class to help draw shadow on borders
- */
-public class RectangularDropShadow {
-
-	/**
-	 * 
-	 */
-	public RectangularDropShadow() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-	
-	//	Images for the border of the shadow border
-	private static ImageData alpha_ilb = 
-		Draw2dUIPluginImages.DESC_LEFT_BOTTOM.getImageData();
-
-	private static ImageData alpha_irb = 
-		Draw2dUIPluginImages.DESC_RIGHT_BOTTOM.getImageData();
-
-	private static ImageData alpha_ir = 
-		Draw2dUIPluginImages.DESC_RIGHT.getImageData();
-
-	private static ImageData alpha_itr = 
-		Draw2dUIPluginImages.DESC_TOP_RIGHT.getImageData();
-
-	private static ImageData alpha_ib = 
-		Draw2dUIPluginImages.DESC_BOTTOM.getImageData();
-		 
-	/**
-	 * Method for determining the width of the drop shadow border will take up on the shape.
-	 * @return int the width of the drop shadow
-	 */
-	public int getShadowWidth() {
-		return alpha_ir.width;
-	}
-
-	/**
-	 * Method for determining the height of the drop shadow border will take up on the shape.
-	 * @return int the height of the drop shadow
-	 */
-	public int getShadowHeight() {
-		return alpha_ib.height;
-	}
-	
-	/**
-	 * draw a shadow around given rectangle @rect
-	 * @param figure
-	 * @param g
-	 * @param rect the rectangle to draw the shadow around
-	 */
-	public void drawShadow(IFigure figure, Graphics g, Rectangle rect){
-		
-		drawBottomLeftShadow(figure, g, rect);
-
-		// bottom
-		drawBottomShadow(figure, g, rect);
-
-		// bottom right
-		drawBottomRightShadow(figure, g, rect);
-
-		// right
-		drawRightShadow(figure, g, rect);
-
-		// top right
-		drawTopRightShadow(figure, g, rect);
-
-	}
-	
-	/**
-	 * @param figure
-	 * @param g
-	 * @param rBox
-	 */
-	protected void drawTopRightShadow(IFigure figure, Graphics g, Rectangle rBox) {
-		Dimension dim = new Dimension(alpha_itr.width, alpha_itr.height);
-		Image itr = createImageFromAlpha(figure, alpha_itr, dim);
-		Point pt = new Point(rBox.getRight().x - MapModeUtil.getMapMode(figure).DPtoLP(alpha_ir.width),
-			rBox.getTop().y );
-		g.drawImage(itr, pt);
-		itr.dispose();
-	}
-
-	/**
-	 * @param figure
-	 * @param g
-	 * @param rBox
-	 */
-	protected void drawRightShadow(IFigure figure, Graphics g, Rectangle rBox) {
-		Dimension dim = getRightShadowDimension(figure, rBox);
-		Image ir = createImageFromAlpha(figure, alpha_ir, dim);
-		Point pt = 
-			new Point(
-				rBox.getRight().x - MapModeUtil.getMapMode(figure).DPtoLP(alpha_ir.width),
-				rBox.getTop().y + MapModeUtil.getMapMode(figure).DPtoLP(alpha_itr.height)) ;
-		g.drawImage(ir, pt);
-		ir.dispose();
-	}
-
-	/**
-	 * @param figure
-	 * @param g
-	 * @param rBox
-	 */
-	protected void drawBottomRightShadow(
-		IFigure figure,
-		Graphics g,
-		Rectangle rBox) {
-		Dimension dim;
-		dim = getBottomRightShadowDimension();
-		Image irb = createImageFromAlpha(figure, alpha_irb, dim);
-		
-		Point pt =
-			new Point(
-				rBox.getRight().x - MapModeUtil.getMapMode(figure).DPtoLP(alpha_ir.width),
-				rBox.getBottom().y - MapModeUtil.getMapMode(figure).DPtoLP(alpha_ib.height) );
-		g.drawImage(irb, pt);
-		irb.dispose();
-	}
-
-	/**
-	 * @param figure
-	 * @param g
-	 * @param rBox
-	 */
-	protected void drawBottomShadow(IFigure figure, Graphics g, Rectangle rBox) {
-		
-		Dimension dim = getBottomShadowDimension(figure, rBox);
-		Image ib = createImageFromAlpha(figure, alpha_ib, dim);
-		Point pt =
-			new Point(
-				rBox.getLeft().x + MapModeUtil.getMapMode(figure).DPtoLP(alpha_ilb.width),
-				rBox.getBottom().y - MapModeUtil.getMapMode(figure).DPtoLP(alpha_ib.height) );
-		g.drawImage(ib, pt);
-		ib.dispose();
-	}
-
-	/**
-	 * @param figure
-	 * @param g
-	 * @param rBox
-	 */
-	private void drawBottomLeftShadow(IFigure figure, Graphics g, Rectangle rBox) {
-		Dimension dim = getLeftShadowDimension();
-		Image ilb = createImageFromAlpha(figure, alpha_ilb, dim);
-		Point pt =
-			new Point(rBox.getLeft().x,
-				rBox.getBottom().y - MapModeUtil.getMapMode(figure).DPtoLP(alpha_ib.height) );
-		g.drawImage(ilb, pt);
-		ilb.dispose();
-	}
-
-	/**
-	 * @param figure
-	 * @param rBox
-	 * @return the <code>Dimension</code> representing the right shadow
-	 */
-	protected Dimension getRightShadowDimension(IFigure figure, Rectangle rBox) {
-
-		int height = Math.max(MapModeUtil.getMapMode(figure).LPtoDP(rBox.height) - alpha_itr.height - alpha_irb.height,
-			1);
-		return new Dimension(alpha_ir.width, height);
-	}
-
-	/**
-	 * @return the <code>Dimension</code> representing the bottom right shadow
-	 */
-	protected Dimension getBottomRightShadowDimension() {
-		return new Dimension(alpha_irb.width, alpha_irb.height);
-	}
-
-	/**
-	 * @param rBox
-	 * @return the <code>Dimension</code> representing the bottom shadow
-	 */
-	protected Dimension getBottomShadowDimension(IFigure figure, Rectangle rBox) {
-
-		int width = Math.max(MapModeUtil.getMapMode(figure).LPtoDP( rBox.width ) - alpha_ilb.width - alpha_irb.width,
-			1);
-		return new Dimension(width, alpha_ib.height);
-	}
-
-	/**
-	 * @return the <code>Dimension</code> representing the left shadow
-	 */
-	protected Dimension getLeftShadowDimension() {
-		return new Dimension(alpha_ilb.width, alpha_ilb.height);
-	}
-	
-	/**
-	 * Utility function for the paint routine to create the image that will be displayed
-	 * based on a transparency image. 
-	 */
-	private Image createImageFromAlpha(
-		IFigure figure,
-		ImageData alphaData,
-		Dimension dim) {
-		Color foreColor = figure.getForegroundColor();
-
-		ImageData newAlpha = alphaData;
-		if (alphaData.width != dim.width || alphaData.height != dim.height) {
-			ImageData newAlphaData =
-				new ImageData(
-					((dim.width + 3) / 4) * 4,
-					dim.height,
-					alphaData.depth,
-					alphaData.palette);
-			Image imgNewAlpha = new Image(null, newAlphaData);
-			GC gc = new GC(imgNewAlpha);
-
-			Image imgAlpha = new Image(null, alphaData);
-			gc.drawImage(
-				imgAlpha,
-				0,
-				0,
-				alphaData.width,
-				alphaData.height,
-				0,
-				0,
-				newAlphaData.width,
-				newAlphaData.height);
-
-			int nDelta = newAlphaData.width - dim.width;
-			if (nDelta > 0) {
-				gc.setForeground(ColorConstants.black);
-				gc.setBackground(ColorConstants.black);
-				gc.fillRectangle(
-					newAlphaData.width - nDelta,
-					0,
-					nDelta,
-					newAlphaData.height);
-			}
-
-			newAlpha = imgNewAlpha.getImageData();
-
-			imgNewAlpha.dispose();
-			imgAlpha.dispose();
-			gc.dispose();
-		}
-
-		Image img =
-			new Image(Display.getDefault(), newAlpha.width, newAlpha.height);
-
-		GC gc = new GC(img);
-		gc.setForeground(foreColor);
-		gc.setBackground(foreColor);
-		gc.fillRectangle(0, 0, newAlpha.width, newAlpha.height);
-		gc.dispose();
-
-		ImageData filledData = img.getImageData();
-		img.dispose();
-
-		for (int i = 0; i < newAlpha.height; i++) {
-			filledData.setAlphas(
-				0,
-				i,
-				newAlpha.width,
-				newAlpha.data,
-				i * newAlpha.width);
-		}
-
-		return new Image(null, filledData);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java
deleted file mode 100644
index 82f3c3f..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.LineBorderEx;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/*
- * @canBeSeenBy %partners
- */
-/**
- * @author sshaw
- *
- */
-public class RectangularDropShadowLineBorder
-	extends LineBorderEx
-	implements DropShadowBorder {
-
-	// whether the shadow will be painted on this border also
-	private boolean drawDropShadow = true;
-	
-	/**
-	 * delegated <code>DropShadow</code> object that has the drop shadow logic.
-	 */
-	private static RectangularDropShadow dropShadow = new RectangularDropShadow();
- 
-	/**
-	 * Constructs a LineBorder 
-	 * of the specified width.
-	 *
-	 * @param w  Width of inset for border
-	 * 
-	 */
-	public RectangularDropShadowLineBorder(int w) {
-		super(w);
-	}
-
-	/**
-	 * Constructs a DropShadowLineBorder with the foreground color and backgroud color
-	 * of the figure that it is drawing the border for.
-	 *
-	 * 
-	 */
-	public RectangularDropShadowLineBorder() {
-		super();
-	}
-
-	/**
-	 * Method for determining the width of the drop shadow border will take up on the shape.
-	 * @return int the width of the drop shadow
-	 */
-	protected int getShadowWidth() {
-		if( shouldDrawDropShadow() == true )
-		{
-			return getDropShadow().getShadowWidth();
-		}
-		return 0;
-		
-	}
-
-	/**
-	 * Method for determining the height of the drop shadow border will take up on the shape.
-	 * @return int the height of the drop shadow
-	 */
-	protected int getShadowHeight() {
-		if( shouldDrawDropShadow() == true )
-		{
-			return getDropShadow().getShadowHeight();
-		}
-		return 0;
-	}
-
-	/**
-	 * Method for determining the inset the border will take up on the shape.
-	 * @param figure Figure that will be inset from the border
-	 * @return Insets the Insets for the border on the given figure.
-	 */
-	public Insets getInsets(IFigure figure) {
-		Insets insetsNew = super.getInsets(figure);
-		insetsNew.top = 0;
-		insetsNew.left = 0;
-		insetsNew.bottom = MapModeUtil.getMapMode(figure).DPtoLP(insetsNew.bottom + getShadowHeight());
-		insetsNew.right = MapModeUtil.getMapMode(figure).DPtoLP(insetsNew.right + getShadowWidth());
-
-		return insetsNew;
-	}
-
-	/**
-	 * Method shouldDrawShadow.  Determines if the shadow should be drawn 
-	 * on the figure border.   Checks that a drop shadow is the preferred
-	 * border, and that the drop shadow can be drawn on this figure.
-	 * @param figure Figure that the border will be drawn on
-	 * @return boolean true if the shadow should be drawn, false otherwise.
-	 */
-	protected boolean shouldDrawShadow(IFigure figure) {
-		
-		if (shouldDrawDropShadow()== false)
-			return false;
-		
-		Rectangle rBox = figure.getBounds();
-
-		// check to see if we can draw a shadow on this figure
-		if (rBox.width < getShadowWidth() * 2
-			|| rBox.height < getShadowHeight() * 2) {
-			return false;
-		}
-
-		return true;
-	}
-	
-	/**
-	 * @see TransparentBorder#getTransparentInsets(IFigure)
-	 */
-	public Insets getTransparentInsets(IFigure figure) {
-		Insets insetsNew = new Insets();
-		
-		insetsNew.top = 0;
-		insetsNew.left = 0;
-		insetsNew.bottom = MapModeUtil.getMapMode(figure).DPtoLP(getShadowHeight());
-		insetsNew.right = MapModeUtil.getMapMode(figure).DPtoLP(getShadowWidth());
-
-		return insetsNew;
-	}
-
-	/**
-	 * Is this border Opaque or not.  
-	 * @return boolean true if opaque, false otherwise
-	 */
-	public boolean isOpaque() {
-		return false;
-	}
-
-
-	/**
-	 * Method paintLineBorder.
-	 * Painting the line border on the shape without the dropshadow.
-	 * @param figure Figure that the border will be painted on
-	 * @param g Graphics context 
-	 * @param insets Insets value that contrains how the border will be painted.
-	 */
-	public void paintLineBorder(IFigure figure, Graphics g, Insets insets) {
-
-		// will not paint line border if width is 0
-		if (getWidth() > 0) { 
-			tempRect.setBounds(getPaintRectangle(figure, insets));
-			g.setLineWidth(getWidth());
-			g.drawRectangle(tempRect);
-		}
-	}
-	
-	/**
-	 * Paint the border of the figure with a dropshadow.
-	 * @param figure Figure that the border will be painted on
-	 * @param g Graphics context 
-	 * @param insets Insets value that contrains how the border will be painted.
-	 * @param rBox Rectangle representing figure bounds.
-	 */
-	public void paintDropShadowBorder(IFigure figure, Graphics g, Insets insets, Rectangle rBox) {
-
-		//Draw the dropShadow.
-		getDropShadow().drawShadow(figure,g,rBox);
-		
-		IMapMode mm = MapModeUtil.getMapMode(figure);
-		
-		//Draw the line border.				
-		if (getWidth() > 0) { 
-			//will not paint line border if width is 0
-			tempRect.setBounds(getPaintRectangle(figure, insets));
-			tempRect.width -= mm.DPtoLP(getShadowWidth());
-			tempRect.height -= mm.DPtoLP(getShadowHeight());
-			if (getWidth() % 2 == 1) {
-				tempRect.width -= mm.DPtoLP(1);
-				tempRect.height -= mm.DPtoLP(1);
-			}
-			tempRect.shrink(mm.DPtoLP(getWidth() / 2), mm.DPtoLP(getWidth() / 2));
-			g.setLineWidth(getWidth());
-
-			if (getColor() != null) {
-				g.setForegroundColor(getColor());
-			} else {
-				g.setForegroundColor(figure.getForegroundColor());
-			}
-			g.drawRectangle(tempRect);
-		}
-	}
-
-	/**
-	 * Overridden method for painting the border on the shape.
-	 * @param figure Figure that the border will be painted on
-	 * @param g Graphics context 
-	 * @param insets Insets value that contrains how the border will be painted.
-	 */
-	public void paint(IFigure figure, Graphics g, Insets insets) {
-
-		Rectangle rBox = new Rectangle(figure.getBounds());
-
-		// draw drop shadow border
-		if (shouldDrawShadow(figure)) {
-			paintDropShadowBorder(figure, g, insets, rBox);			
-		}
-		//draw line border
-		else{			
-			paintLineBorder(figure, g, insets);
-		}		
-	}
-	
-	/* 
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figures.DropShadowBorder#drawDropShadow()
-	 */
-	public boolean shouldDrawDropShadow() {		
-		return this.drawDropShadow;
-	}
-
-	/* 
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figures.DropShadowBorder#drawDropShadow(boolean)
-	 */
-	public void setShouldDrawDropShadow(boolean bDrawDropShadow) {
-		this.drawDropShadow=bDrawDropShadow;
-	}
-
-	/**
-	 * @return Returns the drip shadow iamge.
-	 */
-	protected RectangularDropShadow getDropShadow() {
-		return dropShadow;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/WrapLabel.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/WrapLabel.java
deleted file mode 100644
index 58c3613..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/WrapLabel.java
+++ /dev/null

@@ -1,1714 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.IMapModeHolder;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.Image;
-
-import com.ibm.icu.text.BreakIterator;
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * An extended label that has the following extra features:
- * 
- * 1- It is capable of showing selection and focus feedback (primary or
- * secondary) 2- It is capable of optionally underlining the label's text 3- It
- * is capable of wrapping the label's text at a given width with a given
- * alignment 4- It is capable of supporting multiple label icons (temporary
- * feature)
- * 
- * This class was originally deriving off Draw2d's <code>Label</code> class
- * but with the introduction of the auto-wrapping feature, a copy had to be made
- * overriding was not straightforward. Hopefully, this extended version can be
- * pushed to opensource
- * 
- * <p>
- * Code taken from Eclipse reference bugzilla #98820
- * 
- * @author melaasar
- */
-public class WrapLabel
-	extends Figure
-	implements PositionConstants {	
-
-	private static final String _ellipse = "..."; //$NON-NLS-1$
-
-	private static final Dimension EMPTY_DIMENSION = new Dimension(0, 0);
-
-	private static final Map mapModeConstantsMap = new WeakHashMap();
-
-	private static class MapModeConstants {
-
-		private static final int MAX_IMAGE_INFO = 12;
-
-		public final WeakReference mapModeRef;
-
-		public final int nDPtoLP_3;
-
-		public final int nDPtoLP_2;
-
-		public final int nDPtoLP_0;
-
-		public final Dimension dimension_nDPtoLP_0;
-
-		public final WeakHashMap fontToEllipseTextSize = new WeakHashMap();
-
-		public final SingleIconInfo[] singleIconInfos = new SingleIconInfo[MAX_IMAGE_INFO];
-
-		public MapModeConstants(IMapMode mapMode) {
-			this.mapModeRef = new WeakReference(mapMode);
-			nDPtoLP_2 = mapMode.DPtoLP(2);
-			nDPtoLP_3 = mapMode.DPtoLP(3);
-			nDPtoLP_0 = mapMode.DPtoLP(0);
-			dimension_nDPtoLP_0 = new Dimension(nDPtoLP_0, nDPtoLP_0);
-		}
-
-		public Dimension getEllipseTextSize(Font f) {
-			Dimension d = (Dimension) fontToEllipseTextSize.get(f);
-			if (d == null) {
-				IMapMode mapMode = (IMapMode) mapModeRef.get();
-				d = FigureUtilities.getTextExtents(_ellipse, f);
-				d.height = FigureUtilities.getFontMetrics(f).getHeight();
-				d = new Dimension(mapMode.DPtoLP(d.width), mapMode
-					.DPtoLP(d.height));
-				fontToEllipseTextSize.put(f, d);
-			}
-			return d;
-		}
-
-		public SingleIconInfo getSingleIconInfo(Image image) {
-			if (image == null) {
-				return SingleIconInfo.NULL_INFO;
-			}
-			SingleIconInfo info;
-			for (int i = 0; i < MAX_IMAGE_INFO; ++i) {
-				info = singleIconInfos[i];
-				if (info == null) {
-					info = new SingleIconInfo(image);
-					singleIconInfos[i] = info;
-					return info;
-				}
-				if (info.icon == image) {
-					return info;
-				}
-			}
-			int index = SingleIconInfo.count % MAX_IMAGE_INFO;
-			info = new SingleIconInfo(image);
-			singleIconInfos[index] = info;
-			return info;
-		}
-	}
-
-	// reserve 1 bit
-	private static int FLAG_SELECTED = MAX_FLAG << 1;
-
-	private static int FLAG_HASFOCUS = MAX_FLAG << 2;
-
-	private static int FLAG_UNDERLINED = MAX_FLAG << 3;
-
-	private static int FLAG_STRIKEDTHROUGH = MAX_FLAG << 4;
-
-	private static int FLAG_WRAP = MAX_FLAG << 5;
-
-	// reserve 3 bits
-	private static int FLAG_TEXT_ALIGN = MAX_FLAG << 6;
-
-	private static int FLAG_WRAP_ALIGN = MAX_FLAG << 9;
-
-	private static int FLAG_ICON_ALIGN = MAX_FLAG << 12;
-
-	private static int FLAG_LABEL_ALIGN = MAX_FLAG << 15;
-
-	private static int FLAG_TEXT_PLACEMENT = MAX_FLAG << 18;
-
-	private MapModeConstants mapModeConstants;
-
-	/** the original label's text */
-	private String text;
-
-	/** the label's text used in painting after applying required styles */
-	private String subStringText;
-
-	/** the size of text */
-	private Dimension textSize;	
-
-	private Dimension ellipseTextSize;
-
-	/** the location of text */
-	private Point textLocation;
-
-	/** the cached hint used to calculate text size */
-	private int cachedPrefSizeHint_width;
-
-	private int cachedPrefSizeHint_height;
-
-	/** the icon location */
-	private Point iconLocation;
-
-	private static abstract class IconInfo {
-		/**
-		 * Gets the icon at the index location.
-		 * 
-		 * @param i
-		 *            the index to retrieve the icon of
-		 * @return <code>Image</code> that corresponds to the given index.
-		 */
-		public abstract Image getIcon(int i);
-		
-		/**
-		 * Gets the icon size of the icon at the given index.
-		 * 
-		 * @param i
-		 * @return the <code>Dimension</code> that is the size of the icon at
-		 *         the given index.
-		 */
-		public abstract Dimension getIconSize(IMapMode mapMode, int i);
-
-		/**
-		 * @return the number of icons
-		 */
-		public abstract int getNumberofIcons();
-		
-		/**
-		 * @return the <code>Dimension</code> that is the total size of all
-		 *         the icons.
-		 */
-		public abstract Dimension getTotalIconSize(IMapMode mapMode);
-
-		public abstract void invalidate();
-		
-		/**
-		 * Sets the icon at the index location.
-		 * 
-		 * @param icon
-		 * @param i
-		 */
-		public abstract void setIcon(Image icon, int i);
-		
-		/**
-		 * 
-		 */
-		public abstract int getMaxIcons();
-
-	}	
-
-	private static class SingleIconInfo
-		extends IconInfo {	
-
-		static int count;
-		
-		public static final SingleIconInfo NULL_INFO = new SingleIconInfo(){
-			public int getNumberofIcons() {
-				return 0;
-			}
-		};
-
-		final Image icon;
-
-		/** total icon size */
-		private Dimension totalIconSize;
-
-		private SingleIconInfo() {
-			icon = null;//don't increment count, used only for NULL_INFO
-		}
-
-		public SingleIconInfo(Image icon) {
-			this.icon = icon;
-			++count;
-		}
-
-		public final int getMaxIcons() {
-			return 1;
-		}
-
-		
-		public Image getIcon(int i) {
-			if (i == 0) {
-				return icon;
-			} else if (i > 0) {
-				return null;
-			}
-			throw new IndexOutOfBoundsException();
-		}
-
-		
-		public void setIcon(Image img, int i) {
-			throw new UnsupportedOperationException();
-		}
-
-		
-		public Dimension getIconSize(IMapMode mapMode, int i) {
-			if (i == 0) {
-				return getTotalIconSize(mapMode);
-			}
-
-			throw new IndexOutOfBoundsException();
-		}
-
-		
-		public int getNumberofIcons() {
-			return 1;
-		}
-
-		
-		public Dimension getTotalIconSize(IMapMode mapMode) {
-			if (totalIconSize != null)
-				return totalIconSize;
-
-			if (icon != null && !icon.isDisposed()) {
-				org.eclipse.swt.graphics.Rectangle imgBounds = icon.getBounds();
-				totalIconSize = new Dimension(mapMode.DPtoLP(imgBounds.width),
-					mapMode.DPtoLP(imgBounds.height));
-			} else {
-				totalIconSize = EMPTY_DIMENSION;
-			}
-
-			return totalIconSize;
-		}
-
-		
-		public void invalidate() {
-			totalIconSize = null;
-		}
-
-	}
-
-	private static class MultiIconInfo
-		extends IconInfo {
-
-		/** the label icons */
-		private ArrayList icons = new ArrayList(2);
-
-		/** total icon size */
-		private Dimension totalIconSize;
-
-		public MultiIconInfo() {
-			super();
-		}
-
-		public int getMaxIcons() {
-			return -1;
-		}
-
-		/**
-		 * Gets the icon at the index location.
-		 * 
-		 * @param i
-		 *            the index to retrieve the icon of
-		 * @return <code>Image</code> that corresponds to the given index.
-		 */
-		public Image getIcon(int i) {
-			if (i >= icons.size())
-				return null;
-
-			return (Image) icons.get(i);
-		}
-
-		/**
-		 * Sets the icon at the index location.
-		 * 
-		 * @param icon
-		 * @param i
-		 */
-		public void setIcon(Image icon, int i) {
-			int size = icons.size();
-			if (i >= size) {
-				for (int j = size; j < i; j++)
-					icons.add(null);
-				icons.add(icon);
-				icons.trimToSize();
-			} else
-				icons.set(i, icon);
-		}
-
-		/**
-		 * Gets the icon size of the icon at the given index.
-		 * 
-		 * @param i
-		 * @return the <code>Dimension</code> that is the size of the icon at
-		 *         the given index.
-		 */
-		public Dimension getIconSize(IMapMode mapMode, int i) {
-			Image img = getIcon(i);
-			if (img != null && !img.isDisposed()) {
-				org.eclipse.swt.graphics.Rectangle imgBounds = img.getBounds();				
-				return new Dimension(mapMode.DPtoLP(imgBounds.width), mapMode
-					.DPtoLP(imgBounds.height));
-			}
-			return EMPTY_DIMENSION;
-		}
-
-		/**
-		 * @return the number of icons
-		 */
-		public int getNumberofIcons() {
-			return icons.size();
-		}
-
-		/**
-		 * @return the <code>Dimension</code> that is the total size of all
-		 *         the icons.
-		 */
-		public Dimension getTotalIconSize(IMapMode mapMode) {
-			if (totalIconSize != null)
-				return totalIconSize;
-			int iconNum = getNumberofIcons();
-			if (iconNum == 0) {
-				return totalIconSize = EMPTY_DIMENSION;
-			}
-
-			totalIconSize = new Dimension();
-			for (int i = 0; i < iconNum; i++) {
-				Dimension iconSize = getIconSize(mapMode, i);
-				totalIconSize.width += iconSize.width;
-				if (iconSize.height > totalIconSize.height)
-					totalIconSize.height = iconSize.height;
-			}
-
-			return totalIconSize;
-		}
-
-		/**
-		 * 
-		 */
-		public void invalidate() {
-			totalIconSize = null;
-		}
-	}
-
-	private IconInfo iconInfo;
-
-	/** the cached hint used to calculate text size */	
-	private int cachedTextSizeHint_width;
-
-	private int cachedTextSizeHint_height;
-	
-	
-	
-	/**
-	 * Construct an empty Label.
-	 * 
-	 * @since 2.0
-	 */
-	public WrapLabel() {
-		text = "";//$NON-NLS-1$
-		// set defaults
-		setAlignmentFlags(CENTER, FLAG_TEXT_ALIGN);
-		setAlignmentFlags(CENTER, FLAG_ICON_ALIGN);
-		setAlignmentFlags(CENTER, FLAG_LABEL_ALIGN);
-		setAlignmentFlags(LEFT, FLAG_WRAP_ALIGN);
-		setPlacementFlags(EAST, FLAG_TEXT_PLACEMENT);
-	}
-
-	/**
-	 * Construct a Label with passed String as its text.
-	 * 
-	 * @param s the label text
-	 * @since 2.0
-	 */
-	public WrapLabel(String s) {
-		if (s != null) {
-			text = s;
-		} else {
-			text = "";//$NON-NLS-1$
-		}
-//		setBorder(new LineBorderEx(ColorConstants.red,3));
-	}
-
-	/**
-	 * Construct a Label with passed Image as its icon.
-	 * 
-	 * @param i the label image
-	 * @since 2.0
-	 */
-	public WrapLabel(Image i) {
-		text = "";//$NON-NLS-1$
-		iconInfo = new SingleIconInfo(i);
-	}
-
-	/**
-	 * Construct a Label with passed String as text and passed Image as its
-	 * icon.
-	 * 
-	 * @param s the label text
-	 * @param i the label image
-	 * @since 2.0
-	 */
-	public WrapLabel(String s, Image i) {
-		if (s != null) {
-			text = s;
-		} else {
-			text = "";//$NON-NLS-1$
-		}
-		iconInfo = new SingleIconInfo(i);
-	}
-	
-	/**
-	 * @return <code>IMapMode</code> used by this figure.
-	 *         <code>IMapMode</code> that allows for the coordinate mapping
-	 *         from device to logical units.
-	 */
-	private IMapMode getFigureMapMode() {
-		return (IMapMode) getMapModeConstants().mapModeRef.get();
-	}
-
-	private MapModeConstants getMapModeConstants() {
-		if (mapModeConstants == null) {
-			IMapMode mapMode = MapModeUtil.getMapMode(this);
-			while (mapMode instanceof IMapModeHolder) {
-				mapMode = ((IMapModeHolder) mapMode).getMapMode();
-			}
-			mapModeConstants = (MapModeConstants) mapModeConstantsMap
-				.get(mapMode);
-			if (mapModeConstants == null) {
-				mapModeConstants = new MapModeConstants(mapMode);
-				mapModeConstantsMap.put(mapMode, mapModeConstants);
-			}
-		}
-		return mapModeConstants;
-	}
-
-	private void alignOnHeight(Point loc, Dimension size, int alignment) {
-		switch (alignment) {
-			case TOP:
-				loc.y = getInsets().top;
-				break;
-			case BOTTOM:
-				loc.y = bounds.height - size.height - getInsets().bottom;
-				break;
-			default:
-				loc.y = (bounds.height - size.height) / 2;
-		}
-	}
-
-	private void alignOnWidth(Point loc, Dimension size, int alignment) {
-		switch (alignment) {
-			case LEFT:
-				loc.x = getInsets().left;
-				break;
-			case RIGHT:
-				loc.x = bounds.width - size.width - getInsets().right;
-				break;
-			default:
-				loc.x = (bounds.width - size.width) / 2;
-		}
-	}
-
-	private void calculateAlignment(Dimension iconSize, int textPlacement) {
-		switch (textPlacement) {
-			case EAST:
-			case WEST:
-				alignOnHeight(textLocation, getTextSize(), getTextAlignment());
-				alignOnHeight(getIconLocation(), iconSize, getIconAlignment());
-				break;
-			case NORTH:
-			case SOUTH:
-				alignOnWidth(textLocation, getSubStringTextSize(),
-					getTextAlignment());
-				alignOnWidth(getIconLocation(), iconSize, getIconAlignment());
-				break;
-		}
-	}
-
-	/**
-	 * Calculates the size of the Label using the passed Dimension as the size
-	 * of the Label's text.
-	 * 
-	 * @param txtSize the precalculated size of the label's text
-	 * @return the label's size
-	 * @since 2.0
-	 */
-	protected Dimension calculateLabelSize(Dimension txtSize) {
-		Dimension iconSize = getTotalIconSize();
-		boolean isEmpty = (iconSize.width == 0 && iconSize.height == 0);
-		int len = getText().length();
-		if (len == 0 && isEmpty) {
-			return new Dimension(txtSize.width, txtSize.height);
-		}
-		int gap = (len == 0 || isEmpty) ? 0
-			: getIconTextGap();
-		int placement = getTextPlacement();
-		if (placement == WEST || placement == EAST) {
-			return new Dimension(iconSize.width + gap + txtSize.width, Math
-				.max(iconSize.height, txtSize.height));
-		} else {
-			return new Dimension(Math.max(iconSize.width, txtSize.width),
-				iconSize.height + gap + txtSize.height);
-		}
-	}
-
-	private void calculateLocations() {
-		textLocation = new Point();
-		iconLocation = new Point();
-		Dimension iconSize = getTotalIconSize();
-		int textPlacement = getTextPlacement();
-		calculatePlacement(iconSize, textPlacement);
-		calculateAlignment(iconSize, textPlacement);
-		Rectangle r = getBounds();
-		Dimension ps = getPreferredSize(r.width, r.height);
-		int w = (r.width - ps.width)
-			+ (getTextSize().width - getSubStringTextSize().width);
-		int h = r.height - ps.height;
-		if (w == 0 && h == 0) {
-			return;
-		}
-
-		Dimension offset = new Dimension(w, h);
-		switch (getLabelAlignment()) {
-			case CENTER:
-				offset.scale(0.5f);
-				break;
-			case LEFT:
-				offset.scale(0.0f);
-				break;
-			case RIGHT:
-				offset.scale(1.0f);
-				break;
-			case TOP:
-				offset.height = 0;
-				offset.scale(0.5f);
-				break;
-			case BOTTOM:
-				offset.height = offset.height * 2;
-				offset.scale(0.5f);
-				break;
-			default:
-				offset.scale(0.5f);
-				break;
-		}
-
-		switch (textPlacement) {
-			case EAST:
-			case WEST:
-				offset.height = 0;
-				break;
-			case NORTH:
-			case SOUTH:
-				offset.width = 0;
-				break;
-		}
-
-		textLocation.translate(offset);
-		iconLocation.translate(offset);
-	}
-
-	private void calculatePlacement(Dimension iconSize, int textPlacement) {
-		int gap = (getText().length() == 0 || (iconSize.width == 0 && iconSize.height == 0)) ? 0
-			: getIconTextGap();
-		Insets insets = getInsets();
-		switch (textPlacement) {
-			case EAST:
-				iconLocation.x = insets.left;
-				textLocation.x = iconSize.width + gap + insets.left;
-				break;
-			case WEST:
-				textLocation.x = insets.left;
-				iconLocation.x = getSubStringTextSize().width + gap
-					+ insets.left;
-				break;
-			case NORTH:
-				textLocation.y = insets.top;
-				iconLocation.y = getTextSize().height + gap + insets.top;
-				break;
-			case SOUTH:
-				textLocation.y = iconSize.height + gap + insets.top;
-				iconLocation.y = insets.top;
-		}
-	}
-	/**
-	 * Calculates the size of the Label's text size. The text size calculated
-	 * takes into consideration if the Label's text is currently truncated. If
-	 * text size without considering current truncation is desired, use
-	 * {@link #calculateTextSize(int, int)}.
-	 * 
-	 * @return the size of the label's text, taking into account truncation
-	 * @since 2.0
-	 */
-	protected Dimension calculateSubStringTextSize() {
-		Font f = getFont();
-		return getTextExtents(getSubStringText(), f, getFigureMapMode().DPtoLP(FigureUtilities.getFontMetrics(f).getHeight())); 
-	}
-
-	/**
-	 * Calculates and returns the size of the Label's text. Note that this
-	 * Dimension is calculated using the Label's full text, regardless of
-	 * whether or not its text is currently truncated. If text size considering
-	 * current truncation is desired, use {@link #calculateSubStringTextSize()}.
-	 * 
-	 * @param wHint a width hint
-	 * @param hHint a height hint
-	 * @return the size of the label's text, ignoring truncation
-	 * @since 2.0
-	 */
-	protected Dimension calculateTextSize(int wHint, int hHint) {
-		Font f = getFont();
-		return getTextExtents(getWrappedText(wHint, hHint), f,getFigureMapMode().DPtoLP(FigureUtilities.getFontMetrics(f).getHeight()));
-	}
-
-	private void clearLocations() {
-		iconLocation = textLocation = null;
-	}
-
-	/**
-	 * Returns the Label's icon.
-	 * 
-	 * @return the label icon
-	 * @since 2.0
-	 */
-	public Image getIcon() {
-		return getIcon(0);
-	}
-
-	/**
-	 * Gets the label's icon at the given index
-	 * 
-	 * @param index The icon index
-	 * @return the <code>Image</code> that is the icon for the given index.
-	 */
-	public Image getIcon(int index) {
-		if (iconInfo == null)
-			return null;
-		return iconInfo.getIcon(index);
-	}
-
-	/**
-	 * Determines if there is any icons by checking if icon size is zeros.
-	 * 
-	 * @return true if icons are present, false otherwise 
-	 */
-	protected boolean hasIcons() {
-		return (getNumberofIcons() > 0);
-	}
-
-	/**
-	 * Returns the current alignment of the Label's icon. The default is
-	 * {@link PositionConstants#CENTER}.
-	 * 
-	 * @return the icon alignment
-	 * @since 2.0
-	 */
-	public int getIconAlignment() {
-		return getAlignment(FLAG_ICON_ALIGN);
-	}
-
-	/**
-	 * Returns the bounds of the Label's icon.
-	 * 
-	 * @return the icon's bounds
-	 * @since 2.0
-	 */
-	public Rectangle getIconBounds() {
-		return new Rectangle(getBounds().getLocation().translate(
-			getIconLocation()), getTotalIconSize());
-	}
-
-	/**
-	 * Returns the location of the Label's icon relative to the Label.
-	 * 
-	 * @return the icon's location
-	 * @since 2.0
-	 */
-	protected Point getIconLocation() {
-		if (iconLocation == null)
-			calculateLocations();
-		return iconLocation;
-	}
-
-	/**
-	 * Returns the gap in pixels between the Label's icon and its text.
-	 * 
-	 * @return the gap
-	 * @since 2.0
-	 */
-	public int getIconTextGap() {
-		return getMapModeConstants().nDPtoLP_3;
-	}
-
-	/**
-	 * @see IFigure#getMinimumSize(int, int)
-	 */
-	public Dimension getMinimumSize(int w, int h) {
-		if (minSize != null)
-			return minSize;
-		minSize = new Dimension();
-		LayoutManager layoutManager = getLayoutManager();
-		if (layoutManager != null)
-			minSize.setSize(layoutManager.getMinimumSize(this, w, h));
-		Font f = getFont();
-		Dimension d = getEllipseTextSize().getIntersected(
-			getTextExtents(getText(), f, getFigureMapMode().DPtoLP(FigureUtilities.getFontMetrics(f).getHeight())));		
-		
-		Dimension labelSize = calculateLabelSize(d);
-		Insets insets = getInsets();
-		labelSize.expand(insets.getWidth(), insets.getHeight());
-		minSize.union(labelSize);
-		return minSize;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		if (prefSize == null || wHint != cachedPrefSizeHint_width || hHint != cachedPrefSizeHint_height) {
-			prefSize = calculateLabelSize(getTextSize(wHint, hHint));
-			Insets insets = getInsets();
-			prefSize.expand(insets.getWidth(), insets.getHeight());
-			LayoutManager layoutManager = getLayoutManager();
-			if (layoutManager != null) {
-				prefSize.union(layoutManager.getPreferredSize(this, wHint,
-					hHint));
-			}
-			prefSize.union(getMinimumSize(wHint, hHint));
-			cachedPrefSizeHint_width = wHint;
-			cachedPrefSizeHint_height = hHint;
-		}
-		return prefSize;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.IFigure#getMaximumSize()
-	 */
-	public Dimension getMaximumSize() {
-		// this assumes that getPreferredSize(wHint, hHint) is called before
-		return prefSize;   
-	}
-
-	/**
-	 * Calculates the amount of the Label's current text will fit in the Label,
-	 * including an elipsis "..." if truncation is required.
-	 * 
-	 * @return the substring
-	 * @since 2.0
-	 */
-	public String getSubStringText() {
-		if (subStringText != null)
-			return subStringText;
-		
-		String theText = getText();
-		int textLen = theText.length();
-		if (textLen == 0) {
-			return subStringText = "";//$NON-NLS-1$;;
-		}
-		Dimension size = getSize();
-		Dimension shrink = getPreferredSize(size.width, size.height).getDifference(size);
-		Dimension effectiveSize = getTextSize().getExpanded(-shrink.width, -shrink.height);
-		
-		if (effectiveSize.height == 0) {
-			return subStringText = "";//$NON-NLS-1$;
-		}
-		
-		Font f = getFont();
-		FontMetrics metrics = FigureUtilities.getFontMetrics(f);
-		IMapMode mm = getFigureMapMode();
-		int fontHeight = mm.DPtoLP(metrics.getHeight());
-		int charAverageWidth = mm.DPtoLP(metrics.getAverageCharWidth());
-		int maxLines = (int) (effectiveSize.height / (double) fontHeight);
-		if (maxLines == 0) {
-			return subStringText = "";//$NON-NLS-1$
-		}
-
-		StringBuffer accumlatedText = new StringBuffer();
-		StringBuffer remainingText = new StringBuffer(theText);
-		
-		int effectiveSizeWidth = effectiveSize.width;
-		int widthHint = Math.max(effectiveSizeWidth
-			- getEllipseTextSize().width, 0);
-		int i = 0, j = 0;
-		while (remainingText.length() > 0 && j++ < maxLines) {
-			i = getLineWrapPosition(remainingText.toString(), f, effectiveSizeWidth, fontHeight);
-
-			if (accumlatedText.length() > 0)
-				accumlatedText.append('\n');
-
-			if (i == 0 || (remainingText.length() > i && j == maxLines)) {				
-				i = getLargestSubstringConfinedTo(remainingText.toString(), f, widthHint, fontHeight, charAverageWidth);
-				accumlatedText.append(remainingText.substring(0, i));
-				accumlatedText.append(getEllipse());
-			} else
-				accumlatedText.append(remainingText.substring(0, i));
-			remainingText.delete(0, i);
-		}
-		return subStringText = accumlatedText.toString();
-	}
-	
-	
-	
-	
-	/**
-	 * Creates an equivalent text to that of the label's but with "\n"(s)
-	 * inserted at the wrapping positions. This method assumes unlimited
-	 * bounding box and is used by <code>calculateTextSize()</code> to
-	 * calculate the perfect size of the text with wrapping
-	 * 
-	 * @return the wrapped text
-	 */	
-	private String getWrappedText(int wHint, int hHint) {
-		String theText = getText();		
-		if (wHint == -1 || theText.length() == 0 || !isTextWrapped())
-			return theText;
-
-		Dimension iconSize = getTotalIconSize();
-		if (!(iconSize.width == 0 && iconSize.height == 0)) {
-			switch(getTextPlacement()) {
-				case EAST:
-				case WEST:
-					wHint -= iconSize.width + getIconTextGap();
-					break;
-				case NORTH:
-				case SOUTH:
-					if (hHint != -1)
-						hHint -= iconSize.height + getIconTextGap();
-					break;
-			}
-		}
-		
-		
-		if ((hHint == 0)||(wHint == 0)) {
-			return "";//$NON-NLS-1$;
-		}
-		
-		Font f = getFont();
-		int fontHeight = getFigureMapMode().DPtoLP(FigureUtilities.getFontMetrics(f).getHeight());
-		int maxLines = Integer.MAX_VALUE;
-		if (hHint != -1) {			
-			maxLines = (int) (hHint / (double) fontHeight);
-			if (maxLines == 0) {
-				return "";//$NON-NLS-1$;;
-			}
-		}	
-		
-		StringBuffer accumlatedText = new StringBuffer();
-		StringBuffer remainingText = new StringBuffer(theText);
-		int i = 0, j = 0;
-
-		while (remainingText.length() > 0 && j++  < maxLines) {
-			if ((i = getLineWrapPosition(remainingText.toString(), f, wHint, fontHeight)) == 0)
-				break;
-
-			if (accumlatedText.length() > 0)
-				accumlatedText.append('\n');
-			accumlatedText.append(remainingText.substring(0, i));
-			remainingText.delete(0, i);
-		}
-		return accumlatedText.toString();
-	}
-
-	/**
-	 * Returns the size of the Label's current text. If the text is currently
-	 * truncated, the truncated text with its ellipsis is used to calculate the
-	 * size.
-	 * 
-	 * @return the size of this label's text, taking into account truncation
-	 * @since 2.0
-	 */
-	protected Dimension getSubStringTextSize() {
-		return calculateSubStringTextSize();
-	}
-	
-	/**
-	 * Returns the size of the String constant "..." the ellipse based on
-	 * the currently used Map mode
-	 * size.
-	 * 
-	 * @return the size of ellipse text
-	 * 
-	 */
-	private Dimension getEllipseTextSize() {
-		if (ellipseTextSize == null) {
-			ellipseTextSize = getMapModeConstants().getEllipseTextSize(
-				getFont());
-		}
-		return ellipseTextSize;
-	}
-
-	/**
-	 * Returns the text of the label. Note that this is the complete text of the
-	 * label, regardless of whether it is currently being truncated. Call
-	 * {@link #getSubStringText()}to return the label's current text contents
-	 * with truncation considered.
-	 * 
-	 * @return the complete text of this label
-	 * @since 2.0
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * Returns the current alignment of the Label's text. The default text
-	 * alignment is {@link PositionConstants#CENTER}.
-	 * 
-	 * @return the text alignment
-	 */
-	public int getTextAlignment() {
-		return getAlignment(FLAG_TEXT_ALIGN);
-	}
-
-	/**
-	 * Returns the current alignment of the entire Label. The default label
-	 * alignment is {@link PositionConstants#LEFT}.
-	 * 
-	 * @return the label alignment
-	 */
-	private int getLabelAlignment() {
-		return getAlignment(FLAG_LABEL_ALIGN);
-	}
-	
-	/**
-	 * Returns the bounds of the label's text. Note that the bounds are
-	 * calculated using the label's complete text regardless of whether the
-	 * label's text is currently truncated.
-	 * 
-	 * @return the bounds of this label's complete text
-	 * @since 2.0
-	 */
-	public Rectangle getTextBounds() {
-		return new Rectangle(getBounds().getLocation().translate(
-			getTextLocation()), getTextSize());
-	}
-
-	/**
-	 * Returns the location of the label's text relative to the label.
-	 * 
-	 * @return the text location
-	 * @since 2.0
-	 */
-	protected Point getTextLocation() {
-		if (textLocation != null)
-			return textLocation;
-		calculateLocations();
-		return textLocation;
-	}
-
-	/**
-	 * Returns the current placement of the label's text relative to its icon.
-	 * The default text placement is {@link PositionConstants#EAST}.
-	 * 
-	 * @return the text placement
-	 * @since 2.0
-	 */
-	public int getTextPlacement() {
-		return getPlacement(FLAG_TEXT_PLACEMENT);
-	}
-
-	/**
-	 * Returns the size of the label's complete text. Note that the text used to
-	 * make this calculation is the label's full text, regardless of whether the
-	 * label's text is currently being truncated and is displaying an ellipsis.
-	 * If the size considering current truncation is desired, call
-	 * {@link #getSubStringTextSize()}.
-	 * 
-	 * @param wHint a width hint
-	 * @param hHint a height hint
-	 * @return the size of this label's complete text
-	 * @since 2.0
-	 */
-	protected Dimension getTextSize(int wHint, int hHint) {
-		if (textSize == null || wHint != cachedTextSizeHint_width || hHint != cachedTextSizeHint_height) {
-			textSize = calculateTextSize(wHint, hHint);
-			cachedTextSizeHint_width = wHint;
-			cachedTextSizeHint_height= hHint;
-		}
-		return textSize;
-	}
-
-	/**
-	 * Gets the text size given the current size as a width hint
-	 */
-	private final Dimension getTextSize() {		
-		Rectangle r = getBounds();
-		return getTextSize(r.width, r.height);		
-	}
-	
-	/**
-	 * @see IFigure#invalidate()
-	 */
-	public void invalidate() {
-		prefSize = null;
-		minSize = null;
-		clearLocations();
-		ellipseTextSize = null;
-		textSize = null;
-		subStringText = null;
-		if (iconInfo != null)
-			iconInfo.invalidate();
-		super.invalidate();
-	}
-
-	/**
-	 * Returns <code>true</code> if the label's text is currently truncated
-	 * and is displaying an ellipsis, <code>false</code> otherwise.
-	 * 
-	 * @return <code>true</code> if the label's text is truncated
-	 * @since 2.0
-	 */
-	public boolean isTextTruncated() {
-		return !getSubStringTextSize().equals(getTextSize());
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	public void paintFigure(Graphics graphics) {
-		if (isSelected()) {
-			graphics.pushState();
-			graphics.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			graphics.fillRectangle(getSelectionRectangle());
-			graphics.popState();
-			graphics.setForegroundColor(ColorConstants.white);
-		}
-		if (hasFocus()) {
-			graphics.pushState();
-			graphics.setXORMode(true);
-			graphics.setForegroundColor(ColorConstants.menuBackgroundSelected);
-			graphics.setBackgroundColor(ColorConstants.white);
-			graphics.drawFocus(getSelectionRectangle().resize(-1, -1));
-			graphics.popState();
-		}
-		if (isOpaque())
-			super.paintFigure(graphics);
-		Rectangle figBounds = getBounds();
-
-		graphics.translate(figBounds.x, figBounds.y);
-		if (hasIcons())
-			paintIcons(graphics);
-
-		String subString = getSubStringText();
-		if (subString.length() > 0) {
-			if (!isEnabled()) {
-				graphics.translate(1, 1);
-				graphics.setForegroundColor(ColorConstants.buttonLightest);
-				paintText(graphics, subString);
-				graphics.translate(-1, -1);
-				graphics.setForegroundColor(ColorConstants.buttonDarker);
-			} else {
-				paintText(graphics, subString);
-			}
-		}
-		graphics.translate(-figBounds.x, -figBounds.y);
-	}
-
-	/**
-	 * Paints the text and optioanally underlines it
-	 * 
-	 * @param graphics The graphics context
-	 * @param subString The string to draw
-	 */	
-	private void paintText(Graphics graphics, String subString) {		
-		StringTokenizer tokenizer = new StringTokenizer(subString, "\n"); //$NON-NLS-1$
-		Font f = getFont();
-		FontMetrics fontMetrics = FigureUtilities.getFontMetrics(f);
-		int fontHeight = getFigureMapMode().DPtoLP(fontMetrics.getHeight());
-		int fontHeightHalf = fontHeight / 2;
-		int textWidth = getTextExtents(subString, f, fontHeight).width;
-		Point p = getTextLocation();
-		int y = p.y;
-		int x = p.x;
-		final int wrapAlignment = getTextWrapAlignment();
-		boolean isUnderlined = isTextUnderlined();
-		boolean isStrikedThrough = isTextStrikedThrough();
-		Rectangle clipRect = new Rectangle();
-		graphics.getClip(clipRect);
-		int clipRectTopRight_x = clipRect.getTopRight().x;
-		// If the font's leading area is 0 then we need to add an offset to
-		// avoid truncating at the top (e.g. Korean fonts)
-		if (0 == fontMetrics.getLeading()) {
-			y +=  getMapModeConstants().nDPtoLP_2; // 2 is the leading area for default English			
-		}				
-
-		while (tokenizer.hasMoreTokens()) {
-			String token = tokenizer.nextToken();
-			int tokenWidth = getTextExtents(token, f, fontHeight).width;
-			
-			switch (wrapAlignment) {
-				case CENTER:
-					x += (textWidth - tokenWidth) / 2;
-					break;
-				case RIGHT:
-					x += textWidth - tokenWidth;
-					break;
-			}
-			
-			// increase the clipping rectangle by a small amount to account for font overhang
-			// from italic / irregular characters etc.
-			
-			
-			if (tokenWidth + x <= clipRectTopRight_x) {
-				Rectangle newClipRect = new Rectangle(clipRect);
-				newClipRect.width += (tokenWidth / token.length()) / 2;
-				graphics.setClip(newClipRect);
-			}
-				
-			graphics.drawText(token, x, y);
-			graphics.setClip(clipRect);
-			
-			y += fontHeight;
-
-			if (isUnderlined)
-				graphics.drawLine(x, y - 1, x + tokenWidth, y - 1);
-			if (isStrikedThrough)
-				graphics.drawLine(x, y - fontHeightHalf + 1, x + tokenWidth, y
-					- fontHeightHalf + 1);
-		}
-	}
-
-	/**
-	 * Paints the icon(s)
-	 * 
-	 * @param graphics The graphics context
-	 */
-	private void paintIcons(Graphics graphics) {
-		Point p = Point.SINGLETON;
-		p.setLocation(getIconLocation());
-
-		int num = getNumberofIcons();
-		for (int i = 0; i < num; i++) {
-			Image icon = getIcon(i); 
-			if (icon != null) {
-				graphics.drawImage(icon, p);
-				p.x += getIconSize(i).width;
-			}
-		}
-	}
-
-	/**
-	 * Sets the label's icon to the passed image.
-	 * 
-	 * @param image the new label image
-	 * @since 2.0
-	 */
-	public void setIcon(Image image) {
-		setIcon(image, 0);
-	}
-
-	/**
-	 * Sets the label's icon at given index
-	 * 
-	 * @param image The icon image or null to remove the icon
-	 * @param index The icon index
-	 */
-	public void setIcon(Image image, int index) {
-		if (iconInfo == null) {
-			if (index == 0) {
-				iconInfo = getMapModeConstants().getSingleIconInfo(image);
-			} else {
-				iconInfo = new MultiIconInfo();
-				iconInfo.setIcon(image, index);
-			}
-			revalidate();
-			repaint();// Call repaint, in case the image dimensions are the same.           
-		} else if (iconInfo.getIcon(index) != image) {
-			if (iconInfo.getMaxIcons() == 1) {
-				if (index == 0) {
-					iconInfo = getMapModeConstants().getSingleIconInfo(image);
-					revalidate();
-					repaint();// Call repaint, in case the image dimensions are the same.
-					return;
-				}
-				IconInfo oldIconInfo = iconInfo;
-				iconInfo = new MultiIconInfo();
-				iconInfo.setIcon(oldIconInfo.getIcon(0), 0);
-			}
-			iconInfo.setIcon(image, index);
-			revalidate();
-			repaint();// Call repaint, in case the image dimensions are the same.
-		}	
-	}
-
-
-	/**
-	 * Sets the icon alignment relative to the .abel's alignment to the passed
-	 * value. The default is {@link PositionConstants#CENTER}. Other possible
-	 * values are {@link PositionConstants#TOP},
-	 * {@link PositionConstants#BOTTOM},{@link PositionConstants#LEFT}and
-	 * {@link PositionConstants#RIGHT}.
-	 * 
-	 * @param align the icon alignment
-	 * @since 2.0
-	 */
-	public void setIconAlignment(int align) {
-		if (getIconAlignment() == align)
-			return;
-		setAlignmentFlags(align, FLAG_ICON_ALIGN);
-		clearLocations();
-		repaint();
-	}
-
-	/**
-	 * getIconSize
-	 * @param index of icon to retrieve size of.
-	 * @return Dimension representing the icon size.
-	 */
-	protected Dimension getIconSize(int index) {
-		if (iconInfo == null)
-			return EMPTY_DIMENSION;
-		return iconInfo.getIconSize(getFigureMapMode(), index);
-	}
-	
-	/**
-	 * getIconNumber
-	 * @return int number of icons in the wrap label
-	 */
-	protected int getNumberofIcons() {
-		if (iconInfo == null)
-			return 0;
-		return iconInfo.getNumberofIcons();
-	}
-	
-	/**
-	 * getTotalIconSize
-	 * Calculates the total union of icon sizes
-	 * @return Dimension that is the union of icon sizes
-	 */
-	protected Dimension getTotalIconSize() {
-		if (iconInfo == null)
-			return EMPTY_DIMENSION;
-		return iconInfo.getTotalIconSize(getFigureMapMode());
-	}
-
-	/**
-	 * Sets the Label's alignment to the passed value. The default is
-	 * {@link PositionConstants#CENTER}. Other possible values are
-	 * {@link PositionConstants#TOP},{@link PositionConstants#BOTTOM},
-	 * {@link PositionConstants#LEFT}and {@link PositionConstants#RIGHT}.
-	 * 
-	 * @param align label alignment
-	 */
-	public void setLabelAlignment(int align) {
-		if (getLabelAlignment() == align)
-			return;
-		setAlignmentFlags(align, FLAG_LABEL_ALIGN);
-		clearLocations();
-		repaint();
-	}
-
-	/**
-	 * Return the ellipse string.
-	 * 
-	 * @return the <code>String</code> that represents the fact that the
-	 * text has been truncated and that more text is available but hidden. 
-	 * Usually this is represented by "...".
-	 */
-	protected String getEllipse() {
-		return _ellipse;
-	}
-	
-	/**
-	 * Sets the label's text.
-	 * 
-	 * @param s the new label text
-	 * @since 2.0
-	 */
-	public void setText(String s) {
-		//"text" will never be null.
-		if (s == null)
-			s = "";//$NON-NLS-1$
-		if (text.equals(s))
-			return;
-		text = s;
-		revalidate();
-		repaint(); //If the new text does not cause a new size, we still need
-		// to paint.
-	}
-
-	/**
-	 * Sets the text alignment of the Label relative to the label alignment. The
-	 * default is {@link PositionConstants#CENTER}. Other possible values are
-	 * {@link PositionConstants#TOP},{@link PositionConstants#BOTTOM},
-	 * {@link PositionConstants#LEFT}and {@link PositionConstants#RIGHT}.
-	 * 
-	 * @param align the text alignment
-	 * @since 2.0
-	 */
-	public void setTextAlignment(int align) {
-		if (getTextAlignment() == align)
-			return;
-		setAlignmentFlags(align, FLAG_TEXT_ALIGN);
-		clearLocations();
-		repaint();
-	}
-
-	/**
-	 * Sets the text placement of the label relative to its icon. The default is
-	 * {@link PositionConstants#EAST}. Other possible values are
-	 * {@link PositionConstants#NORTH},{@link PositionConstants#SOUTH}and
-	 * {@link PositionConstants#WEST}.
-	 * 
-	 * @param where the text placement
-	 * @since 2.0
-	 */
-	public void setTextPlacement(int where) {
-		if (getTextPlacement() == where)
-			return;
-		setPlacementFlags(where, FLAG_TEXT_PLACEMENT);
-		revalidate();
-		repaint();
-	}
-
-	/**
-	 * Sets whether the label text should be underlined
-	 * 
-	 * @param b Wether the label text should be underlined
-	 */
-	public void setTextUnderline(boolean b) {
-		if (isTextUnderlined() == b)
-			return;
-		setFlag(FLAG_UNDERLINED, b);
-		repaint();
-	}
-
-	/**
-	 * @return whether the label text is underlined
-	 */
-	public boolean isTextUnderlined() {
-		return (flags & FLAG_UNDERLINED) != 0;
-	}
-	
-	/**
-	 * Sets whether the label text should be striked-through
-	 * 
-	 * @param b Wether the label text should be stricked-through
-	 */
-	public void setTextStrikeThrough(boolean b) {
-		if (isTextStrikedThrough() == b)
-			return;
-		setFlag(FLAG_STRIKEDTHROUGH, b);
-		repaint();
-	}
-
-	/**
-	 * @return wether the label text is stricked-through
-	 */
-	public boolean isTextStrikedThrough() {
-		return (flags & FLAG_STRIKEDTHROUGH) != 0;
-	}
-
-	/**
-	 * Sets whether the label text should wrap
-	 * 
-	 * @param b whether the label text should wrap
-	 */
-	public void setTextWrap(boolean b) {
-		if (isTextWrapped() == b)
-			return;
-		setFlag(FLAG_WRAP, b);
-		revalidate();
-		repaint();
-	}
-
-	/**
-	 * @return wether the label text wrap is on
-	 */
-	public boolean isTextWrapped() {
-		return (flags & FLAG_WRAP) != 0;
-	}
-
-	/**
-	 * Sets the wrapping width of the label text. This is only valid if text
-	 * wrapping is turned on
-	 * 
-	 * @param i The label text wrapping width
-	 */
-	public void setTextWrapWidth(int i) {
-		/*
-		 * if (this.wrapWidth == i) return; this.wrapWidth = i; revalidate();
-		 * repaint();
-		 */
-	}
-
-	/**
-	 * Sets the wrapping width of the label text. This is only valid if text
-	 * wrapping is turned on
-	 * 
-	 * @param i The label text wrapping width
-	 */
-	public void setTextWrapAlignment(int i) {
-		if (getTextWrapAlignment() == i)
-			return;
-		
-		setAlignmentFlags(i, FLAG_WRAP_ALIGN);
-		repaint();
-	}
-
-	/**
-	 * @return the label text wrapping width
-	 */
-	public int getTextWrapAlignment() {
-		return getAlignment(FLAG_WRAP_ALIGN);
-	}
-	
-	/**
-	 * setPlacementFlags
-	 * @param align 
-	 * @param flagOffset
-	 */
-	private void setPlacementFlags(int align, int flagOffset) {
-		flags &= ~(0x7 * flagOffset);
-		switch (align) {
-			case EAST:
-				flags |= 0x1 * flagOffset;
-				break;
-			case WEST:
-				flags |= 0x2 * flagOffset;
-				break;
-			case NORTH:
-				flags |= 0x3 * flagOffset;
-				break;
-			case SOUTH:
-				flags |= 0x4 * flagOffset;
-				break;
-		}
-	}
-
-	/**
-	 * getPlacement
-	 * 
-	 * @param flagOffset
-	 * @return PositionConstant representing the placement
-	 */
-	private int getPlacement(int flagOffset) {
-		int wrapValue = flags & (0x7 * flagOffset);
-		if (wrapValue == 0x1 * flagOffset)
-			return EAST;
-		else if (wrapValue == 0x2 * flagOffset)
-			return WEST;
-		else if (wrapValue == 0x3 * flagOffset)
-			return NORTH;
-		else if (wrapValue == 0x4 * flagOffset)
-			return SOUTH;
-		
-		return EAST;
-	}
-	
-	/**
-	 * setAlignmentFlags
-	 * @param align 
-	 * @param flagOffset
-	 */
-	private void setAlignmentFlags(int align, int flagOffset) {
-		flags &= ~(0x7 * flagOffset);
-		switch (align) {
-			case CENTER:
-				flags |= 0x1 * flagOffset;
-				break;
-			case TOP:
-				flags |= 0x2 * flagOffset;
-				break;
-			case LEFT:
-				flags |= 0x3 * flagOffset;
-				break;
-			case RIGHT:
-				flags |= 0x4 * flagOffset;
-				break;
-			case BOTTOM:
-				flags |= 0x5 * flagOffset;
-				break;
-		}
-	}
-
-	/**
-	 * Retrieves the alignment value from the flags member.
-	 * 
-	 * @param flagOffset that is the bitwise value representing the offset.
-	 * @return PositionConstant representing the alignment
-	 */
-	private int getAlignment(int flagOffset) {
-		int wrapValue = flags & (0x7 * flagOffset);
-		if (wrapValue == 0x1 * flagOffset)
-			return CENTER;
-		else if (wrapValue == 0x2 * flagOffset)
-			return TOP;
-		else if (wrapValue == 0x3 * flagOffset)
-			return LEFT;
-		else if (wrapValue == 0x4 * flagOffset)
-			return RIGHT;
-		else if (wrapValue == 0x5 * flagOffset)
-			return BOTTOM;
-		
-		return CENTER;
-	}
-	
-
-	/**
-	 * Sets the selection state of this label
-	 * 
-	 * @param b true will cause the label to appear selected
-	 */
-	public void setSelected(boolean b) {
-		if (isSelected() == b)
-			return;
-		setFlag(FLAG_SELECTED, b);
-		repaint();
-	}
-
-	/**
-	 * @return the selection state of this label
-	 */
-	public boolean isSelected() {
-		return (flags & FLAG_SELECTED) != 0;
-	}
-
-	/**
-	 * Sets the focus state of this label
-	 * 
-	 * @param b true will cause a focus rectangle to be drawn around the text
-	 *            of the Label
-	 */
-	public void setFocus(boolean b) {
-		if (hasFocus() == b)
-			return;
-		setFlag(FLAG_HASFOCUS, b);
-		repaint();
-	}
-
-	/**
-	 * @return the focus state of this label
-	 */
-	public boolean hasFocus() {
-		return (flags & FLAG_HASFOCUS) != 0;
-	}
-
-	/**
-	 * Returns the bounds of the text selection
-	 * 
-	 * @return The bounds of the text selection
-	 */
-	private Rectangle getSelectionRectangle() {
-		Rectangle figBounds = getTextBounds();
-		int expansion = getMapModeConstants().nDPtoLP_2;
-		figBounds.resize(expansion, expansion);
-		translateToParent(figBounds);
-		figBounds.intersect(getBounds());
-		return figBounds;
-	}
-
-	/**
-	 * returns the position of last character within the supplied text that will
-	 * fit within the supplied width.
-	 * 
-	 * @param s a text string
-	 * @param f font used to draw the text string
-	 * @param w width in pixles.
-	 * @param fontHeight int <b>mapped already to logical units</b>.
-	 */
-	private int getLineWrapPosition(String s, Font f, int w, int fontHeight) {
-		if (getTextExtents(s, f, fontHeight).width <= w) {
-			return s.length();
-		}
-		// create an iterator for line breaking positions
-		BreakIterator iter = BreakIterator.getLineInstance();
-		iter.setText(s);
-		int start = iter.first();
-		int end = iter.next();
-
-		// if the first line segment does not fit in the width,
-		// determine the position within it where we need to cut
-		if (getTextExtents(s.substring(start, end), f, fontHeight).width > w) {
-			iter = BreakIterator.getCharacterInstance();
-			iter.setText(s);
-			start = iter.first();
-		}
-
-		// keep iterating as long as width permits
-		do
-			end = iter.next();
-		while (end != BreakIterator.DONE
-			&& getTextExtents(s.substring(start, end), f, fontHeight).width <= w);
-		return (end == BreakIterator.DONE) ? iter.last()
-			: iter.previous();
-	}	
-
-	/**
-	 * Returns the largest substring of <i>s </i> in Font <i>f </i> that can be
-	 * confined to the number of pixels in <i>availableWidth <i>.
-	 * 
-	 * @param s the original string
-	 * @param f the font
-	 * @param w the available width
-	 * @param fontHeight int <b>mapped already to logical units</b>.
-	 * @param charAverageWidth int <b>mapped already to logical units</b>.
-	 * @return the largest substring that fits in the given width
-	 * @since 2.0
-	 */
-	private int getLargestSubstringConfinedTo(String s, Font f, int w, int fontHeight, int charAverageWidth) {		
-		float avg = charAverageWidth;
-		int min = 0;
-		int max = s.length() + 1;
-
-		//The size of the current guess
-		int guess = 0, guessSize = 0;
-		while ((max - min) > 1) {
-			//Pick a new guess size
-			//	New guess is the last guess plus the missing width in pixels
-			//	divided by the average character size in pixels
-			guess = guess + (int) ((w - guessSize) / avg);
-
-			if (guess >= max)
-				guess = max - 1;
-			if (guess <= min)
-				guess = min + 1;
-
-			//Measure the current guess
-			guessSize = getTextExtents(s.substring(0, guess), f, fontHeight).width;
-
-			if (guessSize < w)
-				//We did not use the available width
-				min = guess;
-			else
-				//We exceeded the available width
-				max = guess;
-		}
-		return min;
-	}
-
-	/**
-	 * Gets the tex extent scaled to the mapping mode
-	 */
-	private Dimension getTextExtents(String s, Font f, int fontHeight) {
-		if (s.length() == 0) {
-			return getMapModeConstants().dimension_nDPtoLP_0;
-		} else {
-			// height should be set using the font height and the number of
-			// lines in the string			
-			Dimension d = FigureUtilities.getTextExtents(s, f);
-			IMapMode mapMode = getFigureMapMode();
-			d.width = mapMode.DPtoLP(d.width);
-			d.height = fontHeight * new StringTokenizer(s, "\n").countTokens();//$NON-NLS-1$
-			return d;			
-		}
-	}
-
-    
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/package.html
deleted file mode 100644
index 78083b6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Provides a set of classes that extend from the org.eclipse.draw2d 
-hierarchies for rendering, geometric manipulation and layout of figures
-on the drawing surface.
-
-<p>These classes can be used when constructing your figures for display.  They
-are pure draw2d extensions have no dependencies into org.eclipse.gef.</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java
deleted file mode 100644
index 8cea70a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java
+++ /dev/null

@@ -1,954 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.geometry;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.geometry.Translatable;
-
-/**
- * This is a geometric utility class that allows for manipulation of line segments.
- * A line segment is defined as a set of two points where one point is designated as the
- * origin and the other is the terminal.
- * 
- * @author sshaw
- * @canBeSeenBy %partners
- */
-public class LineSeg 
-	implements Cloneable, java.io.Serializable, Translatable {
-	
-	final private static int DEFAULT_INTERSECTION_TOLERANCE = 1; 
-
-	private Point origin;
-	private Point terminus;
-	static final long serialVersionUID = 1;
-	
-	/**
-	 * Enumeration class for defining the keypoint along a line segment.  Can be one
-	 * of <code>ORIGIN</code>, <code>MIDPOINT</code> or <code>TERMINUS</code>.
-	 */
-	static public class KeyPoint {
-		private final String name;
-		private KeyPoint(String name) { 
-			this.name = name; 
-		}
-		
-		public String toString() { return name; }
-		
-		/**
-		 * Constant designating the origin point on the line segment.
-		 */
-		public static final KeyPoint ORIGIN = new KeyPoint("origin"); //$NON-NLS-1$
-		
-		/**
-		 * Constant designating the mid point on the line segment.
-		 */
-		public static final KeyPoint MIDPOINT = new KeyPoint("midpoint");//$NON-NLS-1$
-		
-		/**
-		 * Constant designating the terminal point on the line segment.
-		 */
-		public static final KeyPoint TERMINUS = new KeyPoint("terminus");//$NON-NLS-1$
-	}
-
-	/**
-	 * Enumeration class for defining the orientations of a point relative to the line
-	 * segment.  The orientations can be one of <code>POSITIVE</code> or 
-	 * <code>NEGATIVE</code>.
-	 */
-	static public class Sign {
-		private final String name;
-		private Sign(String name) { 
-			this.name = name; 
-		}
-		
-		public String toString() { return name; }
-		
-		/**
-		 * Constant designating an orientation that is position relative to the lineseg
-		 * vector.
-		 */
-		public static final Sign POSITIVE = new Sign("positive");//$NON-NLS-1$
-		
-		/**
-		 * Constant designating an orientation that is negative relative to the lineseg
-		 * vector.
-		 */
-		public static final Sign NEGATIVE = new Sign("negative");//$NON-NLS-1$
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param ptStart Point indicating the start of the line segment
-	 * @param ptEnd Point indicating the end of the line segment
-	 */
-	public LineSeg(Point ptStart, Point ptEnd) {
-		origin = new Point(ptStart);
-		terminus = new Point(ptEnd);
-	}
-
-	/**
-	 * Creates a segment using (fromX, fromY) as either the 
-	 * first point of the segment (start == Origin) or the midpoint of the 
-	 * segment (start == Midpoint), and using slope as its new slope and len as
-	 * the new length.  xdir indicates which direction the segment should
-	 * go in the x-axis.
-	 * 
-	 * @param start <code>KeyPoint</code> from which the other parameters are relative to
-	 * @param fromX int x value of start <code>KeyPoint</code>
-	 * @param fromY int y value of start <code>KeyPoint</code>
-	 * @param slope <code>float</code> slope of the line
-	 * @param len <code>long</code> length of the line
-	 * @param xdir direction
-	 */
-	public LineSeg(
-		final KeyPoint start,
-		final int fromX,
-		final int fromY,
-		final float slope,
-		final long len,
-		final int xdir) {
-		super();
-
-		origin = new Point();
-		terminus = new Point();
-
-		int dx, dy;
-		float dx_float;
-		double len_squared;
-
-		// Find the delta y and x needed to get to the end points.  See
-		// pointOn() for explanation of these equations
-		if (start == KeyPoint.ORIGIN) {
-			len_squared = (float) len * (float) len;
-		} else // start == DirectedLine::Midpoint
-			{
-			len_squared = len / 2.0 * len / 2.0;
-		}
-
-		double slope_squared = slope * slope;
-		dx_float = (float) Math.sqrt(len_squared / (slope_squared + 1.0));
-
-		// Set which direction the segment should go in the x direction.
-		// The y direction will get set automatically based on slope
-		// and the dx.
-
-		dx_float *= xdir;
-		dx = (int) (dx_float + 0.5);
-
-		dy = (int) ((slope * dx_float) + 0.5);
-
-		if (start == KeyPoint.ORIGIN) {
-			origin.x = fromX;
-			origin.y = fromY;
-		} else // start == DirectedLine::Midpoint
-			{
-			origin.x = fromX - dx;
-			origin.y = fromY - dy;
-		}
-
-		terminus.x = fromX + dx;
-		terminus.y = fromY + dy;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object seg) {
-		if (!(seg instanceof LineSeg))
-			return false;
-		
-		LineSeg ls = (LineSeg)seg;
-		return getOrigin().equals(ls.getOrigin())
-			&& getTerminus().equals(ls.getTerminus());
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getOrigin().hashCode() ^ getTerminus().hashCode();
-	}
-	
-	/**
-	 * Accesssor to retrieve the origin point of the line segement.
-	 * 
-	 * @return <code>Point</code> the origin of the line segment.
-	 */
-	public Point getOrigin() {
-		return new Point(origin);
-	}
-
-	/**
-	 * Accesssor to retrieve the terminal point of the line segement.
-	 * 
-	 * @return <code>Point</code> the terminating point of the line segment
-	 */
-	public Point getTerminus() {
-		return new Point(terminus);
-	}
-
-	/**
-	 * Sets the origin point of the line segment
-	 * 
-	 * @param origin Point to set as origin
-	 */
-	public void setOrigin(Point origin) {
-		this.origin = new Point(origin);
-	}
-
-	/**
-	 * Sets the terminating point of the line segment.
-	 * 
-	 * @param terminus Point to set as terminus
-	 */
-	public void setTerminus(Point terminus) {
-		this.terminus = new Point(terminus);
-	}
-
-	/**
-	 * Get points representing the highest point value 
-	 * for this line segment.
-	 * 
-	 * @return <code>Point</code> Representing the highest point value.
-	 */
-	public final Point getSupremum() {
-		return new Point(
-			Math.max(origin.x, terminus.x),
-			Math.max(origin.y, terminus.y));
-	}
-
-	/**
-	 * Get a <code>Point</code> representing the lowest point value 
-	 * for this line segment.
-	 * 
-	 * @return <code>Point</code> Representing the lowest point value.
-	 */
-	public final Point getInfimum() {
-		return new Point(
-			Math.min(origin.x, terminus.x),
-			Math.min(origin.y, terminus.y));
-	}
-	
-	/**
-	 * Determines if this a horizontal segment
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if horizontal, 
-	 * <code>false</code> otherwise.
-	 */
-	public final boolean isHorizontal() {
-		return (origin.y == terminus.y);
-	}
-
-	/**
-	 * Determines if this a vertical segment
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if vertical, 
-	 * <code>false</code> otherwise.
-	 */
-	public final boolean isVertical() {
-		return (origin.x == terminus.x);
-	}
-
-	/**
-	 * Constant to avoid divide by zero errors.
-	 */
-	private static final float BIGSLOPE = 9999;
-
-	/**
-	 * Calculates the slope of this line segment (y=mx+b)
-	 * 
-	 * @return <code>float</code> the slope of this segment.  If the slope
-	 * is not defined such as when the line segment is vertical, then the
-	 * constant <code>BIGSLOPE</code> is returned to avoid divide by zero
-	 * errors.
-	 */
-	public final float slope() {
-		if (isVertical())
-			return BIGSLOPE;
-
-		return (float) (terminus.y - origin.y) / (float) (terminus.x - origin.x);
-	}
-
-	/**
-	 * Calculates the perpendicular slope of this line segment.  This calculates
-	 * the slope and then inverts it.  Again, to avoid divide by zero errors,
-	 * the constant <code>BIGSLOPE</code> is returned if the calculated slope
-	 * before inverting it was zero.
-	 * 
-	 * @return <code>float</code> the perpendicular slope value of the 
-	 * line segment.
-	 */
-	public final float perpSlope() {
-		float m = slope();
-		if (m == 0.0)
-			return BIGSLOPE;
-		else
-			return - (1.0F / m);
-	}
-
-	/**
-	 * Calculate the length of the line segment.
-	 * 
-	 * @return the <code>double</code> length of the line segment.
-	 */
-	public final double length() {
-		return getOrigin().getDistance(getTerminus());
-	}
-
-	/**
-	 * Determines the intersect point between this line and the line passed 
-	 * in as a parameter.  If they intersect, then true is returned and the 
-	 * point reference passed in will be set to the intersect point.  
-	 * If they don't intersect, then the method returns <code>false</code>.
-	 * 
-	 * @param line <code>LineSeg</code> to test the intersection against.
-	 * @param nTolerance int tolerance value for detecting the intersection.
-	 * @return <code>Point</code> that represents the intersection with this line, 
-	 * or <code>null</code> if the calculation is not possible.
-	 */
-	public Point intersect(
-		final LineSeg line,
-		final int nTolerance) {
-		PointList intersections = getLinesIntersections(line);
-		if (intersections.size()>1) {
-			intersections.addPoint(getOrigin().getCopy());
-			intersections.addPoint(getTerminus().getCopy());
-		}
-		for (int i=0; i<intersections.size(); i++) {
-			Point result = intersections.getPoint(i).getCopy();
-			if (containsPoint(result, nTolerance)
-					&& line.containsPoint(result, nTolerance)) {
-					return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Checks if this line segment contains the given point within a tolerance value.
-	 * 
-	 * @param aPoint <code>Point</code> to test if contained in this line.
-	 * @param tolerance int tolerance value for detecting the intersection.
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if the given point lies on this 
-	 * segment, <code>false</code> otherwise.
-	 */
-	public final boolean containsPoint(final Point aPoint, final int tolerance) {
-		Point theOrigin = getOrigin();
-		Point theTerminus = getTerminus();
-
-		return (
-			theOrigin.getDistance(aPoint) + aPoint.getDistance(theTerminus)
-				<= length() + tolerance);
-	}
-
-	/**
-	 * Finds the percentage distance along this line segement where the given point
-	 * resides.
-	 * 
-	 * @param coord <code>Point</code> to determine how far along the line segment it resides.
-	 * @return <code>float</code> the distance along the line segment where the ptCoord is 
-	 * 		in a percentage from.
-	 */
-	public final float distanceAlong(Point coord) {
-		int xCoord = coord.x;
-		int yCoord = coord.y;
-
-		/*
-		Use parametric form for equation of a line segment:
-		p + td, where 0 < t < 1 and d = p2 - p (direction vector)
-		
-		To find out if point lies "inside" line segment (i.e. can
-		draw perpendicular line from segment to point), use projection
-		of point (q) to line (p + td):
-			t = (q-p).d/length(d)^2  (. is dot product)
-		*/
-
-		/* get the direction vector */
-		long dirx = (long) terminus.x - (long) origin.x;
-		long diry = (long) terminus.y - (long) origin.y;
-
-		/* get q - p */
-		long qpx = (long) xCoord - (long) origin.x;
-		long qpy = (long) yCoord - (long) origin.y;
-
-		/* dot product of (q-p) and d */
-		long dotprod = qpx * dirx + qpy * diry;
-
-		/* avoid divide by 0 - check if point1 equals point2.  If so,
-		   there is no segment - return a value which indicates projection
-		   falls outside the segment. */
-		if (dirx == 0 && diry == 0)
-			return -1;
-
-		/* length (magnitude) of d is sqrt(dirx^2 + diry^2).  Don't
-		   bother taking square root since we want the length squared. */
-		return ((float) dotprod / (float) (dirx * dirx + diry * diry));
-	}
-
-	/**
-	 * Finds the perpendicular distance from a point coordinates to this line segment.
-	 * If point is "inside" line segment, then use distance from point to the line, 
-	 * otherwise use distance to nearest endpoint of segment
-	 * 
-	 * @param xCoord the x coordinate of the point.
-	 * @param yCoord the y coordinate of the point.
-	 * @return <code>long</code> the distance from the line segment to the given point.
-	 */
-	public final long distanceToPoint(final int xCoord, final int yCoord) {
-		
-		double proj = projection(xCoord, yCoord);
-
-		if (proj > 0 && proj < 1) {
-			Point pt = perpIntersect(xCoord, yCoord);
-			return Math.round(pt.getDistance(new Point(xCoord, yCoord)));
-		}
-
-		long d1 = Math.round(getOrigin().getDistance(new Point(xCoord, yCoord)));
-		long d2 = Math.round(getTerminus().getDistance(new Point(xCoord, yCoord)));
-		
-		return (d1 < d2 ? d1 : d2);
-
-		/* There are 2 general forms to equations of a line:
-		  1. y = mx + c, where c = y1 - m(x1), and
-		  2. ax + by + c = 0
-		   We know m and c, so putting first version in the form of
-		   the second version, we get:
-		  mx - y + c = 0
-		   So, for form 2, a = m, b = -1, and c = y1 - m(x1).
-		   Distance from point (x, y) to line (using form 2) is:
-		  |ax + by + c| / sqrt(a^2 + b^2)
-		   or
-		  |mx - y + y1 - m(x1)| / sqrt(m^2 + 1)
-		*/
-	}
-
-	/**
-	 * Calculates the perpendicular intersection point on 
-	 * the line segment from the given point.
-	 * 
-	 * @param startX the x coordinate of the point
-	 * @param startY the y coordinate of the point
-	 * @return <code>Point</code> value containment the perpendicular intersection point.
-	 */
-	public final Point perpIntersect(final int startX, final int startY) {
-		float fx;
-
-		// The following equations are based on solving 2 equations with
-		// 2 unknowns (x and y).  The 2 equations are equations for the
-		// slope of each line segment where the slope and 1 point in the
-		// segment are known:
-		// (y1 - y) / (x1 - x) = m
-		// (sy - y) / (sx - x) = -1/m   (-1/m is slope of perp. line)
-		//
-		Point ptResult = new Point();
-		float m = slope();
-
-		fx =
-			(m * startY - m * getOrigin().y + m * m * getOrigin().x + startX)
-				/ (float) (m * m + 1.0);
-
-		if (m == 0) {
-			ptResult.y = getOrigin().y; // segment is horizontal - avoid divide by 0
-		} else {
-			ptResult.y = (int) (startY + ((startX - fx) / m) + 0.5);
-		}
-
-		ptResult.x = Math.round(fx); // add .5 for rounding
-		return ptResult;
-	}
-
-	/**
-	 * Calculates the projection of the given point onto the line segment.
-	 * 
-	 * @param xCoord the x coordinate of the point.
-	 * @param yCoord the y coordinate of the point.
-	 * @return <code>double</code> value of the calculated projection.
-	 */
-	public final double projection(final int xCoord, final int yCoord) {
-		/*
-			Use parametric form for equation of a line segment:
-			p + td, where 0 < t < 1 and d = p2 - p (direction vector)
-		
-		To find out if point lies "inside" line segment (i.e. can
-		draw perpendicular line from segment to point), use projection
-		of point (q) to line (p + td):
-			t = (q-p).d/length(d)^2  (. is dot product)
-		*/
-
-		/* get the direction vector */
-		long dirx = (long) getTerminus().x - (long) getOrigin().x;
-		long diry = (long) getTerminus().y - (long) getOrigin().y;
-
-		/* get q - p */
-		long qpx = (long) xCoord - (long) getOrigin().x;
-		long qpy = (long) yCoord - (long) getOrigin().y;
-
-		/* dot product of (q-p) and d */
-		long dotprod = qpx * dirx + qpy * diry;
-
-		/* avoid divide by 0 - check if point1 equals point2.  If so,
-		   there is no segment - return a value which indicates projection
-		   falls outside the segment. */
-		if (dirx == 0 && diry == 0)
-			return -1.0F;
-
-		/* length (magnitude) of d is sqrt(dirx^2 + diry^2).  Don't
-		   bother taking square root since we want the length squared. */
-		return ((double) dotprod / (double) (dirx * dirx + diry * diry));
-	}
-
-	/**
-	 * Returns out a positive or negative value (Positive / Negative) depending
-	 * on the orientation of the given point to the line.
-	 * 
-	 * 				Point on this side: Positive.				 
-	 *			     		  
-	 *	    P1------------------------------>
-	 *					this segment
-	 *
-	 * 				Point on this side: Negative.
-	 * 
-	 * @param rel <code>Point</code> to test the relative position against this line.
-	 * @return <code>Sign</code> value indicating the relative position of the given point.
-	 */
-	public final Sign positionRelativeTo(Point rel) {
-		Ray ptRelRay = new Ray(getOrigin(), rel);
-
-		TrigValues val = getTrigValues(ptRelRay);
-		double dNewAngle = Math.atan2(-val.sinTheta, -val.cosTheta);
-
-		if (dNewAngle > 0)
-			return Sign.POSITIVE;
-
-		return Sign.NEGATIVE;
-	}
-
-	/**
-	 * Locates a point at a given height and distance along the line segment.
-	 * 
-	 * 					 B (the point we are looking for)
-	 *					 +
-	 *					 |
-	 *			  dist   |h		  this segment
-	 *		P1-----------+------------------->
-	 *					 A
-	 *	
-	 *	 get point A (on picture above)
-	 *
-	 * @param pctDist <code>double</code> distance along the line
-	 * @param theHeight <code>long</code> height above the line
-	 * @param asOriented <code>Sign</code> indicating relative position of the point to be located
-	 * @return <code>Point</code> value that was located on the line.
-	 */
-	public final Point locatePoint(
-		final double pctDist,
-		final long theHeight,
-		final Sign asOriented) {
-
-		int xdir;
-		int dist = (int) (pctDist * length());
-		Point pt = new Point();
-		pointOn(dist, KeyPoint.ORIGIN, pt); // (x,y) now = A
-
-		// get linesegment AB
-		// first determine the direction AB should go in the x axis.  Don't ask-
-		// just have faith.
-
-		if (getOrigin().y > getTerminus().y
-			|| (getOrigin().y == getTerminus().y && getOrigin().x < getTerminus().x)) {
-			xdir = (asOriented == Sign.POSITIVE ? -1 : 1);
-		} else {
-			xdir = (asOriented == Sign.POSITIVE ? 1 : -1);
-		}
-
-		LineSeg linesegAB =
-			new LineSeg(KeyPoint.ORIGIN, pt.x, pt.y, perpSlope(), theHeight, xdir);
-
-		return (new Point(linesegAB.getTerminus().x, linesegAB.getTerminus().y));
-	}
-
-	/**
-	 * Gets the point on the line segment at the given distance away from the 
-	 * key point.
-	 * 
-	 * @param theDistance <code>long</code> distance along the line
-	 * @param fromKeyPoint <code>KeyPoint</code> to calculate the distance from
-	 * @param ptResult <code>Point</code> where the resulting calculating value is stored.
-	 * @return <code>boolean</code> <code>true</code> if point can be calculated, 
-	 * <code>false</code> otherwise.
-	 */
-	public final boolean pointOn(
-		final long theDistance,
-		final KeyPoint fromKeyPoint,
-		Point ptResult) {
-		float m, dx_float;
-		int dx, dy, startX = 0, startY = 0, otherX = 0, otherY = 0;
-
-		// Set the point to offset from and the other point used to determine
-		// which direction dx and dy should be applied to get a point on the
-		// line.
-
-		if (fromKeyPoint == KeyPoint.ORIGIN) {
-			startX = getOrigin().x;
-			startY = getOrigin().y;
-			otherX = getTerminus().x;
-			otherY = getTerminus().y;
-		}
-		else if (fromKeyPoint == KeyPoint.TERMINUS) {
-			startX = getTerminus().x;
-			startY = getTerminus().y;
-			otherX = getOrigin().x;
-			otherY = getOrigin().y;
-		}
-		else if (fromKeyPoint == KeyPoint.MIDPOINT) {
-			startX = (getOrigin().x + getTerminus().x) / 2;
-			startY = (getOrigin().y + getTerminus().y) / 2;
-			otherX = getTerminus().x;
-			otherY = getTerminus().y;
-		}
-		else {
-			return false;
-		}
-
-		m = slope(); // get the slope of this line
-
-		// Find dx and dy - the delta x and y to get from the endpoint to the
-		// point on the line at the specified distance away.
-		// The following is based on solving 2 equations with 2 unknowns:
-		//   dy/dx = m	  (m is slope of line)
-		//   dy^2 + dx^2 = dist^2
-		//
-		double d_squared = (float) theDistance * (float) theDistance;
-		double m_squared = m * m;
-
-		// Add .5 so result is rounded to nearest integer when cast
-		dx_float = (float) Math.sqrt(d_squared / (m_squared + 1.0));
-		dx = (int) (dx_float + 0.5);
-		dy = (int) (Math.sqrt(d_squared * m_squared / (m_squared + 1.0)) + 0.5);
-
-		/* negative distance means we want point off the line */
-		if (theDistance < 0) {
-			dx = -dx;
-			dy = -dy;
-		}
-
-		ptResult.x = ((startX > otherX) ? startX - dx : startX + dx);
-		ptResult.y = ((startY > otherY) ? startY - dy : startY + dy);
-		boolean in_line;
-		if (startX > otherX)
-			in_line = ptResult.x >= otherX;
-		else
-			in_line = ptResult.x <= otherX;
-		if (in_line) {
-			if (startY > otherY)
-				in_line = ptResult.y >= otherY;
-			else
-				in_line = ptResult.y <= otherY;
-		}
-		return in_line;
-	}
-
-	/**
-	 * Structure to hold onto trig values that represent an angle
-	 * @author sshaw
-	 */
-	static public class TrigValues {
-		
-		/**
-		 * Sin theta value
-		 */
-		public double sinTheta;
-		
-		
-		/**
-		 * Cos theta value.
-		 */
-		public double cosTheta;
-	}
-
-	/**
-	 * Gets the trig values associated with the angle from this line segment
-	 * to the given vector.
-	 * 
-	 * @param ptToVector <code>Ray</code> value to calculate trig values of.
-	 * @return <code>TrigValues</code> object representing the trigonometry values
-	 * for the angle of the passed in <code>Ray</code> relative to <code>this</code>
-	 * or null if calculation is not possible, 
-	 */
-	public TrigValues getTrigValues(final Ray ptToVector) {
-		double dFromLength = length();
-		double dToLength = ptToVector.length();
-
-		Ray ptFromVector = new Ray(getOrigin(), getTerminus());
-
-		if (dFromLength <= 0 || dToLength <= 0) {
-			return null;
-		}
-
-		// 1. find angle for ptToVector relative to the origin.
-		double dAlpha;
-		double dCosAlpha, dSinAlpha;
-
-		dCosAlpha = ptFromVector.x / dFromLength;
-		dSinAlpha = ptFromVector.y / dFromLength;
-		dAlpha = Math.atan2(dSinAlpha, dCosAlpha);
-
-		// 2. inverse the angle to get the rotation
-		dCosAlpha = Math.cos(-dAlpha);
-		dSinAlpha = Math.sin(-dAlpha);
-
-		// 3. rotate vector 2 by angle above so that it's angle relative to vector 1 can
-		// be calculated
-		double dRotateX = (ptToVector.x * dCosAlpha) - (ptToVector.y * dSinAlpha);
-		double dRotateY = (ptToVector.x * dSinAlpha) + (ptToVector.y * dCosAlpha);
-
-		// 4. Now calculate the Theta trig values
-		TrigValues val = new TrigValues();
-		val.cosTheta = dRotateX / dToLength;
-		val.sinTheta = dRotateY / dToLength;
-
-		return val;
-	}
-
-	/**
-	 * Returns a new <code>LineSeg</code> that is parallel to this by the given distance.  
-	 * Orientation is relative to the start and end.  Negative implies to the 
-	 * left and Position implies to the right.
-	 * 
-	 * @param ptLoc <code>Point</code> value to constrain the line to.
-	 * @return <code>LineSeg</code> line that was calculated going through the given point
-	 */
-	public final LineSeg getParallelLineSegThroughPoint(Point ptLoc) {
-		if (isHorizontal()) {
-            return new LineSeg(new Point(getOrigin().x, ptLoc.y), new Point(getTerminus().x, ptLoc.y));
-		}
-        else if (isVertical()) {
-            return new LineSeg(new Point(ptLoc.x, getOrigin().y), new Point(ptLoc.x, getTerminus().y));
-        }
-        else {
-            Point ptProj = perpIntersect(ptLoc.x, ptLoc.y);
-    		long nHeight = Math.round(ptProj.getDistance(ptLoc));
-    		Sign position = positionRelativeTo(ptLoc);
-		
-            return new LineSeg(
-			     locatePoint(0.0, nHeight, position),
-			     locatePoint(1.0, nHeight, position));
-        }
-	}
-		
-	/**
-	 * Returns the coefficients of the generalized equation of the line passing through
-	 * points (x1,y1) and (x2,y2)
-	 * Generalized line equation: ax+by=c => a==result[0], b==result[1], c==result[2]
-	 * 
-	 * @param x1 - x coordinate of the 1st point
-	 * @param y1 - y coordinate of the 1st point
-	 * @param x2 - x coordinate of the 2nd point
-	 * @param y2 - y coordinate of the 2nd point
-	 * @return the coefficients of the generalized equation of the line passing through
-	 * points (x1,y1) and (x2,y2)
-	 */
-	public static double [] getLineEquation(double x1, double y1, double x2, double y2) {
-		double equation[] = new double[3];
-		for (int i=0; i<3; i++)
-			equation[i]=0;
-		
-		if (x1 == x2 && y1 == y2)
-			return equation;
-		
-		if (x1 == x2) {
-			equation[0]=1;
-			equation[1]=0;
-			equation[2]=x1;
-			return equation;
-		}
-		
-		equation[0]=(y1-y2)/(x2-x1);
-		equation[1]=1.0;
-		equation[2]=y2+equation[0]*x2;
-		return equation;
-	}
-
-	/**
-	 * Returns array with 3 numbers in it, which are the coefficients of the
-	 * generalized line equation of the line corresponding to this line segment
-	 * a*x+b*y=c is the equation => result[0]=a, result[1]=b, result[2]=c
-	 * 
-	 * @return an array with 3 numbers in it, which are the coefficients of the
-	 * generalized line equation
-	 */
-	public double [] getEquation() {
-		return getLineEquation(origin.x, origin.y, terminus.x, terminus.y);
-	}
-	
-	/**
-	 * Returns intersection points of two lines that contain this line segment and
-	 * the argumet line segment.
-	 * The list of intersection points may contain at most two points and will contain
-	 * 2 points if and only if the lines are equal. The 2 points will be the end points
-	 * of the parameter line segment 
-	 * 
-	 * @param line - the line segment
-	 * @return intersection points of two lines that contain this line segment and
-	 * the argumet line segment.
-	 */
-	public PointList getLinesIntersections (LineSeg line) {
-		PointList intersections = new PointList();
-		double temp[] = getEquation();
-		double a1 = temp[0];
-		double b1 = temp[1];
-		double c1 = temp[2];
-
-		temp = line.getEquation();
-		double a2 = temp[0];
-		double b2 = temp[1];
-		double c2 = temp[2];
-		// Cramer's rule for the system of linear equations
-		double det = a1*b2 - b1*a2;
-		if (det == 0) {
-			if (a1==a2 && b1==b2 && c1==c2) {
-				// if lines are the same, then instead of infinite number of intersections
-				// we will put the end points of the line segment passed as an argument
-				intersections.addPoint(new Point(line.getOrigin().getCopy()));
-				intersections.addPoint(new Point(line.getTerminus().getCopy()));
-			}
-		}
-		else {
-			intersections.addPoint(new Point(Math.round((c1*b2-b1*c2)/det), Math.round((a1*c2-c1*a2)/det)));
-		}
-		return intersections;
-	}
-	
-	/**
-	 * Calculates intersection points of the line of the line segment and ellipse 
-	 * 
-	 * @param ellipseBounds - width and height of the ellipse
-	 * @return - <Code>PointList</Code> containing all intersection points
-	 */
-	public PointList getLineIntersectionsWithEllipse(Rectangle ellipseBounds) {
-		PointList intersections = new PointList();
-		if (ellipseBounds.width == 0 || ellipseBounds.height == 0)
-			return intersections;
-		double xl1 = getOrigin().x - ellipseBounds.getCenter().x;
-		double xl2 = getTerminus().x - ellipseBounds.getCenter().x;
-		double yl1 = getOrigin().y - ellipseBounds.getCenter().y;
-		double yl2 = getTerminus().y - ellipseBounds.getCenter().y;
-		double [] equation = getLineEquation(xl1, yl1, xl2, yl2);
-		
-		if (equation.length<3 || (equation[0]==0 && equation[1]==0))
-			return intersections;
-		
-		double a = equation[0];
-		double b = equation[1];
-		double c = equation[2];
-		double w = ellipseBounds.width;
-		double h = ellipseBounds.height;
-		
-		// Ellipse with a cneter at the origin has an equation:
-		// (h*x)^2+(w*y)^2=(h*w/2)^2
-		// Line equation: a*x+b*y=c
-		
-		if (b==0) {
-			// b==0 is a special case since in general case we will express
-			// y in terms of x, i.e. we need to divide by b, which should not
-			// be 0
-			// b==0 => a*x=c +> x=c/a;
-			double x = c/a;
-			// y^2 = (h/2)^2-((h*c)/(a*w))^2
-			double y = Math.pow(h/2,2)-Math.pow((h*c)/(a*w),2);
-			if (y<0)
-				return intersections;
-			intersections.addPoint(new Point(Math.round(x+ellipseBounds.getCenter().x), Math.round(Math.sqrt(y)+ellipseBounds.getCenter().y)));
-			intersections.addPoint(new Point(Math.round(x+ellipseBounds.getCenter().x), Math.round(-Math.sqrt(y)+ellipseBounds.getCenter().y)));
-		}
-		else {
-			// y = (c-a*x)/b => we get quadratic equation for x
-			// x^2*(h^2+(w*a/b)^2)-x*(2*w^2*a*c)/(b^2)+((w*c/b)^2-(h*w/2)^2)=0 or
-			// x^2*xA+x*xB+xC=0
-			double xA = Math.pow(h,2)+Math.pow((w*a)/b,2);
-			double xB = (-2)*Math.pow(w,2)*a*c/Math.pow(b,2);
-			double xC = Math.pow(w*c/b,2)-Math.pow(h*w/2,2);
-			double xD = Math.pow(xB,2)-4*xA*xC;
-			
-			if (xD<0)
-				return intersections;
-			
-			double x1 = (-xB+Math.sqrt(xD))/(2*xA);
-			double x2 = (-xB-Math.sqrt(xD))/(2*xA);
-			intersections.addPoint(new Point(Math.round(x1+ellipseBounds.getCenter().x), Math.round((c-a*x1)/b+ellipseBounds.getCenter().y)));
-			intersections.addPoint(new Point(Math.round(x2+ellipseBounds.getCenter().x), Math.round((c-a*x2)/b+ellipseBounds.getCenter().y)));
-		}
-		
-		return intersections;
-	}
-	
-	/**
-	 * Calculates intersection points of the line that contains this line segment with
-	 * a list of other line segments. If the list of points (line segments) form a closed
-	 * <Code>PolyLine</Code>, i.e form a closed polygon figure, then the method will
-	 * claculate intersections of a line and a figure
-	 * 
-	 * @param points - list of points that form linesegments, i.e the <Code>PolyLine</Code>
-	 * @return the intersection points of the line that contains this line segment with
-	 * a list of other line segments.
-	 */
-	public PointList getLineIntersectionsWithLineSegs(final PointList points) {
-		double temp[] = getEquation();
-		double a = temp[0];
-		double b = temp[1];
-		double c = temp[2];
-		PointList intersections = new PointList();
-
-		if (points.size()<2) {
-			if (a*points.getPoint(0).x+b*points.getPoint(0).y==c) {
-				intersections.addPoint(points.getPoint(0).getCopy());
-			}
-			return intersections;
-		}
-		
-		for (int i=0; i<points.size()-1; i++) {
-			LineSeg line = new LineSeg(points.getPoint(i).getCopy(), points.getPoint(i+1).getCopy());
-			PointList currentIntersections = getLinesIntersections(line);
-			for (int j=0; j<currentIntersections.size(); j++) {
-				Point intersection = currentIntersections.getPoint(j);
-				if (line.containsPoint(intersection,DEFAULT_INTERSECTION_TOLERANCE))
-					intersections.addPoint(currentIntersections.getPoint(j));
-			}
-		}
-		return intersections;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.Translatable#performScale(double)
-	 */
-	public void performScale(double factor) {
-		setOrigin(getOrigin().scale(factor));
-		setTerminus(getTerminus().scale(factor));
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.Translatable#performTranslate(int, int)
-	 */
-	public void performTranslate(int dx, int dy) {
-		setOrigin(getOrigin().translate(dx, dy));
-		setTerminus(getTerminus().translate(dx, dy));
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java
deleted file mode 100644
index aaa42fe..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java
+++ /dev/null

@@ -1,1848 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.draw2d.ui.geometry;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.geometry.Transform;
-
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dDebugOptions;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-
-
-/**
- * A set of utility methods around manipulating PointList objects
- * 
- * @author sshaw
- */
-public class PointListUtilities {
-
-	/**
-	 * Removes redudant points from the point list.
-	 * 
-	 * @param points the <code>PointList</code> which will be modified to remove redudant points
-	 * @param straightLineTolerance the tolerance value within which indicates the line is straight
-	 * @return <code>boolean</code> <code>true</code> if segments were modified, <code>false</code> otherwise.
-	 */
-	static boolean flattenSegments(PointList points, int straightLineTolerance) {
-		boolean changed = false;
-		
-		for (int i = 0; i < points.size() - 1; i++) {
-			Point ptStart = points.getPoint(i);
-	
-			Point ptTerm = null;
-			if (i + 1 < points.size())
-				ptTerm = points.getPoint(i + 1);
-	
-			Point ptNext = null;
-			if (i + 2 < points.size())
-				ptNext = points.getPoint(i + 2);
-	
-			// We conservatively avoid changing the endpoint of the line, since it may then
-			// fail to attach to the terminal view.  This implies ptNext must be non-NIL.
-			if (points.size() <= 2 || ptTerm == null || ptNext == null)
-				return changed;
-	
-			if (sameOrientation(ptStart, ptTerm, ptNext, straightLineTolerance)) {
-				removePoint(points, i + 1);
-				
-				Ray seg = new Ray(ptStart, ptTerm);
-				if (seg.y < straightLineTolerance) {
-					points.setPoint(new Point(ptNext.x, ptStart.y), i + 1);
-				} else if (seg.x < straightLineTolerance){
-					points.setPoint(new Point(ptStart.x, ptNext.y), i + 1);
-				}
-				
-				changed = true;
-			}
-		}
-		
-		return changed;
-	}
-	
-	static private Point removePoint(PointList points, int index) {
-		Point removedPt = points.getPoint(index);
-		for (int i=index; i<points.size()-1; i++) {
-			points.setPoint(points.getPoint(i+1), i);
-		}
-		points.setSize(points.size() - 1);
-		return removedPt;
-	}
-	
-	/**
-	 * Normalizes the line segments in the polyline.  Checks for lines that are with-in a threshold for length
-	 * and removes them.  Additionally, it will remove points that that adjacent segments that are both
-	 * horizontal, or both vertical.
-	 * 
-	 * @param points <code>PointList</code> to be normalized
-	 * @return <code>boolean</code> <code>true</code> if segments were changed, <code>false</code> otherwise
-	 */
-	static public boolean normalizeSegments(PointList points) {
-		return normalizeSegments(points, 0);
-	}
-	
-	/**
-	 * Normalizes the line segments in the polyline.  Checks for lines that are with-in a threshold for length
-	 * and removes them.  Additionally, it will remove points that that adjacent segments that are both
-	 * horizontal, or both vertical.  Will utilize a tolerance value to determine if segments needs to flattened
-	 * or not.
-	 * 
-	 * @param points <code>PointList</code> to normalize
-	 * @param straightLineTolerance the tolerance value within which indicates the line is straight in
-	 * relative coordinates.
-	 * @return <code>boolean</code> <code>true</code> if segments were changed, <code>false</code> otherwise
-	 */
-	static public boolean normalizeSegments(PointList points, int straightLineTolerance) {
-		
-		boolean hasChanged = false;
-
-		// first pass to remove points with-in the length tolerance
-		for (int i = 1; i < points.size() - 1; i++) {
-			Ray nextVector =
-				new Ray(points.getPoint(i), points.getPoint(i - 1));
-			int nextLength = (int) nextVector.length();
-
-			if (nextLength <= straightLineTolerance) {
-				points.removePoint(i);
-				hasChanged = true;
-			}
-		}
-		
-		// second pass to flatten segments that are parallel to each other with-in a tolerance value
-		hasChanged |= flattenSegments(points, straightLineTolerance);
-		
-		// recursively normalize the points if something has changed.
-		if (hasChanged)
-			normalizeSegments(points, straightLineTolerance);
-		
-		return hasChanged;
-	}
-
-	/**
-	 * Method getPointsSupremum.
-	 * Get points representing the extrema for this poly line.
-	 * 
-	 * @param points PointList to calculate the highest point from.
-	 * @return Point value of the highest point in the bounding box of the
-	 *      polyline.
-	 */
-	static public Point getPointsSupremum(PointList points) {
-		Point theSupremum = points.getFirstPoint();
-		for (int i = 1; i < points.size(); i++) {
-			Point other = points.getPoint(i);
-			theSupremum =
-				new Point(
-					Math.max(theSupremum.x, other.x),
-					Math.max(theSupremum.y, other.y));
-		}
-
-		return theSupremum;
-	}
-
-	/**
-	 * Method getPointsSupremum.
-	 * Get points representing the minimum for this poly line.
-	 * 
-	 * @param points PointList to calculate the minimum point from.
-	 * @return Point value of the lowest point in the bounding box of the
-	 *      polyline.
-	 */
-	static public Point getPointsInfimum(PointList points) {
-		Point theInfimum = points.getFirstPoint();
-		for (int i = 1; i < points.size(); i++) {
-			Point other = points.getPoint(i);
-			theInfimum =
-				new Point(
-					Math.min(theInfimum.x, other.x),
-					Math.min(theInfimum.y, other.y));
-		}
-
-		return theInfimum;
-	}
-
-	/**
-	 * createPointsFromRect
-	 * 
-	 * @param rBox Rectangle to base the PointList from
-	 * @return PointList that is equivalent to the Rectangle
-	 */
-	static public PointList createPointsFromRect(Rectangle rBox) {
-		PointList points = new PointList(5);
-		Point pt = new Point(rBox.getLeft().x, rBox.getTop().y);
-		points.addPoint(pt);
-		pt = new Point(rBox.getRight().x, rBox.getTop().y);
-		points.addPoint(pt);
-		pt = new Point(rBox.getRight().x, rBox.getBottom().y);
-		points.addPoint(pt);
-		pt = new Point(rBox.getLeft().x, rBox.getBottom().y);
-		points.addPoint(pt);
-		pt = new Point(rBox.getLeft().x, rBox.getTop().y);
-		points.addPoint(pt);
-
-		return points;
-	}
-	
-	/**
-	 * reAdjustBoxSize
-	 * private utility method to shrink / expand the box segment size to accommodate the given point
-	 * on the edge.  When completed the containedPoint will be on the border of the boxSegs list.
-	 * Assumptions: 
-	 * 1. boxSegs is a list of LineSegs that represent a rectangle.
-	 * 2. boxSegs is ordered clockwise around the rectangle.
-	 * 
-	 * @param boxSegs List of LineSegs to shrink / expand
-	 * @param containedPoint Point that is typically contained inside the Rectangle the
-	 * the boxSegs LineSeg list represents.
-	 */
-	static private void reAdjustBoxSize(List boxSegs, Point containedPoint) {
-		assert boxSegs.size() == 4;
-
-		LineSeg seg =
-			getNearestSegment(
-				boxSegs,
-				containedPoint.x,
-				containedPoint.y);
-		LineSeg newSeg = seg.getParallelLineSegThroughPoint(containedPoint);
-
-		ListIterator li = boxSegs.listIterator();
-		LineSeg prev = null;
-		LineSeg next = null;
-		LineSeg current = null;
-		if (li.hasNext())
-			current = (LineSeg) li.next();
-
-		while (current != null) {
-			if (li.hasNext())
-				next = (LineSeg) li.next();
-			else
-				next = null;
-
-			if (current.equals(seg)) {
-				if (prev != null) {
-					prev.setTerminus(newSeg.getOrigin());
-				}
-
-				current.setOrigin(newSeg.getOrigin());
-				current.setTerminus(newSeg.getTerminus());
-
-				if (next != null) {
-					next.setOrigin(newSeg.getTerminus());
-				}
-			}
-			current = next;
-		}
-	}
-	
-	/**
-	 * Method routeAroundRect.
-	 * Route this polyline around a rectangle that is presumably intersecting with 
-	 * it.
-	 * 
-	 * @param points PointList that will be modified to route around the given rectangle
-	 * @param rBox the <code>Rectangle</code> around which the routing will occur.
-	 * @param nSmoothFactor the <code>int</code> smooth factor to route the line with 
-	 *          0 - None, 15 - some, 30 - lots
-	 * @param bIncludeIntersectionPoints the <code>boolean</code> determining whether to include the
-	 * points that intersect with the rectangle in the newly routed polyline.
-	 * @param nBuffer the <code>int</code> buffer around the rectangle.
-	 * @return <code>PointList</code> that is the newly routed version of <code>points</code>
-	 * of <code>null</code> if operation was not successful or if the calculation is not possible.
-	 */
-	static public PointList routeAroundRect(
-		PointList points,
-		final Rectangle rBox,
-		int nSmoothFactor,
-		final boolean bIncludeIntersectionPoints,
-		final int nBuffer) {
-		Point infimumPoint = getPointsInfimum(points);
-		Point supremumPoint = getPointsSupremum(points);
-
-		Ray diameter = new Ray(infimumPoint, supremumPoint);
-		Rectangle rPoly =
-			new Rectangle(
-				infimumPoint.x,
-				infimumPoint.y,
-				diameter.x,
-				diameter.y);
-
-		// increase connect view rect by one in case it's fully horizontal
-		// or vertical
-		rPoly.expand(1, 1);
-
-		if (rPoly.intersects(rBox)) {
-			// construct a polyline out of the box
-			PointList rBoxPoly = createPointsFromRect(rBox);
-
-			// check to see if the end points of the list are contained in the box.
-			// If so, then we should shrink the box to force an intersection
-			Point firstPoint = points.getFirstPoint();
-			Point lastPoint = points.getLastPoint();
-			boolean bFPContained = rBox.contains(firstPoint);
-			boolean bLPContained = rBox.contains(lastPoint);
-
-			if (bFPContained || bLPContained) {
-				List boxSegs = getLineSegments(rBoxPoly);
-
-				if (bFPContained) {
-					reAdjustBoxSize(boxSegs, firstPoint);
-				}
-				if (bLPContained) {
-					reAdjustBoxSize(boxSegs, lastPoint);
-				}
-
-				rBoxPoly.removeAllPoints();
-				ListIterator li = boxSegs.listIterator();
-				while (li.hasNext()) {
-					LineSeg seg = (LineSeg) li.next();
-
-					rBoxPoly.addPoint(seg.getOrigin());
-					if (!li.hasNext())
-						rBoxPoly.addPoint(seg.getTerminus());
-				}
-			}
-
-			return routeAroundPoly(
-				points,
-				rBoxPoly,
-				nSmoothFactor,
-				true,
-				bIncludeIntersectionPoints,
-				nBuffer);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Method getLineSegments.
-	 * Converts the points of this polyline into a list of <code>LineSeg</code> 
-	 *      objects
-	 * 
-	 * @param points PointList to get LineSeg equivalents of.
-	 * @return List of LineSeg objects.
-	 */
-	public static List getLineSegments(PointList points) {
-		if (points.size() <= 1)
-			return new ArrayList(0);
-
-		ArrayList lines = new ArrayList(points.size() - 1);
-
-		for (int i = 0; i < points.size() - 1; i++) {
-			lines.add(new LineSeg(points.getPoint(i), points.getPoint(i + 1)));
-		}
-
-		return lines;
-	}
-
-	final static int INTERSECT_TOLERANCE = 1;
-	final static int MIN_LINE_LENGTH = 5;
-	
-	/**
-	 * Constant that is the default number of lines that a bezier is approximated by as a polyline
-	 * point list.
-	 */
-	public final static int DEFAULT_BEZIERLINES = 16;
-	
-	final static int MAX_BEZIERLINES = 32;
-
-	/**
-	 * Routes this polyline around another polyline that is presumably intersecting with 
-	 * it.
-	 * 
-	 * @param points the <code>PointList</code> that is to be modified based on
-	 * the routing calculations made around the <code>poly</code> parameter.
-	 * @param poly the <code>PolylinePointList</code> around which the routing will occur.
-	 * @param nSmoothFactor the <code>int</code> smooth factor to route the line with 
-	 *          0 - None, 15 - some, 30 - lots
-	 * @param bShortestDistance the <code>boolean</code> determining whether to use the
-	 * shortest distance possible to achieve this or else minimally modify the existing polyline.
-	 * @param bIncludeIntersectionPoints the <code>boolean</code> determining whether to include the
-	 * points that intersect with the rectangle in the newly routed polyline.
-	 * @param nBuffer the <code>int</code> buffer around the rectangle.
-	 * @return <code>PointList</code> that is the newly routed version of <code>points</code>
-	 * of <code>null</code> if operation was not successful or if the calculation is not possible.
-	 */
-	static public PointList routeAroundPoly(
-		PointList points,
-		final PointList poly,
-		int nSmoothFactor,
-		boolean bShortestDistance,
-		final boolean bIncludeIntersectionPoints,
-		final int nBuffer) {
-
-		LineSeg pCurBoxSeg = null;
-		Point ptIntersect = new Point();
-		PointList rPolyPoints = new PointList(points.size() * 2);
-
-		List rBoxSegments = getLineSegments(poly);
-
-		Point ptIntersect1 = null;
-		Point ptPrevIntersect = new Point(-100, -100);
-		// place initially off the diagram
-		int nPointsSinceFirstIntersection = 0;
-
-		int nCurrentLength1 = 0;
-		int nCurrentLength = 0;
-
-		List mySegments = getLineSegments(points);
-		ListIterator listIter = mySegments.listIterator();
-		while (listIter.hasNext()) {
-			LineSeg pSegment = (LineSeg) listIter.next();
-
-			boolean bFoundIntersects = false;
-
-			ListIterator boxIter = rBoxSegments.listIterator();
-			while (boxIter.hasNext()) {
-				LineSeg pBoxSegment = (LineSeg) boxIter.next();
-
-				// check if this segment intersects with the box - intersect with 0 tolerance
-				ptIntersect = pSegment.intersect(pBoxSegment, INTERSECT_TOLERANCE);
-				if (ptIntersect != null) {
-					// check case where intersect is on a corner - causing intersect
-					// to show up in two adjacent line segments
-					if (Math.abs(ptPrevIntersect.x - ptIntersect.x)
-						> (INTERSECT_TOLERANCE * 2)
-						|| Math.abs(ptPrevIntersect.y - ptIntersect.y)
-							> (INTERSECT_TOLERANCE * 2)) {
-						if (ptIntersect1 != null) {
-							Point ptIntersect2 = null;
-							LineSeg pCurBoxSeg2;
-							PointList newRoutePoints = new PointList();
-
-							int nCurrentLength2 =
-								nCurrentLength
-									+ (int) (pSegment.distanceAlong(ptIntersect)
-										* pSegment.length());
-
-							// which intersection point should be added first?
-							if (nCurrentLength1 < nCurrentLength2) {
-								ptIntersect2 = new Point(ptIntersect);
-								pCurBoxSeg2 = pBoxSegment;
-							} else {
-								ptIntersect2 = new Point(ptIntersect1);
-								pCurBoxSeg2 = pCurBoxSeg;
-
-								ptIntersect1 = new Point(ptIntersect);
-								pCurBoxSeg = pBoxSegment;
-							}
-
-							getRoutedPoints(
-								points,
-								newRoutePoints,
-								ptIntersect1,
-								ptIntersect2,
-								rPolyPoints.getLastPoint(),
-								pSegment.getTerminus(),
-								pCurBoxSeg,
-								pCurBoxSeg2,
-								poly,
-								nSmoothFactor,
-								bShortestDistance,
-								bIncludeIntersectionPoints,
-								nBuffer);
-
-							while (nPointsSinceFirstIntersection > 0) {
-								rPolyPoints.removePoint(rPolyPoints.size() - 1);
-								nPointsSinceFirstIntersection--;
-							}
-
-							for (int i = 0; i < newRoutePoints.size(); i++)
-								rPolyPoints.addPoint(
-									newRoutePoints.getPoint(i));
-							rPolyPoints.addPoint(
-								new Point(pSegment.getTerminus()));
-
-							ptIntersect1 = null;
-							bFoundIntersects = true;
-							break; // go to next segment
-						} else {
-							ptIntersect1 = new Point(ptIntersect);
-
-							pCurBoxSeg = pBoxSegment;
-							rPolyPoints.addPoint(
-								new Point(pSegment.getOrigin()));
-
-							nPointsSinceFirstIntersection = 0;
-							nCurrentLength1 =
-								nCurrentLength
-									+ (int) (pSegment.distanceAlong(ptIntersect)
-										* pSegment.length());
-						}
-					}
-
-					ptPrevIntersect = new Point(ptIntersect);
-				}
-			}
-
-			nCurrentLength += pSegment.length();
-
-			if (!bFoundIntersects) {
-				rPolyPoints.addPoint(new Point(pSegment.getOrigin()));
-
-				if (ptIntersect1 != null)
-					nPointsSinceFirstIntersection++;
-
-				if (!listIter.hasNext())
-					rPolyPoints.addPoint(new Point(pSegment.getTerminus()));
-			}
-		}
-
-		if (points.size() != rPolyPoints.size()) {
-			return rPolyPoints;
-		}
-
-		return null;
-	}
-
-	/**
-	 * copyPoints
-	 * This method is necessary because of an apparrent defect in the getCopy()
-	 * routine of PointList class.  It is initializing the copy based on size
-	 * but then making the copy based on the array allocation which may be different
-	 * causing an ArrayIndexOutOfBounds exception.
-	 * 
-	 * @param pointsFrom
-	 * @return PointList
-	 */
-	static public PointList copyPoints(PointList pointsFrom) {
-		PointList points = new PointList(pointsFrom.size());
-		copyFrom(points, pointsFrom);
-		return points;
-	}
-
-	static private void copyFrom(PointList pointsTo, PointList pointsFrom) {
-		pointsTo.removeAllPoints();
-		for (int i = 0; i < pointsFrom.size(); i++)
-			pointsTo.addPoint(pointsFrom.getPoint(i));
-	}
-
-	/**
-	 * Method addRoutedPoints.
-	 * Utility function used by getRoutedPoints to add the new "detour" route to the
-	 * existing polyline.
-	 * 
-	 * @param routePoints
-	 * @param pCurBoxSeg1
-	 * @param pCurBoxSeg2
-	 * @param routePoly
-	 * @param bForward
-	 * @param nBuffer
-	 * @return int
-	 */
-	static private int addRoutedPoints(
-		PointList routePoints,
-		LineSeg pCurBoxSeg1,
-		LineSeg pCurBoxSeg2,
-		final PointList routePoly,
-		final boolean bForward,
-		final int nBuffer) {
-		// figure out which direction to traverse
-		Point pNewPoint = null;
-		float fOffset = 0;
-		int nDistance = 0;
-
-		List rBoxSegments = getLineSegments(routePoly);
-		ListIterator boxIter =
-			bForward
-				? rBoxSegments.listIterator()
-				: rBoxSegments.listIterator(rBoxSegments.size());
-		while (bForward ? boxIter.hasNext() : boxIter.hasPrevious()) {
-			LineSeg seg =
-				bForward
-					? (LineSeg) boxIter.next()
-					: (LineSeg) boxIter.previous();
-			if (seg.equals(pCurBoxSeg1))
-				break;
-		}
-
-		// traverse forward
-		do {
-			fOffset = nBuffer / (float) pCurBoxSeg1.length();
-
-			Point ptEnd;
-			if (bForward) {
-				fOffset += 1.0;
-				ptEnd = pCurBoxSeg1.getTerminus();
-			} else {
-				fOffset *= -1.0;
-				ptEnd = pCurBoxSeg1.getOrigin();
-			}
-
-			if (routePoints.size() > 0)
-				nDistance += routePoints.getLastPoint().getDistance(ptEnd);
-
-			if (nBuffer > 0)
-				pNewPoint =
-					new Point(
-						pCurBoxSeg1.locatePoint(
-							fOffset,
-							nBuffer,
-							LineSeg.Sign.POSITIVE));
-			else
-				pNewPoint = new Point(ptEnd);
-
-			routePoints.addPoint(pNewPoint);
-
-			if (!pCurBoxSeg1.equals(pCurBoxSeg2)) {
-				if (bForward) {
-					if (!boxIter.hasNext())
-						boxIter = rBoxSegments.listIterator();
-					pCurBoxSeg1 = (LineSeg) boxIter.next();
-				} else {
-					if (!boxIter.hasPrevious())
-						boxIter =
-							rBoxSegments.listIterator(rBoxSegments.size());
-
-					pCurBoxSeg1 = (LineSeg) boxIter.previous();
-				}
-			}
-		} while (!pCurBoxSeg1.equals(pCurBoxSeg2));
-
-		return nDistance;
-	}
-
-	/**
-	 * Method getRoutedPoints.
-	 * Utility function for the routing functions to created a new routed polyline.
-	 * 
-	 * @param points
-	 * @param newRoutePoints
-	 * @param ptIntersect1
-	 * @param ptIntersect2
-	 * @param ptPrev
-	 * @param ptNext
-	 * @param pCurBoxSeg1
-	 * @param pCurBoxSeg2
-	 * @param routePoly
-	 * @param nSmoothFactor
-	 * @param bShortestDistance
-	 * @param bIncludeIntersectionPoints
-	 * @param nBuffer
-	 */
-	static private void getRoutedPoints(
-		PointList points,
-		PointList newRoutePoints,
-		final Point ptIntersect1,
-		final Point ptIntersect2,
-		final Point ptPrev,
-		final Point ptNext,
-		LineSeg pCurBoxSeg1,
-		LineSeg pCurBoxSeg2,
-		final PointList routePoly,
-		int nSmoothFactor,
-		boolean bShortestDistance,
-		final boolean bIncludeIntersectionPoints,
-		final int nBuffer) {
-		PointList newRoutePoints1 = new PointList();
-		PointList newRoutePoints2 = new PointList();
-
-		Point ptAbove = new Point(ptIntersect1);
-		if (nBuffer > 0) {
-			float dDistance = pCurBoxSeg1.distanceAlong(ptIntersect1);
-			ptAbove =
-				pCurBoxSeg1.locatePoint(
-					dDistance,
-					nBuffer,
-					LineSeg.Sign.POSITIVE);
-		}
-
-		newRoutePoints1.addPoint(new Point(ptAbove));
-		newRoutePoints2.addPoint(new Point(ptAbove));
-
-		// if we're not including the intersection points we still need to calculate the distance
-		int nDistance1 = 0;
-		int nDistance2 = 0;
-
-		// figure out which direction to traverse
-		LineSeg pCurSeg = pCurBoxSeg1;
-		nDistance1
-			+= addRoutedPoints(
-				newRoutePoints1,
-				pCurSeg,
-				pCurBoxSeg2,
-				routePoly,
-				true,
-				nBuffer);
-		nDistance1 += newRoutePoints1.getLastPoint().getDistance(ptIntersect2);
-
-		pCurSeg = pCurBoxSeg1;
-		nDistance2
-			+= addRoutedPoints(
-				newRoutePoints2,
-				pCurSeg,
-				pCurBoxSeg2,
-				routePoly,
-				false,
-				nBuffer);
-		nDistance2 += newRoutePoints2.getLastPoint().getDistance(ptIntersect2);
-
-		ptAbove = new Point(ptIntersect2);
-		if (nBuffer > 0) {
-			float dDistance = pCurBoxSeg2.distanceAlong(ptIntersect2);
-			ptAbove =
-				pCurBoxSeg2.locatePoint(
-					dDistance,
-					nBuffer,
-					LineSeg.Sign.POSITIVE);
-		}
-
-		newRoutePoints1.addPoint(new Point(ptAbove));
-		newRoutePoints2.addPoint(new Point(ptAbove));
-
-		if ((nDistance1 < nDistance2 && bShortestDistance)
-			|| (nDistance1 > nDistance2 && !bShortestDistance)) {
-			copyFrom(newRoutePoints, newRoutePoints1);
-		} else {
-			copyFrom(newRoutePoints, newRoutePoints2);
-		}
-
-		// check for redundant points and remove them from the list if necessary.
-		if (!bIncludeIntersectionPoints && newRoutePoints.size() >= 3) {
-			PointList checkPoints = new PointList(newRoutePoints.size() + 2);
-
-			checkPoints.addPoint(new Point(ptPrev));
-			for (int i = 0; i < newRoutePoints.size(); i++)
-				checkPoints.addPoint(new Point(newRoutePoints.getPoint(i)));
-			checkPoints.addPoint(new Point(ptNext));
-
-			int nIndex = 0;
-			Point ptStart = checkPoints.getPoint(nIndex++);
-			Point ptCheckSkip = checkPoints.getPoint(nIndex++);
-			Point ptEnd = checkPoints.getPoint(nIndex++);
-
-			List polySegments = getLineSegments(routePoly);
-
-			newRoutePoints.removeAllPoints();
-
-			while (ptEnd != null) {
-				LineSeg tempSeg = new LineSeg(ptStart, ptEnd);
-
-				// check if we should add the pptCheckSkip to the routePoints or not
-				Point ptIntersect = new Point();
-				boolean bAddPoint = false;
-
-				// if the temporary line seg does intersect with the routePoly, this means
-				// that the ptCheckSkip is needed for the route to work
-				ListIterator segIter = polySegments.listIterator();
-				while (segIter.hasNext()) {
-					LineSeg pPolySegment = (LineSeg) segIter.next();
-					ptIntersect = tempSeg.intersect(pPolySegment,INTERSECT_TOLERANCE);
-					if (ptIntersect != null) {
-						bAddPoint = true;
-						break;
-					}
-				}
-
-				if (bAddPoint) {
-					newRoutePoints.addPoint(new Point(ptCheckSkip));
-					ptStart = new Point(ptCheckSkip);
-				}
-
-				ptCheckSkip = new Point(ptEnd);
-
-				if (nIndex < checkPoints.size())
-					ptEnd = checkPoints.getPoint(nIndex++);
-				else
-					ptEnd = null;
-			}
-		}
-
-		if (nSmoothFactor > 0) {
-			PointList tempPoly =
-				calcSmoothPolyline(
-					newRoutePoints,
-					nSmoothFactor,
-					DEFAULT_BEZIERLINES);
-			copyFrom(newRoutePoints, tempPoly);
-		}
-	}
-
-	/**
-	 * Method calcSmoothPolyline.
-	 * Calculate the smooth polyline approximation of this polyline based on 
-	 *      a smooth factor.
-	 * 
-	 * @param points the <code>PointList</code> that is used to calculate the
-	 * smooth point list from.  
-	 * @param nSmoothFactor the <code>int</code> smooth factor to smooth the line with 
-	 *          0 - None, 15 - some, 30 - lots
-	 * @param nBezierSteps the <code>int</code> number of line steps used to approximate the smooth curve
-	 * @return PolylinePointList List of PolylinePoint representing the smooth 
-	 *      polyline.
-	 */
-	static public final PointList calcSmoothPolyline(
-		PointList points,
-		int nSmoothFactor,
-		int nBezierSteps) {
-		PointList theBezierPoints =
-			calcBezier(
-				points,
-				nSmoothFactor,
-				0,
-				points.size() - 1);
-		return calcApproxPolylineFromBezier(
-			theBezierPoints,
-			nBezierSteps);
-	}
-
-	/**
-	 * Calculates the smooth polyline equivalent of the given points list.  It will extrapolate a bezier
-	 * approximation in polylines that resembles a curved line.
-	 * 
-	 * @param points the <code>PointList</code> that is used to calculate the smooth bezier approximation.
-	 * @param nSmoothFactor the <code>int</code> smooth factor to smooth the line with 
-	 *          0 - None, 15 - some, 30 - lots
-	 * @param nBezierSteps the <code>int</code> number of line steps used to approximate the smooth curve
-	 * @param nStartIndex the <code>int</code> index in the line to start from to create the smooth approximation
-	 * @param nEndIndex the <code>int</code> index in the line to end at to create the smooth approximation
-	 * @return PolylinePointList List of PolylinePoint representing the smooth 
-	 *      polyline.
-	 */
-	static public PointList calcSmoothPolyline(
-		PointList points,
-		int nSmoothFactor,
-		int nBezierSteps,
-		int nStartIndex,
-		int nEndIndex) {
-		PointList theBezierPoints =
-			calcBezier(
-				points,
-				nSmoothFactor,
-				nStartIndex,
-				nEndIndex);
-		return calcApproxPolylineFromBezier(
-			theBezierPoints,
-			nBezierSteps);
-	}
-
-	/**
-	 * Calculate the actual bezier points of this polyline based on a smooth factor.
-	 * 
-	 * @param points PointList to calculate the bezier approximation from
-	 * @param nSmoothFactor the <code>int</code> smooth factor to smooth the line with 
-	 *          0 - None, 15 - some, 30 - lots
-	 * @param nStartIndex int Index to start the calculation at
-	 * @param nEndIndex int Index to end the calculation at
-	 * @return PolylinePointList List of PolylinePoint representing the bezier.
-	 */
-	static private PointList calcBezier(
-		final PointList points,
-		int nSmoothFactor,
-		int nStartIndex,
-		int nEndIndex) {
-		Point ptPrevControl = null;
-		PointList theBezierPoints = new PointList(points.size() * 2);
-		// parse through the line segments and create control points based on a smoothing factor.
-		List theSegments = getLineSegments(points);
-
-		for (int i = 0; i < theSegments.size(); i++) {
-			LineSeg pLineSeg = (LineSeg) theSegments.get(i);
-
-			double dLineLength = pLineSeg.length();
-			double dControlLength = dLineLength * nSmoothFactor / 100;
-
-			boolean bAddToBezier = false;
-			if (i >= nStartIndex && i <= nEndIndex)
-				bAddToBezier = true;
-			else if (i > nEndIndex)
-				return theBezierPoints;
-
-			if (dLineLength > MIN_LINE_LENGTH) {
-				Point ptStartControl = new Point();
-				Point ptTerminusControl = new Point();
-				Point ptStart = new Point(pLineSeg.getOrigin());
-				Point ptTerminus = new Point(pLineSeg.getTerminus());
-
-				if (theBezierPoints.size() == 0) {
-					if (bAddToBezier)
-						theBezierPoints.addPoint(ptStart);
-				}
-
-				if (ptPrevControl != null) {
-					LineSeg prevControlSeg =
-						new LineSeg(ptPrevControl, ptStart);
-					ptStartControl = new Point();
-					prevControlSeg.pointOn(
-						(int) Math.round(
-							prevControlSeg.length() + dControlLength),
-						LineSeg.KeyPoint.ORIGIN,
-						ptStartControl);
-				} else {
-					ptStartControl = new Point();
-					pLineSeg.pointOn(
-						(int) Math.round(dControlLength),
-						LineSeg.KeyPoint.ORIGIN,
-						ptStartControl);
-				}
-				if (bAddToBezier)
-					theBezierPoints.addPoint(ptStartControl);
-
-				// Calculate the next terminating control point
-				LineSeg pNextSeg = null;
-				if (i + 1 < theSegments.size()) {
-					pNextSeg = (LineSeg) theSegments.get(i + 1);
-					while (pNextSeg != null
-						&& pNextSeg.length() < MIN_LINE_LENGTH) {
-						i++;
-						if (i + 1 < theSegments.size())
-							pNextSeg = (LineSeg) theSegments.get(i + 1);
-						else
-							pNextSeg = null;
-					}
-				}
-
-				if (pNextSeg != null) {
-					// compute two vectors and calculate the angle between them.
-					Ray ptVector1 =
-						new Ray(pLineSeg.getOrigin(), pLineSeg.getTerminus());
-					Ray ptVector2 =
-						new Ray(pNextSeg.getOrigin(), pNextSeg.getTerminus());
-					double dNewAngle = 0.0;
-
-					LineSeg.TrigValues val = pLineSeg.getTrigValues(ptVector2);
-
-					dNewAngle = Math.atan2(-val.sinTheta, -val.cosTheta);
-
-					if (dNewAngle > 0)
-						dNewAngle = (Math.PI - dNewAngle) / -2;
-					else
-						dNewAngle = (-Math.PI - dNewAngle) / -2;
-
-					Transform trans = new Transform();
-					trans.setRotation(dNewAngle);
-					Point ptVector1Prime =
-						trans.getTransformed(
-							new Point(ptVector1.x, ptVector1.y));
-
-					LineSeg nextControlSeg =
-						new LineSeg(
-							new Point(0, 0),
-							new Point(ptVector1Prime.x, ptVector1Prime.y));
-					Point ptProjection = new Point();
-					nextControlSeg.pointOn(
-						(int) Math.round(dControlLength),
-						LineSeg.KeyPoint.ORIGIN,
-						ptProjection);
-
-					ptTerminusControl =
-						new Point(
-							pLineSeg.getTerminus().x - ptProjection.x,
-							pLineSeg.getTerminus().y - ptProjection.y);
-				} else {
-					pLineSeg.pointOn(
-						(int) Math.round(dLineLength - dControlLength),
-						LineSeg.KeyPoint.ORIGIN,
-						ptTerminusControl);
-				}
-
-				ptPrevControl = new Point(ptTerminusControl);
-				if (bAddToBezier) {
-					theBezierPoints.addPoint(ptTerminusControl);
-					theBezierPoints.addPoint(ptTerminus);
-				}
-			}
-		}
-
-		return theBezierPoints;
-	}
-
-	/**
-	 * Utility function that takes a set of bezier points and calculates a polyline 
-	 * approximation.
-	 * 
-	 * @param points the <code>PointList</code> to calculate the bezier from.
-	 * @param nBezierSteps the <code>int</code> number of line steps that will be used
-	 *      to approximate each bezier curve
-	 * @return PolylinePointList List of PolylinePoint representing the smooth 
-	 *      polyline.
-	 */
-	static private PointList calcApproxPolylineFromBezier(
-		final PointList points,
-		int nBezierSteps) {
-		PointList thePolyPoints =
-			new PointList(points.size() * nBezierSteps + 2);
-
-		Point ptCtl1, ptCtl2, ptCtl3, ptCtl4;
-		boolean bStart = true;
-
-		if (points.size() < 4)
-			return thePolyPoints;
-
-		ptCtl1 = new Point();
-		for (int i = 0; i < points.size() - 3; i = i + 3) {
-			if (bStart) {
-				ptCtl1 = new Point(points.getPoint(i));
-				bStart = false;
-			} else {
-				thePolyPoints.removePoint(thePolyPoints.size() - 1);
-			}
-
-			ptCtl2 = new Point(points.getPoint(i + 1));
-			ptCtl3 = new Point(points.getPoint(i + 2));
-			ptCtl4 = new Point(points.getPoint(i + 3));
-
-			if (!BezierToLines(thePolyPoints,
-				ptCtl1,
-				ptCtl2,
-				ptCtl3,
-				ptCtl4,
-				nBezierSteps))
-				return null;
-
-			ptCtl1 = new Point(ptCtl4);
-		}
-
-		// now construct the PolyLine based on the points
-		thePolyPoints.setPoint(points.getPoint(0), 0);
-		thePolyPoints.setPoint(
-			points.getPoint(points.size() - 1),
-			thePolyPoints.size() - 1);
-
-		return thePolyPoints;
-	}
-
-	/**
-	 * Method BezierToLines.
-	 * Utility function that takes a set of bezier points and calculates a polyline 
-	 * approximation.
-	 * 
-	 * @param thePolyPoints
-	 * @param ptCtl1
-	 * @param ptCtl2
-	 * @param ptCtl3
-	 * @param ptCtl4
-	 * @param nSteps
-	 * @return boolean
-	 */
-	private static boolean BezierToLines(
-		PointList thePolyPoints,
-		Point ptCtl1,
-		Point ptCtl2,
-		Point ptCtl3,
-		Point ptCtl4,
-		int nSteps) {
-		boolean bRC = true;
-
-		int nTotalPoints;
-		/* total number of coordinate pairs in working arrays */
-		int nLinePoints;
-		/* total number of bezier endpoints in working arrays */
-		double[] lpWorkX; /* pointer to X coordinate working array */
-		double[] lpWorkY; /* pointer to Y coordinate working array */
-		int i, j;
-
-		nSteps = Math.min(MAX_BEZIERLINES, nSteps);
-
-		/* get pointers to working arrays in workspace */
-		lpWorkX = new double[3 * nSteps + 2];
-		lpWorkY = new double[3 * nSteps + 2];
-
-		/* enter original bezier X coordinates into X working array */
-		lpWorkX[0] = ptCtl1.x;
-		lpWorkX[1] = ptCtl2.x;
-		lpWorkX[2] = ptCtl3.x;
-		lpWorkX[3] = ptCtl4.x;
-
-		/* enter original bezier Y coordinates into Y working array */
-		lpWorkY[0] = ptCtl1.y;
-		lpWorkY[1] = ptCtl2.y;
-		lpWorkY[2] = ptCtl3.y;
-		lpWorkY[3] = ptCtl4.y;
-
-		/* initially 2 bezier endpoints and 4 coordinate pairs total */
-		nLinePoints = 2;
-		nTotalPoints = 4;
-
-		/* generate enough bezier endpoints to satisfy requested number of steps */
-
-		while (nLinePoints <= nSteps) {
-			/* spread coordinate pairs in working array */
-
-			for (i = nTotalPoints - 1; i > 0; i--) {
-				lpWorkX[2 * i] = lpWorkX[i];
-				lpWorkY[2 * i] = lpWorkY[i];
-			}
-
-			nTotalPoints = (2 * nTotalPoints) - 1;
-
-			/* average consecutive coordinates and put average between coordinates */
-
-			for (i = nTotalPoints - 2; i > 0; i -= 2) {
-				lpWorkX[i] = (lpWorkX[i - 1] + lpWorkX[i + 1]) / 2;
-				lpWorkY[i] = (lpWorkY[i - 1] + lpWorkY[i + 1]) / 2;
-			}
-
-			/* now average averages and store over control points */
-			/* but do not overwrite bezier endpoints */
-
-			for (i = nTotalPoints - 3; i > 0; i -= 2) {
-				/* only control points */
-
-				if ((i % 6) != 0) {
-					lpWorkX[i] = (lpWorkX[i - 1] + lpWorkX[i + 1]) / 2;
-					lpWorkY[i] = (lpWorkY[i - 1] + lpWorkY[i + 1]) / 2;
-				}
-			}
-
-			/* lastly overwrite midpoint of control points with */
-			/* average of previous calculation, yeilds midpoint on bezier */
-
-			for (i = nTotalPoints - 4; i > 0; i -= 6) {
-				lpWorkX[i] = (lpWorkX[i - 1] + lpWorkX[i + 1]) / 2;
-				lpWorkY[i] = (lpWorkY[i - 1] + lpWorkY[i + 1]) / 2;
-			}
-
-			nLinePoints = (nTotalPoints / 3) + 1;
-		}
-
-		/* have enough bezier endpoints, move bezier endpoints to */
-		/* polyline CGIPOINTs array */
-
-		for (i = 0; i < nSteps; i++) {
-			Point ptTemp = new Point();
-
-			j = (3 * i);
-			// consider converting to a float & running through the point convertor if needed */
-			ptTemp.x = (int) Math.round(lpWorkX[j]);
-			ptTemp.y = (int) Math.round(lpWorkY[j]);
-
-			thePolyPoints.addPoint(ptTemp);
-		}
-
-		return (bRC);
-	}
-
-	/**
-	 * Calculate the point on the polyline given a distance from a key point.
-	 * 
-	 * @param points the <code>PointList</code> to calculate the point on the polyline.
-	 * @param theDistance the <code>long</code> x coordinate of the point
-	 * @param fromKeyPoint the <code>int</code> constant value indicating the key point
-	 *      Origin, Terminus, Midpoint
-	 * @param ptResult the <code>Point</code> where the resulting point value is set.
-	 * @return Point the calculated point residing on the polyline.
-	 */
-	static public Point pointOn(
-		PointList points,
-		final long theDistance,
-		final LineSeg.KeyPoint fromKeyPoint,
-		Point ptResult) {
-		List mySegments = getLineSegments(points);
-		return pointOn(mySegments, theDistance, fromKeyPoint, ptResult);
-	}
-
-	/**
-	 * Method getPointsLength.
-	 * Static utility function to calculate the length of a series of
-	 * points if interpreted as line segments.
-	 * 
-	 * @param points PointList to calculate the length of.
-	 * @return length of the line segments
-	 */
-	public static long getPointsLength(PointList points) {
-		List segs = getLineSegments(points);
-
-		return length(segs);
-	}
-
-	/**
-	 * Method length.
-	 * Static utility function to calculate the length of a series of
-	 * line segments.
-	 * @param mySegments List of line segments to calculate the length of.
-	 * @return long length of the line segments
-	 */
-	protected static long length(List mySegments) {
-		long theLength = 0;
-		ListIterator lineIter = mySegments.listIterator();
-		while (lineIter.hasNext()) {
-			LineSeg aSegment = (LineSeg) lineIter.next();
-			theLength += Math.round(aSegment.length());
-		}
-
-		return theLength;
-	}
-
-	private final static int BIGDISTANCE = 32766;
-
-	/**
-	 * Static utility method to get the nearest segment in the polyline 
-	 * from the given coordinates.
-	 * 
-	 * @param mySegments the <code>List</code> of <code>LineSeg</code> objects
-	 * @param xCoord the <code>int</code> x coordinate of the point
-	 * @param yCoord the <code>int</code> y coordinate of the point
-	 * @return the <code>LineSeg</code> by reference which is closest to the given coordinates.
-	 */
-	public static LineSeg getNearestSegment(
-		List mySegments,
-		final int xCoord,
-		final int yCoord) {
-		long minDistance = BIGDISTANCE;
-		long nextDistance = 0;
-
-		LineSeg closeSegment = null;
-		LineSeg firstSegment =
-			mySegments.isEmpty() ? null : (LineSeg) mySegments.get(0);
-
-		ListIterator lineIter = mySegments.listIterator();
-		while (lineIter.hasNext()) {
-			LineSeg aSegment = (LineSeg) lineIter.next();
-			nextDistance = aSegment.distanceToPoint(xCoord, yCoord);
-
-			if (nextDistance < minDistance) {
-				closeSegment = aSegment;
-				minDistance = nextDistance;
-			}
-		}
-
-		if (closeSegment != null)
-			return closeSegment;
-
-		// prevent crash
-		return firstSegment;
-	}
-
-	/**
-	 * Method pointOn.
-	 * Static utility function used by <code>pointOn</code>.
-	 * @param mySegments
-	 * @param theDistance the <code>long</code> x coordinate of the point
-	 * @param fromKeyPoint the <code>int</code> constant value indicating the key point
-	 *      Origin, Terminus, Midpoint
-	 * @param ptResult the <code>Point</code> where the resulting point value is set.
-	 * @return Point the calculated point residing on the polyline.
-	 */
-	protected static Point pointOn(
-		List mySegments,
-		final long theDistance,
-		final LineSeg.KeyPoint fromKeyPoint,
-		Point ptResult) {
-		long thisLength = length(mySegments);
-		long halfLength = thisLength / 2;
-
-		if (theDistance >= thisLength) {
-			if (fromKeyPoint == LineSeg.KeyPoint.ORIGIN) {
-				((LineSeg) mySegments.get(mySegments.size() - 1)).pointOn(
-					theDistance - thisLength,
-					LineSeg.KeyPoint.TERMINUS,
-					ptResult);
-				return ptResult;
-			} else if (fromKeyPoint == LineSeg.KeyPoint.MIDPOINT) {
-				((LineSeg) mySegments.get(mySegments.size() - 1)).pointOn(
-					theDistance - halfLength,
-					LineSeg.KeyPoint.TERMINUS,
-					ptResult);
-				return ptResult;
-			} else if (fromKeyPoint == LineSeg.KeyPoint.TERMINUS) {
-				((LineSeg) mySegments.get(mySegments.size() - 1)).pointOn(
-					theDistance,
-					LineSeg.KeyPoint.TERMINUS,
-					ptResult);
-				return ptResult;
-			} else {
-				IllegalArgumentException iae = new IllegalArgumentException();
-				Trace.throwing(Draw2dPlugin.getInstance(), Draw2dDebugOptions.EXCEPTIONS_THROWING, PointListUtilities.class, "pointOn()", //$NON-NLS-1$
-				iae);
-				throw iae;
-			}
-		} else if (theDistance < 0) {
-			if (fromKeyPoint == LineSeg.KeyPoint.ORIGIN) {
-				((LineSeg) mySegments.get(0)).pointOn(
-					theDistance,
-					fromKeyPoint,
-					ptResult);
-				return ptResult;
-			} else if (fromKeyPoint == LineSeg.KeyPoint.MIDPOINT) {
-				return pointOn(
-					mySegments,
-					halfLength + theDistance,
-					LineSeg.KeyPoint.ORIGIN,
-					ptResult);
-			} else if (fromKeyPoint == LineSeg.KeyPoint.TERMINUS) {
-				((LineSeg) mySegments.get(mySegments.size() - 1)).pointOn(
-					theDistance,
-					fromKeyPoint,
-					ptResult);
-				return ptResult;
-			} else {
-				IllegalArgumentException iae = new IllegalArgumentException();
-				Trace.throwing(Draw2dPlugin.getInstance(), Draw2dDebugOptions.EXCEPTIONS_THROWING, PointListUtilities.class, "pointOn()", //$NON-NLS-1$
-				iae);
-				throw iae;
-			}
-		} else {
-			LocateInfo locateInfo = new LocateInfo();
-			if (!locateSegment(mySegments,
-				((double) theDistance) / ((double) thisLength),
-				fromKeyPoint,
-				locateInfo))
-				return null;
-
-			locateInfo.theSegment.pointOn(
-				locateInfo.remainingDist,
-				(fromKeyPoint == LineSeg.KeyPoint.MIDPOINT
-					? LineSeg.KeyPoint.ORIGIN
-					: fromKeyPoint),
-				ptResult);
-			return ptResult;
-		}
-	}
-
-	static private class LocateInfo {
-		
-		/**
-		 * remainin distance
-		 */
-		public long remainingDist;
-
-		/**
-		 * the line segment.
-		 */
-		public LineSeg theSegment;
-	}
-
-	/**
-	 * Find the line segment of this polyline that includes the given
-	 * percentage of the length of the polyline from the given keypoint.
-	 * Return a pointer to the segment and the portion of the length
-	 * of the return segment to complete the distance of the total length.
-	 * The pctDist must be between 0.0 and 1.0 if the keypoint is either
-	 * the origin or the terminus; pctDist must be between 0.0 and 0.5
-	 * if the keypoint is the midpoint.
-	 * 
-	 * @param mySegments
-	 * @param pctDist
-	 * @param fromKeyPoint the <code>int</code> constant value indicating the key point
-	 *      Origin, Terminus, Midpoint
-	 * @param locateInfo LocateInfo where the calculated info is stored for return.
-	 * @return boolean true if the segment could be located, false otherwise.
-	 */
-	private static boolean locateSegment(
-		List mySegments,
-		final double pctDist,
-		final LineSeg.KeyPoint fromKeyPoint,
-		LocateInfo locateInfo) {
-		// Formerly asserted: ASSERT (0.0 <= pctDist && pctDist <= 1.0);
-		// but got one crash reported by a customer in apparently normal
-		// circumstances, so enforce the condition.
-		double thePctDist = pctDist;
-		if (pctDist < 0.0) {
-			thePctDist = 0.0;
-		} else if (1.0 < pctDist) {
-			thePctDist = 1.0;
-		}
-
-		final long theLength = length(mySegments);
-		long remainingLength = Math.round(thePctDist * theLength);
-		long nextLength = 0;
-
-		locateInfo.theSegment = null;
-
-		if (fromKeyPoint == LineSeg.KeyPoint.MIDPOINT
-			|| fromKeyPoint == LineSeg.KeyPoint.ORIGIN) {
-
-			if (fromKeyPoint == LineSeg.KeyPoint.MIDPOINT) {
-				// formerly asserted: ASSERT (pctDist <= 0.5); but not
-				// really essential to the algorithm
-
-				// Let's be tricky. Since locating from the midpoint moves in
-				// the direction of the terminus let's just change the distance
-				// and locate from the origin.
-				remainingLength += theLength / 2;
-			}
-
-			ListIterator lineIter = mySegments.listIterator();
-			while (lineIter.hasNext()) {
-				LineSeg aSegment = (LineSeg) lineIter.next();
-
-				nextLength = Math.round(aSegment.length());
-				if (nextLength >= remainingLength) {
-					locateInfo.theSegment = aSegment;
-					break;
-				} else {
-					remainingLength -= nextLength;
-				}
-			}
-		} else if (fromKeyPoint == LineSeg.KeyPoint.TERMINUS) {
-			ListIterator lineIter = mySegments.listIterator(mySegments.size());
-			while (lineIter.hasPrevious()) {
-				LineSeg aSegment = (LineSeg) lineIter.previous();
-
-				nextLength = Math.round(aSegment.length());
-				if (nextLength >= remainingLength) {
-					locateInfo.theSegment = aSegment;
-					break;
-				} else {
-					remainingLength -= nextLength;
-				}
-			}
-		} else {
-			IllegalArgumentException iae = new IllegalArgumentException();
-			Trace.throwing(Draw2dPlugin.getInstance(), Draw2dDebugOptions.EXCEPTIONS_THROWING, PointListUtilities.class, "pointOn()", //$NON-NLS-1$
-			iae);
-			throw iae;
-		}
-
-		locateInfo.remainingDist = remainingLength;
-
-		return true;
-	}
-
-	/**
-	 * Method distanceAlong.
-	 * Static utility function to calculate the distanceAlong a series of line segments
-	 * a given point is on the line.
-	 * @param mySegments
-	 * @param aPoint Point to calculate the distance along the polyline of.
-	 * @return double value of the distance along the polyline of the given point.
-	 */
-	protected static double distanceAlong(
-		List mySegments,
-		final Point aPoint) {
-		LineSeg theSegment = getNearestSegment(mySegments, aPoint.x, aPoint.y);
-		double linePct =
-			segmentDistance(mySegments, theSegment, LineSeg.KeyPoint.ORIGIN);
-		double segmentPct = theSegment.distanceAlong(aPoint);
-
-		if (0.0 <= segmentPct && segmentPct <= 1.0) {
-			long polyLength = length(mySegments);
-			if (polyLength != 0) {
-				linePct
-					+= (segmentPct
-						* (theSegment.length() / polyLength));
-			}
-			return linePct;
-		} else {
-			return segmentPct;
-		}
-	}
-
-	/**
-	 * Method segmentDistance.
-	 * Compute the percentage of the distance along this polyline
-	 * that the given segment occurs. If the keypoint specified is
-	 * Origin, then the given segment will not be included in the
-	 * percentage; if the keypoint is Midpoint, then half of the
-	 * length will be included; if the keypoint is Terminus, the
-	 * the whole length will be included. The segment must be a
-	 * segment of this polyline.
-	 * @param mySegments
-	 * @param theSegment
-	 * @param uptoKeyPoint
-	 * @return double
-	 */
-	protected static double segmentDistance(
-		List mySegments,
-		LineSeg theSegment,
-		final LineSeg.KeyPoint uptoKeyPoint) {
-		long accumulatedLength = 0;
-
-		ListIterator lineIter = mySegments.listIterator();
-		while (lineIter.hasNext()) {
-			LineSeg aSegment = (LineSeg) lineIter.next();
-
-			if (theSegment.equals(aSegment)) {
-				if (uptoKeyPoint == LineSeg.KeyPoint.ORIGIN) {
-					// empty block
-				} else if (uptoKeyPoint == LineSeg.KeyPoint.MIDPOINT) {
-					accumulatedLength += aSegment.length() / 2;
-				} else if (uptoKeyPoint == LineSeg.KeyPoint.TERMINUS) {
-					accumulatedLength += aSegment.length();
-				} else {
-					IllegalArgumentException iae =
-						new IllegalArgumentException();
-					Trace.throwing(Draw2dPlugin.getInstance(), Draw2dDebugOptions.EXCEPTIONS_THROWING, PointListUtilities.class, "pointOn()", //$NON-NLS-1$
-					iae);
-					throw iae;
-				}
-
-				long polyLength = length(mySegments);
-				if (polyLength != 0) {
-					return ((double) accumulatedLength / (double) polyLength);
-				} else {
-					// RJ: removed the ASSERT for now
-					return 0.0;
-				}
-			} else {
-				accumulatedLength += aSegment.length();
-			}
-		}
-
-		return 0.0;
-	}
-
-	/**
-	 * Method routeAroundPoint.
-	 * Calculate a new routed version of this polyline that will route itself around a 
-	 * given point.
-	 * 
-	 * @param points PointList to modify
-	 * @param ptCenter the <code>Point</code> around which the routing will occur.
-	 * @param nHeight the <code>int</code> height to route around the point.
-	 * @param nWidth the <code>int</code> width to route around the point.
-	 * @param nSmoothFactor the <code>int</code> smooth factor to route the line with 
-	 *          0 - None, 15 - some, 30 - lots
-	 * @param nInclineOffset the <code>int</code> amount to incline the routed points.
-	 * @param bTop the <code>boolean</code> route above or below the point on the line.
-	 * @return <code>PointList</code> that is the newly routed version of <code>points</code>
-	 * of <code>null</code> if operation was not successful or if the calculation is not possible.
-	 */
-	static public PointList routeAroundPoint(
-		PointList points,
-		final Point ptCenter,
-		int nHeight,
-		int nWidth,
-		int nSmoothFactor,
-		int nInclineOffset,
-		boolean bTop) {
-		List mySegments = getLineSegments(points);
-
-		long nPolyLength = length(mySegments);
-		long nCenterDistance =
-			Math.round(
-				distanceAlong(mySegments, ptCenter)
-					* nPolyLength);
-
-		Point ptMidStart = new Point();
-		pointOn(
-			mySegments,
-			nCenterDistance - (nWidth / 2),
-			LineSeg.KeyPoint.ORIGIN,
-			ptMidStart);
-		Point ptMidEnd = new Point();
-		pointOn(
-			mySegments,
-			nCenterDistance + (nWidth / 2),
-			LineSeg.KeyPoint.ORIGIN,
-			ptMidEnd);
-		LineSeg lineNew = new LineSeg(ptMidStart, ptMidEnd);
-
-		Point ptStart = new Point();
-		lineNew.pointOn(nInclineOffset, LineSeg.KeyPoint.ORIGIN, ptStart);
-		LocateInfo locateInfo = new LocateInfo();
-		if (!locateSegment(mySegments,
-			(nCenterDistance - ((long) nWidth / 2)) / (double) nPolyLength,
-			LineSeg.KeyPoint.ORIGIN,
-			locateInfo))
-			return null;
-		LineSeg pStartSeg = locateInfo.theSegment;
-
-		Point ptEnd = new Point();
-		lineNew.pointOn(nInclineOffset, LineSeg.KeyPoint.TERMINUS, ptEnd);
-		if (!locateSegment(mySegments,
-			(nCenterDistance + ((long) nWidth / 2)) / (double) nPolyLength,
-			LineSeg.KeyPoint.ORIGIN,
-			locateInfo))
-			return null;
-		LineSeg pEndSeg = locateInfo.theSegment;
-
-		// figure out which side to route around
-		float fSlope = lineNew.slope();
-		int nDir = 1;
-		if ((bTop && fSlope <= 0) || (!bTop && fSlope > 0))
-			nDir *= -1;
-
-			LineSeg lineStart =
-				new LineSeg(LineSeg.KeyPoint.ORIGIN, // Origin or Midpoint
-	ptStart.x, ptStart.y, lineNew.perpSlope(), nHeight, nDir);
-
-			LineSeg lineEnd =
-				new LineSeg(LineSeg.KeyPoint.ORIGIN, // Origin or Midpoint
-	ptEnd.x, ptEnd.y, lineNew.perpSlope(), nHeight, nDir);
-
-		PointList rRotatedBox = new PointList();
-		rRotatedBox.addPoint(new Point(ptMidStart));
-		rRotatedBox.addPoint(new Point(lineStart.getTerminus()));
-		rRotatedBox.addPoint(new Point(lineEnd.getTerminus()));
-		rRotatedBox.addPoint(new Point(ptMidEnd));
-		rRotatedBox.addPoint(new Point(ptMidStart));
-
-		PointList rPolyPoints =
-			new PointList(rRotatedBox.size() * MAX_BEZIERLINES + points.size());
-		boolean bFoundStart = false;
-		boolean bFoundEnd = false;
-		int nPointsSinceStart = 0;
-
-		List boxSegments = getLineSegments(rRotatedBox);
-		ListIterator lineIter = mySegments.listIterator();
-		while (lineIter.hasNext()) {
-			LineSeg pSegment = (LineSeg) lineIter.next();
-
-			if (pSegment.equals(pStartSeg)) {
-				rPolyPoints.addPoint(new Point(pSegment.getOrigin()));
-				bFoundStart = true;
-			}
-
-			if (pSegment == pEndSeg) {
-				PointList newRoutePoints =
-					new PointList(rRotatedBox.size() * MAX_BEZIERLINES);
-
-				LineSeg pCurSeg1 = (LineSeg) boxSegments.get(0);
-				LineSeg pCurSeg2 =
-					(LineSeg) boxSegments.get(boxSegments.size() - 1);
-				getRoutedPoints(
-					points,
-					newRoutePoints,
-					ptMidStart,
-					ptMidEnd,
-					ptMidStart,
-					ptMidEnd,
-					pCurSeg1,
-					pCurSeg2,
-					rRotatedBox,
-					nSmoothFactor,
-					false,
-					true,
-					0);
-
-				while (nPointsSinceStart > 0) {
-					rPolyPoints.removePoint(rPolyPoints.size() - 1);
-					nPointsSinceStart--;
-				}
-
-				for (int i = 0; i < newRoutePoints.size(); i++)
-					rPolyPoints.addPoint(new Point(newRoutePoints.getPoint(i)));
-				rPolyPoints.addPoint(new Point(pSegment.getTerminus()));
-				bFoundEnd = true;
-			} else {
-				rPolyPoints.addPoint(new Point(pSegment.getOrigin()));
-
-				if (bFoundStart)
-					nPointsSinceStart++;
-
-				if (!lineIter.hasNext())
-					rPolyPoints.addPoint(new Point(pSegment.getTerminus()));
-			}
-
-		}
-
-		if (bFoundEnd)
-			return rPolyPoints;
-
-		return null;
-	}
-
-	/**
-	 * Method findNearestLineSegIndexOfPoint.
-	 * Calculate the nearest line segment index distance wise to the given point.
-	 * 
-	 * @param points PointList to calculate the nearest line segment of.
-	 * @param ptCoord the <code>Point</code> to test containment of.
-	 * @return int Index of line segment that is nearest in the polyline to the given point.
-	 * The index is 1 based where 1 represents the first segment.
-	 */
-	static public int findNearestLineSegIndexOfPoint(
-		PointList points,
-		final Point ptCoord) {
-		List mySegments = getLineSegments(points);
-		ListIterator lineIter = mySegments.listIterator();
-		int nNextIndex = 0;
-		int nMinIndex = 0;
-		long minDistance = BIGDISTANCE;
-		long nextDistance = 0;
-
-		while (lineIter.hasNext()) {
-			LineSeg aSegment = (LineSeg) lineIter.next();
-			nNextIndex++;
-
-			nextDistance = aSegment.distanceToPoint(ptCoord.x, ptCoord.y);
-
-			if (nextDistance < minDistance) {
-				minDistance = nextDistance;
-				nMinIndex = nNextIndex;
-			}
-		}
-
-		return nMinIndex;
-	}
-
-	/**
-	 * Method findIntersections.
-	 * Find all intersection points between this polyline and another polyline passed
-	 * into the method.
-	 * 
-	 * @param points PointList to calculate interesections with.
-	 * @param poly the <code>PointList</code> to calculate intersections with.
-	 * @param intersections the <code>PointList</code> containing the resulting calculated 
-	 * intersection points.
-	 * @param distances the <code>PointList</code> containing point values representing the
-	 * distance along the polyline the intersections occur.
-	 * @return boolean true if intersections could be calculated, false otherwise.
-	 */
-	static public boolean findIntersections(
-		PointList points,
-		final PointList poly,
-		PointList intersections,
-		PointList distances) {
-		List polySegments = getLineSegments(poly);
-		List mySegments = getLineSegments(points);
-
-		Point pLastIntersect = null;
-
-		double dCurrentLength = 0;
-
-		ListIterator segIter = mySegments.listIterator();
-		while (segIter.hasNext()) {
-			LineSeg pSegment = (LineSeg) segIter.next();
-
-			double dSegLength = pSegment.length();
-
-			ListIterator polyIter = polySegments.listIterator();
-			while (polyIter.hasNext()) {
-				LineSeg pPolySegment = (LineSeg) polyIter.next();
-
-				Point ptIntersect = pSegment.intersect(pPolySegment, INTERSECT_TOLERANCE);
-
-				// check if this segment intersects with the box
-				if (ptIntersect != null) {
-					boolean bAddIntersect = true;
-
-					if (pLastIntersect != null) {
-						// check case where intersect is on a corner - causing intersect
-						// to show up in two adjacent line segments
-						if (Math.abs(pLastIntersect.x - ptIntersect.x)
-							< (INTERSECT_TOLERANCE * 2)
-							&& Math.abs(pLastIntersect.y - ptIntersect.y)
-								< (INTERSECT_TOLERANCE * 2))
-							bAddIntersect = false;
-					}
-
-					if (bAddIntersect) {
-						pLastIntersect = new Point(ptIntersect);
-						intersections.addPoint(pLastIntersect);
-
-						Point ptDistance = new Point(0, 0);
-						ptDistance.x =
-							(int) Math.round(
-								dCurrentLength
-									+ pSegment.distanceAlong(ptIntersect)
-										* dSegLength);
-						distances.addPoint(ptDistance);
-					}
-				}
-			}
-
-			dCurrentLength += dSegLength;
-
-		}
-
-		return intersections.size() > 0;
-	}
-
-	/**
-	 * Finds a point relative to the pointList passed in based on the parameters passed in.
-	 * 
-	 * @param pointList the <code>PointList</code> 
-	 * @param fromLine distance off the line 
-	 * @param fromEnd distance from the starting point of the line (i.e. distance from source end along the line)
-	 * @param isPercentage is the fromEnd given as a percentage?
-	 * @return Point
-	 */
-	public static Point calculatePointRelativeToLine(
-		PointList pointList,
-		int fromLine,
-		int fromEnd,
-		boolean isPercentage) {
-		double fractionDistance = 0;
-		if (isPercentage) {
-			fractionDistance = fromEnd / 100.0;
-		} else {
-			fractionDistance = (double) fromEnd / (double) pointList.size();
-		}
-
-		LocateInfo locateInfo =
-			new LocateInfo();
-		if (locateSegment(
-				getLineSegments(pointList),
-				fractionDistance,
-				LineSeg.KeyPoint.ORIGIN,
-				locateInfo)) {
-			double inSegPercDist = 0;
-			LineSeg seg = locateInfo.theSegment;
-			if (seg.length() > 0)
-				inSegPercDist =
-					locateInfo.remainingDist
-						/ seg.length();
-			// relative position is coded as the the sign of the height
-			Point location =
-				seg.locatePoint(
-					inSegPercDist,
-					Math.abs(fromLine),
-					(fromLine > 0
-						? LineSeg.Sign.POSITIVE
-						: LineSeg.Sign.NEGATIVE));
-			return location;
-		}
-		return null;
-	}
-	
-	/**
-	 * Assumption: Points in the <Code>PointList</Code> and <Code>Point</Code> p lie on the same line.
-	 * Returns the <Code>Point</Code> from the <Code>PointList</Code> closest to @param p
-	 * 
-	 * @param points - the list of points to select the result from
-	 * @param p - the point to which the closest point must be found
-	 * @return the <Code>Point</Code> from the <Code>PointList</Code> closest to @param p
-	 */
-	public static Point pickClosestPoint(PointList points, Point p) {
-		Point result = points.getFirstPoint();
-		for (int i=1; i<points.size(); i++) {
-			Point temp = points.getPoint(i);
-			if (Math.abs(temp.x - p.x) < Math.abs(result.x - p.x))
-				result = temp;
-			else if (Math.abs(temp.y - p.y) < Math.abs(result.y - p.y))
-				result = temp;
-		}
-		return result;
-	}
-	
-	/**
-	 * Assumption: Points in the <Code>PointList</Code> and <Code>Point</Code> p lie on the same line.
-	 * Returns the <Code>Point</Code> from the <Code>PointList</Code> closest to @param p
-	 * 
-	 * @param points - the list of points to select the result from
-	 * @param p - the point to which the closest point must be found
-	 * @return the <Code>Point</Code> from the <Code>PointList</Code> closest to @param p
-	 */
-	public static Point pickFarestPoint(PointList points, Point p) {
-		Point result = points.getFirstPoint();
-		for (int i=1; i<points.size(); i++) {
-			Point temp = points.getPoint(i);
-			if (Math.abs(temp.x - p.x) > Math.abs(result.x - p.x))
-				result = temp;
-			else if (Math.abs(temp.y - p.y) > Math.abs(result.y - p.y))
-				result = temp;
-		}
-		return result;
-	}
-	
-	/**
-	 * Method sameOrientation.
-	 * @param pt1
-	 * @param pt2
-	 * @param pt3
-	 * @return boolean true if the line connecting all three points are 
-	 *      straight, false otherwise.
-	 */
-	static boolean sameOrientation(Point pt1, Point pt2, Point pt3, int straightLineTolerance) {
-		LineSeg line = new LineSeg(pt1, pt3);
-		Point pt = line.perpIntersect(pt2.x, pt2.y);
-		return Math.round(pt.getDistance(new Point(pt2.x, pt2.y))) < straightLineTolerance;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/package.html
deleted file mode 100644
index 810d83e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Provides a set of classes for geometric manipulation.
-
-<p>These classes are often used when performing complex geometry calculations for use
-when displaying or manipulating draw2d figures.</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graphics/GCUtilities.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graphics/GCUtilities.java
deleted file mode 100644
index bc58b2d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graphics/GCUtilities.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.draw2d.ui.graphics;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Utility class for operations around using a <code>GC</code>
- * 
- * @author sshaw, crevells
- */
-public class GCUtilities {
-
-    static private boolean checkedAdvancedGraphicsSupport = false;
-
-    static private boolean platformSupportsAdvancedGraphics = false;
-
-
-    /**
-     * Returns true is advanced graphics is supported in this environment. This
-     * includes the OS supporting an advanced graphics library (usually an
-     * externally installed library such as Cairo or GDI+)
-     * 
-     * @return true if advanced graphics is supported; false otherwise
-     */
-    public static boolean supportsAdvancedGraphics() {
-        if (!checkedAdvancedGraphicsSupport) {
-            Shell shell = new Shell();
-            GC gc = new GC(shell);
-            gc.setAdvanced(true);
-            platformSupportsAdvancedGraphics = (gc.getAdvanced() == true);
-            checkedAdvancedGraphicsSupport = true;
-            gc.dispose();
-            shell.dispose();
-        }
-
-        // Advanced graphics is disabled if the RTL orintation is ON
-        // this is to avoid SWT bugzilla 99564, on the GC object, where if the Advanced
-        // graphics Mask is on it does not consider mirroring
-        return platformSupportsAdvancedGraphics
-            && Window.getDefaultOrientation() != SWT.RIGHT_TO_LEFT;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dDebugOptions.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dDebugOptions.java
deleted file mode 100644
index 81137c2..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dDebugOptions.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class Draw2dDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private Draw2dDebugOptions() {
-		// empty constructor
-	}
-
-	public static final String DEBUG = Draw2dPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-    public static final String DND = DEBUG + "/dnd/tracing"; //$NON-NLS-1$  
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dPlugin.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dPlugin.java
deleted file mode 100644
index f3cc9a0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dPlugin.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- * @author melaasar
- */
-public class Draw2dPlugin
-	extends AbstractUIPlugin {
-
-	/** the plugin singleton */
-	private static Draw2dPlugin singleton;
-
-	/**
-	 * Method getInstance.
-	 * 
-	 * @return Plugin
-	 */
-	public static Draw2dPlugin getInstance() {
-		return singleton;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Creates the Draw2d plugin instance
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#Plugin()
-	 */
-	public Draw2dPlugin() {
-		super();
-		if (singleton == null)
-			singleton = this;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dStatusCodes.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dStatusCodes.java
deleted file mode 100644
index 3ef583b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/Draw2dStatusCodes.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class Draw2dStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private Draw2dStatusCodes() {
-		// empty constructor
-	}
-
-	public static final int OK = 0;
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimatableScrollPane.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimatableScrollPane.java
deleted file mode 100644
index eea98d1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimatableScrollPane.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2003  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Orientable;
-import org.eclipse.draw2d.ScrollBar;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ListScrollBar;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * An implementation of an animatable scroll pane
- * 
- * @author melaasar
- *
- * <p>
- * Code taken from Eclipse reference bugzilla #98820
- *
- */
-public class AnimatableScrollPane extends ScrollPane {
-
-	private AnimationModel animationModel = null;
-	private boolean expanded = true;
-	private static final long delay = 150;
-
-	private void animate() {
-		animationModel = new AnimationModel(delay, expanded);
-		animationModel.animationStarted();
-		while (!animationModel.isFinished())
-			this.step();
-		animationModel = null;
-	}
-
-	/**
-	 * Should be called, after which the compoenents can be removed.
-	 */
-	public void collapse() {
-		if (expanded == false)
-			return;
-		expanded = false;
-		animate();
-	}
-
-	/** 
-	 * Should get called after adding all the new components.
-	 */
-	public void expand() {
-		if (expanded == true)
-			return;
-		expanded = true;
-		animate();
-	}
-
-	/**
-	 * Sets the scroll pane state as being expanded or not.
-	 * 
-	 * @param value the <code>boolean</code> to set the expanded value of.  
-	 * If <code>true</code> then the state will be set as expanded, <code>false</code>
-	 * if not.
-	 */
-	public void setExpanded(boolean value) {
-		if (expanded == value)
-			return;
-		expanded = value;
-		revalidate();
-	}
-
-	/**
-	 * Accessor for the expanded property
-	 * @return boolean expanded
-	 */
-	public final boolean isExpanded() {
-		return expanded;
-	}
-
-	private void step() {
-		revalidate();
-		getUpdateManager().performUpdate();
-	}
-
-	/** @see org.eclipse.draw2d.IFigure#isOpaque() */
-	public boolean isOpaque() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		if (animationModel == null) {
-			if (expanded)
-				return super.getPreferredSize(wHint, hHint);
-			return getMinimumSize(wHint, hHint);
-		}
-		Dimension pref = super.getPreferredSize(wHint, hHint);
-		Dimension min = getMinimumSize(wHint, hHint);
-		float scale = animationModel.getProgress();
-		return pref.equals(min)
-			? pref
-			: pref.getScaled(scale).expand(min.getScaled(1.0f - scale));
-	}
-	
-	/**
-	 * @see IFigure#validate()
-	 */
-	public void validate() {
-		if (isValid())
-			return;
-		setValid(true);
-		layout();
-		
-		for (int i = 0; i < getChildren().size(); i++)
-			((IFigure)getChildren().get(i)).validate();
-		if ((hBar != null) && getHorizontalScrollBarVisibility()!= NEVER)
-			getHorizontalScrollBar().validate();
-		if ((vBar != null) && getVerticalScrollBarVisibility()!= NEVER)
-			getVerticalScrollBar().validate();
-	}
-    
-    
-    protected void createVerticalScrollBar() {
-        IMapMode mm= MapModeUtil.getMapMode(this);
-        int mm_1 = mm.DPtoLP(1);
-        Insets insets = new Insets(mm_1, mm.DPtoLP(2),
-            mm_1, mm.DPtoLP(0));
-        int mm_15 = mm.DPtoLP(15);
-        Dimension size = new Dimension(mm_15, mm_15);
-        setVerticalScrollBar( new ListScrollBar(Orientable.VERTICAL, insets, size, 
-            mm.DPtoLP(10), mm.DPtoLP(50)));
-    }
-    
-    
-    protected void createHorizontalScrollBar() {
-        IMapMode mm= MapModeUtil.getMapMode(this);
-        int mm_1 = mm.DPtoLP(1);
-        Insets insets = new Insets(mm_1, mm.DPtoLP(2),
-            mm_1, mm.DPtoLP(0));
-        int mm_15 = mm.DPtoLP(15);
-        Dimension size = new Dimension(mm_15, mm_15);
-        setHorizontalScrollBar( new ListScrollBar(Orientable.HORIZONTAL, insets, size, 
-            mm.DPtoLP(10), mm.DPtoLP(50)));
-    }
-    
-    public ScrollBar basicGetVerticalScrollBar() {
-        return vBar;
-    }
-    
-    
-    public ScrollBar basicGetHorizontalScrollBar() {        
-        return hBar;
-    }
-
-
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimationModel.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimationModel.java
deleted file mode 100644
index b0408af..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimationModel.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import java.util.Date;
-
-/**
- * Holds the count information, and notifies
- * interested figures of changes in animation.
- * Created by a root, which loops through the
- * animation process.
- * 
- * <p>
- * Code taken from Eclipse reference bugzilla #98820
- *
- * @canBeSeenBy %level0
- */
-public class AnimationModel {
-
-private long startTime = new Date().getTime();
-private long duration = 0;
-
-private boolean ascending;
-
-/**
- * Default constructor taking in number of
- * milliseconds the animation should take.
- */
-public AnimationModel(long duration, boolean ascending){
-	this.duration = duration;
-	this.ascending = ascending;
-}
-
-/**
- * Called to notify the start of the animation process.
- * Notifies all listeners to get ready for animation start.
- */
-public void animationStarted(){
-	startTime = new Date().getTime();
-}
-
-/**
- * Returns (0.0<=value<=1.0), of current position
- */
-public float getProgress(){
-	long presentTime = new Date().getTime();
-	float elapsed = (presentTime-startTime);
-	float progress = Math.min(1.0f, elapsed/duration);
-	if (!ascending)
-		return 1.0f - progress;
-	return progress;
-}
-
-public boolean isFinished(){
-	return (new Date().getTime() - startTime) > duration;
-}
-
-}
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ConnectionLayerEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ConnectionLayerEx.java
deleted file mode 100644
index 8bee522..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ConnectionLayerEx.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.AutomaticRouter;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.FanRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ForestRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.RectilinearRouter;
-
-
-/**
- * This class provides a hook for the default routers available through the drawing
- * surface.  Specifically, the oblique, rectilinear and tree routers.
- * 
- * @author sshaw
- * @canBeSeenBy %partners
- */
-public class ConnectionLayerEx extends ConnectionLayer {
-
-	private boolean dirtied = false;
-	static private boolean allowJumpLinks = true;
-	
-	/**
-	 * Adds the given figure with the given contraint at the given index.
-	 * If the figure is a connection, its connection router is set.
-	 * In addition this method override will dirty the jump link
-	 * information so that next display update they can be regenerated.
-	 *
-	 * @param figure  <code>IFigure</code> being added.
-	 * @param constraint  Constraint of the figure being added.
-	 * @param index  Index where the figure is to be added. 
-	 */
-	public void add(IFigure figure, Object constraint, int index) {
-		super.add(figure, constraint, index);
-
-		dirtyJumpLinks(figure.getBounds());
-	}
-
-	/**
-	 * Removes the given figure from the connection layer.
-	 * In addition this method override will dirty the jump link
-	 * information so that next display update they can be regenerated.
-	 *
-	 * @param figure  <code>IFigure</code> being removed.
-	 */
-	public void remove(IFigure figure) {
-		super.remove(figure);
-
-		dirtyJumpLinks(figure.getBounds());
-	}
-
-	/**
-	 * Determines if we should jump links at all in the connection layer.
-	 * To address scaleability concerns, we turn off jump links while editing connections.
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if the jump links capability is currently
-	 * available, <code>false</code> otherwise.
-	 */
-	static public boolean shouldJumpLinks() {
-		return allowJumpLinks;
-	}
-	
-	/**
-	 * Method setJumpLinks
-	 * This method will set if we should jump links at all in the connection layer.
-	 * To address scaleability concerns, we turn off jump links while editing connections.
-	 * 
-	 * @param set the current state of the jump links capability based on the <code>boolean</code> 
-	 * value passed.  <code>true</code> indicates that jump links is available, <code>false</code>
-	 * otherwise.
-	 */
-	static public void setJumpLinks(boolean set) {
-		allowJumpLinks = set;
-	}
-	
-	/**
-	 * Method cleanJumpLinks
-	 * This method will reset the "dirtied" flag so that we know to redirty
-	 * all the connections when the method "dirtyJumpLinks" is called.
-	 */
-	public void cleanJumpLinks() {
-		dirtied = false;
-	}
-	
-	/**
-	 * Iterates through all the connections and set a 
-	 * flag indicating that the jump link information needs to be updated.
-	 * At display time, the connection will regenerate the jump link information.
-	 * 
-	 * @param region the <code>Rectangle</code> that indicates the dirty region inside
-	 * which the jump links calculations should be regenerated.
-	 */
-	public void dirtyJumpLinks(Rectangle region) {
-		
-		if (!dirtied && shouldJumpLinks()) {
-			List children = getChildren();
-			ListIterator childIter = children.listIterator();
-			while (childIter.hasNext()) {
-				IFigure poly = (IFigure) childIter.next();
-				if (poly instanceof PolylineConnectionEx)
-					if (poly.getBounds().intersects(region))
-						((PolylineConnectionEx) poly).refreshLine();
-			}
-			dirtied = true;
-		}
-	}
-
-	/**
-	 * Returns the connection router being used by this layer.
-	 *
-	 * @return  Connection router being used by this layer.
-	 * @see  #setConnectionRouter(ConnectionRouter)
-	 */
-	public ConnectionRouter getConnectionRouter() {
-		return getObliqueRouter();
-	}
-
-	private ConnectionRouter obliqueRouter = null;
-	private ConnectionRouter rectilinearRouter = null;
-	private ConnectionRouter treeRouter = null;
-
-	/**
-	 * Provides an access point to the oblique router for the entire
-	 * layer.  Each connection will contain a reference to this router so that
-	 * the router can keep track of overlapping connections and reroute accordingly.
-	 * 
-	 * @return the <code>ConnectionRouter</code> that handles oblique style routing.
-	 */
-	public ConnectionRouter getObliqueRouter() {
-		if (obliqueRouter == null) {
-			AutomaticRouter router = new FanRouter();
-			router.setNextRouter(new ObliqueRouter());
-			obliqueRouter = router;
-		}
-
-		return obliqueRouter;
-	}
-
-	/**
-	 * Provides an access point to the rectilinear router for the entire
-	 * layer.  Each connection will contain a reference to this router so that
-	 * the router can keep track of overlapping connections and reroute accordingly.
-	 * 
-	 * @return the <code>ConnectionRouter</code> that handles rectilinear style routing.
-	 */
-	public ConnectionRouter getRectilinearRouter() {
-		if (rectilinearRouter == null)
-			rectilinearRouter = new RectilinearRouter();
-
-		return rectilinearRouter;
-	}
-	
-	/**
-	 * This method provides an access point to the tree router for the entire
-	 * layer.  Each connection will contain a reference to this router so that
-	 * the router can keep track of overlapping connections and reroute accordingly.
-	 * 
-	 * @return the <code>ConnectionRouter</code> that handles tree style routing.
-	 */
-	public ConnectionRouter getTreeRouter() {
-		if (treeRouter == null)
-			treeRouter = new ForestRouter();
-
-		return treeRouter;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DelegatingLayout.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DelegatingLayout.java
deleted file mode 100644
index e1f67c7..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DelegatingLayout.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.geometry.Dimension;
-
-/*
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- */
-public class DelegatingLayout extends org.eclipse.draw2d.DelegatingLayout {
-	private Map constraints = new HashMap();
-
-	protected Dimension calculatePreferredSize(IFigure parent, int wHint, int hHint) {
-		List children = parent.getChildren();
-		Dimension d = new Dimension();
-		for (int i = 0; i < children.size(); i++) {
-			IFigure child = (IFigure) children.get(i);
-			d.union(child.getPreferredSize(wHint, hHint));
-		}
-		return d;
-	}
-
-	public void layout(IFigure parent) {
-
-		List children = parent.getChildren();
-		for (int i = 0; i < children.size(); i++) {
-			IFigure child = (IFigure) children.get(i);
-			child.setSize(child.getPreferredSize());
-			Object locator = constraints.get(child);
-			if (locator != null && locator instanceof Locator) {
-				((Locator) locator).relocate(child);
-			}
-		}
-	}
-
-	public void setConstraint(IFigure figure, Object constraint) {
-		super.setConstraint(figure, constraint);
-		if (constraint != null)
-			constraints.put(figure, constraint);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DropShadowButtonBorder.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DropShadowButtonBorder.java
deleted file mode 100644
index 3651305..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DropShadowButtonBorder.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.AbstractBorder;
-import org.eclipse.draw2d.ButtonModel;
-import org.eclipse.draw2d.Clickable;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-/*
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- */
-public class DropShadowButtonBorder 
-	extends AbstractBorder
-{
-
-private static final Color
-	highlight   = ColorConstants.menuBackgroundSelected,
-	dropshadow2 = new Color(null, new RGB (143, 141, 138)),
-	dropshadow3 = ColorConstants.buttonDarker;
-
-/**
- * Returns the space used by the border for the 
- * figure provided as input. In this border all 
- * sides always have equal width.
- *
- * @param figure  Figure for which this is the border.
- * @return  Insets for this border.
- */
-public Insets getInsets(IFigure figure) {
-    IMapMode mm = MapModeUtil.getMapMode(figure);
-
-    int DPtoLP_1 = mm.DPtoLP(1);
-    int DPtoLP_3 = mm.DPtoLP(3);
-    return new Insets(DPtoLP_1, DPtoLP_1, DPtoLP_3, DPtoLP_3);
-}
-
-public boolean isOpaque(){
-	return true;
-}
-
-public void paint(IFigure figure, Graphics g, Insets theInsets){
-    
-	ButtonModel model = ((Clickable)figure).getModel();
-	Rectangle r = getPaintRectangle(figure, theInsets);
-	g.setLineWidth(1);
-    
-    IMapMode mm = MapModeUtil.getMapMode(figure);
-
-    int DPtoLP_3 = mm.DPtoLP(3);
-	r.width  -= DPtoLP_3;
-	r.height -= DPtoLP_3;
-
-    int DPtoLP_1 = mm.DPtoLP(1);
-
-	if (model.isMouseOver() && !model.isArmed()){
-
-		g.setForegroundColor(highlight);
-		g.drawRectangle(r);
-
-		r.translate(1,1);
-		g.setForegroundColor(dropshadow2);
-		g.drawLine(r.x      , r.bottom(), r.right(), r.bottom());
-		g.drawLine(r.right(), r.y       , r.right(), r.bottom());
-
-		r.translate(1,1);
-		g.setForegroundColor(dropshadow3);
-		g.drawLine(r.x+1    , r.bottom(), r.right()-1, r.bottom());
-		g.drawLine(r.right(), r.y+1     , r.right()  , r.bottom()-1);
-	}
-
-	else if (model.isPressed()){
-		r.translate(DPtoLP_1, DPtoLP_1);
-
-		g.setForegroundColor(highlight);
-		g.drawRectangle(r);
-
-		r.translate(DPtoLP_1, DPtoLP_1);
-		g.setForegroundColor(dropshadow2);
-		g.drawLine(r.x      , r.bottom(), r.right(), r.bottom());
-		g.drawLine(r.right(), r.y       , r.right(), r.bottom());
-	}
-
-	else {
-		r.translate(DPtoLP_1, DPtoLP_1);
-
-		g.setForegroundColor(dropshadow3);
-		g.drawRectangle(r);
-
-		r.translate(DPtoLP_1, DPtoLP_1);
-		g.drawLine(r.x      , r.bottom(), r.right(), r.bottom());
-		g.drawLine(r.right(), r.y       , r.right(), r.bottom());
-	}
-}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/FeedbackConnection.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/FeedbackConnection.java
deleted file mode 100644
index b6674a1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/FeedbackConnection.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.jface.util.Assert;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-/*
- * @canBeSeenBy %level0
- */
-public class FeedbackConnection extends PolylineConnectionEx {
-
-	private Connection master = null;
-	private List masterConstraint = null;
-
-	public FeedbackConnection() {
-		setLineStyle(Graphics.LINE_DASHDOT);
-	}
-		
-	public FeedbackConnection(Connection master) {
-		this();
-		
-		this.master = master;
-		
-		PointList pts = PointListUtilities.copyPoints(master.getPoints());
-		setPoints(pts);
-		setSourceAnchor(master.getSourceAnchor());
-		setTargetAnchor(master.getTargetAnchor());
-		setForegroundColor(master.getForegroundColor());
-		
-		if (master instanceof PolylineConnectionEx) {
-			setSmoothness(((PolylineConnectionEx)master).getSmoothness());
-			setRoutingStyles(((PolylineConnectionEx)master).isClosestDistanceRouting(),
-							 ((PolylineConnectionEx)master).isAvoidObstacleRouting());
-		}
-			
-		// Update the constraint based on the current figure
-		ConnectionRouter masterRouter = master.getConnectionRouter();
-		
-		masterConstraint = (List)master.getRoutingConstraint();
-		List newConstraint = new ArrayList(masterConstraint.size());
-		
-		setConnectionRouter(masterRouter);
-		masterRouter.remove(master);
-
-		for (int i=0; i<masterConstraint.size(); i++) {
-			Bendpoint bp = (Bendpoint)masterConstraint.get(i);
-			newConstraint.add( new AbsoluteBendpoint(bp.getLocation()) );
-		}
-		
-		Assert.isTrue(newConstraint.size() >= 2 && newConstraint.size() == masterConstraint.size());
-		setRoutingConstraint(newConstraint);
-	}
-	
-	public void dispose() {
-		if (getConnectionRouter() != null)
-			getConnectionRouter().remove(this);
-		setRoutingConstraint(null);
-		
-		if (getSourceAnchor() != null)
-			getSourceAnchor().removeAnchorListener(this);
-		if (getTargetAnchor() != null)
-			getTargetAnchor().removeAnchorListener(this);
-
-		if (master != null && masterConstraint != null) {
-			master.setRoutingConstraint(masterConstraint);
-		}
-	}
-}
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ImageFigureEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ImageFigureEx.java
deleted file mode 100644
index 6df108e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ImageFigureEx.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-/*
- * Created on Sep 17, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.ImageFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * A copy of GEF's ImageFigure that takes care of himetric conversion
- * 
- * @author melaasar
- */
-public class ImageFigureEx
-	extends Figure {
-
-	private Image img;
-
-	private Dimension imgSize = new Dimension();
-
-	private int alignment;
-
-	/**
-	 * Constructor <br>
-	 * The default alignment is <code>PositionConstants.CENTER</code>.
-	 */
-	public ImageFigureEx() {
-		this(null, PositionConstants.CENTER);
-	}
-
-	/**
-	 * Constructor <br>
-	 * The default alignment is <code>PositionConstants.CENTER</code>.
-	 * 
-	 * @param image
-	 *            The Image to be displayed
-	 */
-	public ImageFigureEx(Image image) {
-		this(image, PositionConstants.CENTER);
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param image
-	 *            The Image to be displayed
-	 * @param alignment
-	 *            A PositionConstant indicating the alignment
-	 * 
-	 * @see ImageFigure#setImage(Image)
-	 * @see ImageFigure#setAlignment(int)
-	 */
-	public ImageFigureEx(Image image, int alignment) {
-		setImage(image);
-		setAlignment(alignment);
-	}
-
-	/**
-	 * @return The Image that this Figure displays
-	 */
-	public Image getImage() {
-		return img;
-	}
-
-    /**
-     * @return <code>Dimension</code> that is the size of the image in logical coordinates
-     */
-    private Dimension getImageSize() {
-        if (imgSize.isEmpty() && getImage() != null) {
-            org.eclipse.swt.graphics.Rectangle r = getImage().getBounds();
-            IMapMode mm = MapModeUtil.getMapMode(this);
-            imgSize = new Dimension(mm.DPtoLP(r.width), 
-                mm.DPtoLP(r.height));
-        }
-        
-        if (!imgSize.isEmpty())
-            return imgSize;
-        
-        return getBounds().getSize();
-    }
-    
-	/**
-	 * Returns the size of the Image that this Figure displays; or (0,0) if no
-	 * Image has been set.
-	 * 
-	 * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return getImageSize();
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		super.paintFigure(graphics);
-
-		if (getImage() == null)
-			return;
-
-		int x, y;
-		Rectangle area = getClientArea();
-        Dimension size = getImageSize();
-        
-		switch (alignment & PositionConstants.NORTH_SOUTH) {
-			case PositionConstants.NORTH:
-				y = area.y;
-				break;
-			case PositionConstants.SOUTH:
-				y = area.y + area.height - size.height;
-				break;
-			default:
-				y = (area.height - size.height) / 2 + area.y;
-				break;
-		}
-		switch (alignment & PositionConstants.EAST_WEST) {
-			case PositionConstants.EAST:
-				x = area.x + area.width - size.width;
-				break;
-			case PositionConstants.WEST:
-				x = area.x;
-				break;
-			default:
-				x = (area.width - size.width) / 2 + area.x;
-				break;
-		}
-		graphics.drawImage(getImage(), x, y);
-	}
-
-	/**
-	 * Sets the alignment of the Image within this Figure. The alignment comes
-	 * into play when the ImageFigure is larger than the Image. The alignment
-	 * could be any valid combination of the following:
-	 * 
-	 * <UL>
-	 * <LI>PositionConstants.NORTH</LI>
-	 * <LI>PositionConstants.SOUTH</LI>
-	 * <LI>PositionConstants.EAST</LI>
-	 * <LI>PositionConstants.WEST</LI>
-	 * <LI>PositionConstants.CENTER or PositionConstants.NONE</LI>
-	 * </UL>
-	 * 
-	 * @param flag
-	 *            A constant indicating the alignment
-	 */
-	public void setAlignment(int flag) {
-		alignment = flag;
-	}
-
-	/**
-	 * Sets the Image that this ImageFigure displays.
-	 * <p>
-	 * IMPORTANT: Note that it is the client's responsibility to dispose the
-	 * given image.
-	 * 
-	 * @param image
-	 *            The Image to be displayed. It can be <code>null</code>.
-	 */
-	public void setImage(Image image) {
-		if (img == image)
-			return;
-		img = image;
-        
-        // reset image size
-        imgSize = new Dimension();
-        
-		revalidate();
-		repaint();
-	}
-    
-    
-}
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java
deleted file mode 100644
index 385edb9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.graphics.Color;
-
-
-
-/**
- * This subclass of the LineBorder is required to provide MapMode support.
- * Without this the line border around figures using Hi-Metrics is displayed
- * incorrectly.
- * 
- * @author jschofie
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- */
-public class LineBorderEx
-	extends LineBorder {
-
-	/**
-	 * Constructs a default black LineBorder with a width of one pixel.
-	 */
-	public LineBorderEx() {
-		super();
-	}
-
-	/**
-	 * Constructs a black LineBorder with a specified width
-	 * @param width width of the line border in pixels
-	 */
-	public LineBorderEx(int width) {
-		super(width);
-	}
-
-	/**
-	 * Constructs a LineBorder with a width of 1 pixel using the color specified
-	 * @param color
-	 */
-	public LineBorderEx(Color color) {
-		super(color);
-	}
-
-	/**
-	 * Construct a LineBorder with a given color and width
-	 * @param color
-	 * @param width width of the line border in pixels
-	 */
-	public LineBorderEx(Color color, int width) {
-		super(color, width);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.LineBorder#paint(org.eclipse.draw2d.IFigure, org.eclipse.draw2d.Graphics, org.eclipse.draw2d.geometry.Insets)
-	 */
-	public void paint(IFigure figure, Graphics graphics, Insets insets) {
-		tempRect.setBounds(getPaintRectangle(figure, insets));
-		if (getWidth() % 2 == 1) {
-			tempRect.width -= MapModeUtil.getMapMode(figure).DPtoLP(1);
-			tempRect.height -= MapModeUtil.getMapMode(figure).DPtoLP(1);
-		}
-		int shrinkWidth = MapModeUtil.getMapMode(figure).DPtoLP( getWidth() / 2 );
-		tempRect.shrink(shrinkWidth, shrinkWidth);
-
-		graphics.setLineWidth(getWidth());
-		if (getColor() != null)
-			graphics.setForegroundColor(getColor());
-
-		graphics.drawRectangle(tempRect);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OnConnectionLocator.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OnConnectionLocator.java
deleted file mode 100644
index f9825fc..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OnConnectionLocator.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-
-/**
- * This locator places the figure on the connection, a specified 
- * percentage of the connection length away from the source end.
- * 
- * @author chmahone
- */
-public class OnConnectionLocator extends ConnectionLocator {
-
-	/** percentage away from source end */
-	private int percentageFromSource;
-
-	/**
-	 * Constructor for <code>OnConnectionLocator</code>.
-	 * @param connection the parent <code>Connection</code> figure
-	 * @param percentageFromSource percentage of the connection length 
-	 * away from the source end (range is from 0 to 100)
-	 */
-	public OnConnectionLocator(
-		Connection connection,
-		int percentageFromSource) {
-
-		super(connection);
-		this.percentageFromSource = percentageFromSource;
-	}
-
-	/**
-	 * Puts the figure a percentage of the connection length away from the source end.
-	 * @see org.eclipse.draw2d.ConnectionLocator#getLocation(PointList)
-	 */
-	protected Point getLocation(PointList points) {
-		Point p =
-			PointListUtilities.calculatePointRelativeToLine(
-				PointListUtilities.copyPoints(points),
-				0,
-				getPercentageFromSource(),
-				true);
-		return p;
-	}
-
-	/**
-	 * Gets the value of <code>percentageFromSource</code>.
-	 * @return int the value of <code>percentageFromSource</code>
-	 */
-	protected int getPercentageFromSource() {
-		return percentageFromSource;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java
deleted file mode 100644
index 9b592ee..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2003  IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollBar;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.ScrollPaneLayout;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/*
- * @canBeSeenBy %partners
- * 
- * <p>
- * Code taken from Eclipse reference bugzilla #98820
- * 
- */
-public class OverlayScrollPaneLayout extends ScrollPaneLayout {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.AbstractLayout#calculatePreferredSize(org.eclipse.draw2d.IFigure, int, int)
-	 */
-	protected Dimension calculatePreferredSize(
-		IFigure container,
-		int wHint,
-		int hHint) {
-		ScrollPane scrollpane = (ScrollPane) container;
-		Insets insets = scrollpane.getInsets();
-
-		int excludedWidth = insets.getWidth();
-		int excludedHeight = insets.getHeight();
-
-		return scrollpane
-			.getViewport()
-			.getPreferredSize(wHint - excludedWidth, hHint - excludedHeight)
-			.getExpanded(excludedWidth, excludedHeight);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.LayoutManager#layout(org.eclipse.draw2d.IFigure)
-	 */
-	public void layout(IFigure parent) {
-        int hVis;
-        int vVis;
-        ScrollPane scrollpane;
-        ScrollBar vBar;
-        ScrollBar hBar;      
-        if (parent instanceof AnimatableScrollPane) {
-            AnimatableScrollPane p = (AnimatableScrollPane) parent;
-            hBar = p.basicGetHorizontalScrollBar();
-            vBar = p.basicGetVerticalScrollBar();
-            hVis = p.getHorizontalScrollBarVisibility();
-            vVis = p.getVerticalScrollBarVisibility();
-            scrollpane = p;
-        } else {
-            scrollpane = (ScrollPane) parent;
-            hVis = scrollpane.getHorizontalScrollBarVisibility();
-            vVis = scrollpane.getVerticalScrollBarVisibility();           
-                hBar = (hVis != NEVER)?scrollpane.getHorizontalScrollBar():null;            
-                vBar = (vVis != NEVER)?scrollpane.getVerticalScrollBar():null;
-        }
-		Rectangle clientArea = parent.getClientArea();
-		int bottom = 0;
-		int right  = 0 ;		
-		Viewport viewport = scrollpane.getViewport();
-		Dimension available = clientArea.getSize();
-		Dimension preferred = viewport.getPreferredSize(available.width, available.height).getCopy();
-		boolean showV = preferred.height > available.height && available.height > 0;
-		boolean showH = preferred.width > available.width && available.width > 0;
-		//Adjust for visibility override flags
-		showV = !(vVis == NEVER) && (showV || vVis == ALWAYS);
-		showH = !(hVis == NEVER) && (showH || hVis == ALWAYS);
-		Rectangle bounds, viewportArea = clientArea;
-		int hPad = 0;
-		int vPad = 0;       
-	
-		if (showH){
-            hBar = scrollpane.getHorizontalScrollBar();
-			bottom = hBar.getPreferredSize(clientArea.width, clientArea.height).height;
-			hPad = hBar.getSize().height;
-		}
-		
-		if (showV){
-            vBar = scrollpane.getVerticalScrollBar();
-			right =	vBar.getPreferredSize(clientArea.width, clientArea.height).width;
-			vPad = vBar.getSize().width;
-		}
-		
-		if (showV) {
-			bounds =
-				new Rectangle(
-					viewportArea.right() - right,
-					viewportArea.y,
-					right,
-					viewportArea.height - hPad);
-			vBar.setBounds(bounds);
-		}
-        
-		if (showH) {
-			bounds =
-				new Rectangle(
-					viewportArea.x,
-					viewportArea.bottom() - bottom,
-					viewportArea.width - vPad,
-					bottom);
-			hBar.setBounds(bounds);
-		}
-        
-		if (vBar!=null){
-			vBar.setVisible(showV);            
-        }
-		if (hBar!=null){
-			hBar.setVisible(showH);            
-        }
-        
-		viewport.setBounds(viewportArea);
-	}
-		
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ScrollPaneLayout#calculateMinimumSize(org.eclipse.draw2d.IFigure)
-	 */
-	public Dimension calculateMinimumSize(IFigure container) {
-		ScrollPane scrollpane = (ScrollPane) container;
-		return scrollpane.getViewport().getMinimumSize();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/TransparentBorder.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/TransparentBorder.java
deleted file mode 100644
index 01172e0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/TransparentBorder.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-
-/*
- * @canBeSeenBy %level0
- */
-public interface TransparentBorder extends Border {
-
-	/**
-	 * Method getTransparentInsets.
-	 * This method allows a border to indicate which part of it's inset
-	 * is transparent.  This is important so that if certain methods wish to
-	 * ignore this part of the border they can. i.e. When placing resize
-	 * handles around a shape.
-	 * @param figure IFigure to calculate the insets of
-	 * @return Insets object containing the border offsets which are 
-	 * 		transparent.
-	 */
-	public Insets getTransparentInsets(IFigure figure);
-}
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/package.html
deleted file mode 100644
index e3c76c5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level0
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/AdvancedSubGraph.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/AdvancedSubGraph.java
deleted file mode 100644
index 8f2ed7b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/AdvancedSubGraph.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graph;
-
-import org.eclipse.draw2d.graph.Subgraph;
-
-/**
- * @author mmostafa
- * Advanced node introduce the AutoSize feature to the Draw2d SubGraph 
- *
- */
-public class AdvancedSubGraph
-    extends Subgraph {
-    
-    private boolean autoSize = false;
-    private boolean hadBufferZone = false;
-    
-    public AdvancedSubGraph(Object data) {
-        super(data, null);
-    }
-
-    public AdvancedSubGraph(Object data, Subgraph parent) {
-        super(data, parent);
-    }
-    
-    /**
-     * set the auto size field
-     * @param newValue
-     */
-    public void setAutoSize(boolean newValue){
-        autoSize = newValue;
-    }
-    
-    /**
-     * access the auto size field
-     * @return true is auto size is ON other wise false
-     */
-    public boolean isAutoSize(){
-        return autoSize;
-    }
-    
-    /**
-     * set the AHs Buffered Zone field
-     * @param newValue
-     */
-    public void setHasBufferedZone(boolean newValue){
-        hadBufferZone = newValue;
-    }
-    
-    /**
-     * access the had buffered zone field
-     * @return true is auto size is ON other wise false
-     */
-    public boolean isHasBufferedZone(){
-        return hadBufferZone;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/CompositeDirectedGraphLayout.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/CompositeDirectedGraphLayout.java
deleted file mode 100644
index adf192c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/CompositeDirectedGraphLayout.java
+++ /dev/null

@@ -1,322 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graph;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.EdgeList;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.NodeList;
-import org.eclipse.draw2d.graph.Subgraph;
-
-
-
-/**
- * @author mmostafa
- * 
- * Composite layout that layout the passed graph in a recursive fashion 
- *
- */
-public class CompositeDirectedGraphLayout
-    extends DirectedGraphLayout {
-
-    /* (non-Javadoc)
-     * @see org.eclipse.draw2d.graph.DirectedGraphLayout#visit(org.eclipse.draw2d.graph.DirectedGraph)
-     */
-    public void visit(DirectedGraph graph) {
-            layoutNodes(graph.nodes, false);
-    }
-    
-    private void layoutNodes(NodeList nodes, boolean virtualPass) {
-        EdgeList edges = new EdgeList();
-        for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-            Node element = (Node) iter.next();
-            if (element instanceof Subgraph && !(element instanceof VirtualNode)){
-                layoutNodes(((Subgraph)element).members,virtualPass);
-            }
-            for (Iterator edgesIter = element.outgoing.iterator(); edgesIter.hasNext();) {
-                Edge edge = (Edge)edgesIter.next();
-                if (nodes.contains(edge.target)){
-                    edges.add(edge);
-                }
-            }
-        }
-        if (!virtualPass){
-            virtualNodesToNodes virtualNodesNodes = new virtualNodesToNodes();
-            createVirtualNodes(nodes, edges, virtualNodesNodes);
-            NodeList vituralNodes = virtualNodesNodes.getVirtualNodes();
-            int size = vituralNodes.size();
-            if (size > 0){
-                edges = virtualNodesNodes.getEdges();
-                for (Iterator iter = vituralNodes.iterator(); iter.hasNext();) {
-                    Subgraph virtualNode = (Subgraph) iter.next();
-                    layoutNodes(virtualNode.members, true);
-                }
-                adjustVirtualNodesWidthAndHeight(vituralNodes);
-            }
-        }
-        int nodesSize = nodes.size();
-        Map nodeToOutGoing = new HashMap();
-        Map nodeToIncomingGoing = new HashMap();
-        removeDisconnectedEdges(nodes, nodeToOutGoing, nodeToIncomingGoing);
-        if (nodesSize >= 2){
-            Node parent  = getParent(nodes.getNode(0));
-            DirectedGraph g = new DirectedGraph();
-            g.nodes = nodes;
-            g.edges = edges;
-            DirectedGraphLayout layout = new DirectedGraphLayout();
-            layout.visit(g);
-            if (parent instanceof AdvancedSubGraph)
-                adjustAutoSizeNodeWidthAndHeight((AdvancedSubGraph)parent);
-        }else if (nodesSize==1){
-            Node parent  = getParent(nodes.getNode(0));
-            if (parent instanceof AdvancedSubGraph)
-                adjustAutoSizeNodeWidthAndHeight((AdvancedSubGraph)parent);
-        }
-        
-        restoreDisconnectedEdges(nodeToOutGoing, nodeToIncomingGoing);
-    }
-
-    private void restoreDisconnectedEdges(Map nodeToOutGoing, Map nodeToIncomingGoing) {
-        restoreEdges(nodeToOutGoing.entrySet(),true);
-        restoreEdges(nodeToIncomingGoing.entrySet(),false);
-    }
-
-    private void removeDisconnectedEdges(NodeList nodes, Map nodeToOutGoing, Map nodeToIncomingGoing) {
-        for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-            Node element = (Node) iter.next();
-            pushExtraEdges(nodes, nodeToOutGoing, element, element.outgoing,false);
-            pushExtraEdges(nodes, nodeToIncomingGoing, element, element.incoming,true);
-        }
-    }
-
-    private void createVirtualNodes(NodeList nodes, EdgeList edges, virtualNodesToNodes virtualNodesNodes) {
-        Set handledEdges = new HashSet();
-        recursiveHandleVirtualNode(nodes, edges, virtualNodesNodes, handledEdges, new HashSet(nodes));
-    }
-
-    private void recursiveHandleVirtualNode(NodeList nodes, EdgeList edges, virtualNodesToNodes virtualNodesNodes, Set handledEdges, Set nodesSnapeShot) {
-        for (Iterator edgeIter = edges.iterator(); edgeIter.hasNext();) {
-            Edge element = (Edge) edgeIter.next();
-            if (handledEdges.contains(element))
-                continue;
-            handledEdges.add(element);
-            if (!nodesSnapeShot.contains(element.source) || !nodesSnapeShot.contains(element.target))
-                continue;
-            Node source = element.source;
-            Node target = element.target;
-            boolean sourceHandled = true;
-            boolean targetHandled = true;
-            Subgraph sg = virtualNodesNodes.getVirtualContainer(source);
-            Subgraph sg1 = virtualNodesNodes.getVirtualContainer(target);
-            if (sg==null){
-                sourceHandled = false;
-                sg = sg1;
-            }
-            if (sg1==null)
-                targetHandled = false;
-            if (sourceHandled == false && targetHandled==false){
-                sg = new VirtualNode(null,source.getParent());
-                sg.setPadding(new Insets(30));
-                if (source.getParent()==null)
-                    nodes.add(sg);
-            }
-            if (!sourceHandled){
-                addNode(sg, source, nodes);
-                virtualNodesNodes.addNode(sg, source);
-            }
-            if (!targetHandled){
-                addNode(sg, target, nodes);
-                virtualNodesNodes.addNode(sg, target);
-            }
-            // order is important; so we should start handling the outgoing and the incoming
-            // edges only after the source and target had been handled
-            if (!sourceHandled){
-                recursiveHandleVirtualNode(nodes,source.outgoing,virtualNodesNodes,handledEdges,nodesSnapeShot);
-                recursiveHandleVirtualNode(nodes,source.incoming,virtualNodesNodes,handledEdges,nodesSnapeShot);
-            }
-            if (!targetHandled){
-                recursiveHandleVirtualNode(nodes,target.outgoing,virtualNodesNodes,handledEdges,nodesSnapeShot);
-                recursiveHandleVirtualNode(nodes,target.incoming,virtualNodesNodes,handledEdges,nodesSnapeShot);
-            }
-        }
-    }
-
-    private void pushExtraEdges(NodeList nodes, Map nodeToIncomingGoing, Node element, List list,boolean sourceCheck) {
-        List edges = new ArrayList();
-        for (Iterator iterator = list.iterator() ; iterator.hasNext();) {
-            Edge edge = (Edge) iterator.next();
-            Node nodeToCheck = sourceCheck ? edge.source : edge.target;
-            if (!nodes.contains(nodeToCheck)){
-                edges.add(edge);
-                iterator.remove();
-                Node sourceNode = null;
-                Node targetNode = null;
-                sourceNode = getParent(edge.source);
-                targetNode = getParent(edge.target);
-                sourceNode = (!sourceCheck || sourceNode!=null )? sourceNode : edge.source;
-                targetNode = ( sourceCheck || targetNode!=null)? targetNode : edge.target;
-                if (!sourceCheck &&
-                    sourceNode!= null && targetNode!=null && sourceNode!=targetNode &&
-                    (edge.source!=sourceNode || edge.target!=targetNode)){
-                    Edge virtualEdge = new Edge(sourceNode,
-                                                targetNode,
-                                                edge.getDelta(),
-                                                edge.weight);
-                    virtualEdge.setPadding(edge.getPadding());
-                }
-            }
-        }
-        if (!edges.isEmpty())
-            nodeToIncomingGoing.put(element,edges);
-    }
-
-    private Node getParent(Node node) {
-        Node parent  = node.getParent();
-        if (parent != null && parent instanceof VirtualNode)
-            parent = parent.getParent();
-        return parent;
-    }
-
-    private void restoreEdges(Set entries, boolean outgoing) {
-        for (Iterator iter = entries.iterator(); iter.hasNext();) {
-            Map.Entry entry =   (Map.Entry) iter.next();
-            Node node = (Node)entry.getKey();
-            List edgesList = (List)entry.getValue();
-            for (Iterator iterator = edgesList.iterator(); iterator.hasNext();) {
-                Edge edgeToRestore = (Edge) iterator.next();
-                if (outgoing)
-                    node.outgoing.add(edgeToRestore);
-                else
-                    node.incoming.add(edgeToRestore);
-            }
-            
-        }
-    }
-
-    private void adjustVirtualNodesWidthAndHeight(NodeList vituralNodes) {
-        for (Iterator iter = vituralNodes.iterator(); iter.hasNext();) {
-            Subgraph subGraph = (Subgraph) iter.next();
-            adjustVirtualNodeWidthAndHeight(subGraph);
-        }
-        
-    }
-
-    private void adjustVirtualNodeWidthAndHeight(Subgraph subGraph) {
-       NodeList nodes = subGraph.members;
-       if (nodes.isEmpty())
-           return;
-       int size = nodes.size();
-       Node node = nodes.getNode(0);
-       int top=node.y,left=node.x,bottom = top + node.height ,right = left+node.width;
-       for (int index = 1 ; index<size; index++) {
-           node = (Node)nodes.get(index);
-           if (top>node.y)
-               top = node.y;
-           if (bottom < (node.y+node.height))
-               bottom = node.y+node.height;
-           if (left>node.x)
-               left = node.x;
-           if (right<(node.x+node.width))
-               right = node.x+node.width;
-       }
-       subGraph.width = right - left;
-       subGraph.height = bottom - top;
-     }
-    
-    private void adjustAutoSizeNodeWidthAndHeight(AdvancedSubGraph subGraph) {
-    	
-        NodeList nodes = subGraph.members;
-        if (nodes.isEmpty())
-            return;
-        int size = nodes.size();
-        Node node = nodes.getNode(0);
-        int top=node.y,left=node.x,bottom = top + node.height ,right = left+node.width;
-        Node topNode, leftNode;
-        topNode = leftNode = node;
-        for (int index = 1 ; index<size; index++) {
-            node = (Node)nodes.get(index);
-            if (top>node.y){
-                top = node.y;
-                topNode = node;
-            }
-            if (bottom < (node.y+node.height))
-                bottom = node.y+node.height;
-            if (left>node.x){
-                left = node.x;
-                leftNode = node;
-            }
-            if (right<(node.x+node.width))
-                right = node.x+node.width;
-        }
-        int xDiff = 0 ;
-        int yDiff = 0 ;
-        if (subGraph.isHasBufferedZone()){
-             xDiff = leftNode.x;
-             yDiff = topNode.y ;
-        }
-        subGraph.width = right - left + xDiff;
-        subGraph.width = right - left + yDiff;
-        
-    }
-
-    private void addNode(Subgraph parent, Node node, NodeList nodes) {
-        if (node.getParent()!=null)
-            node.getParent().members.remove(node);
-        node.setParent(parent);
-        parent.addMember(node);
-        nodes.remove(node);
-    }
-    
-    private class virtualNodesToNodes extends HashMap{
-        Set virtualNodes = new HashSet();
-        public void addNode(Subgraph sg, Node node){
-            virtualNodes.add(sg);
-            put(node, sg);
-        }
-        
-        public EdgeList getEdges() {
-            EdgeList edges = new EdgeList();
-            for (Iterator iter = virtualNodes.iterator(); iter.hasNext();) {
-                Node element = (Node) iter.next();
-                for (Iterator iterator = element.outgoing.iterator(); iterator
-                    .hasNext();) {
-                    Edge edge = (Edge) iterator.next();
-                    if (virtualNodes.contains(edge.target))
-                        edges.add(edge);
-                    
-                }
-            }
-            return edges;
-        }
-
-        public Subgraph getVirtualContainer(Node node){
-            return (Subgraph)get(node);
-        }
-        
-        public NodeList getVirtualNodes(){
-            NodeList nodeList = new NodeList();
-            nodeList.addAll(virtualNodes);
-            return nodeList;
-        }
-    }
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/VirtualNode.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/VirtualNode.java
deleted file mode 100644
index 3b8ae54..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/VirtualNode.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graph;
-
-import org.eclipse.draw2d.graph.Subgraph;
-
-/**
- * @author mmostafa
- *  for Internal use 
- *
- */
-
-public class VirtualNode
-    extends AdvancedSubGraph {
-
-    /**
-     * @param data
-     */
-    public VirtualNode(Object data) {
-        super(data);
-    }
-    
-    /**
-     * @param data
-     * @param parent
-     */
-    public VirtualNode(Object data, Subgraph parent) {
-        super(data, parent);
-    }
-    
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/FontRegistry.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/FontRegistry.java
deleted file mode 100644
index 26b33d2..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/FontRegistry.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graphics;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-
-/**
- * Manages font resources.
- * 
- * @author cmahoney
- */
-final class FontRegistry {
-
-	/**
-	 * Singleton instance for the font registry.
-	 */
-	private static FontRegistry singletonInstance = new FontRegistry();
-
-	/**
-	 * Return singleton instance of the font registry.
-	 * 
-	 * @return the font registry
-	 */
-	public static FontRegistry getInstance() {
-		return singletonInstance;
-	}
-
-	private Map fonts = null;
-
-	/**
-	 * Private constructor.
-	 */
-	private FontRegistry() {
-		super();
-	}
-
-	/**
-	 * Returns the Font based on the FontData given; creates a new Font (and
-	 * caches it) if this is a new one being requested; otherwise, returns a
-	 * cached Font.
-	 * 
-	 * The FontRegistry from the parent AbstractResourceManager class could not
-	 * be used because if the Font didn't exist it returns a default font.
-	 * 
-	 * @param device
-	 *            the device to create the font on
-	 * @param fd
-	 *            FontData from which to find or create a Font
-	 * @return the Font
-	 */
-	public Font getFont(Device device, FontData fd) {
-		if (fonts == null)
-			fonts = new HashMap();
-
-		Object value = fonts.get(fd.toString());
-		if (value != null) {
-			return (Font) value;
-		}
-		Font newFont = new Font(device, fd);
-		fonts.put(fd.toString(), newFont);
-		return newFont;
-	}
-
-	/**
-	 * Removes all fonts currently in the cache and dispose of them
-	 */
-	public void clearFontCache() {
-		if (fonts != null) {
-			List keys = new ArrayList(fonts.keySet());
-			Iterator keyiter = keys.iterator();
-			while (keyiter.hasNext()) {
-				Font font = (Font) fonts.remove(keyiter.next());
-				font.dispose();
-			}
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/MapModeGraphics.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/MapModeGraphics.java
deleted file mode 100644
index 471b64b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/MapModeGraphics.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graphics;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.DiagramMapModeUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * The MapModeGraphics class is used to translate the various map modes.
- *
- * @author sshaw
- */
-public class MapModeGraphics extends ScaledGraphics {
-
-	private IMapMode mm;
-	
-	/**
-	 * Constructs a new ScaledGraphics based on the given Graphics object.
-	 * @param g the base graphics object
-	 * @param mm <code>IMapMode</code> to retrieve the scale factor from.
-	 */
-	public MapModeGraphics(Graphics g, IMapMode mm) {
-		super(g);
-		setScale(DiagramMapModeUtil.getScale(mm));
-		this.mm = mm;
-	}
-
-	/**
-	 * @return <code>IMapMode</code>
-	 */
-	public IMapMode getMapMode() {
-		return mm;
-	}
-
-	/** @see Graphics#drawImage(Image, int, int) */
-	public void drawImage(Image srcImage, int x, int y) {
-		org.eclipse.swt.graphics.Rectangle size = srcImage.getBounds();
-		drawImage(srcImage, 0, 0, size.width, size.height, x, y, getMapMode().DPtoLP(size.width), getMapMode().DPtoLP(size.height));
-	}
-	
-	/** @see Graphics#scale(double) */
-	public void scale(double amount) {
-		getGraphics().scale(amount);
-	}
-	
-	/**
-	 * Override to prevent zooming of the font height.
-	 */
-	int zoomFontHeight(int height) {
-		return height;
-	}
-
-	Point zoomTextPoint(int x, int y) {
-		return zoomRect(x, y, 0, 0).getTopLeft();
-	}
-	
-	Font zoomFont(Font f) {
-		if (f == null)
-			f = Display.getCurrent().getSystemFont();
-		return f;
-	}
-		
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/PrinterGraphics.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/PrinterGraphics.java
deleted file mode 100644
index 8053b2d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/PrinterGraphics.java
+++ /dev/null

@@ -1,198 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graphics;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.printing.Printer;
-
-
-/**
- * Created on May 8, 2003
- *
- * @author sshaw
- * @version 1.0
- * 
- * Overridden to handle printing problem with transparencies.  Specifically,
- * dropshadows print with as a black bar (RATLC00513998)
- */
-public class PrinterGraphics extends org.eclipse.draw2d.PrinterGraphics {
-	
-    private double printScale = 1.0;
-    private boolean roundFonts = false;
-    private Stack stateStack = new Stack();
-    
-    /**
-	 * @return Returns the printScale.
-	 */
-	protected double getPrintScale() {
-		return printScale;
-	}
-	
-    /**
-	* Creates a new <code>PrinterGraphics</code> with <code>Graphics</code> g, using 
-	* <code>Printer</code> p
-	* 
-	* @param g <code>Graphics</code> object to draw with
-	* @param p <code>Printer</code> to print to
-	* @param roundFonts the <code>boolean</code> if <code>true</code> indicates that fonts 
-	* should be rounded to account for printer font scaling errors.
-	*/
-	public PrinterGraphics(Graphics g, Printer p, boolean roundFonts) {
-		super(g, p);
-        this.roundFonts = roundFonts;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#dispose()
-	 */
-	public void dispose() {
-		
-		for (Iterator it = collapseImageCache.values().iterator(); it.hasNext();)
-		{
-	        Image img = (Image) it.next();
-	        img.dispose();
-		}
-
-		collapseImageCache.clear();
-
-		super.dispose();
-	}
-	
-	Map collapseImageCache = new HashMap();
-
-    /**
-     * collapseImage
-     * This method is necessary to work around a problem with the printer GC that
-     * doesn't seem to support alpha channels on Images.  Consequently we collapse the
-     * image based on the background.
-     * This workaround won't be necessary when Bugzilla 28766 is fixed.
-     * 
-	 * @param srcImage Image to collapse the alpha channel of.
-	 * @return Image that has no alpha channel.
-	 */
-	private Image collapseImage(Image srcImage) {
-		Image result = (Image)collapseImageCache.get(srcImage);
-		if (result != null)
-			return result;
-		
-		org.eclipse.swt.graphics.Rectangle r1 = srcImage.getBounds();
-        Image newImg = new Image( null, r1.width, r1.height);
-        
-        GC gc = new GC(newImg);
-        gc.setForeground(getForegroundColor());
-        gc.setBackground(getBackgroundColor());
-        gc.fillRectangle(0, 0, r1.width, r1.height);
-        gc.drawImage(srcImage, 0, 0);
-        gc.dispose();
-		
-        collapseImageCache.put(srcImage, newImg);
-    	return newImg;
-    }
-    
-    /**
-	 * @see org.eclipse.draw2d.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int)
-	 */
-	public void drawImage(Image srcImage, int x, int y) {
-		Image collapseImage = collapseImage(srcImage);
-		super.drawImage(collapseImage, x, y);
-    }
-    
-    /**
-	 * @see org.eclipse.draw2d.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int, int, int, int, int, int, int)
-	 */
-	public void drawImage(Image srcImage,
-        int sx, int sy, int sw, int sh,
-        int tx, int ty, int tw, int th)
-    {
-		Image collapseImage = collapseImage(srcImage);
-        super.drawImage(collapseImage, sx, sy, sw, sh, tx, ty, tw, th);
-    }
-    
-    /**
-     * shouldRoundFonts
-     * Accessor method to determine if fonts should be rounded to account for printer
-     * font scaling errors.
-     * 
-	 * @return boolean true if fonts should be rounded, false otherwise.
-	 */
-	public boolean shouldRoundFonts() {
-        return roundFonts;
-    }
-    
-    /**
-	 * @see org.eclipse.draw2d.Graphics#scale(double)
-	 */
-	public void scale(double amount) {
-        printScale = printScale * amount;
-        super.scale(amount);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#popState()
-     */
-    public void popState() {
-        if (!stateStack.isEmpty())
-            printScale = ((Double)stateStack.pop()).doubleValue();
-        super.popState();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#pushState()
-     */
-    public void pushState() {
-        stateStack.push(new Double(printScale));
-        super.pushState();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#restoreState()
-     */
-    public void restoreState() {
-        if (!stateStack.isEmpty())
-            printScale = ((Double)stateStack.firstElement()).doubleValue();
-        super.restoreState();
-    }
-    
-    /**
-     * This should be escalated as a GEF / SWT problem - difficult to reproduce in 
-     * logic example though.  The font size needs to scaled down to account for 
-     * printer font scaling issues.
-     * 
-	 * @see org.eclipse.draw2d.Graphics#setFont(org.eclipse.swt.graphics.Font)
-	 */
-	public void setFont(Font f) {
-       
-       Font newFont = f;
-       
-       if (shouldRoundFonts()) {
-           FontData fd = f.getFontData()[0];
-           int nAdjustedHeight = (int)(((fd.getHeight() - 0.5f) / getPrintScale()) * getPrintScale());
-           if (fd.getHeight() != nAdjustedHeight) {
-               fd.setHeight(nAdjustedHeight);    
-               newFont = FontRegistry.getInstance().getFont(null, fd);   
-           }
-       }
-       
-       super.setFont(newFont);
-    }
-    
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScalableFreeformLayeredPane.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScalableFreeformLayeredPane.java
deleted file mode 100644
index 37eb78e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScalableFreeformLayeredPane.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graphics;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.geometry.Translatable;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.draw2d.ui.graphics.GCUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.IMapModeHolder;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTException;
-
-
-/**
- * @author jcorchis / sshaw / jschofie
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- *
- * Override for supporting anti-aliasing lines
- */
-public class ScalableFreeformLayeredPane
-	extends org.eclipse.draw2d.ScalableFreeformLayeredPane implements IMapModeHolder {
-
-	boolean antiAlias = true;
-	private IMapMode mm;
-	
-	/**
-	 * @return <code>IMapMode</code> that is used to map coordinate coordinates
-	 * from device to logical.
-	 */
-	public IMapMode getMapMode() {
-		return mm;
-	}
-
-	public ScalableFreeformLayeredPane(IMapMode mm) {
-		super();
-		this.mm = mm;
-	}
-
-	public void setAntiAlias(boolean antiAliasValue) {
-		antiAlias = antiAliasValue;
-		super.repaint();
-	}
-	
-    /**
-    * 
-    * @see org.eclipse.draw2d.Figure#paintClientArea(Graphics)
-    */
-    protected void paintClientArea(Graphics graphics) {
-        // Use Anti-Aliasing
-    	if ((graphics instanceof SWTGraphics) && antiAlias && 
-    		GCUtilities.supportsAdvancedGraphics()) {
-            graphics.setAntialias(SWT.ON);			
-		} else if (graphics.getAntialias()==SWT.ON){
-			graphics.setAntialias(SWT.OFF);		
-        }
-        
-        
-    	// Create MapMode Graphics Object
-        MapModeGraphics gMM = createMapModeGraphics(graphics);
-    	gMM.pushState();
-  	
-    	if (getChildren().isEmpty()) {
-    		gMM.popState();
-    		return;
-    	}
-    	try {
-			if (getScale() == 1.0) {
-				super.paintClientArea(gMM);
-			} else {
-				ScaledGraphics g = createScaledGraphics(gMM);
-				boolean optimizeClip = getBorder() == null || getBorder().isOpaque();
-				if (!optimizeClip)
-					g.clipRect(getBounds().getCropped(getInsets()));
-				g.scale(getScale());
-				g.pushState();
-				paintChildren(g);
-				g.dispose();
-				gMM.restoreState();
-			}
-		} catch (SWTException e) {
-			Log.error(Draw2dPlugin.getInstance(), IStatus.ERROR,e.getMessage(), e);
-		}
-    	
-    	gMM.popState();
-    }
-
-	/**
-	 * @param graphics <code>MapModeGraphics</code> object to wrap with a <code>ScaledGraphics</code>
-	 * @return <code>ScaledGraphics</code>
-	 */
-	protected ScaledGraphics createScaledGraphics(MapModeGraphics gMM) {
-		ScaledGraphics g = new ScaledGraphics(gMM);
-		return g;
-	}
-
-	/**
-	 * @param graphics <code>Graphics</code> object to wrap with a <code>MapModeGraphics</code>
-	 * @return <code>MapModeGraphics</code>
-	 */
-	protected MapModeGraphics createMapModeGraphics(Graphics graphics) {
-		MapModeGraphics gMM = new MapModeGraphics(graphics, getMapMode());
-		return gMM;
-	}
-
-    /**
-     * @see org.eclipse.draw2d.Figure#getClientArea()
-     */
-    public Rectangle getClientArea(Rectangle rect) {
-    	
-    	super.getClientArea(rect);
-    	getMapMode().DPtoLP(rect);
-    	return rect;
-    }
-    
-    /**
-     * @see org.eclipse.draw2d.Figure#translateToParent(Translatable)
-     */
-    public void translateToParent(Translatable t) {
-    	super.translateToParent(t);
-    	getMapMode().LPtoDP(t);
-    }
-
-    /**
-     * @see org.eclipse.draw2d.Figure#translateFromParent(Translatable)
-     */
-    public void translateFromParent(Translatable t) {
-    	super.translateFromParent( t );
-    	getMapMode().DPtoLP(t);
-    }
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#DPtoLP(int)
-	 */
-	public int DPtoLP(int deviceUnit) {
-		return getMapMode().DPtoLP(deviceUnit);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#DPtoLP(org.eclipse.draw2d.geometry.Translatable)
-	 */
-	public Translatable DPtoLP(Translatable t) {
-		return getMapMode().DPtoLP(t);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#LPtoDP(int)
-	 */
-	public int LPtoDP(int logicalUnit) {
-		return getMapMode().LPtoDP(logicalUnit);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#LPtoDP(org.eclipse.draw2d.geometry.Translatable)
-	 */
-	public Translatable LPtoDP(Translatable t) {
-		return getMapMode().LPtoDP(t);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScaledGraphics.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScaledGraphics.java
deleted file mode 100644
index bcefb9e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScaledGraphics.java
+++ /dev/null

@@ -1,876 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.graphics;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.draw2d.ui.graphics.GCUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.TextLayout;
-import org.eclipse.swt.graphics.TextStyle;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * @canBeSeenBy %partners
- *  
- * Subclass of Graphics that uses resource manager for its font cache and 
- * scales graphics/fonts by a specified scale factor
- *
- * <p>
- * Code taken from Eclipse reference bugzilla #77403
- * See also bugzilla #111454
- * 
- */
-/**
- * A Graphics object able to scale all operations based on the current scale factor.
- */
-public class ScaledGraphics
-	extends Graphics
-{
-
-private static class FontHeightCache {
-	Font font;
-	int height;
-}
-
-static class FontKey {
-	Font font;
-	int height;
-	protected FontKey() {/* empty constructor */ }
-	protected FontKey(Font font, int height) {
-		this.font = font;
-		this.height = height;
-	}
-	
-	public boolean equals(Object obj) {
-		return (((FontKey)obj).font.equals(font) 
-				&& ((FontKey)obj).height == height);
-	}
-
-	public int hashCode() {
-		return font.hashCode() ^ height;
-	}
-
-	protected void setValues(Font font, int height) {
-		this.font = font;
-		this.height = height;
-	}
-}
-
-/**
- * The internal state of the scaled graphics.
- */
-protected static class State {
-	private double appliedX;
-	private double appliedY;
-	private Font font;
-	private int lineWidth;
-	private double zoom; 
-
-	/**
-	 * Constructs a new, uninitialized State object.
-	 */
-	protected State() {/* empty constructor */}
-	
-	/**
-	 * Constructs a new State object and initializes the properties based on the given 
-	 * values.
-	 * 
-	 * @param zoom the zoom factor
-	 * @param x the x offset
-	 * @param y the y offset
-	 * @param font the font
-	 * @param lineWidth the line width
-	 */
-	protected State(double zoom, double x, double y, Font font, int lineWidth) {
-		this.zoom = zoom;
-		this.appliedX = x;
-		this.appliedY = y;
-		this.font = font;
-		this.lineWidth = lineWidth;
-	}
-	
-	/**
-	 * Sets all the properties of the state object.
-	 * @param zoom the zoom factor
-	 * @param x the x offset
-	 * @param y the y offset
-	 * @param font the font
-	 * @param lineWidth the line width
-	 */
-	protected void setValues(double zoom, double x, double y, 
-								Font font, int lineWidth) {
-		this.zoom = zoom;
-		this.appliedX = x;
-		this.appliedY = y;
-		this.font = font;
-		this.lineWidth = lineWidth;
-	}
-}
-
-static private boolean advancedGraphicsWarningLogged = false;
-
-private static int[][] intArrayCache = new int[8][];
-private final Rectangle tempRECT = new Rectangle();
-
-static {
-	for (int i = 0; i < intArrayCache.length; i++)
-		intArrayCache[i] = new int[i + 1];
-}
-
-private boolean allowText = true;
-//private static final Point PT = new Point();
-//private Map fontCache = new HashMap();
-private Map fontDataCache = new HashMap();
-private FontKey fontKey = new FontKey();
-private double fractionalX;
-private double fractionalY;
-private Graphics graphics;
-private FontHeightCache localCache = new FontHeightCache();
-private Font localFont;
-private int localLineWidth;
-private List stack = new ArrayList();
-private int stackPointer = 0;
-private FontHeightCache targetCache = new FontHeightCache();
-
-double zoom = 1.0;
-
-/**
- * Constructs a new ScaledGraphics based on the given Graphics object.
- * @param g the base graphics object
- */
-public ScaledGraphics(Graphics g) {
-	graphics = g;
-	localFont = g.getFont();
-	localLineWidth = g.getLineWidth();
-}
-
-/** @see Graphics#clipRect(Rectangle) */
-public void clipRect(Rectangle r) {
-	graphics.clipRect(zoomClipRect(r));
-}
-
-Font createFont(FontData data) {
-	return new Font(Display.getCurrent(), data);
-}
-
-/** @see Graphics#dispose() */
-public void dispose() {
-	//Remove all states from the stack
-	while (stackPointer > 0) {
-		popState();
-	}
-	
-	//	 Resource manager handles fonts 
-}
-
-/** @see Graphics#drawArc(int, int, int, int, int, int) */
-public void drawArc(int x, int y, int w, int h, int offset, int sweep) {
-	Rectangle z = zoomRect(x, y, w, h);
-	if (z.isEmpty() || sweep == 0)
-		return;
-	graphics.drawArc(z, offset, sweep);
-}
-
-/** @see Graphics#drawFocus(int, int, int, int) */
-public void drawFocus(int x, int y, int w, int h) {
-	graphics.drawFocus(zoomRect(x, y, w, h));
-}
-
-/** @see Graphics#drawImage(Image, int, int) */
-public void drawImage(Image srcImage, int x, int y) {
-	org.eclipse.swt.graphics.Rectangle size = srcImage.getBounds();
-    Dimension sizeLPDim = new Dimension(size.width, size.height);
-    if (graphics instanceof MapModeGraphics) {
-        ((MapModeGraphics)graphics).getMapMode().DPtoLP(sizeLPDim);
-    }
-    
-    Rectangle z = new Rectangle((int)(Math.floor((x * zoom + fractionalX))), 
-        (int)(Math.floor((y * zoom + fractionalY))),
-        (int)(Math.floor((sizeLPDim.width * zoom + fractionalX))), 
-        (int)(Math.floor((sizeLPDim.height * zoom + fractionalY))));
-    
-	graphics.drawImage(srcImage, 0, 0, size.width, size.height,
-		z.x, z.y, z.width, z.height);
-}
-
-/** @see Graphics#drawImage(Image, int, int, int, int, int, int, int, int) */
-public void drawImage(Image srcImage, int sx, int sy, int sw, int sh,
-										int tx, int ty, int tw, int th) {
-	//"t" == target rectangle, "s" = source
-			 
-	Rectangle t = zoomRect(tx, ty, tw, th);
-	if (!t.isEmpty())
-		graphics.drawImage(srcImage, sx, sy, sw, sh, t.x, t.y, t.width, t.height);
-}
-
-/** @see Graphics#drawLine(int, int, int, int) */
-public void drawLine(int x1, int y1, int x2, int y2) {
-	graphics.drawLine(
-		(int)(Math.floor((x1 * zoom + fractionalX))),
-		(int)(Math.floor((y1 * zoom + fractionalY))),
-		(int)(Math.floor((x2 * zoom + fractionalX))),
-		(int)(Math.floor((y2 * zoom + fractionalY))));
-}
-
-/** @see Graphics#drawOval(int, int, int, int) */
-public void drawOval(int x, int y, int w, int h) {
-	graphics.drawOval(zoomRect(x, y, w, h));
-}
-
-/** @see Graphics#drawPoint(int, int) */
-public void drawPoint(int x, int y) {
-	graphics.drawPoint((int)Math.floor(x * zoom + fractionalX),
-			(int)Math.floor(y * zoom + fractionalY));
-}
-
-/**
- * @see Graphics#drawPolygon(int[])
- */
-public void drawPolygon(int[] points) {
-	graphics.drawPolygon(zoomPointList(points));
-}
-
-/** @see Graphics#drawPolygon(PointList) */
-public void drawPolygon(PointList points) {
-	graphics.drawPolygon(zoomPointList(points.toIntArray()));
-}
-
-/**
- * @see Graphics#drawPolyline(int[])
- */
-public void drawPolyline(int[] points) {
-	graphics.drawPolyline(zoomPointList(points));
-}
-
-/** @see Graphics#drawPolyline(PointList) */
-public void drawPolyline(PointList points) {
-	graphics.drawPolyline(zoomPointList(points.toIntArray()));
-}
-
-/** @see Graphics#drawRectangle(int, int, int, int) */
-public void drawRectangle(int x, int y, int w, int h) {
-	graphics.drawRectangle(zoomRect(x, y, w, h));
-}
-
-/** @see Graphics#drawRoundRectangle(Rectangle, int, int) */
-public void drawRoundRectangle(Rectangle r, int arcWidth, int arcHeight) {
-	graphics.drawRoundRectangle(zoomRect(r.x, r.y, r.width, r.height),
-		(int)(arcWidth * zoom),
-		(int)(arcHeight * zoom));
-}
-
-/** @see Graphics#drawString(String, int, int) */
-public void drawString(String s, int x, int y) {
-	if (allowText)
-		graphics.drawString(s, zoomTextPoint(x, y));
-}
-
-/** @see Graphics#drawText(String, int, int) */
-public void drawText(String s, int x, int y) {
-	if (allowText)
-		graphics.drawText(s, zoomTextPoint(x, y));
-}
-
-/**
- * @see Graphics#drawText(String, int, int, int)
- */
-public void drawText(String s, int x, int y, int style) {
-	if (allowText)
-		graphics.drawText(s, zoomTextPoint(x, y), style);
-}
-
-/**
- * @see Graphics#drawTextLayout(TextLayout, int, int, int, int, Color, Color)
- */
-public void drawTextLayout(TextLayout layout, int x, int y, int selectionStart,
-		int selectionEnd, Color selectionForeground, Color selectionBackground) {
-	TextLayout scaled = zoomTextLayout(layout);
-	graphics.drawTextLayout(scaled,
-			(int)Math.floor(x * zoom + fractionalX),
-			(int)Math.floor(y * zoom + fractionalY),
-			selectionStart, selectionEnd, selectionBackground, selectionForeground);
-	scaled.dispose();
-}
-
-/** @see Graphics#fillArc(int, int, int, int, int, int) */
-public void fillArc(int x, int y, int w, int h, int offset, int sweep) {
-	Rectangle z = zoomFillRect(x, y, w, h);
-	if (z.isEmpty() || sweep == 0)
-		return;
-	graphics.fillArc(z, offset, sweep);
-}
-
-/** @see Graphics#fillGradient(int, int, int, int, boolean) */
-public void fillGradient(int x, int y, int w, int h, boolean vertical) {
-	graphics.fillGradient(zoomFillRect(x, y, w, h), vertical);
-}
-
-/** @see Graphics#fillOval(int, int, int, int) */
-public void fillOval(int x, int y, int w, int h) {
-	graphics.fillOval(zoomFillRect(x, y, w, h));
-}
-
-/**
- * @see Graphics#fillPolygon(int[])
- */
-public void fillPolygon(int[] points) {
-	graphics.fillPolygon(zoomPointList(points));
-}
-
-/** @see Graphics#fillPolygon(PointList) */
-public void fillPolygon(PointList points) {
-	graphics.fillPolygon(zoomPointList(points.toIntArray()));
-}
-
-/** @see Graphics#fillRectangle(int, int, int, int) */
-public void fillRectangle(int x, int y, int w, int h) {
-	graphics.fillRectangle(zoomFillRect(x, y, w, h));
-}
-
-/** @see Graphics#fillRoundRectangle(Rectangle, int, int) */
-public void fillRoundRectangle(Rectangle r, int arcWidth, int arcHeight) {
-	graphics.fillRoundRectangle(zoomFillRect(r.x, r.y, r.width, r.height),
-		(int)(arcWidth * zoom),
-		(int)(arcHeight * zoom));
-}
-
-/** @see Graphics#fillString(String, int, int) */
-public void fillString(String s, int x, int y) {
-	if (allowText)
-		graphics.fillString(s, zoomTextPoint(x, y));
-}
-
-/** @see Graphics#fillText(String, int, int) */
-public void fillText(String s, int x, int y) {
-	if (allowText)
-		graphics.fillText(s, zoomTextPoint(x, y));
-}
-
-/**
- * @see Graphics#getAbsoluteScale()
- */
-public double getAbsoluteScale() {
-	return zoom * graphics.getAbsoluteScale();
-}
-
-/**
- * @see Graphics#getAlpha()
- */
-public int getAlpha() {
-	return graphics.getAlpha();
-}
-
-/**
- * @see Graphics#getAntialias()
- */
-public int getAntialias() {
-	return graphics.getAntialias();
-}
-
-/** @see Graphics#getBackgroundColor() */
-public Color getBackgroundColor() {
-	return graphics.getBackgroundColor();
-}
-
-Font getCachedFont(FontKey key) {
-	FontData data = key.font.getFontData()[0];		
-	data.setHeight(key.height);
-	return FontRegistry.getInstance().getFont(Display.getCurrent(), data);
-}
-
-/**
- * Allows clients to reset the font cache utilized by the ScaledGraphics in
- * order to avoid caching more objects then necessary.
- */
-static public void resetFontCache() {
-	FontRegistry.getInstance().clearFontCache();
-}
-
-FontData getCachedFontData(Font f) {
-	FontData data = (FontData)fontDataCache.get(f);
-	if (data != null)
-		return data;
-	data = getLocalFont().getFontData()[0];
-	fontDataCache.put(f, data);
-	return data;
-}
-
-/** @see Graphics#getClip(Rectangle) */
-public Rectangle getClip(Rectangle rect) {
-	graphics.getClip(rect);
-	int x = (int)(rect.x / zoom);
-	int y = (int)(rect.y / zoom);
-	/*
-	 * If the clip rectangle is queried, perform an inverse zoom, and take the ceiling of
-	 * the resulting double. This is necessary because forward scaling essentially performs
-	 * a floor() function. Without this, figures will think that they don't need to paint
-	 * when actually they do.
-	 */
-	rect.width = (int)Math.ceil(rect.right() / zoom) - x;
-	rect.height = (int)Math.ceil(rect.bottom() / zoom) - y;
-	rect.x = x;
-	rect.y = y;
-	return rect;
-}
-
-/**
- * @see Graphics#getFillRule()
- */
-public int getFillRule() {
-	return graphics.getFillRule();
-}
-
-/** @see Graphics#getFont() */
-public Font getFont() {
-	return getLocalFont();
-}
-
-/** @see Graphics#getFontMetrics() */
-public FontMetrics getFontMetrics() {
-	return FigureUtilities.getFontMetrics(localFont);
-}
-
-/** @see Graphics#getForegroundColor() */
-public Color getForegroundColor() {
-	return graphics.getForegroundColor();
-}
-
-/**
- * @see Graphics#getInterpolation()
- */
-public int getInterpolation() {
-	return graphics.getInterpolation();
-}
-
-/**
- * @see Graphics#getLineCap()
- */
-public int getLineCap() {
-	return graphics.getLineCap();
-}
-
-/**
- * @see Graphics#getLineJoin()
- */
-public int getLineJoin() {
-	return graphics.getLineJoin();
-}
-
-/** @see Graphics#getLineStyle() */
-public int getLineStyle() {
-	return graphics.getLineStyle();
-}
-
-/** @see Graphics#getLineWidth() */
-public int getLineWidth() {
-	return getLocalLineWidth();
-}
-
-private Font getLocalFont() {
-	return localFont;
-}
-
-private int getLocalLineWidth() {
-	return localLineWidth;
-}
-
-/**
- * @see Graphics#getTextAntialias()
- */
-public int getTextAntialias() {
-	return graphics.getTextAntialias();
-}
-
-/** @see Graphics#getXORMode() */
-public boolean getXORMode() {
-	return graphics.getXORMode();
-}
-
-/** @see Graphics#popState() */
-public void popState() {
-	graphics.popState();
-	stackPointer--;
-	restoreLocalState((State)stack.get(stackPointer));
-}
-
-/** @see Graphics#pushState() */
-public void pushState() {
-	State s;
-	if (stack.size() > stackPointer) {
-		s = (State)stack.get(stackPointer);
-		s.setValues(zoom, fractionalX, fractionalY, getLocalFont(), localLineWidth);
-	} else {
-		stack.add(new State(zoom, fractionalX, fractionalY, getLocalFont(), 
-								localLineWidth));
-	}
-	stackPointer++;
-
-	graphics.pushState();
-}
-
-private void restoreLocalState(State state) {
-	this.fractionalX = state.appliedX;
-	this.fractionalY = state.appliedY;
-	setScale(state.zoom);
-	setLocalFont(state.font);
-	setLocalLineWidth(state.lineWidth);
-}
-
-/** @see Graphics#restoreState() */
-public void restoreState() {
-	graphics.restoreState();
-	restoreLocalState((State)stack.get(stackPointer - 1));
-}
-
-/** @see Graphics#scale(double) */
-public void scale(double amount) {
-	setScale(zoom * amount);
-}
-
-/**
- * This method requires advanced graphics support. A check should be made to
- * ensure advanced graphics is supported in the user's environment before
- * calling this method. See {@link GCUtilities#supportsAdvancedGraphics()}.
- * 
- * @see Graphics#setAlpha(int)
- */
-public void setAlpha(int alpha) {
-    if (!GCUtilities.supportsAdvancedGraphics()) { 
-        logAdvancedGraphicsWarning();
-        return;
-    }
-	graphics.setAlpha(alpha);
-}
-
-/**
- * This method requires advanced graphics support. A check should be made to
- * ensure advanced graphics is supported in the user's environment before
- * calling this method. See {@link GCUtilities#supportsAdvancedGraphics()}.
- * 
- * @see Graphics#setAntialias(int)
- */
-public void setAntialias(int value) {
-    if (!GCUtilities.supportsAdvancedGraphics()) { 
-        logAdvancedGraphicsWarning();
-        return;
-    }
-	graphics.setAntialias(value);
-}
-
-/** @see Graphics#setBackgroundColor(Color) */
-public void setBackgroundColor(Color rgb) {
-	graphics.setBackgroundColor(rgb);
-}
-
-/** @see Graphics#setClip(Rectangle) */
-public void setClip(Rectangle r) {
-	graphics.setClip(zoomClipRect(r));
-}
-
-/**
- * @see Graphics#setFillRule(int)
- */
-public void setFillRule(int rule) {
-	graphics.setFillRule(rule);
-}
-
-/** @see Graphics#setFont(Font) */
-public void setFont(Font f) {
-	setLocalFont(f);
-}
-
-/** @see Graphics#setForegroundColor(Color) */
-public void setForegroundColor(Color rgb) {
-	graphics.setForegroundColor(rgb);
-}
-
-/**
- * This method requires advanced graphics support. A check should be made to
- * ensure advanced graphics is supported in the user's environment before
- * calling this method. See {@link GCUtilities#supportsAdvancedGraphics()}.
- * 
- * @see org.eclipse.draw2d.Graphics#setInterpolation(int)
- */
-public void setInterpolation(int interpolation) {
-    if (!GCUtilities.supportsAdvancedGraphics()) { 
-        logAdvancedGraphicsWarning();
-        return;
-    }
-	graphics.setInterpolation(interpolation);
-}
-
-/**
- * @see Graphics#setLineCap(int)
- */
-public void setLineCap(int cap) {
-	graphics.setLineCap(cap);
-}
-
-/**
- * @see Graphics#setLineDash(int[])
- */
-public void setLineDash(int[] dash) {
-	graphics.setLineDash(dash);
-}
-
-/**
- * @see Graphics#setLineJoin(int)
- */
-public void setLineJoin(int join) {
-	graphics.setLineJoin(join);
-}
-
-/** @see Graphics#setLineStyle(int) */
-public void setLineStyle(int style) {
-	graphics.setLineStyle(style);
-}
-
-/** @see Graphics#setLineWidth(int) */
-public void setLineWidth(int width) {
-	setLocalLineWidth(width);
-}
-
-private void setLocalFont(Font f) {
-	localFont = f;
-	graphics.setFont(zoomFont(f));
-}
-
-private void setLocalLineWidth(int width) {
-	localLineWidth = width;
-	graphics.setLineWidth(zoomLineWidth(width));
-}
-
-void setScale(double value) {
-	if (zoom == value)
-		return;
-	this.zoom = value;
-	graphics.setFont(zoomFont(getLocalFont()));
-	graphics.setLineWidth(zoomLineWidth(localLineWidth));
-}
-
-/**
- * This method requires advanced graphics support. A check should be made to
- * ensure advanced graphics is supported in the user's environment before
- * calling this method. See {@link GCUtilities#supportsAdvancedGraphics()}.
- * 
- * @see Graphics#setTextAntialias(int)
- */
-public void setTextAntialias(int value) {
-    if (!GCUtilities.supportsAdvancedGraphics()) { 
-        logAdvancedGraphicsWarning();
-        return;
-    }
-	graphics.setTextAntialias(value);
-}	
-
-/** @see Graphics#setXORMode(boolean) */
-public void setXORMode(boolean b) {
-	graphics.setXORMode(b);
-}
-
-/** @see Graphics#translate(int, int) */
-public void translate(int dx, int dy) {
-	// fractionalX/Y is the fractional part left over from previous 
-	// translates that gets lost in the integer approximation.
-	double dxFloat = dx * zoom + fractionalX;
-	double dyFloat = dy * zoom + fractionalY;
-	fractionalX = dxFloat - Math.floor(dxFloat);
-	fractionalY = dyFloat - Math.floor(dyFloat);
-	graphics.translate((int)Math.floor(dxFloat), (int)Math.floor(dyFloat));
-}
-
-private Rectangle zoomClipRect(Rectangle r) {
-	tempRECT.x = (int)(Math.floor(r.x * zoom + fractionalX));
-	tempRECT.y = (int)(Math.floor(r.y * zoom + fractionalY));
-	tempRECT.width = (int)(Math.ceil(((r.x + r.width) * zoom + fractionalX))) - tempRECT.x;
-	tempRECT.height = (int)(Math.ceil(((r.y + r.height) * zoom + fractionalY))) - tempRECT.y;
-	return tempRECT;
-}
-
-private Rectangle zoomFillRect(int x, int y, int w, int h) {
-	tempRECT.x = (int)(Math.floor((x * zoom + fractionalX)));
-	tempRECT.y = (int)(Math.floor((y * zoom + fractionalY)));
-	tempRECT.width = (int)(Math.floor(((x + w - 1) * zoom + fractionalX))) - tempRECT.x + 1;
-	tempRECT.height = (int)(Math.floor(((y + h - 1) * zoom + fractionalY))) - tempRECT.y + 1;
-	return tempRECT;
-}
-
-Font zoomFont(Font f) {
-	if (f == null)
-		f = Display.getCurrent().getSystemFont();
-	FontData data = getCachedFontData(f);
-	int zoomedFontHeight = zoomFontHeight(data.getHeight());
-	allowText = zoomedFontHeight > 0;
-	fontKey.setValues(f, zoomedFontHeight);
-	return getCachedFont(fontKey);
-}
-
-int zoomFontHeight(int height) {
-	return (int)(zoom * height);
-}
-
-int zoomLineWidth(int w) {
-	return w;
-}
-
-private int[] zoomPointList(int[] points) {
-	int[] scaled = null;
-
-	// Look in cache for a integer array with the same length as 'points'
-	for (int i = 0; i < intArrayCache.length; i++) {
-		if (intArrayCache[i].length == points.length) {
-			scaled = intArrayCache[i];
-			
-			// Move this integer array up one notch in the array
-			if (i != 0) {
-				int[] temp = intArrayCache[i - 1];
-				intArrayCache[i - 1] = scaled;
-				intArrayCache[i] = temp;	
-			}
-		}
-	}
-	
-	// If no match is found, take the one that is last and resize it.
-	if (scaled == null) {
-		intArrayCache[intArrayCache.length - 1] = new int[points.length];
-		scaled = intArrayCache[intArrayCache.length - 1];
-	}
-	
-	// Scale the points
-	for (int i = 0; (i + 1) < points.length; i += 2) {
-		scaled[i] = (int)(Math.floor((points[i] * zoom + fractionalX)));
-		scaled[i + 1] = (int)(Math.floor((points[i + 1] * zoom + fractionalY)));
-	}
-	return scaled;
-}	
-
-protected Rectangle zoomRect(int x, int y, int w, int h) {
-	tempRECT.x = (int)(Math.floor(x * zoom + fractionalX));
-	tempRECT.y = (int)(Math.floor(y * zoom + fractionalY));
-	tempRECT.width = (int)(Math.floor(((x + w) * zoom + fractionalX))) - tempRECT.x;
-	tempRECT.height = (int)(Math.floor(((y + h) * zoom + fractionalY))) - tempRECT.y;
-	return tempRECT;
-}
-
-private TextLayout zoomTextLayout(TextLayout layout) {
-	TextLayout zoomed = new TextLayout(Display.getCurrent());
-	zoomed.setText(layout.getText());
-	
-	int zoomWidth = -1;
-	
-	if (layout.getWidth() != -1)
-		zoomWidth = ((int)(layout.getWidth() * zoom));
-		
-	if (zoomWidth < -1 || zoomWidth == 0)
-		return null;
-	
-	zoomed.setFont(zoomFont(layout.getFont()));
-	zoomed.setAlignment(layout.getAlignment());
-	zoomed.setAscent(layout.getAscent());
-	zoomed.setDescent(layout.getDescent());
-	zoomed.setOrientation(layout.getOrientation());
-	zoomed.setSegments(layout.getSegments());
-	zoomed.setSpacing(layout.getSpacing());
-	zoomed.setTabs(layout.getTabs());
-	
-	zoomed.setWidth(zoomWidth);
-	int length = layout.getText().length();
-	if (length > 0) {
-		int start = 0, offset = 1;
-		TextStyle style = null, lastStyle = layout.getStyle(0);
-		for (; offset <= length; offset++) {
-			if (offset != length
-					&& (style = layout.getStyle(offset)) == lastStyle)
-				continue;
-			int end = offset - 1;
-			
-			if (lastStyle != null) {
-				TextStyle zoomedStyle = new TextStyle(zoomFont(lastStyle.font),
-						lastStyle.foreground, lastStyle.background);
-                zoomedStyle.metrics = lastStyle.metrics;
-                zoomedStyle.rise = lastStyle.rise;
-                zoomedStyle.strikeout = lastStyle.strikeout;
-                zoomedStyle.underline = lastStyle.underline;
-				zoomed.setStyle(zoomedStyle, start, end);
-			}
-			lastStyle = style;
-			start = offset;
-		}
-	}
-	return zoomed;
-}
-
-Point zoomTextPoint(int x, int y) {
-	if (localCache.font != localFont) {
-		//Font is different, re-calculate its height
-		FontMetrics metric = FigureUtilities.getFontMetrics(localFont); 
-		localCache.height = metric.getHeight() - metric.getDescent();
-		localCache.font = localFont;
-	}
-	if (targetCache.font != graphics.getFont()) {
-		FontMetrics metric = graphics.getFontMetrics();
-		targetCache.font = graphics.getFont();
-		targetCache.height = metric.getHeight() - metric.getDescent();
-	}
-	return new Point(((int)(Math.floor((x * zoom) + fractionalX))),
-						(int)(Math.floor((y + localCache.height - 1) * zoom 
-											- targetCache.height + 1 + fractionalY)));
-}
-
-
-protected Graphics getGraphics() {
-	return graphics;
-}
-
-/**
- * Logs a warning once if advanced graphics support is not available.
- */
-private void logAdvancedGraphicsWarning() {
-    if (!advancedGraphicsWarningLogged) {
-        if (Window.getDefaultOrientation() == SWT.RIGHT_TO_LEFT) {
-            Log
-                .warning(
-                    Draw2dPlugin.getInstance(),
-                    IStatus.WARNING,
-                    "Advanced graphics support is not available in right-to-left mode.  Diagrams might not look as nice as they could in left-to-right mode."); //$NON-NLS-1$
-        } else {
-            Log
-                .warning(
-                    Draw2dPlugin.getInstance(),
-                    IStatus.WARNING,
-                    "Unable to load advanced graphics library.  Diagrams might not look as nice as they could with an advanced graphics library installed (e.g. Cairo or GDI+)"); //$NON-NLS-1$
-        }
-        advancedGraphicsWarningLogged = true;
-    }
-}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/package.html
deleted file mode 100644
index e3c76c5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level0
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/l10n/Draw2dUIPluginImages.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/l10n/Draw2dUIPluginImages.java
deleted file mode 100644
index 535663c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/l10n/Draw2dUIPluginImages.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.l10n;
-
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly. The public
- * strings represent images that will be cached and can be retrieved using
- * {@link #get(String)} which should <b>not</b> be disposed by the client.
- * 
- * @author cmahoney
- */
-public class Draw2dUIPluginImages {
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "icons/"; //$NON-NLS-1$
-
-	// Cached images that can be retrieved using the get method. The
-	// corresponding image descriptor must be initialized using the
-	// createAndCache() method.
-	
-	public static final String IMG_UP_PRESSED_ARROW = PREFIX_ROOT
-		+ "uppressedarrow.gif"; //$NON-NLS-1$
-
-	public static final String IMG_DOWN_PRESSED_ARROW = PREFIX_ROOT
-		+ "downpressedarrow.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LEFT_PRESSED_ARROW = PREFIX_ROOT
-		+ "leftpressedarrow.gif";//$NON-NLS-1$
-
-	public static final String IMG_RIGHT_PRESSED_ARROW = PREFIX_ROOT
-		+ "rightpressedarrow.gif";//$NON-NLS-1$
-
-	// Image descriptors.
-	
-	public static final ImageDescriptor DESC_LEFT_BOTTOM = create(PREFIX_ROOT
-		+ "leftbottom.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RIGHT_BOTTOM = create(PREFIX_ROOT
-		+ "rightbottom.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RIGHT = create(PREFIX_ROOT
-		+ "right.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_TOP_RIGHT = create(PREFIX_ROOT
-		+ "topright.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_BOTTOM = create(PREFIX_ROOT
-		+ "bottom.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_DOWN_ARROW = create(PREFIX_ROOT
-		+ "downarrow.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_UP_ARROW = create(PREFIX_ROOT
-		+ "uparrow.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_LEFT_ARROW = create(PREFIX_ROOT
-		+ "leftarrow.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RIGHT_ARROW = create(PREFIX_ROOT
-		+ "rightarrow.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_UP_PRESSED_ARROW = createAndCache(IMG_UP_PRESSED_ARROW);
-
-	public static final ImageDescriptor DESC_DOWN_PRESSED_ARROW = createAndCache(IMG_DOWN_PRESSED_ARROW);
-
-	public static final ImageDescriptor DESC_LEFT_PRESSED_ARROW = createAndCache(IMG_LEFT_PRESSED_ARROW);
-
-	public static final ImageDescriptor DESC_RIGHT_PRESSED_ARROW = createAndCache(IMG_RIGHT_PRESSED_ARROW);
-
-	public static final ImageDescriptor DESC_UP_GRAY_ARROW = create(PREFIX_ROOT
-		+ "upgrayarrow.gif");//$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_DOWN_GRAY_ARROW = create(PREFIX_ROOT
-		+ "downgrayarrow.gif");//$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_LEFT_GRAY_ARROW = create(PREFIX_ROOT
-		+ "leftgrayarrow.gif");//$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RIGHT_GRAY_ARROW = create(PREFIX_ROOT
-		+ "rightgrayarrow.gif");//$NON-NLS-1$
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(Draw2dPlugin
-			.getPluginId(), imageName);
-	}
-
-	/**
-	 * Creates the image descriptor from the filename given and caches it in the
-	 * plugin's image registry.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor createAndCache(String imageName) {
-		ImageDescriptor result = create(imageName);
-		Draw2dPlugin.getInstance().getImageRegistry().put(imageName, result);
-		return result;
-	}
-
-	/**
-	 * Gets an image from the image registry. This image should not be disposed
-	 * of, that is handled in the image registry. The image descriptor must have
-	 * previously been cached in the image registry. The cached images for the
-	 * public image names defined in this file can be retrieved using this
-	 * method.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the image or null if it has not been cached in the registry
-	 */
-	public static Image get(String imageName) {
-		return Draw2dPlugin.getInstance().getImageRegistry().get(imageName);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/l10n/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/l10n/package.html
deleted file mode 100644
index e214e94..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/DiagramMapModeUtil.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/DiagramMapModeUtil.java
deleted file mode 100644
index e2365eb..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/DiagramMapModeUtil.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode;
-
-import org.eclipse.draw2d.geometry.Translatable;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * @author sshaw
- * 
- * Internal MapMode util to extract a scale value from the IMapMode interface.  The scale factor
- * shouldn't be exposed through public API to allow future support for non linear scaling coordinate
- * systems.
- */
-public class DiagramMapModeUtil extends MapModeUtil {
-
-	private static class TranslatableDouble implements Translatable {
-
-		double scale = 1.0;
-		
-		public void performScale(double factor) {
-			scale = factor;
-		}
-
-		public void performTranslate(int dx, int dy) {
-			// do nothing
-		}
-
-		protected double getScale() {
-			return scale;
-		}
-	}
-	
-	private static TranslatableDouble SCALE = new TranslatableDouble();
-	
-	static public double getScale( IMapMode mm ) {
-		mm.LPtoDP(SCALE);
-		return SCALE.getScale();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/HiMetricMapMode.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/HiMetricMapMode.java
deleted file mode 100644
index 12c30ca..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/HiMetricMapMode.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Translatable;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * This class implements the MapMode interface to provide support for
- * HiMetric values.  HIMetric values are represented as 1/100 of an inch.
- * 
- * @author jschofie sshaw
- */
-public class HiMetricMapMode
-	implements IMapMode {
-
-	private float dpi;
-	private double scale = 1;
-	private static final double UNITS_PER_INCH = 2540.0;
-
-	public HiMetricMapMode() {
-		Display.getDefault().syncExec(new Runnable() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				dpi = Display.getDefault().getDPI().x;
-			}
-		});
-		
-		scale = dpi / UNITS_PER_INCH;
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figure.surface.mapmode.IMapMode#LPtoDP(int)
-	 */
-	public int LPtoDP(int logicalUnit) {
-		Point devPt = new Point(logicalUnit, 0);
-		devPt.performScale( scale );
-    	return devPt.x;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figure.surface.mapmode.IMapMode#DPtoLP(int)
-	 */
-	public int DPtoLP(int deviceUnit) {
-		Point logPt = new Point(deviceUnit, 0);
-		logPt.performScale( 1 / scale );
-		return logPt.x;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#DPtoLP(org.eclipse.draw2d.geometry.Translatable)
-	 */
-	public Translatable DPtoLP(Translatable t) {
-		t.performScale( 1 / scale );
-		return t;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#LPtoDP(org.eclipse.draw2d.geometry.Translatable)
-	 */
-	public Translatable LPtoDP(Translatable t) {
-		t.performScale( scale );
-		return t;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/IMapModeHolder.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/IMapModeHolder.java
deleted file mode 100644
index 3f9dbb6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/IMapModeHolder.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode;
-
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-
-/**
- * An interface to be implemented by classes that wrap an IMapMode
- * in order to allow clients a read access to the underlying IMapMode
- * 
- * @author Yasser Lulu
- *
- */
-public interface IMapModeHolder
-    extends IMapMode {
-    
-    /**
-     * An accessor method for the wrapped IMapMode
-     * 
-     * @return IMapMode the held IMapMode
-     */
-    IMapMode getMapMode();
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/IdentityMapMode.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/IdentityMapMode.java
deleted file mode 100644
index e8f3aed..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/IdentityMapMode.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode;
-
-import org.eclipse.draw2d.geometry.Translatable;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-
-/**
- * This class implements the MapMode interface to provide support for
- * an Identity mapping.  Performs a null mapping.
- * 
- * @author sshaw
- */
-public class IdentityMapMode
-	implements IMapMode {
-
-	public IdentityMapMode() {
-		// no initialization required
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figure.surface.mapmode.IMapMode#LPtoDP(int)
-	 */
-	public int LPtoDP(int logicalUnit) {
-		return logicalUnit;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figure.surface.mapmode.IMapMode#DPtoLP(int)
-	 */
-	public int DPtoLP(int deviceUnit) {
-		return deviceUnit;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#DPtoLP(org.eclipse.draw2d.geometry.Translatable)
-	 */
-	public Translatable DPtoLP(Translatable t) {
-		t.performScale( 1.0 );
-		return t;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#LPtoDP(org.eclipse.draw2d.geometry.Translatable)
-	 */
-	public Translatable LPtoDP(Translatable t) {
-		t.performScale( 1.0 );
-		return t;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/package.html
deleted file mode 100644
index e30abac..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/package.html
deleted file mode 100644
index 2b6635b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BranchRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BranchRouter.java
deleted file mode 100644
index f051b94..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BranchRouter.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import org.eclipse.draw2d.AbstractRouter;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- *
- * Final router class for routing a specific branch on a connection tree.
- * Package protected - no should be using this router directly.  Use the Forest
- * Router as the top level entry point.
- */
-public class BranchRouter extends AbstractRouter {
-
-	private TreeRouter tree;
-	
-	/**
-	 * @param tree
-	 */
-	public BranchRouter(TreeRouter tree) {
-		super();
-		
-		this.tree = tree;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ConnectionRouter#route(org.eclipse.draw2d.Connection)
-	 * 
-	 * case 1: connection has never been routed before and needs
-	 * points to be populated.  points.size() < 4 
-	 * 
-	 * case 2: user moved the trunk vertex of the connection by either
-	 * moving the line attached to the target or second last target line
-	 * 
-	 * case 3: user moved the source or target shape causing a layout
-	 * of the connection.  
-	 * 
-	 * case 4: user moved the source line attached to the source shape. 
-	 * 
-	 * case 5: connection is being rerouted as a result of an invalidation
-	 * from case 2.  
-	 * 
-	 */
-	public void route(Connection conn) {
-		Point ptTrunkLoc = getTrunkLocation(conn);
-		
-		getTree().setTrunkLocation(conn, ptTrunkLoc);
-		
-		Point ptSourceLoc = getSourceLocation(conn, ptTrunkLoc);
-		
-		PointList points = recreateBranch(conn, ptSourceLoc, ptTrunkLoc);
-		conn.setPoints(points);
-	}
-	
-	/**
-	 * getTrunkLocation
-	 * Method to retrieve the trunk location in relative coordinates
-	 * 
-	 * @param conn Connection being routed
-	 * @return Point that is the trunk location in relative coordinates.
-	 */
-	protected Point getTrunkLocation(Connection conn) {
-		PointList points = getTree().getPointsFromConstraint(conn);
-		Point ptTrunkLoc = getTree().getTrunkLocation(conn); // default;
-		
-		// check valid again based on constraint
-		if (getTree().isTreeBranch(conn, points)) {
-			if (getTree().isTopDown(conn))
-				ptTrunkLoc.x = points.getPoint(3).x;
-			else
-				ptTrunkLoc.y = points.getPoint(3).y;
-			
-			if (getTree().isOrthogonalTreeBranch(conn, points)) {
-				if (getTree().isTopDown(conn))
-					ptTrunkLoc.y = points.getPoint(2).y;
-				else
-					ptTrunkLoc.x = points.getPoint(2).x;
-			}
-		}
-
-		return ptTrunkLoc;
-	}
-	
-	/**
-	 * getSourceLocation
-	 * Method to retrieve the source location where the connection is connected
-	 * to the source element.
-	 * 
-	 * @param conn Connection to be routed.
-	 * @param ptTrunkLoc Point trunk location in relative coordinates
-	 * @return Point source location in relative coordinates
-	 */
-	public Point getSourceLocation(Connection conn, Point ptTrunkLoc) {
-		Point ptSourceRef = conn.getSourceAnchor().getReferencePoint();
-		conn.translateToRelative(ptSourceRef);
-		boolean bTopDown = getTree().isTopDown(conn);
-		
-		int branchOffset = getSourceBranchOffset(conn) + (bTopDown ? ptSourceRef.x : ptSourceRef.y);
-		
-		Point ref;
-		if (bTopDown)
-			ref = new Point(branchOffset, ptTrunkLoc.y);
-		else
-			ref = new Point(ptTrunkLoc.x, branchOffset);
-		
-		LineSeg line = OrthogonalRouterUtilities.getOrthogonalLineSegToAnchorLoc(conn, conn.getSourceAnchor(), ref);
-		return line.getOrigin();
-	}
-
-	/**
-	 * recreateBranch
-	 * Utility method used to recreate the points list for the branch connection given
-	 * a trunk vertex location and a source attachpoint location.
-	 * 
-	 * @param conn Connection used to do translate points to relative coordinates.
-	 * @param ptSourceLoc Point that is attached to the source node
-	 * @param ptTrunkLoc Point that is the vertex between the line attached to the target
-	 * and the "shoulder" line that holds the individual source branches.
-	 * @return PointList that represents the full connection tree branch.
-	 */
-	public PointList recreateBranch(Connection conn, Point ptSourceLoc, Point ptTrunkLoc) {
-		PointList points = new PointList(4);
-		boolean bTopDown = getTree().isTopDown(conn);
-		
-		points.addPoint(new Point(ptSourceLoc));
-		
-		Point pt2 = bTopDown ? new Point(ptSourceLoc.x, ptTrunkLoc.y) : new Point(ptTrunkLoc.x, ptSourceLoc.y);
-		points.addPoint(pt2);
-		
-		points.addPoint(new Point(ptTrunkLoc));
-		
-		LineSeg line = OrthogonalRouterUtilities.getOrthogonalLineSegToAnchorLoc(conn, conn.getTargetAnchor(), ptTrunkLoc);
-		Point ptTargetLoc = line.getOrigin();
-		
-		Point pt4 = bTopDown ? new Point(ptTrunkLoc.x, ptTargetLoc.y) : new Point(ptTargetLoc.x, ptTrunkLoc.y);
-		points.addPoint(pt4);
-		
-		return points;
-	}
-	
-	/**
-	 * getTree
-	 * Getter method for the container tree router.
-	 * 
-	 * @return Returns the tree.
-	 */
-	protected TreeRouter getTree() {
-		return tree;
-	}
-	
-	
-	/**
-	 * getSourceBranchOffset
-	 * Utility method to retrieve the branch offset value either as a default
-	 * value based on the source anchor or utilizes the constraint to find a 
-	 * current value.
-	 * 
-	 * @param conn Connection to retrieve the constraint from.
-	 * @return int value that represents an offset from the source anchor 
-	 * reference point.
-	 */
-	private int getSourceBranchOffset(Connection conn) {
-		Point ptSourceRef = conn.getSourceAnchor().getReferencePoint();
-		conn.translateToRelative(ptSourceRef);
-		boolean bTopDown = getTree().isTopDown(conn);
-		
-		int branchOffset = bTopDown ? ptSourceRef.x : ptSourceRef.y;
-		
-		// if constraint is valid, then retrieve just the branchOffset (ie the connection
-		// location to the source shape from the values.
-		PointList constraintPoints = getTree().getPointsFromConstraint(conn);
-		if (getTree().isTreeBranch(conn, constraintPoints)) {
-			Point ptLoc = constraintPoints.getFirstPoint();
-			branchOffset = bTopDown ? ptLoc.x : ptLoc.y;	
-		}
-		
-		return branchOffset - (bTopDown ? ptSourceRef.x : ptSourceRef.y);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/FanRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/FanRouter.java
deleted file mode 100644
index 6a53e4e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/FanRouter.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
- 
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * This class exists only as a workaround to Bugzilla Bug 37342: 
- * FanRouter.handleCollision incorrect for PointList where start 
- * and end point are the same.
- * 
- * @author chmahone
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- */
-public class FanRouter extends org.eclipse.draw2d.FanRouter {
-
-	static final int SEPARATION = 15;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ConnectionRouter#route(org.eclipse.draw2d.Connection)
-	 */
-	public void route(Connection conn) {
-		routeBendpoints(conn);
-	}
-	
-	/**
-	 * routeBendpoints
-	 * Method that performs the actual routing of the Connection.  Clients will override this instead
-	 * of route which is final.
-	 * 
-	 * @param conn Connection to be routed.
-	 */
-	private void routeBendpoints(Connection conn) {
-		if (!isFeedback(conn)) 
-			setSeparation(MapModeUtil.getMapMode(conn).DPtoLP(SEPARATION));
-		else
-			setSeparation(SEPARATION);
-		
-		super.route(conn);
-	}
-
-	private boolean isFeedback(Connection conn) {
-		Dimension dim = new Dimension(100, 100);
-		Dimension dimCheck = dim.getCopy();
-		conn.translateToRelative(dimCheck);
-		return dim.equals(dimCheck);
-	}
-	
-	/**
-	 * This is a workaround to Bugzilla Bug 37342: 
- 	 * FanRouter.handleCollision incorrect for PointList where start 
- 	 * and end point are the same.  If there are only two points and 
- 	 * they are both the same, then do nothing.
- 	 * 
- 	 * Also overridden to handle integer overflow issue with the Ray::Length method when
- 	 * fed HiMetric values that are large.  Ray length has to be manually calculated
- 	 * instead. 
-	 * @see org.eclipse.draw2d.AutomaticRouter#handleCollision(org.eclipse.draw2d.geometry.PointList, int)
-	 */
-	protected void handleCollision(PointList points, int index) {
-		if (points.size() == 2
-			&& points.getFirstPoint().equals(points.getLastPoint())) {
-			return;
-		}
-		
-		Point start = points.getFirstPoint();
-		Point end = points.getLastPoint();
-		
-		if (start.equals(end))
-			return;
-		
-		Point midPoint = new Point((end.x + start.x) / 2, (end.y + start.y) / 2);
-		int position = end.getPosition(start);
-		Ray ray;
-		if (position == PositionConstants.SOUTH || position == PositionConstants.EAST)
-			ray = new Ray(start, end);
-		else
-			ray = new Ray(end, start);
-		double length = Math.sqrt(((double)ray.x * (double)ray.x) + ((double)ray.y * (double)ray.y));
-
-		double xSeparation = getSeparation() * ray.x / length;
-		double ySeparation = getSeparation() * ray.y / length;
-		
-		Point bendPoint;
-			
-		if (index % 2 == 0) {
-			bendPoint = new Point(
-				midPoint.x + (index / 2) * (-1 * ySeparation),
-				midPoint.y + (index / 2) * xSeparation);
-		} else {
-			bendPoint = new Point(
-				midPoint.x + (index / 2) * ySeparation,
-				midPoint.y + (index / 2) * (-1 * xSeparation));
-		}
-		if (!bendPoint.equals(midPoint))
-			points.insertPoint(bendPoint, 1);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ForestRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ForestRouter.java
deleted file mode 100644
index ca188f1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ForestRouter.java
+++ /dev/null

@@ -1,225 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import java.util.HashMap;
-
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-
-
-/**
- * @author sshaw
- *
- * This router manages the tree routers on a given target.  Potentially multiple trees
- * can exist if they have different semantic types.
- */
-public class ForestRouter extends BendpointConnectionRouter implements OrthogonalRouter {
-
-	private HashMap connections = new HashMap();
-	private HashMap trunkVertexes = new HashMap();
-	
-	private class AnchorKey {
-    
-		private ConnectionAnchor anchor;
-		private Object qualifier;
-	
-		AnchorKey(ConnectionAnchor anchor, Object qualifier) {
-			this.anchor = anchor;
-			this.qualifier = qualifier;
-		}
-	
-		public boolean equals(Object object) {
-			boolean isEqual = false;
-			AnchorKey hashKey;
-		
-			if (object instanceof AnchorKey) {
-				hashKey = (AnchorKey)object;
-				ConnectionAnchor hkA1 = hashKey.getAnchor();
-				Object hkA2 = hashKey.getQualifier();
-			
-				isEqual = (hkA1.equals(anchor) && hkA2.equals(qualifier));
-			}
-			return isEqual;
-		}
-			
-		/**
-		 * Accessor to retrieve the <code>ConnectionAnchor</code> that is stored as part of the key.
-		 * 
-		 * @return the <code>ConnectionAnchor</code> that is used for the key.
-		 */
-		public ConnectionAnchor getAnchor() {
-			return anchor;
-		}
-	
-		/**
-		 * Accessor to retrieve the qualifier object that is stored as part of the key.
-		 * 
-		 * @return the <code>Object</code> that is designated the qualifier.
-		 */
-		public Object getQualifier() {
-			return qualifier;	
-		}
-	
-		/* 
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
-		public int hashCode() {
-			return anchor.hashCode() ^ qualifier.hashCode();
-		}
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.ConnectionRouter#invalidate(org.eclipse.draw2d.Connection)
-	 */
-	public void invalidate(Connection conn) {
-		if (conn.getSourceAnchor() == null || conn.getTargetAnchor() == null)
-			return;
-		
-		ConnectionRouter connectionRouter = getSubRouter(conn);
-		if (connectionRouter != null)
-			connectionRouter.invalidate(conn);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.ConnectionRouter#remove(org.eclipse.draw2d.Connection)
-	 */
-	public void remove(Connection conn) {
-		if (conn.getSourceAnchor() == null || conn.getTargetAnchor() == null)
-			return;
-		
-		ConnectionRouter connectionRouter = getSubRouter(conn);
-		if (connectionRouter != null)
-			connectionRouter.remove(conn);
-		
-		super.remove(conn);
-	}
-
-	
-	/**
-	 * Checks for trunk overlap and re-routes to avoid.
-	 */
-	public void route(Connection conn) {
-		if (conn.getTargetAnchor().getOwner() == null ||
-			conn.getSourceAnchor().getOwner() == null) {
-			PointList points = conn.getPoints();
-			points.removeAllPoints();
-
-			Point ref1 = conn.getTargetAnchor().getReferencePoint();
-			Point ref2 = conn.getSourceAnchor().getReferencePoint();
-			PrecisionPoint precisePt = new PrecisionPoint();
-
-			precisePt.setLocation(conn.getSourceAnchor().getLocation(ref1));
-			conn.translateToRelative(precisePt);
-			points.addPoint(precisePt);
- 
-			precisePt.setLocation(conn.getTargetAnchor().getLocation(ref2));
-			conn.translateToRelative(precisePt);
-			points.addPoint(precisePt);
-			conn.setPoints(points);
-			return;
-		}
-		
-		TreeRouter treeRouter = getSubRouter(conn);
-		
-		// remove existing trunk vertex before routing occurs.
-		Dimension trunk = treeRouter.getTrunkVertex();
-		if (trunk != null) {
-			AnchorKey trunkKey = new AnchorKey(conn.getTargetAnchor(), trunk);
-			trunkVertexes.remove(trunkKey);
-		}
-		 
-		if (treeRouter != null) {
-			treeRouter.route(conn);
-		
-			trunk = treeRouter.getTrunkVertex();
-			Dimension adjustedTrunk = accountForTrunkOverlap(trunk, conn);
-			if (!adjustedTrunk.equals(trunk)) {
-				treeRouter.setTrunkVertex(adjustedTrunk);
-				treeRouter.invalidate(conn);
-			}
-		}
-	}
-	
-	/**
-	 * Makes sure the routed tree doesn't intersect with an existing tree in the "forest".
-	 * This is called recursively for each trunk.
-	 * 
-	 * @param trunk <code>Dimension</code> trunkVertex value to compare
-	 * @param conn <code>Connection</code> that is connection currently being routed
-	 * @return <code>Dimension</code> new trunk vertex value
-	 */
-	private Dimension accountForTrunkOverlap(Dimension trunk, Connection conn) {
-		if (conn.getTargetAnchor() == null ||
-			conn.getTargetAnchor().getOwner() == null)
-			return trunk;
-		
-		AnchorKey trunkKey = new AnchorKey(conn.getTargetAnchor(), trunk);
-		
-		// check if trunk vertex doesn't exist or if it exceeds a maximum then
-		// return.
-		int ownerExt = conn.getTargetAnchor().getOwner().getBounds().width / 2;
-		int trunkExt = trunk.width;
-		
-		if (conn instanceof ITreeConnection) {
-			if (((ITreeConnection)conn).getOrientation() == ITreeConnection.Orientation.HORIZONTAL) {
-				ownerExt = conn.getTargetAnchor().getOwner().getBounds().height / 2;
-				trunkExt = trunk.height;
-			}
-		}
-		
-		if (trunkVertexes.get(trunkKey) == null ||
-			Math.abs(trunkExt) > ownerExt) {
-			trunkVertexes.put(trunkKey, Boolean.TRUE);
-			return trunk;
-		}
-		else {
-			Dimension newTrunk = new Dimension(trunk);
-			newTrunk.expand(10, 10);
-			return accountForTrunkOverlap(newTrunk, conn);
-		}
-	}
-
-	/**
-	 * Utility method to retrieve the sub router that manages the individual trees.
-	 * 
-	 * @param conn <code>Connection</code> to be routered
-	 * @return <code>TreeRouter</code> that will end up routing the given <code>Connection</code>.
-	 */
-	public TreeRouter getSubRouter(Connection conn) {
-		if (conn.getTargetAnchor() == null)
-			return null;
-		
-		String hint = "base"; //$NON-NLS-1$
-		if (conn instanceof ITreeConnection) {
-			hint = ((ITreeConnection)conn).getHint();
-		}
-		
-		AnchorKey connectionKey = new AnchorKey(conn.getTargetAnchor(), hint);
-		TreeRouter connectionRouter = (TreeRouter)connections.get(connectionKey);
-		if (connectionRouter == null) {
-			connectionRouter = new TreeRouter();
-			connections.put(connectionKey, connectionRouter);
-		}
-		
-		return connectionRouter;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ITreeConnection.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ITreeConnection.java
deleted file mode 100644
index 9b7edbd..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ITreeConnection.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import org.eclipse.draw2d.Connection;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- *
- * Extended interface used to distinguish between tree types.  The hint describes which
- * tree to add the connection to.
- */
-public interface ITreeConnection extends Connection {
-
-	/**
-	 * getHint
-	 * Gets the hint about the connection which determines which tree this connection
-	 * will be contributed to.
-	 * 
-	 * @return String that is a hint to the tree router.
-	 */
-	public String getHint();
-	
-	/**
-	 * @author sshaw
-	 *
-	 * enum used to determine the tree orientation
-	 */
-	static public class Orientation {
-		
-		private Orientation() {
-			// The default constructor does nothing
-		}
-		
-		static public Orientation VERTICAL = new Orientation();
-		static public Orientation HORIZONTAL = new Orientation();
-	}
-	
-	/**
-	 * getOrientation
-	 * Determines how this connection should be oriented in a tree structure.
-	 *  
-	 * @return Orientation enum
-	 */
-	public Orientation getOrientation();
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ObliqueRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ObliqueRouter.java
deleted file mode 100644
index 3386ff1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ObliqueRouter.java
+++ /dev/null

@@ -1,641 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dDebugOptions;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.jface.util.Assert;
-
-/*
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- */
-public class ObliqueRouter extends BendpointConnectionRouter {
-
-	static public class ArrayListMap {
-		private HashMap map = new HashMap();
-
-		public ArrayListMap() {
-			super();
-		}
-
-		public ArrayList get(Object key) {
-			Object value = map.get(key);
-			if (value == null)
-				return null;
-
-			if (value instanceof ArrayList)
-				return (ArrayList) value;
-			ArrayList v = new ArrayList(1);
-			v.add(value);
-			return v;
-		}
-
-		public void put(Object key, Object value) {
-			Object arrayListObject = map.get(key);
-			if (arrayListObject == null) {
-				map.put(key, value);
-				return;
-			}
-			if (arrayListObject instanceof ArrayList) {
-				ArrayList arrayList = (ArrayList) arrayListObject;
-				if (!arrayList.contains(value))
-					arrayList.add(value);
-				return;
-			}
-			if (arrayListObject != value) {
-				ArrayList arrayList = new ArrayList(2);
-				arrayList.add(arrayListObject);
-				arrayList.add(value);
-				map.put(key, arrayList);
-			}
-		}
-
-		public void remove(Object key, Object value) {
-			Object arrayListObject = map.get(key);
-			if (arrayListObject != null) {
-				if (arrayListObject instanceof ArrayList) {
-					ArrayList arrayList = (ArrayList) arrayListObject;
-					arrayList.remove(value);
-					if (arrayList.isEmpty())
-						map.remove(key);
-					return;
-				}
-				map.remove(key);
-			}
-		}
-
-		public int size() {
-			return map.size();
-		} 
-	}
-
-	private ArrayListMap selfRelConnections = new ArrayListMap();
-	private class ArrayListKey {
-
-		private ConnectionAnchor connectAnchor1;
-		private ConnectionAnchor connectAnchor2;
-
-		ArrayListKey(Connection conn) {
-			connectAnchor1 = conn.getSourceAnchor();
-			connectAnchor2 = conn.getTargetAnchor();
-		}
-
-		public ConnectionAnchor getSourceAnchor() {
-			return connectAnchor1;
-		}
-
-		public ConnectionAnchor getTargetAnchor() {
-			return connectAnchor2;
-		}
-
-		public int hashCode() {
-			return connectAnchor1.hashCode() ^ connectAnchor2.hashCode();
-		}
-
-		public boolean equals(Object object) {
-			boolean isEqual = false;
-			ArrayListKey listKey;
-
-			if (object instanceof ArrayListKey) {
-				listKey = (ArrayListKey) object;
-				ConnectionAnchor lk1 = listKey.getSourceAnchor();
-				ConnectionAnchor lk2 = listKey.getTargetAnchor();
-
-				isEqual =
-					(lk1.equals(connectAnchor1) && lk2.equals(connectAnchor2))
-						|| (lk1.equals(connectAnchor2) && lk2.equals(connectAnchor1));
-			}
-			return isEqual;
-		}
-	}
-
-	public static final int ROUTER_FLAG_SKIPNORMALIZATION = 1;
-
-	protected int routerFlags;
-
-	public ObliqueRouter() {
-		routerFlags = 0;
-	}
-
-	/**
-	 * Determines whether the router is going to avoid obstructions during the
-	 * routing algorithm.
-	 */
-	public boolean isAvoidingObstructions(Connection conn) {
-		if (conn instanceof PolylineConnectionEx) {
-			return ((PolylineConnectionEx) conn).isAvoidObstacleRouting();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Determines whether the router is going use the closest distance during the
-	 */
-	public boolean isClosestDistance(Connection conn) {
-		if (conn instanceof PolylineConnectionEx) {
-			return ((PolylineConnectionEx) conn).isClosestDistanceRouting();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if this connection is currently being reoriented by seeing if the
-	 * source or target owner are null.
-	 */
-	protected boolean isReorienting(Connection conn) {
-		if (conn.getSourceAnchor().getOwner() == null
-			|| conn.getTargetAnchor().getOwner() == null) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.ConnectionRouter#route(org.eclipse.draw2d.Connection)
-	 */
-	final public void route(Connection conn) {
-        if (conn.isVisible())
-            routeBendpoints(conn);
-	}
-	
-	/**
-	 * Route the connection accordingly to the router paradigm.
-	 */
-	public void routeBendpoints(Connection conn) {
-		if ((conn.getSourceAnchor() == null)
-			|| (conn.getTargetAnchor() == null))
-			return;
-
-        PointList points = new PointList();
-             
-		if (isAvoidingObstructions(conn)) {
-            points = RouterHelper.getInstance().routeAroundObstructions(conn);	
-		} 
-        else if (isClosestDistance(conn)) {
-            points = RouterHelper.getInstance().routeClosestDistance(conn);
-        }
-        else {
-            points = RouterHelper.getInstance().routeFromConstraint(conn);
-        }
-        
-        routeLine(conn, 0, points);
-		conn.setPoints(points);
-	}
-
-
-	/**
-	 * Method removePointsInViews.
-	 * This method will parse through all the points in the given 
-	 * polyline and remove any of the points that intersect with the 
-	 * start and end figures.
-	 * 
-	 * @param conn Connection figure that is currently being routed
-	 * @param newLine PointList that will contain the filtered list of points
-     * @return boolean true if newLine points changed, false otherwise.
-     * @throws IllegalArgumentException if either paramter is null.
-	 */
-	protected boolean removePointsInViews(
-		Connection conn,
-		PointList newLine) {
-		
-        boolean bChanged = false;
-        
-		// error checking
-		if (conn == null || newLine == null ) {
-			IllegalArgumentException iae = new IllegalArgumentException();
-			Trace.throwing(
-				Draw2dPlugin.getInstance(),
-				Draw2dDebugOptions.EXCEPTIONS_THROWING,
-				getClass(),
-				"removePointsInViews()", //$NON-NLS-1$
-				iae);
-			throw iae;
-		}
-		
-		// check whether the method should be executed.
-		if (newLine.size() < 3)
-			return false;
-        
-        IFigure sourceOwner = conn.getSourceAnchor().getOwner();
-        IFigure targetOwner = conn.getTargetAnchor().getOwner();
-		if (sourceOwner == null)
-			return false;
-		if (targetOwner == null)
-			return false;
-	
-		Rectangle startRect = null;        
-        if (!(sourceOwner instanceof Connection)) {
-            startRect = new Rectangle(sourceOwner.getBounds());
-            sourceOwner.translateToAbsolute(startRect);
-            conn.translateToRelative(startRect);
-        }
-
-        Rectangle endRect = null;        
-        if (!(targetOwner instanceof Connection)) {
-    		endRect = new Rectangle(targetOwner.getBounds());
-            targetOwner.translateToAbsolute(endRect);
-    		conn.translateToRelative(endRect);
-        }
-
-		// Ignore the first and last points
-		PointList newPoints = new PointList(newLine.size());
-		for (int i = 0; i < newLine.size(); i++) {
-			
-			Point pt = newLine.getPoint(i);
-			if (i == 0 || i == newLine.size() - 1)
-				newPoints.addPoint(pt);
-			else if ((startRect == null || !startRect.contains(pt))
-                && (endRect == null || !endRect.contains(pt))) {
-                newPoints.addPoint(pt);
-            }
-            else {
-                bChanged = true;
-            }
-		}
-
-		if (newPoints.size() != newLine.size()) {
-			newLine.removeAllPoints();
-			for (int i = 0; i < newPoints.size(); i++)
-				newLine.addPoint(new Point(newPoints.getPoint(i)));
-		}
-        
-        return bChanged;
-	}
-	
-	/**
-	 * Helper method for "route" to just do the core routing of this router without any
-	 * additional ideology (i.e. no closest distance, obstructions routing).
-	 */
-	public void routeLine(
-		Connection conn,
-		int nestedRoutingDepth,
-		PointList newLine) {
-
-		// get the original line	
-		if (!checkSelfRelConnection(conn, newLine)) {
-			removePointsInViews(conn, newLine);
-		}
-		resetEndPointsToEdge(conn, newLine);
-	}
-
-	/**
-	 * getStraightEdgePoint
-	 * Gets the anchored edge point that intersects with the given line segment.
-	 * 
-	 * @param ptEdge Point on the edge of the end shape in relative coordinates
-	 * @param ptRef1 Point that is the first reference in relative coordinates
-	 * @param ptRef2 Point that is the second reference in relative coordiantes
-	 * @return Point that is the straight edge point in relative coordinates
-	 */
-	protected static Point getStraightEdgePoint(
-		final Point ptEdge,
-		final Point ptRef1,
-		final Point ptRef2) {
-		LineSeg lineSeg = new LineSeg(ptRef1, ptRef2);
-		
-		Point ptProj = lineSeg.perpIntersect(ptEdge.x, ptEdge.y);
-
-		// account for possible rounding errors and ensure the
-		// resulting line is straight
-		if (Math.abs(ptProj.x - ptRef2.x) < Math.abs(ptProj.y - ptRef2.y))
-			ptProj.x = ptRef2.x;
-		else
-			ptProj.y = ptRef2.y;
-
-		return ptProj;
-	}
-
-	/**
-	 * Reset the end points of the connection line to the appropriate anchor position on the start
-	 * and end figures.
-	 */
-	protected void resetEndPointsToEdge(
-    Connection conn,
-    PointList newLine) {
-		RouterHelper.getInstance().resetEndPointsToEdge(conn, newLine);
-	}
-	
-	protected static final int SELFRELSIZEINIT = 62;
-	protected static final int SELFRELSIZEINCR = 10;
-
-	/**
-	 * Method checkSelfRelConnection.
-	 * Checks to see if this connection should be routed specially as a self relation.
-	 * @param conn Connection to check if it's a self relation
-	 * @param newLine PointList of the routed points
-	 * @return boolean True if Connection is a self relation, False otherwise.
-	 */
-	protected boolean checkSelfRelConnection(
-		Connection conn,
-		PointList newLine) {
-		if ((conn.getSourceAnchor().getOwner() == conn.getTargetAnchor()
-			.getOwner())
-			&& newLine.size() < 4) {
-			getSelfRelVertices(conn, newLine);
-			return true;
-		} else {
-			removeSelfRelConnection(conn);
-			return false;
-		}
-	}
-
-	/**
-	 * Method removeSelfRelConnection.
-	 * Removes the given connection from the self relation hash map
-	 * @param conn Connection to remove from the map
-	 */
-	private void removeSelfRelConnection(Connection conn) {
-		if (conn.getSourceAnchor() == null || conn.getTargetAnchor() == null
-			|| conn.getSourceAnchor().getOwner() == null
-			|| conn.getTargetAnchor().getOwner() == null)
-			return;
-
-		ArrayListKey connectionKey = new ArrayListKey(conn);
-		ArrayList connectionList = selfRelConnections.get(connectionKey);
-		if (connectionList != null) {
-			int index = connectionList.indexOf(conn);
-			if (index == -1)
-				return;
-			selfRelConnections.remove(connectionKey, conn);
-		}
-	}
-
-	/**
-	 * Method insertSelfRelVertices.
-	 * This method will create a routed line that routes from and to the same figure.
-	 * @param conn
-	 * @param newLine
-	 */
-	protected void getSelfRelVertices(Connection conn, PointList newLine) {
-		if (conn.getSourceAnchor().getOwner() == null)
-			return;
-
-		ArrayListKey connectionKey = new ArrayListKey(conn);
-		int nSelfIncr = 0;
-		int nIndex = 0;
-		ArrayList connectionList = selfRelConnections.get(connectionKey);
-		if (connectionList != null) {
-			if (!connectionList.contains(conn)) {
-				selfRelConnections.put(connectionKey, conn);
-				connectionList = selfRelConnections.get(connectionKey);
-			}
-
-			nIndex = connectionList.indexOf(conn);
-			Assert.isTrue(nIndex >= 0);
-		} else {
-			selfRelConnections.put(connectionKey, conn);
-		}
-
-		Dimension selfrelsizeincr = new Dimension(SELFRELSIZEINCR, 0);
-		if (!RouterHelper.getInstance().isFeedback(conn))
-			selfrelsizeincr = (Dimension)MapModeUtil.getMapMode(conn).DPtoLP(selfrelsizeincr);
-		
-		IFigure owner = conn.getSourceAnchor().getOwner();
-		Rectangle bBox = owner.getClientArea();
-		owner.translateToAbsolute(bBox);
-		conn.translateToRelative(bBox);
-
-		nSelfIncr = selfrelsizeincr.width * (nIndex / 8);
-		newLine.removeAllPoints();
-
-		switch (nIndex % 8) {
-			case 0 :
-				getCornerSelfRelVertices(conn, bBox, newLine,	nSelfIncr, 1, 1, bBox.getBottomRight());
-				break;
-			case 1 :
-				getVerticalSelfRelVertices(conn, bBox, newLine, nSelfIncr, 1, bBox.getBottom());
-				break;
-			case 2 :
-				getCornerSelfRelVertices(conn, bBox, newLine, nSelfIncr, -1, 1, bBox.getBottomLeft());
-				break;
-			case 3 :
-				getHorizontalSelfRelVertices(conn, bBox, newLine, nSelfIncr, -1, bBox.getLeft());
-				break;
-			case 4 :
-				getCornerSelfRelVertices(conn, bBox, newLine, nSelfIncr, -1, -1, bBox.getTopLeft());
-				break;
-			case 5 :
-				getVerticalSelfRelVertices(conn, bBox, newLine, nSelfIncr, -1, bBox.getTop());
-				break;
-			case 6 :
-				getCornerSelfRelVertices(conn, bBox, newLine, nSelfIncr, 1, -1, bBox.getTopRight());
-				break;
-			case 7 :
-				getHorizontalSelfRelVertices(conn, bBox, newLine, nSelfIncr, 1, bBox.getRight());
-				break;
-		}
-		
-		// ensure that the end points are anchored properly to the shape.
-		Point ptS2 = newLine.getPoint(0);
-		Point ptS1 = conn.getSourceAnchor().getReferencePoint();
-		conn.translateToRelative(ptS1);
-		Point ptAbsS2 = new Point(ptS2);
-		conn.translateToAbsolute(ptAbsS2);
-		Point ptEdge = conn.getSourceAnchor().getLocation(ptAbsS2);
-		conn.translateToRelative(ptEdge);
-		ptS1 = getStraightEdgePoint(ptEdge, ptS1, ptS2);
-
-		Point ptE2 = newLine.getPoint(newLine.size() - 1);
-		Point ptE1 = conn.getTargetAnchor().getReferencePoint();
-		conn.translateToRelative(ptE1);
-		Point ptAbsE2 = new Point(ptE2);
-		conn.translateToAbsolute(ptAbsE2);
-		ptEdge = conn.getTargetAnchor().getLocation(ptAbsE2);
-		conn.translateToRelative(ptEdge);
-		ptE1 = getStraightEdgePoint(ptEdge, ptE1, ptE2);
-
-		newLine.setPoint(ptS1, 0);
-		newLine.setPoint(ptE1, newLine.size() - 1); 
-	}
-
-	/**
-	 * Method getCornerSelfRelVertices.
-	 * Retrieves the relation points for the self relation given a corner point and direction factors.
-	 * @param bBox Rectangle representing the shape extents to create the self relation around.
-	 * @param newLine PointList of the line to receive the new points
-	 * @param nOffset Incremental offset of the self relation to prevent overlapping relations.
-	 * @param nXDir int Direction (either -1, 1) indicating the horizontal growth direction 
-	 * @param nYDir int Direction (either -1, 1) indicating the vertical growth direction 
-	 * @param ptOrient Point which represents the starting location for the self relation to 
-	 * grow from.
-	 */
-	private void getCornerSelfRelVertices(
-		Connection conn,
-		Rectangle bBox,
-		PointList newLine,
-		int nOffset,
-		int nXDir,
-		int nYDir,
-		Point ptOrient) {
-
-		int x = ptOrient.x;
-		int y = bBox.getCenter().y + (nYDir * bBox.height / 4 );
-		Point p1 = new Point(x, y);
-		newLine.addPoint(p1);
-
-		int xNew, yNew;
-
-		Dimension selfrelsizeinit = new Dimension(SELFRELSIZEINIT, 0);
-		if (!RouterHelper.getInstance().isFeedback(conn))
-			selfrelsizeinit = (Dimension)MapModeUtil.getMapMode(conn).DPtoLP(selfrelsizeinit);
-		
-		xNew = x + (nXDir * (selfrelsizeinit.width + nOffset));
-		Point p2 = new Point(xNew, y);
-		newLine.addPoint(p2);
-
-		yNew = ptOrient.y + (nYDir * (selfrelsizeinit.width + nOffset));
-		Point p3 = new Point(xNew, yNew);
-		newLine.addPoint(p3);
-
-		xNew = ptOrient.x - (nXDir * bBox.width / 4);
-		Point p4 = new Point(xNew, yNew);
-		newLine.addPoint(p4);
-
-		yNew = ptOrient.y;
-		Point p5 = new Point(xNew, yNew);
-		newLine.addPoint(p5);
-	}
-
-	/**
-	 * Method getVerticalSelfRelVertices.
-	 * @param bBox Rectangle representing the shape extents to create the self relation around.
-	 * @param newLine PointList of the line to receive the new points
-	 * @param nOffset Incremental offset of the self relation to prevent overlapping relations.
-	 * @param nDir int Direction (either -1, 1) indicating the vertical growth direction 
-	 * @param ptOrient Point which represents the starting location for the self relation to 
-	 * grow from.
-	 */
-	private void getVerticalSelfRelVertices(
-		Connection conn,
-		Rectangle bBox,
-		PointList newLine,
-		int nOffset,
-		int nDir,
-		Point ptOrient) {
-		
-		int nWidth = bBox.width / 4;
-		
-		int x = ptOrient.x - nWidth / 2;
-		int y = ptOrient.y;
-		Point p1 = new Point(x, y);
-		newLine.addPoint(p1);
-
-		int xNew, yNew;
-
-		Dimension selfrelsizeinit = new Dimension(SELFRELSIZEINIT, 0);
-		if (!RouterHelper.getInstance().isFeedback(conn))
-			selfrelsizeinit = (Dimension)MapModeUtil.getMapMode(conn).DPtoLP(selfrelsizeinit);
-		
-		yNew = y + (nDir * (selfrelsizeinit.width + nOffset));
-		Point p2 = new Point(x, yNew);
-		newLine.addPoint(p2);
-
-		xNew = ptOrient.x + nWidth / 2;
-		Point p3 = new Point(xNew, yNew);
-		newLine.addPoint(p3);
-
-		yNew = ptOrient.y;
-		Point p4 = new Point(xNew, yNew);
-		newLine.addPoint(p4);
-	}
-	
-	/**
-	 * Method getHorizontalSelfRelVertices.
-	 * @param bBox Rectangle representing the shape extents to create the self relation around.
-	 * @param newLine PointList of the line to receive the new points
-	 * @param nOffset Incremental offset of the self relation to prevent overlapping relations.
-	 * @param nDir int Direction (either -1, 1) indicating the horizontal growth direction 
-	 * @param ptOrient Point which represents the starting location for the self relation to 
-	 * grow from.
-	 */
-	private void getHorizontalSelfRelVertices(
-		Connection conn,
-		Rectangle bBox,
-		PointList newLine,
-		int nOffset,
-		int nDir,
-		Point ptOrient) {
-		
-		int nHeight = bBox.height / 4;
-		
-		int y = ptOrient.y - nHeight / 2;
-		int x = ptOrient.x;
-		Point p1 = new Point(x, y);
-		newLine.addPoint(p1);
-
-		int xNew, yNew;
-		
-		Dimension selfrelsizeinit = new Dimension(SELFRELSIZEINIT, 0);
-		if (!RouterHelper.getInstance().isFeedback(conn))
-			selfrelsizeinit = (Dimension)MapModeUtil.getMapMode(conn).DPtoLP(selfrelsizeinit);
-		
-		xNew = x + (nDir * (selfrelsizeinit.width + nOffset));
-		Point p2 = new Point(xNew, y);
-		newLine.addPoint(p2);
-
-		yNew = ptOrient.y + nHeight / 2;
-		Point p3 = new Point(xNew, yNew);
-		newLine.addPoint(p3);
-
-		xNew = ptOrient.x;
-		Point p4 = new Point(xNew, yNew);
-		newLine.addPoint(p4);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.BendpointConnectionRouter#remove(Connection)
-	 */
-	public void remove(Connection connection) {
-		super.remove(connection);
-		
-        RouterHelper.getInstance().remove(connection);
-		removeSelfRelConnection(connection);
-	}
-
-	/* 
-	 * Added to support GEF's shortest path routing
-	 */
-	public void invalidate(Connection connection) {
-        super.invalidate(connection);
-		RouterHelper.getInstance().invalidate(connection);
-	}
-    
-    /**
-     * Sets the constraint for the given {@link Connection}.
-     *
-     * @param connection The connection whose constraint we are setting
-     * @param constraint The constraint
-     */
-    public void setConstraint(Connection connection, Object constraint) {
-        super.setConstraint(connection, constraint);
-        RouterHelper.getInstance().setConstraint(connection, constraint);
-    }
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/OrthogonalRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/OrthogonalRouter.java
deleted file mode 100644
index 40c9838..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/OrthogonalRouter.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-/**
- * @author sshaw
- *
- * This interface identifies a router as othogonal based.  i.e. the lines are always routed
- * straight veriticaly or horizontally.
- */
-public interface OrthogonalRouter {
-
-	// Empty interface
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/OrthogonalRouterUtilities.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/OrthogonalRouterUtilities.java
deleted file mode 100644
index 3fda400..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/OrthogonalRouterUtilities.java
+++ /dev/null

@@ -1,173 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-
-
-/**
- * @author sshaw
- *
- */
-public class OrthogonalRouterUtilities {
-	/**
-	 * Calculates the center point that is aligned vertically or 
-	 * horizontally with the given reference point.
-	 * 
-	 * @param rect the <code>Rectangle</code> whose center point is used as 
-	 * the location point to be adjusted versus the outside reference point.
-	 * @param ref the <code>Point</code> that is used as the reference to
-	 * readjust the center point of the given <code>Rectangle</code>
-	 * @return a <code>Point</code> that is adjusted horizontally or vertically
-	 * with respect to the given reference point.
-	 */
-	public static Point getAdjustedCenterPoint(
-		final Rectangle rect,
-		final Point ref) {
-		Point ptNewCenter = new Point(rect.getCenter());
-
-		if (ref.x < rect.getRight().x && ref.x > rect.getLeft().x) {
-			ptNewCenter.x = ref.x;
-		} else if (ref.y < rect.getBottom().y && ref.y > rect.getTop().y) {
-			ptNewCenter.y = ref.y;
-		}
-
-		return ptNewCenter;
-	}
-
-	/**
-	 * Resets both of the end points in the polyline to be close to the center point
-	 * of the figure.
-	 * 
-	 * @param conn the <code>Connection</code> that is used to retrieve the ends and map the coordinates 
-	 * of the end owners into absolute coordinates.
-	 * @param newLine the <code>PointList</code> whose end points are modified to be inside the end owners
-	 * bounding boxes.
-	 */
-	public static void resetEndPointsToCenter(
-		Connection conn,
-		PointList newLine) {
-        
-        Rectangle startRect = getBounds(conn.getSourceAnchor().getOwner());
-        conn.getSourceAnchor().getOwner().translateToAbsolute(startRect);
-
-		Point ptStart = newLine.getPoint(1);
-		conn.translateToAbsolute(ptStart);
-		ptStart = getAdjustedCenterPoint(startRect, ptStart);
-		conn.translateToRelative(ptStart);
-		newLine.setPoint(ptStart, 0);
-        
-        Rectangle endRect = getBounds(conn.getTargetAnchor().getOwner());
-        conn.getTargetAnchor().getOwner().translateToAbsolute(endRect);
-
-		Point ptEnd = newLine.getPoint(newLine.size() - 2);
-		conn.translateToAbsolute(ptEnd);
-		ptEnd = getAdjustedCenterPoint(endRect, ptEnd);
-		conn.translateToRelative(ptEnd);
-		newLine.setPoint(ptEnd, newLine.size() - 1);
-	}
-	
-	/**
-	 * getEdgePoint
-	 * Utility method used to calculate the edge point of the source of target shape.
-	 * 
-	 * @param conn Connection figure used to translate the point coordinates
-	 * @param anchor ConnectionAnchor to get the source / target bounds.
-	 * @param ptRef Point Reference point from which the edge point is calculated
-	 * @return Point that is on the edge of the Source / Target shape.
-	 */
-	private static Point getEdgePoint(
-		Connection conn,
-		ConnectionAnchor anchor,
-		Point ptRef) {
-		Rectangle rect = getBounds(anchor.getOwner());
-		anchor.getOwner().translateToAbsolute(rect);
-		conn.translateToRelative(rect);
-		
-        Point ptRef2 = new Point(ptRef);
-        Point ptRef1 = getAdjustedCenterPoint(rect, ptRef2);
-
-        Point ptAbsRef2 = new Point(ptRef2);
-        conn.translateToAbsolute(ptAbsRef2);
-        Point ptEdge = anchor.getLocation(ptAbsRef2);
-		conn.translateToRelative(ptEdge);
-
-		LineSeg lineSeg = new LineSeg(ptRef1, ptRef2);
-		Point ptProj = lineSeg.perpIntersect(ptEdge.x, ptEdge.y);
-
-		// account for possible rounding errors and ensure the
-		// resulting line is straight
-		if (Math.abs(ptProj.x - ptRef2.x) < Math.abs(ptProj.y - ptRef2.y))
-			ptProj.x = ptRef2.x;
-		else
-			ptProj.y = ptRef2.y;
-		
-		return ptProj;
-	}
-	
-	/**
-	 * Utility method used to calculate the orthongaol line segment that connects to the
-	 * given anchor location from a reference point.
-	 * 
-	 * @param conn <code>Connection</code> figure used to translate the point coordinates
-	 * @param anchor the <code>ConnectionAnchor</code> to retrieve the location given a reference 
-	 * point
-	 * @param ref the <code>Point</code> that is a reference from which the edge point is 
-	 * calculated
-	 * @return <code>Point</code> that is on a legitimate connection location of the 
-	 * <code>ConnectionAnchor</code> owner shape.
-	 */	
-	public static LineSeg getOrthogonalLineSegToAnchorLoc(
-			Connection conn,
-			ConnectionAnchor anchor,
-			Point ref) {
-			
-			assert anchor != null && anchor.getOwner() != null;
-			
-			Point ptAbsRef = getEdgePoint(conn, anchor, ref);
-			conn.translateToAbsolute(ptAbsRef);
-			Point ptEdge = anchor.getLocation(ptAbsRef);
-			conn.translateToRelative(ptEdge);
-			
-			LineSeg result = new LineSeg(ptEdge, ref);
-			if (!result.isHorizontal() && !result.isVertical()) {
-				if (Math.abs(result.getOrigin().x - result.getTerminus().x) < 
-					Math.abs(result.getOrigin().y - result.getTerminus().y)) {
-					result.setTerminus(new Point(result.getOrigin().x, result.getTerminus().y));
-				}
-				else {
-					result.setTerminus(new Point(result.getTerminus().x, result.getOrigin().y));
-				}
-			}
-			
-			return result;
-	}
-    
-    /**
-     * Returns a copy of the bounds of this figure or if the figure is a
-     * <code>Connection</code> the bounds of the pointlist will be returned.
-     * 
-     * @param figure
-     * @return a copy of the bounds
-     */
-    private static Rectangle getBounds(IFigure figure) {
-        return figure instanceof Connection ? ((Connection) figure).getPoints()
-            .getBounds().getCopy()
-            : figure.getBounds().getCopy();
-    }
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RectilinearRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RectilinearRouter.java
deleted file mode 100644
index c53c4f0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RectilinearRouter.java
+++ /dev/null

@@ -1,675 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- *
- * RectilinearRouter which routes the Connection so that the lines
- * are always vertical or horizontal.
- */
-public class RectilinearRouter extends ObliqueRouter implements OrthogonalRouter {
-
-	/**
-     * removeSegmentsInViews
-     * This method will parse through all the line segments in the given 
-     * polyline and remove any of the segments that intersect with the 
-     * start and end figures.
-     * 
-	 * @param conn Connection figure that is used to access anchors
-	 * @param newLine PointList that will be modified by the routine.
-	 * @return boolean true if method change newLine PointList, false otherwise
-	 */
-	protected boolean removeSegmentsInViews(Connection conn, PointList newLine) {
-		// Ignore the first and last points
-		PointList newPoints = new PointList(newLine.size());
-		Point ptStart = new Point(newLine.getFirstPoint());
-		Point ptEnd = new Point(newLine.getLastPoint());
-		for (int i = 0; i < newLine.size(); i++) {
-			if (i != 0 && i != newLine.size() - 1)
-				newPoints.addPoint(new Point(newLine.getPoint(i)));
-		}
-
-		if (newPoints.size() < 3)
-			return false;
-
-		int lastIntersect = 0;
-		int count = 0;
-		boolean found = false;
-        boolean bChanged = false;
-
-		if (conn.getSourceAnchor().getOwner() == null)
-			return false;
-
-		Rectangle startRect =
-			new Rectangle(conn.getSourceAnchor().getOwner().getBounds());
-		conn.getSourceAnchor().getOwner().translateToAbsolute(startRect);
-		conn.translateToRelative(startRect);
-
-		for (int i = 0; i < newPoints.size() - 1; i++) {
-			boolean in1 = startRect.contains(newPoints.getPoint(i));
-			boolean in2 = startRect.contains(newPoints.getPoint(i + 1));
-			if (in1 != in2) {
-				lastIntersect = count;
-				found = true;
-			} else if (!(in1 || in2)) // Neither intersect, so skip out
-				{
-				break;
-			}
-			++count;
-		}
-
-		// remove segments before the one that finally
-		// intersects:
-		if (found) {
-			for (int i = 0; i <= lastIntersect; ++i) {
-				newPoints.removePoint(0);
-                bChanged = true;
-            }
-		}
-
-		lastIntersect = count = newLine.size() - 1;
-		found = false;
-
-		if (conn.getTargetAnchor().getOwner() == null)
-			return false;
-
-		Rectangle endRect =
-			new Rectangle(conn.getTargetAnchor().getOwner().getBounds());
-		conn.getTargetAnchor().getOwner().translateToAbsolute(endRect);
-		conn.translateToRelative(endRect);
-
-		for (int i = newPoints.size() - 1; i > 0; i--) {
-			boolean in1 = endRect.contains(newPoints.getPoint(i));
-			boolean in2 = endRect.contains(newPoints.getPoint(i - 1));
-			if (in1 != in2) {
-				lastIntersect = count;
-				found = true;
-			} else if (!(in1 || in2)) // Neither intersect, so skip out
-				{
-				break;
-			}
-			--count;
-		}
-
-		// remove segments after the one that finally
-		// intersects:
-		if (found) {
-			for (int i = newPoints.size() - 1; i >= lastIntersect; --i) {
-				newPoints.removePoint(newPoints.size() - 1);
-                bChanged = true;
-            }
-		}
-
-		if (newPoints.size() != newLine.size()) {
-			newLine.removeAllPoints();
-			newLine.addPoint(ptStart);
-			for (int i = 0; i < newPoints.size(); i++)
-				newLine.addPoint(new Point(newPoints.getPoint(i)));
-			newLine.addPoint(ptEnd);
-		}
-        
-        return bChanged;
-	}
-    
-	/**
-     * updateToBiTerminal
-     * Determines if the polyline has only two bendpoints (endpoints) and if so,
-     * updates the connection to be consistent with the Rectilinear router - i.e.
-     * vertical or horizontal alignment.
-     * 
-	 * @param conn Connection that is being routed.
-	 * @param newLine PointList to be checked and modified if bi-terminal routing is
-     * possible
-	 * @return true if PointList is a candidate for bi-terminal routing, false otherwise
-	 */
-	protected boolean updateToBiTerminal(Connection conn, PointList newLine) {
-		boolean retVal = false;
-
-		if (newLine.size() == 2) {
-			Point ptOrig = new Point(newLine.getPoint(0));
-			Point ptTerm = new Point(newLine.getPoint(1));
-
-			Dimension offsets = new Dimension(10, 10);
-			conn.translateToRelative(offsets);
-			
-			Rectangle bBoxF, bBoxT;
-			if (conn.getSourceAnchor().getOwner() != null) {
-				bBoxF = getBounds(conn.getSourceAnchor().getOwner());
-				conn.getSourceAnchor().getOwner().translateToAbsolute(bBoxF);
-				conn.translateToRelative(bBoxF);
-			} else
-				bBoxF = new Rectangle(ptOrig.x - offsets.width / 2, ptOrig.y - offsets.height / 2, 
-											offsets.width, offsets.height);
-
-            if (conn.getTargetAnchor().getOwner() != null) {
-                bBoxT = getBounds(conn.getTargetAnchor().getOwner());
-				conn.getTargetAnchor().getOwner().translateToAbsolute(bBoxT);
-				conn.translateToRelative(bBoxT);
-			} else
-				bBoxT = new Rectangle(ptTerm.x - offsets.width / 2, ptTerm.y - offsets.height / 2, 
-											offsets.width, offsets.height);
-
-			int ix1 = Math.max(bBoxF.getLeft().x, bBoxT.getLeft().x);
-			int ix2 = Math.min(bBoxF.getRight().x, bBoxT.getRight().x);
-
-			Point posF = bBoxF.getCenter();
-			Point posT = bBoxT.getCenter();
-
-			Ray origSeg = new Ray(ptOrig, ptTerm);
-			boolean isOblique = (origSeg.y != 0 && origSeg.x != 0);
-
-			if (ix1 <= ix2) {
-				// The two boundboxes overlap each other so we can create a single
-				// segment that goes between them, but only if we have a nonrectilinear line
-				// or the existing segment is already is routed between the two icons
-				if (isOblique || ptOrig.x < ix1 || ptOrig.x > ix2) {
-					if (isOblique && ptOrig.x > ix1 && ptOrig.x < ix2) 
-						posF.x = ptOrig.x;
-					else
-						posF.x = ix1 + (ix2 - ix1) / 2;
-					
-					posT.x = posF.x;
-
-					newLine.removeAllPoints();
-					newLine.addPoint(posF);
-					newLine.addPoint(posT);
-					retVal = true;
-				}
-			} else {
-				int iy1 = Math.max(bBoxF.getTop().y, bBoxT.getTop().y);
-				int iy2 = Math.min(bBoxF.getBottom().y, bBoxT.getBottom().y);
-				if (iy1 <= iy2) {
-					// The two boundboxes overlap each other so we can create a single
-					// segment that goes between them, but only if we have a nonrectilinear line
-					// or the existing segment is already is routed between the two icons
-					if (isOblique || ptOrig.y < iy1 || ptOrig.y > iy2) {
-						if (isOblique && ptOrig.y > iy1 && ptOrig.y < iy2) 
-							posF.y = ptOrig.y;
-						else
-							posF.y = iy1 + (iy2 - iy1) / 2;
-						posT.y = posF.y;
-
-						newLine.removeAllPoints();
-						newLine.addPoint(posF);
-						newLine.addPoint(posT);
-						retVal = true;
-					}
-				}
-			}
-		}
-
-		return retVal;
-	}
-    
-	/**
-     * resetEndPointsToEdge
-     * Resets both of the end points in the polyline to be anchored properly on the
-     * edge of the start and end figures.
-     * @see org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter#resetEndPointsToEdge(org.eclipse.draw2d.Connection, org.eclipse.draw2d.geometry.PointList)
-     */   
-    protected void resetEndPointsToEdge(Connection conn, PointList newLine) {
-
-        // if we are reorienting, then just default to the super class implementation and
-        // don't try to do rectilinear routing.
-        if (isReorienting(conn)) {
-            super.resetEndPointsToEdge(conn, newLine);
-            return;
-        }
-        
-        Point origin = null;
-        if (conn.getSourceAnchor().getOwner() instanceof Connection) {
-            origin = getIntersectionPoint((Connection) conn.getSourceAnchor()
-                .getOwner(), new LineSeg(newLine.getPoint(1), newLine
-                .getPoint(0)));
-        }
-        if (origin == null) {
-            LineSeg edgeLine1 = OrthogonalRouterUtilities
-                .getOrthogonalLineSegToAnchorLoc(conn, conn.getSourceAnchor(),
-                    newLine.getPoint(1));
-            origin = edgeLine1.getOrigin();
-        }
-
-        Point terminus = null;
-        if (conn.getTargetAnchor().getOwner() instanceof Connection) {
-            int numPoints = newLine.size();
-            terminus = getIntersectionPoint((Connection) conn.getTargetAnchor()
-                .getOwner(), new LineSeg(newLine.getPoint(numPoints - 2),
-                newLine.getPoint(numPoints - 1)));
-        }
-        if (terminus == null) {
-            LineSeg edgeLine2 = OrthogonalRouterUtilities
-                .getOrthogonalLineSegToAnchorLoc(conn, conn.getTargetAnchor(),
-                    newLine.getPoint(newLine.size() - 2));
-            terminus = edgeLine2.getOrigin();
-        }
-
-        if (origin != null && terminus != null) {
-            newLine.setPoint(origin, 0);
-            if (newLine.size() > 2) {
-                for (int i=0; i<2; i++) {
-                    Point ptCurrent = newLine.getPoint(i);
-                    Point ptNext = newLine.getPoint(i+1);
-                    makeOrthogonal(ptCurrent, ptNext);
-                    
-                    newLine.setPoint(ptNext, i+1);
-                }
-            }
-            
-            newLine.setPoint(terminus, newLine.size() - 1);
-            if (newLine.size() > 2) {
-                for (int i=newLine.size() - 1; i>=newLine.size() - 2; i--) {
-                    Point ptCurrent = newLine.getPoint(i);
-                    Point ptNext = newLine.getPoint(i-1);
-                    makeOrthogonal(ptCurrent, ptNext);
-                    
-                    newLine.setPoint(ptNext, i-1);
-                }
-            }
-        } else
-            super.resetEndPointsToEdge(conn, newLine);
-    }
-
-	private void makeOrthogonal(Point ptCurrent, Point ptNext) {
-		if (Math.abs(ptNext.x - ptCurrent.x) < Math.abs(ptNext.y - ptCurrent.y)) {
-		    ptNext.x = ptCurrent.x;
-		} else {
-		    ptNext.y = ptCurrent.y;
-		}
-	}
-
-	private static int CONNECTION_OFFSET = 26;
-
-	/**
-     * updateIfNotRectilinear
-     * This is the core method that will calculate the rectilinear version of the
-     * polyline points.
-     * 
-	 * @param conn Connection that is the owner of the PointList
-	 * @param newLine PointList to be checked and modified
-	 */
-	protected void updateIfNotRectilinear(Connection conn, PointList newLine) {
-		boolean isRectilinear = true;
-
-		for (int i = 0; i < newLine.size() - 1; i++) {
-			Ray segVector =
-				new Ray(newLine.getPoint(i), newLine.getPoint(i + 1));
-
-			if (segVector.x != 0 && segVector.y != 0) {
-				isRectilinear = false;
-				break;
-			}
-		}
-        
-        // first see if it is already rectilinear already
-        if (isRectilinear && areEndsInBounds(conn, newLine)) {
-            return;
-        }
-
-        // now try to turn it into a biterminal (i.e. one straight line)
-        if (updateToBiTerminal(conn, newLine) && areEndsInBounds(conn, newLine)) {
-            return;
-        }
-
-		// We've got a line that isn't rectilinear, so let's route
-		// General rules based on number of segments starting with
-		// if starting with two points (one segment) take shortest distance first.
-		// if starting with three points (two segments) put longest segment
-		//	as the middle segment
-		OrthogonalRouterUtilities.resetEndPointsToCenter(conn, newLine);
-
-		PointList oldPoints = PointListUtilities.copyPoints(newLine);
-
-		PointList newPoints = new PointList();
-		newPoints.addPoint(oldPoints.removePoint(0));
-		while (oldPoints.size() > 0) {
-			if (oldPoints.size() >= 2) {
-				// This starts at point where last left off,
-				// or the starting point if first time through.
-				Point p0 = newPoints.getLastPoint();
-				Point p1 = oldPoints.removePoint(0);
-				Point p2 = oldPoints.removePoint(0);
-
-				// make the shortest segment first.
-				if (Math.abs(p2.y - p0.y) > Math.abs(p2.x - p0.x)) {
-					// x has shortest segment
-					newPoints.addPoint(new Point(p1.x, p0.y));
-					newPoints.addPoint(new Point(p1.x, p2.y));
-				} else // y has shortest segment first. 
-					{
-					newPoints.addPoint(new Point(p0.x, p1.y));
-					newPoints.addPoint(new Point(p2.x, p1.y));
-				}
-				newPoints.addPoint(p2);
-			} else if (oldPoints.size() == 1) {
-				Point p0 = newPoints.getLastPoint();
-				Point p1 = oldPoints.removePoint(0);
-				if (Math.abs(p1.y - p0.y) > Math.abs(p1.x - p0.x)) {
-					newPoints.addPoint(new Point(p1.x, p0.y));
-				} else {
-					newPoints.addPoint(new Point(p0.x, p1.y));
-				}
-				newPoints.addPoint(p1);
-			}
-
-		}
-		oldPoints.removeAllPoints();
-		// Now make a pass through to collapse any redundent segments.
-		oldPoints.addPoint(newPoints.removePoint(0));
-		while (newPoints.size() >= 2) {
-			Point p0 = oldPoints.getLastPoint();
-			Point p1 = newPoints.getPoint(0);
-			Point p2 = newPoints.getPoint(1);
-			if (p0.x == p1.x && p0.x == p2.x) {
-				// Have two vertical segments in a row
-				// get rid of the point between
-				newPoints.removePoint(0);
-			} else if (p0.y == p1.y && p0.y == p2.y) {
-				// Have two horizontal segments in a row
-				// get rid of the point between
-				newPoints.removePoint(0);
-			} else {
-				oldPoints.addPoint(newPoints.removePoint(0));
-			}
-		}
-		while (newPoints.size() > 0) {
-			oldPoints.addPoint(newPoints.removePoint(0));
-		}
-
-		// set the newly routed line back into newLine
-		newLine.removeAllPoints();
-		for (int i = 0; i < oldPoints.size(); i++)
-			newLine.addPoint(oldPoints.getPoint(i));
-	}
-
-	/**
-     * checkEndSegments
-     * This method is useful to ensure that the arrow heads and / or tail adornments
-     * are always visible irrespective of any routing that occurs.  This is accomplished
-     * by assert a minimum length of the line segments that are at the beginning and end
-     * of the PointList. 
-     * 
-	 * @param conn Connection to check the end segments of
-	 * @param newLine PointList to modify
-     * @return boolean true if end segments are ok, false otherwise.
-	 */ 
-	protected boolean checkEndSegments(Connection conn, PointList newLine) {
-		boolean bOk = true;
-        
-		Dimension connection_offset = new Dimension(CONNECTION_OFFSET, 0);
-		conn.translateToRelative(connection_offset);
-		
-        // now check for end segments length and fix up after.
-		if (newLine.size() > 2) {
-			Point ptFix = new Point(newLine.getPoint(1));
-			if (!checkEndSegment(conn, conn.getSourceAnchor(), ptFix, connection_offset.width / 2)) {
-				newLine.setPoint(ptFix, 1);
-				// check next point to ensure rectilinear
-				Point ptNext = newLine.getPoint(2);
-				makeOrthogonal(ptFix, ptNext);
-                
-                newLine.setPoint(ptNext, 2);
-                bOk = false;
-			}
-
-			ptFix = new Point(newLine.getPoint(newLine.size() - 2));
-			if (!checkEndSegment(conn, conn.getTargetAnchor(), ptFix, connection_offset.width / 2)) {
-				newLine.setPoint(ptFix, newLine.size() - 2);
-				// check next point to ensure rectilinear
-				Point ptNext = newLine.getPoint(newLine.size() - 3);
-				makeOrthogonal(ptFix, ptNext);
-                
-                newLine.setPoint(ptNext, newLine.size() - 3);
-                bOk = false;
-			}
-		}
-        
-        return bOk;
-	}
-    
-    /**
-     * straightenPoints
-     * This is a simpler version of the @see updateIfNotRectilinear that simply ensures
-     * that the lines are horizontal or vertical without any intelligence in terms of 
-     * shortest distance around a rectangle.
-     * 
-	 * @param newLine PointList to check for rectilinear qualities and change if necessary.
-	 */
-	protected void straightenPoints(PointList newLine) {
-        for (int i=0; i<newLine.size()-1; i++) {
-            Point ptCurrent = newLine.getPoint(i);
-            Point ptNext = newLine.getPoint(i+1);
-            makeOrthogonal(ptCurrent, ptNext);
-            
-            newLine.setPoint(ptNext, i+1);
-        }
-    }
-
-	/**
-	 * checkEndSegment
-	 * This method is useful to ensure that the arrow heads and / or tail adornments
-	 * are always visible irrespective of any routing that occurs.  This is accomplished
-	 * by assert a minimum length of the line segments that are at the beginning and end
-	 * of the PointList. 
-	 * 
-	 * @param conn Connection that is used to reference the source / target anchors
-	 * @param anchor ConnectionAnchor used to calculate the edge point
-	 * @param ptNext Point that is checked against the edge to see if it's in violation.  It will
-	 * be modified to a correct value if the method returns false.
-     * @param offset int value representing the offset allowed from the shape edge.
-	 * @return boolean true if end segment is ok, false otherwise.
-	 */
-	protected boolean checkEndSegment(
-		Connection conn,
-		ConnectionAnchor anchor,
-		Point ptNext,
-        int offset) {
-		LineSeg seg = OrthogonalRouterUtilities.getOrthogonalLineSegToAnchorLoc(conn, anchor, ptNext);
-		if (seg != null) {
-			// ensure target line segments is bigger then a tolerance level (average arrow size)
-			if (seg.length() < offset) {
-				seg.pointOn(offset, LineSeg.KeyPoint.ORIGIN, ptNext);
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private static final int maxRoutingDepth = 10;
-
-	/**
-     * Overridden method from ObliqueRouter that will perform the conversion of the
-     * polyline to a rectilinear version.
-     * @see org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter#routeLine(org.eclipse.draw2d.Connection, int, org.eclipse.draw2d.geometry.PointList)
-	 */
-	public void routeLine(
-		Connection conn,
-		int nestedRoutingDepth,
-		PointList newLine) {
-		boolean skipNormalization =
-			(routerFlags & ROUTER_FLAG_SKIPNORMALIZATION) != 0;
-        
-        int nStartSize = newLine.size();
-        
-		// if we are reorienting, then just default to the super class implementation and
-		// don't try to do rectilinear routing.
-		if (isReorienting(conn)) {
-			super.routeLine(conn, nestedRoutingDepth, newLine);
-			resetEndPointsToEdge(conn, newLine);
-			return;
-		}
-
-		// get the original line
-		if (checkSelfRelConnection(conn, newLine)) {
-			 checkEndSegments(conn, newLine);
-			 resetEndPointsToEdge(conn, newLine);
-			return;
-		}
-
-		// We've eliminated any unnecessary segments,
-		// Now let's make sure everything is rectilinear
-		updateIfNotRectilinear(conn, newLine);
-
-		// Because we have created a polyline, it may have multiple
-        // points of intersection with the originating and
-        // terminating views.  We need to find the last intersection
-        // point.
-        boolean normalizationChangedLine = false;
-		if (!skipNormalization) {
-			normalizationChangedLine = removeSegmentsInViews(conn, newLine);
-	    	normalizationChangedLine |= removePointsInViews(conn, newLine); 
-            
-            // Normalize the polyline to remove unwanted segments
-			Dimension tolerance = new Dimension(3, 0);
-			if (!RouterHelper.getInstance().isFeedback(conn))
-				tolerance = (Dimension)MapModeUtil.getMapMode(conn).DPtoLP(tolerance);
-			
-            normalizationChangedLine |= PointListUtilities.normalizeSegments(newLine, tolerance.width);
-		}
-		
-        // check the end segments to ensure they conform to a minimum distance.
-        checkEndSegments(conn, newLine);
-          
-		resetEndPointsToEdge(conn, newLine); 
-                
-        // final fix-up to ensure straight lines  
-        straightenPoints(newLine);
-         
-		if (normalizationChangedLine) {
-			// May need to reposition endpoints again, so recurse. It must be
-			// the case that normalization reduces the complexity of the line,
-			// so that the recursion terminates.
-			if (nestedRoutingDepth < maxRoutingDepth) {
-				nestedRoutingDepth++; 
-				routeLine(conn, nestedRoutingDepth, newLine);
-				// If unwinding from setting to 0, then don't decrement.
-				if (nestedRoutingDepth != 0)
-					nestedRoutingDepth--;
-			}
-		}
-        else {
-            Rectangle startRect = getBounds(conn.getSourceAnchor().getOwner());
-            conn.getSourceAnchor().getOwner().translateToAbsolute(startRect);
-            conn.translateToRelative(startRect);
-            
-            Dimension buffer = new Dimension(2, 2);
-    		conn.translateToRelative(buffer);
-    		
-            startRect.expand(buffer.width, buffer.height);
-              
-            Rectangle endRect = getBounds(conn.getTargetAnchor().getOwner());
-            conn.getTargetAnchor().getOwner().translateToAbsolute(endRect);
-            conn.translateToRelative(endRect);
-            endRect.expand(buffer.width, buffer.height);
-            
-            if (!startRect.contains(newLine.getPoint(0)) ||
-                !endRect.contains(newLine.getPoint(newLine.size() - 1)) ||
-                newLine.size() - nStartSize >= 2) {
-             
-                newLine.removeAllPoints();
-                Point r1 = conn.getSourceAnchor().getReferencePoint();
-                conn.translateToRelative(r1);
-                newLine.addPoint(r1);
-
-                Point r2 = conn.getTargetAnchor().getReferencePoint();
-                conn.translateToRelative(r2);
-                newLine.addPoint(r2);
-                
-                updateIfNotRectilinear(conn, newLine);
-                resetEndPointsToEdge(conn, newLine); 
-            }
-        }
-		//## end RectRouter::routeLine%803842153.body
-	}
-    
-    /**
-     * Returns true if the ends of the line passed in our within the bounds of
-     * the connection's source and target ends.
-     * 
-     * @param connection
-     *            the connection whose source and target ends will be looked at
-     * @param line
-     *            the line in question
-     * @return true if the two ends of the lines are within the bounds; false
-     *         otherwise
-     */
-    private boolean areEndsInBounds(Connection connection, PointList line) {
-        Rectangle startRect = new PrecisionRectangle(getBounds(connection
-            .getSourceAnchor().getOwner()));
-        connection.getSourceAnchor().getOwner().translateToAbsolute(startRect);
-        connection.translateToRelative(startRect);
-
-        Rectangle endRect = new PrecisionRectangle(getBounds(connection
-            .getTargetAnchor().getOwner()));
-        connection.getTargetAnchor().getOwner().translateToAbsolute(endRect);
-        connection.translateToRelative(endRect);
-
-        if (!startRect.contains(line.getPoint(0))
-            || !endRect.contains(line.getPoint(line.size() - 1))) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns a copy of the bounds of this figure or if the figure is a
-     * <code>Connection</code> the bounds of the pointlist will be returned.
-     * 
-     * @param figure
-     * @return a copy of the bounds
-     */
-    private Rectangle getBounds(IFigure figure) {
-        return figure instanceof Connection ? ((Connection) figure).getPoints()
-            .getBounds().getCopy()
-            : figure.getBounds().getCopy();
-    }
-
-    /**
-     * Returns the closest intersection point from the line segment given that
-     * will extend to hit the connection passed in.
-     * 
-     * @param connection
-     *            the connection
-     * @param lineSeg
-     *            the line segment to extend to find intersections with the
-     *            connection
-     * @return the closeest intersecting point or null if there are none
-     */
-    private Point getIntersectionPoint(Connection connection, LineSeg lineSeg) {
-
-        PointList intersections = lineSeg
-            .getLineIntersectionsWithLineSegs(connection.getPoints());
-        if (intersections.size() > 0) {
-            return PointListUtilities.pickClosestPoint(intersections, lineSeg
-                .getOrigin());
-        }
-
-        return null;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RouterHelper.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RouterHelper.java
deleted file mode 100644
index 14b4b60..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RouterHelper.java
+++ /dev/null

@@ -1,516 +0,0 @@
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ShortestPathConnectionRouter;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * Manager class which determines which shortest path connection router to use
- * for a given <code>Connection</code>.
- * 
- * @author sshaw
- * 
- */
-class RouterHelper {
-
-    static private RouterHelper sprm = new RouterHelper(false);
-
-    /**
-     * @return the <code>RouterHelper</code> singleton instance
-     */
-    static public RouterHelper getInstance() {
-        return sprm;
-    }
-
-    private Map routers = new WeakHashMap();
-
-    private Map lastUsedRouter = new WeakHashMap();
-
-    private boolean useGEFRouter = false;
-
-    private RouterHelper(boolean useGEFRouter) {
-        super();
-        this.useGEFRouter = useGEFRouter;
-    }
-
-    /**
-     * @param conn
-     * @param constraint
-     */
-    public void setConstraint(Connection conn, Object constraint) {
-        if (useGEFRouter) {
-            ShortestPathConnectionRouter spcr = getRouter(conn);
-            if (spcr != null)
-                spcr.setConstraint(conn, constraint);
-        }
-    }
-
-    /**
-     * @param conn
-     */
-    public void remove(Connection conn) {
-        if (useGEFRouter) {
-            ShortestPathConnectionRouter spcr = getRouter(conn);
-            if (spcr != null)
-                spcr.remove(conn);
-        }
-    }
-
-    /**
-     * @param conn
-     */
-    public void invalidate(Connection conn) {
-        if (useGEFRouter) {
-            ShortestPathConnectionRouter spcr = getRouter(getSourceContainer(conn));
-            if (spcr != null)
-                spcr.invalidate(conn);
-        }
-    }
-    
-    /**
-     * @param conn the <code>Connection</code> that is to be check if it is a feedback
-     * connection or not.
-     * @return <code>true</code> is it is a feedback connection, <code>false</code> otherwise.
-     */
-    public boolean isFeedback(Connection conn) {
-        Dimension dim = new Dimension(100, 100);
-        Dimension dimCheck = dim.getCopy();
-        conn.translateToRelative(dimCheck);
-        return dim.equals(dimCheck);
-    }
-    
-    /**
-     * @param conn the <code>Connection</code> that is to be routed.
-     * @return the <code>PointList</code> that is the list of points that are
-     * a direct mapping of the constraint points.
-     */
-    public PointList routeFromConstraint(Connection conn) {
-        List bendpoints = (List)conn.getConnectionRouter().getConstraint(conn);
-        if (bendpoints == null)
-            bendpoints = Collections.EMPTY_LIST;
-
-        PointList points = new PointList(bendpoints.size());
-
-        for (int i = 0; i < bendpoints.size(); i++) {
-            Bendpoint bp = (Bendpoint) bendpoints.get(i);
-            points.addPoint(bp.getLocation());
-        }
-
-        if (bendpoints.size() == 0) {
-            Point r1 = conn.getSourceAnchor().getReferencePoint().getCopy();
-            conn.translateToRelative(r1);
-            points.addPoint(r1);
-
-            Point r2 = conn.getTargetAnchor().getReferencePoint().getCopy();
-            conn.translateToRelative(r2);
-            points.addPoint(r2);
-        }
-        
-        return points;
-    }
-
-    /**
-     * @param conn the <code>Connection</code> that is to be routed.
-     * @return the <code>PointList</code> that is the list of points that represent
-     * the closest distance possible to route the line.
-     */
-    public PointList routeClosestDistance(Connection conn) {
-        PointList newLine = routeFromConstraint(conn);
-        
-        Point ptOrig = new Point(newLine.getFirstPoint());
-        Point ptTerm = new Point(newLine.getLastPoint());
-
-        newLine.removeAllPoints();
-        newLine.addPoint(ptOrig);
-        newLine.addPoint(ptTerm);
-        
-        return newLine;
-    }
-    
-    /**
-     * @param conn the <code>Connection</code> that is to be routed.
-     * @return the <code>PointList</code> that is the list of points that are
-     * avoiding all the possible obstructions in the container for the connection.
-     */
-    public PointList routeAroundObstructions(Connection conn) {
-        PointList newLine = null;
-        
-        if (useGEFRouter) {
-            newLine = new PointList();
-            
-            ShortestPathConnectionRouter spcr = RouterHelper.getInstance().getRouter(conn);
-            if (spcr == null)
-                newLine = routeFromConstraint(conn);
-            else {
-                spcr.route(conn);
-                newLine.removeAllPoints();
-                newLine.addAll(conn.getPoints());
-            }
-        } else {
-            newLine = routeClosestDistance(conn);
-            
-            Point infimumPoint = PointListUtilities.getPointsInfimum(newLine);
-            Point supremumPoint = PointListUtilities.getPointsSupremum(newLine);
-
-            Ray diameter = new Ray(infimumPoint, supremumPoint);
-            Rectangle rPoly = new Rectangle(infimumPoint.x, infimumPoint.y,
-                diameter.x, diameter.y);
-
-            List collectObstructs = new LinkedList();
-
-            IFigure parent = getRouterContainerFigure(conn);
-
-            // don't bother routing if there is no attachments
-            if (parent == null)
-                return routeFromConstraint(conn);
-
-            // set the end points back to the reference points - this will avoid
-            // errors, where
-            // an edge point is erroneously aligned with a specific edge, even
-            // though the avoid
-            // obstructions would suggest attachment to another edge is more
-            // appropriate
-            Point ptRef = conn.getSourceAnchor().getReferencePoint();
-            conn.translateToRelative(ptRef);
-            newLine.setPoint(ptRef, 0);
-            ptRef = conn.getTargetAnchor().getReferencePoint();
-            conn.translateToRelative(ptRef);
-            newLine.setPoint(ptRef, newLine.size() - 1);
-
-            // TBD - optimize this
-            // increase connect view rect by width or height of diagram
-            // to maximize views included in the obstruction calculation
-            // without including all views in the diagram
-            Rectangle rBoundingRect = new Rectangle(parent.getBounds());
-            parent.translateToAbsolute(rBoundingRect);
-            conn.translateToRelative(rBoundingRect);
-
-            if (rPoly.width > rPoly.height) {
-                rPoly.y = rBoundingRect.y;
-                rPoly.setSize(rPoly.width, rBoundingRect.height);
-            } else {
-                rPoly.x = rBoundingRect.x;
-                rPoly.setSize(rBoundingRect.width, rPoly.height);
-            }
-
-            List children = parent.getChildren();
-            for (int i = 0; i < children.size(); i++) {
-                IFigure child = (IFigure) children.get(i);
-
-                if (child != conn.getSourceAnchor().getOwner() 
-                    && child != conn.getTargetAnchor().getOwner() 
-                    && !FigureUtilities.isAncestor(child, conn.getSourceAnchor().getOwner())
-                    && !FigureUtilities.isAncestor(child, conn.getTargetAnchor().getOwner())) {
-                    Rectangle rObstruct = new Rectangle(child.getBounds());
-                    child.translateToAbsolute(rObstruct);
-                    conn.translateToRelative(rObstruct);
-
-                    // inflate slightly
-                    rObstruct.expand(1, 1);
-
-                    if (rPoly.intersects(rObstruct)) {
-                        collectObstructs.add(rObstruct);
-                    }
-                }
-            }
-
-            // parse through obstruction collect and combine rectangle that
-            // intersect with each other
-            if (collectObstructs.size() > 0) {
-                Dimension buffer = new Dimension(ROUTER_OBSTRUCTION_BUFFER + 1,
-                    0);
-                if (!isFeedback(conn))
-                    buffer = (Dimension) MapModeUtil.getMapMode(conn).DPtoLP(
-                        buffer);
-                final int inflate = buffer.width;
-
-                List collapsedRects = collapseRects(collectObstructs, inflate);
-                collectObstructs.clear();
-
-                // Loop through the collapsedRects list until there are no more
-                // intersections
-                boolean bRouted = true;
-                while (bRouted && !collapsedRects.isEmpty()) {
-                    ListIterator listIter = collapsedRects.listIterator();
-                    bRouted = false;
-
-                    while (listIter.hasNext()) {
-                        Rectangle rObstruct = (Rectangle) listIter.next();
-                        PointList routedPoly = PointListUtilities
-                            .routeAroundRect(newLine, rObstruct, 0, false,
-                                inflate);
-
-                        if (routedPoly != null) {
-                            bRouted = true;
-                            newLine.removeAllPoints();
-                            newLine.addAll(routedPoly);
-                        } else
-                            collectObstructs.add(rObstruct);
-                    }
-
-                    List tempList = collapsedRects;
-                    collapsedRects = collectObstructs;
-                    tempList.clear();
-                    collectObstructs = tempList;
-
-                    if (bRouted && !collapsedRects.isEmpty())
-                        resetEndPointsToEdge(conn, newLine);
-                }
-            }
-        }
-        
-        return newLine;
-    }
-
-    /**
-     * @param conn the <code>Connection</code> that is to have used to determine the end
-     * points for reseting the <code>newLine</code> parameter.
-     * @param newLine the <code>PointList</code> to reset the end points of to be on the
-     * edge of the connection source and target nodes.
-     */
-    public void resetEndPointsToEdge(Connection conn, PointList newLine) {
-        if (newLine.size() <= 1)
-            return;
-
-        Point ptS2 = newLine.getPoint(1);
-        Point ptAbsS2 = new Point(ptS2);
-        conn.translateToAbsolute(ptAbsS2);
-        if (newLine.size() == 2)
-            ptAbsS2 = conn.getTargetAnchor().getReferencePoint();
-        Point ptAbsS1 = conn.getSourceAnchor().getLocation(ptAbsS2);
-        Point ptS1 = new Point(ptAbsS1);
-        conn.translateToRelative(ptS1);
-
-        Point ptE2 = newLine.getPoint(newLine.size() - 2);
-        Point ptAbsE2 = new Point(ptE2);
-        conn.translateToAbsolute(ptAbsE2);
-        if (newLine.size() == 2)
-            ptAbsE2 = ptAbsS1;
-        Point ptE1 = new Point(conn.getTargetAnchor().getLocation(ptAbsE2));
-        conn.translateToRelative(ptE1);
-
-        newLine.setPoint(ptS1, 0);
-        // convert reference points back to relative to avoid rounding issues.
-        newLine.setPoint(ptE1, newLine.size() - 1);
-        if (newLine.size() != 2) {
-            ptS2 = ptAbsS2;
-            conn.translateToRelative(ptS2);
-            newLine.setPoint(ptS2, 1);
-            ptE2 = ptAbsE2;
-            conn.translateToRelative(ptE2);
-            newLine.setPoint(ptE2, newLine.size() - 2);
-        }
-    }
-
-    private final static int ROUTER_OBSTRUCTION_BUFFER = 12;
-
-    /**
-     * This method will collapse all the rectangles together that intersect in
-     * the given List. It utilizes a recursive implementation.
-     */
-    private List collapseRects(List collectRect, int inflate) {
-        if (collectRect.size() == 0)
-            return new LinkedList();
-
-        Rectangle rCompare = new Rectangle((Rectangle) collectRect.remove(0));
-        List collapsedRects = collapseRects(rCompare, collectRect, inflate);
-        collapsedRects.add(rCompare);
-
-        return collapsedRects;
-    }
-
-    /**
-     * Recursively called method called by collapseRects(List collectRect).
-     */
-    private List collapseRects(Rectangle rCompare, List collectRect, int inflate) {
-        List newCollect = new LinkedList();
-        Rectangle rCompare1 = new Rectangle(rCompare);
-
-        // compare rectangle with each rectangle in the rest of the list
-        boolean intersectionOccurred = false;
-        ListIterator listIter = collectRect.listIterator();
-        while (listIter.hasNext()) {
-            Rectangle rCompare2 = new Rectangle((Rectangle) listIter.next());
-
-            Rectangle rExpandRect1 = new Rectangle(rCompare1);
-            Rectangle rExpandRect2 = new Rectangle(rCompare2);
-
-            // inflate the rect by the obstruction buffer for the intersection
-            // calculation so that we won't try to route through a space smaller
-            // then necessary
-            rExpandRect1.expand(inflate, inflate);
-            rExpandRect2.expand(inflate, inflate);
-
-            if (rExpandRect1.intersects(rExpandRect2)) {
-                rCompare1.union(rCompare2);
-                intersectionOccurred = true;
-            } else {
-                newCollect.add(rCompare2);
-            }
-        }
-
-        rCompare.setBounds(rCompare1);
-
-        if (newCollect.size() > 0) {
-            if (intersectionOccurred) {
-                return collapseRects(rCompare, newCollect, inflate);
-            } else {
-                Rectangle rFirst = new Rectangle((Rectangle) newCollect
-                    .remove(0));
-                List finalCollapse = collapseRects(rFirst, newCollect, inflate);
-                finalCollapse.add(rFirst);
-
-                return finalCollapse;
-            }
-        } else {
-            return newCollect;
-        }
-    }
-
-    /**
-     * @param conn
-     * @return
-     */
-    private IFigure getRouterContainerFigure(Connection conn) {
-        IFigure sourcefigContainer = getSourceContainer(conn);
-        IFigure targetfigContainer = getTargetContainer(conn);
-        IFigure commonFig = FigureUtilities.findCommonAncestor(
-            sourcefigContainer, targetfigContainer);
-
-        IFigure routerContainer = null;
-
-        if (sourcefigContainer == null || targetfigContainer == null)
-            return null;
-
-        if (sourcefigContainer == targetfigContainer) {
-            routerContainer = sourcefigContainer;
-        } else if (commonFig != sourcefigContainer
-            && commonFig != targetfigContainer) {
-            routerContainer = commonFig;
-        } else {
-            // find the end that isn't the common ancestor and use it's bounds
-            // to find
-            // the optimal end for the avoid obstructions algorithm
-            IFigure checkFig = sourcefigContainer;
-            if (commonFig == sourcefigContainer)
-                checkFig = targetfigContainer;
-
-            // decide which end of the connection exists more in it's container
-            // relative
-            // to the other end, and use that container to determine which
-            // router to
-            // return.
-            Rectangle checkRect = checkFig.getBounds().getCopy();
-            checkFig.translateToAbsolute(checkRect);
-            conn.translateToRelative(checkRect);
-            int sourceDistance = findDistanceToEndRect(conn.getPoints(),
-                checkRect);
-            int targetDistance = (int) PointListUtilities.getPointsLength(conn
-                .getPoints())
-                - sourceDistance;
-
-            if (sourceDistance > targetDistance)
-                routerContainer = sourcefigContainer;
-            else
-                routerContainer = targetfigContainer;
-        }
-
-        return routerContainer;
-    }
-
-    /**
-     * @param conn
-     * @return
-     */
-    private ShortestPathConnectionRouter getRouter(Connection conn) {
-        IFigure container = getRouterContainerFigure(conn);
-        if (container == null)
-            return null;
-
-        ShortestPathConnectionRouter spcr = getRouter(container);
-        ShortestPathConnectionRouter lur = (ShortestPathConnectionRouter) lastUsedRouter
-            .get(conn);
-        if (lur != spcr) {
-            if (lur != null)
-                lur.remove(conn);
-            spcr.setConstraint(conn, conn.getRoutingConstraint());
-        }
-        lastUsedRouter.put(conn, spcr);
-
-        return spcr;
-    }
-
-    private IFigure getSourceContainer(Connection conn) {
-        if (conn.getSourceAnchor() != null)
-            return findContainerFigure(conn.getSourceAnchor().getOwner());
-        
-        return null;
-    }
-
-    private IFigure getTargetContainer(Connection conn) {
-        if (conn.getTargetAnchor() != null)
-            return findContainerFigure(conn.getTargetAnchor().getOwner());
-        
-        return null;
-    }
-
-    /**
-     * findContainerFigure Recursive method to find the figure that owns the
-     * children the connection is connecting to.
-     * 
-     * @param fig
-     *            IFigure to find the shape container figure parent of.
-     * @return Container figure
-     */
-    private IFigure findContainerFigure(IFigure fig) {
-        if (fig == null)
-            return null;
-
-        if (fig.getLayoutManager() instanceof XYLayout)
-            return fig;
-
-        return findContainerFigure(fig.getParent());
-    }
-
-    private int findDistanceToEndRect(PointList points, Rectangle endRect) {
-        PointList intersections = new PointList();
-        PointList distances = new PointList();
-        boolean foundSourceDistance = PointListUtilities.findIntersections(
-            points, PointListUtilities.createPointsFromRect(endRect),
-            intersections, distances);
-
-        int sourceDistance = foundSourceDistance ? distances.getFirstPoint().x
-            : 0;
-        return sourceDistance;
-    }
-
-    private ShortestPathConnectionRouter getRouter(IFigure figContainer) {
-        ShortestPathConnectionRouter shortestPathRouter = (ShortestPathConnectionRouter) routers
-            .get(figContainer);
-        if (shortestPathRouter == null) {
-            shortestPathRouter = new ShortestPathConnectionRouter(figContainer);
-            shortestPathRouter.setSpacing(MapModeUtil.getMapMode(figContainer)
-                .DPtoLP(10));
-            routers.put(figContainer, shortestPathRouter);
-        }
-
-        return shortestPathRouter;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/TreeRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/TreeRouter.java
deleted file mode 100644
index 2f03780..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/TreeRouter.java
+++ /dev/null

@@ -1,492 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.internal.routers;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dDebugOptions;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * @author sshaw
- *
- * This class is a top level router for managing the individual branches in a set of
- * tree routed connections.
- */
-public class TreeRouter extends BendpointConnectionRouter implements OrthogonalRouter {
-
-	private BranchRouter branchRouter = new BranchRouter(this);
-	private ArrayList connectionList = new ArrayList();
-	private Dimension trunkVertex;
-	private Orientation trunkOrientation;
-	private boolean updatingPeers = false;
-	
-	static private class Orientation {
-
-		private Orientation() {
-			// Empty constructor
-		}
-		
-		/**
-		 * Constant for the top orientation 
-		 */
-		static public Orientation TOP = new Orientation();
-		
-		/**
-		 * Constant for the bottom orientation 
-		 */
-		static public Orientation BOTTOM = new Orientation();
-		
-		/**
-		 * Constant for the right orientation 
-		 */
-		static public Orientation RIGHT = new Orientation(); 
-		
-		/**
-		 * Constant for the left orientation 
-		 */
-		static public Orientation LEFT = new Orientation(); 
-		
-		/**
-		 * getEdge
-		 * Method to return the edge point of the given Rectangle representative
-		 * of the orientation value of the instance.
-		 * 
-		 * @param bounds Rectangle to retrieve the edge value from.
-		 * @return Point that is the edge of the rectangle for the orientation of this.
-		 */
-		public Point getEdge(Rectangle bounds) {
-			if (this == TOP)
-				return bounds.getTop();
-			else if (this == BOTTOM)
-				return bounds.getBottom();
-			else if (this == RIGHT)
-				return bounds.getRight();
-
-			return bounds.getLeft();
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	public TreeRouter() {
-		super();
-	}
-
-	
-	/**
-	 * @see org.eclipse.draw2d.ConnectionRouter#invalidate(Connection)
-	 */
-	public void invalidate(Connection conn) {
-		if (conn.getSourceAnchor() == null || conn.getSourceAnchor().getOwner() == null ||
-			conn.getTargetAnchor() == null || conn.getTargetAnchor().getOwner() == null)
-			return;
-
-		ListIterator li = connectionList.listIterator();
-		while (li.hasNext()) {
-			Connection connNext = (Connection)li.next();
-			
-			if (!trunkVertexEqual(connNext, conn)) {
-				updateConstraint(connNext);
-			}
-		}
-	}
-	
-	private boolean trunkVertexEqual(Connection connMaster, Connection connSlave) {
-		PointList cmPts = connMaster.getPoints();
-		PointList csPts = connSlave.getPoints();
-		if (cmPts.size() > 2 && csPts.size() > 2)
-			return cmPts.getPoint(2).equals(csPts.getPoint(2));
-		
-		return false;
-	}
-	
-	/**
-	 * getTrunkLocation
-	 * Method to retrieve the trunk location in relative coordinates based on 
-	 * current tree state.
-	 * 
-	 * @param conn Connection being routed
-	 * @return Point that is the trunk location in relative coordinates.
-	 */
-	public Point getTrunkLocation(Connection conn) {
-		Dimension vertex = getTrunkVertex();
-		Point target = getTrunkOrientation().getEdge(conn.getTargetAnchor().getOwner().getBounds());
-
-		Point ptTrunkLoc = new Point(vertex.width, vertex.height);
-		ptTrunkLoc = ptTrunkLoc.getTranslated(target);
-		
-		return ptTrunkLoc;
-	}
-	
-	/**
-	 * setTrunkLocation
-	 * Setter method to set the trunk location.  Translates the point into a relative
-	 * point from the target edge.
-	 * 
-	 * @param conn Connection being routed
-	 * @param ptTrunkLoc Point that is the trunk location in relative coordinates.
-	 */
-	public void setTrunkLocation(Connection conn, Point ptTrunkLoc) {
-		Point ptRelTrunkLoc = new Point(ptTrunkLoc);
-		
-		// update orientation
-		if (isTopDown(conn)) {
-			if (ptTrunkLoc.y < conn.getTargetAnchor().getOwner().getBounds().getCenter().y)
-				setTrunkOrientation(Orientation.TOP);
-			else
-				setTrunkOrientation(Orientation.BOTTOM);
-		}
-		else {
-			if (ptTrunkLoc.x < conn.getTargetAnchor().getOwner().getBounds().getCenter().x)
-				setTrunkOrientation(Orientation.LEFT);
-			else
-				setTrunkOrientation(Orientation.RIGHT);
-		}
-
-		Point target = getTrunkOrientation().getEdge(conn.getTargetAnchor().getOwner().getBounds());
-		
-		Dimension currentVertex = ptRelTrunkLoc.getDifference(target);
-		setTrunkVertex(currentVertex);
-	}
-	
-	/**
-	 * updateConstraint
-	 * Updates the constraint value for the connection based on the tree vertex
-	 *
-	 * @param conn Connection whose constraint is to be updated.
-	 */
-	protected void updateConstraint(Connection conn) {
-		if (isUpdatingPeers())
-			return;
-		
-		List bendpoints = (List)conn.getRoutingConstraint(); 
-		if (bendpoints == null)
-			bendpoints = new ArrayList(conn.getPoints().size());
-		
-		if (bendpoints != null) {
-			Point sourceRefPoint = conn.getSourceAnchor().getReferencePoint();
-			conn.translateToRelative(sourceRefPoint);
-
-			Point targetRefPoint = conn.getTargetAnchor().getReferencePoint();
-			conn.translateToRelative( targetRefPoint);
-
-			Point ptTrunk = getTrunkLocation(conn);
-			Point ptSource = getBranchRouter().getSourceLocation(conn, ptTrunk);
-			
-			bendpoints.clear();
-			PointList pts = getBranchRouter().recreateBranch(conn, ptSource, ptTrunk);
-			for (int i=0; i<pts.size(); i++) {
-				Bendpoint bp = new AbsoluteBendpoint(pts.getPoint(i));
-				bendpoints.add(bp);
-			}
-		}
-		
-		setUpdatingPeers(true);
-		
-		try {
-			setConstraint(conn, bendpoints);
-			conn.invalidate();
-			conn.validate();
-		}
-		catch (Exception e) {
-			Trace.catching(Draw2dPlugin.getInstance(), Draw2dDebugOptions.EXCEPTIONS_CATCHING, TreeRouter.class, "updateConstraint", //$NON-NLS-1$
-				e);
-		}
-		finally {
-			setUpdatingPeers(false);
-		}
-	}
-	
-	/**
-	 * getPointsFromConstraint
-	 * Utility method retrieve the PointList equivalent of the bendpoint constraint
-	 * set in the Connection.
-	 * 
-	 * @param conn Connection to retrieve the constraint from.
-	 * @return PointList list of points that is the direct equivalent of the set constraint.
-	 */
-	public PointList getPointsFromConstraint(Connection conn) {
-		List bendpoints = (List)conn.getRoutingConstraint();
-		if (bendpoints == null)
-			return new PointList();
-		
-		PointList points = new PointList(bendpoints.size());
-		for (int i = 0; i < bendpoints.size(); i++) {
-			Bendpoint bp = (Bendpoint) bendpoints.get(i);
-			points.addPoint(bp.getLocation());
-		}
-		
-		straightenPoints(points, MapModeUtil.getMapMode(conn).DPtoLP(3));
-		return points;
-	}
-	
-    /**
-     * straightenPoints
-     * This is a simpler version of the @see updateIfNotRectilinear that simply ensures
-     * that the lines are horizontal or vertical without any intelligence in terms of 
-     * shortest distance around a rectangle.
-     * 
-	 * @param newLine PointList to check for rectilinear qualities and change if necessary.
-	 * @param tolerance int tolerance value by which points will be straightened in HiMetrics
-	 */
-	static protected void straightenPoints(PointList newLine, int tolerance) {
-        for (int i=0; i<newLine.size()-1; i++) {
-            Point ptCurrent = newLine.getPoint(i);
-            Point ptNext = newLine.getPoint(i+1);
-            
-            int xDelta = Math.abs(ptNext.x - ptCurrent.x);
-            int yDelta = Math.abs(ptNext.y - ptCurrent.y);
-            
-            if (xDelta < yDelta) {
-            	if (xDelta > tolerance)
-            		return;
-                ptNext.x = ptCurrent.x;
-            } else {
-            	if (yDelta > tolerance)
-            		return;
-                ptNext.y = ptCurrent.y;
-            }
-            
-            newLine.setPoint(ptNext, i+1);
-        }
-    }
-	
-	/**
-	 * Returns the branch router in the chain.
-	 * @return The getBranchRouter router
-	 * 
-	 */
-	protected BranchRouter getBranchRouter() {
-		return branchRouter;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.ConnectionRouter#remove(Connection)
-	 */
-	public void remove(Connection conn) {
-		if (conn.getSourceAnchor() == null || conn.getTargetAnchor() == null)
-			return;
-		
-		int index = connectionList.indexOf(conn);
-		connectionList.remove(conn);
-		for (int i = index + 1; i < connectionList.size(); i++)
-			((Connection)connectionList.get(i)).revalidate();
-	
-		getBranchRouter().remove(conn);
-	}
-
-	/**
-	 * isTopDown
-	 * Utility method to determine if the connection should routed in a top-down fashion
-	 * or in a horizontal fashion.
-     * 
-	 * @param conn Connection to query
-	 * @return boolean true if connection should be routed top-down, false otherwise.
-	 */
-	public boolean isTopDown(Connection conn) {
-		boolean vertical = true;
-		if (conn instanceof ITreeConnection) {
-			vertical = ((ITreeConnection)conn).getOrientation().equals(ITreeConnection.Orientation.VERTICAL) ? vertical = true : false;
-		}
-		
-		return vertical;
-	}
-	
-	private int DEFAULT_TRUNK_HEIGHT = 32;
-	
-	/**
-	 * checkTrunkVertex
-	 * Method to initialize the trunk vertex to a default value if not already set
-	 * 
-	 * @param conn Connection to be routed.
-	 */
-	private void checkTrunkVertex(Connection conn) {
-		if (getTrunkVertex() == null) {
-			Rectangle sourceRect = conn.getSourceAnchor().getOwner().getBounds();
-			Rectangle targetRect = conn.getTargetAnchor().getOwner().getBounds();
-			
-			Dimension default_trunk = new Dimension(0, DEFAULT_TRUNK_HEIGHT);
-			conn.translateToRelative(default_trunk);
-			
-			if (isTopDown(conn)) {
-				if (sourceRect.getCenter().y < targetRect.getCenter().y) {
-					setTrunkVertex(new Dimension(0, -default_trunk.height));
-					setTrunkOrientation(Orientation.TOP);
-				}
-				else {
-					setTrunkVertex(new Dimension(0, default_trunk.height));
-					setTrunkOrientation(Orientation.BOTTOM);
-				}
-			}
-			else {
-				if (sourceRect.getCenter().x < targetRect.getCenter().x) {
-					setTrunkVertex(new Dimension(-default_trunk.height, 0));
-					setTrunkOrientation(Orientation.LEFT);
-				}
-				else {
-					setTrunkVertex(new Dimension(default_trunk.height, 0));
-					setTrunkOrientation(Orientation.RIGHT);
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * Routes the given connection.  Calls the 'getBranchRouter' router method first
-	 * @see org.eclipse.draw2d.ConnectionRouter#route(org.eclipse.draw2d.Connection)
-	 */
-	public void route(Connection conn) {
-		
-		if (conn.getSourceAnchor() == null || conn.getSourceAnchor().getOwner() == null ||
-			conn.getTargetAnchor() == null || conn.getTargetAnchor().getOwner() == null) {
-			super.route(conn);
-			return;
-		}
-		
-		if (!connectionList.contains(conn)) {
-			connectionList.add(conn);
-		}
-		
-		checkTrunkVertex(conn);
-		
-		getBranchRouter().route(conn);
-		invalidate(conn);
-	}
-
-	/**
-	 * @return Returns the truckVertex.
-	 */
-	protected Dimension getTrunkVertex() {
-		return trunkVertex;
-	}
-
-	/**
-	 * @param trunkVertex The trunkVertex to set.
-	 */
-	protected void setTrunkVertex(Dimension trunkVertex) {
-		this.trunkVertex = trunkVertex;
-	}
-	
-	/**
-	 * @return Returns the trunkOrientation.
-	 */
-	protected Orientation getTrunkOrientation() {
-		return trunkOrientation;
-	}
-	
-	/**
-	 * @param trunkOrientation The trunkOrientation to set.
-	 */
-	protected void setTrunkOrientation(Orientation trunkOrientation) {
-		this.trunkOrientation = trunkOrientation;
-	}
-	
-	/**
-	 * Utility method to determine if the given set of points conforms to the constraints
-	 * of being an orthogonal connection tree-branch.
-	 * 1. Points size must be 4.
-	 * 2. Source point resides with-in boundary of source shape based on orientation
-	 * 3. Target point resides with-in boundary of target shape based on orientation
-	 * 4. Middle line is perpendicular to the 2 end lines.
-	 * 
-	 * @param conn the <code>Connection</code> to test
-	 * @param points <code>PointList</code> to test constraints against
-	 * @return <code>boolean</code> <code>true</code> if points represent valid orthogaonl tree 
-	 * branch, <code>false</code> otherwise.
-	 */
-	public boolean isOrthogonalTreeBranch(Connection conn, PointList points) {
-		if (isTreeBranch(conn, points)) {
-			LineSeg branch = new LineSeg(points.getPoint(0), points.getPoint(1));
-			LineSeg trunkShoulder = new LineSeg(points.getPoint(1), points.getPoint(2));
-			LineSeg trunk = new LineSeg(points.getPoint(2), points.getPoint(3));
-			
-			if (isTopDown(conn))
-				return branch.isVertical() && trunkShoulder.isHorizontal() && trunk.isVertical();
-			else
-				return branch.isHorizontal() && trunkShoulder.isVertical() && trunk.isHorizontal();
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Utility method to determine if the given set of points conforms to the constraints
-	 * of being a connection tree-branch.
-	 * 1. Points size must be 4.
-	 * 2. Source point resides with-in boundary of source shape based on orientation
-	 * 3. Target point resides with-in boundary of target shape based on orientation
-	 * 
-	 * @param conn the <code>Connection</code> to test
-	 * @param points the <code>PointList</code> to test constraints against
-	 * @return <code>boolean</code> <code>true</code> if points represent valid tree branch, 
-	 * <code>false</code> otherwise.
-	 */
-	public boolean isTreeBranch(Connection conn, PointList points) {
-		if (points.size() == 4) {
-			// just check if ends are with-in the owner bounding box
-			Rectangle targetBounds = conn.getTargetAnchor().getOwner().getBounds();
-			Rectangle sourceBounds = conn.getSourceAnchor().getOwner().getBounds();
-			
-			if (isTopDown(conn)) {
-				return (points.getPoint(0).x > sourceBounds.x && 
-					    points.getPoint(0).x < sourceBounds.x + sourceBounds.width) &&
-					   (points.getPoint(3).x > targetBounds.x && 
-						points.getPoint(3).x < targetBounds.x + targetBounds.width);
-			}
-			else
-			{
-				return (points.getPoint(0).y > sourceBounds.y && 
-					    points.getPoint(0).y < sourceBounds.y + sourceBounds.height) &&
-					   (points.getPoint(3).y > targetBounds.y && 
-						points.getPoint(3).y < targetBounds.y + targetBounds.height);
-			}
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * @return Returns the connectionList List which is a copy of the internal list.
-	 */
-	public List getConnectionList() {
-		return (List)connectionList.clone();
-	}
-	/**
-	 * @return Returns the updatingPeers.
-	 */
-	protected boolean isUpdatingPeers() {
-		return updatingPeers;
-	}
-	/**
-	 * @param updatingPeers The updatingPeers to set.
-	 */
-	protected void setUpdatingPeers(boolean updatingPeers) {
-		this.updatingPeers = updatingPeers;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/package.html
deleted file mode 100644
index e30abac..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/IMapMode.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/IMapMode.java
deleted file mode 100644
index 0a1c2f9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/IMapMode.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.draw2d.ui.mapmode;
-
-import org.eclipse.draw2d.geometry.Translatable;
-
-
-/**
- * Objects implementing this interface are responsible for mapping the units
- * in the model to pixles.  For an example of how to use this interface
- * @see org.eclipse.gmf.runtime.gef.ui.internal.figure.surface.mapmode.HiMetricMapMode
- *
- * @author jschofie / sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.draw2d.ui.*
- */
-public interface IMapMode {
-
-	/**
-	 * Convert a Logical Unit into a Device Unit
-	 *  
-	 * @param logicalUnit the value to be converted
-	 * @return the value represented in device units
-	 */
-	public int LPtoDP(int logicalUnit);
-
-	/**
-	 * Convert a Device Unit into a Logical Unit
-	 *  
-	 * @param deviceUnit the value to be converted
-	 * @return the value represented in logical units
-	 */
-	public int DPtoLP(int deviceUnit);
-	
-	/**
-	 * Convert a <code>Translatable</code> to Device Units (pixels)
-	 * 
-	 * @param t the <code>Translatable</code> to convert
-	 * @return the parameter <code>t</code> that was scaled for convenience.
-	 */
-	public Translatable LPtoDP( Translatable t );
-	
-	/**
-	 * Convert a Translatable to Logical Units (i.e. Hi-Metrics)
-	 * @param t the Translatable to convert
-	 * @return the parameter <code>t</code> that was scaled for convenience.
-	 */
-	public Translatable DPtoLP( Translatable t );
-
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/MapModeTypes.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/MapModeTypes.java
deleted file mode 100644
index 01f9685..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/MapModeTypes.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.mapmode;
-
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.HiMetricMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.mapmode.IdentityMapMode;
-
-
-
-/**
- * @author sshaw
- * Class that defines different <code>IMapMode</code> types available for use
- *
- */
-public class MapModeTypes {
-
-	/**
-	 * Constant <code>IMapMode</code> class for HiMetric coordinate mapping
-	 */
-	static public IMapMode HIMETRIC_MM  = new HiMetricMapMode();
-	
-	/**
-	 * Constant <code>IMapMode</code> class for Identity coordinate mapping
-	 */
-	static public IMapMode IDENTITY_MM = new IdentityMapMode();
-	
-	/**
-	 * Constant <code>IMapMode</code> class default coordinate mapping (HiMetric is
-	 * current default).
-	 */
-	static public IMapMode DEFAULT_MM = HIMETRIC_MM;
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/MapModeUtil.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/MapModeUtil.java
deleted file mode 100644
index 558a19a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/MapModeUtil.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.mapmode;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-
-/**
- * @author sshaw
- * Utility class to retrieve the <code>IMapMode</code> class from a <code>IFigure</code> context 
- */
-public class MapModeUtil {
-
-	/**
-	 * Parses up the figure containment hierarchy to find a <code>IFigure</code> that implements
-	 * the <code>IMapMode</code> interface.  This is then returned as the coordinate system
-	 * mapping.
-	 * 
-	 * @param fig <code>IFigure</code> to retrieve the <code>IMapMode</code> object from.
-	 * @return appropriate <code>IMapMode</code> for the given <code>IFigure</code> object.
-	 */
-	static public IMapMode getMapMode( IFigure fig ) {
-        if (fig == null) {
-            Log.warning(Draw2dPlugin.getInstance(), IStatus.WARNING, "MapModeUtil#getMapMode(IFigure fig) fig parameter must not be null - using default MapMode");//$NON-NLS-1$
-            return MapModeTypes.DEFAULT_MM;
-        }
-        
-        if (fig instanceof IMapMode)
-            return (IMapMode)fig;
-        
-        if (fig.getParent() == null) {
-            Log.warning(Draw2dPlugin.getInstance(), IStatus.WARNING, "MapModeUtil#getMapMode(IFigure fig) fig parameter must be attached to a parent - using default MapMode");//$NON-NLS-1$
-            return MapModeTypes.DEFAULT_MM;
-        }
-		
-		return getMapMode(fig.getParent());
-	}
-	
-	/**
-	 * @return <code>IMapMode</code> that is the default coordinate system mapping supported
-	 * by the diagram infrastructure.  Editors that support a different coordinate system,
-	 * should use the @link{ MapModeUtil#getMapMode( IFigure fig) } to retrieve the 
-	 * appropriate <code>IMapMode</code> for their specific Editor.
-	 */
-	static public IMapMode getMapMode() {
-		return MapModeTypes.DEFAULT_MM;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/package.html b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/package.html
deleted file mode 100644
index 8a993a1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/package.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-This package contains the {@link org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapMode} class.
-
-@canBeSeenBy %partners
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/.classpath b/org.eclipse.gmf.runtime.emf.clipboard.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.emf.clipboard.core/.cvsignore b/org.eclipse.gmf.runtime.emf.clipboard.core/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/.options b/org.eclipse.gmf.runtime.emf.clipboard.core/.options
deleted file mode 100644
index f7aa90c..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.options
+++ /dev/null

@@ -1,14 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.emf.clipboard.core plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.emf.clipboard.core plug-in
-org.eclipse.gmf.runtime.emf.clipboard.core/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting=false

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/.project b/org.eclipse.gmf.runtime.emf.clipboard.core/.project
deleted file mode 100644
index a44d459..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.clipboard.core</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/org.eclipse.gmf.runtime.emf.clipboard.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.emf.clipboard.core/META-INF/MANIFEST.MF
deleted file mode 100644
index c0c988c..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.emf.clipboard.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.emf.clipboard.core.internal.ClipboardPlugin$Implementation
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.emf.clipboard.core,
- org.eclipse.gmf.runtime.emf.clipboard.core.internal;x-friends:="org.eclipse.gmf.runtime.notation.providers",
- org.eclipse.gmf.runtime.emf.clipboard.core.internal.l10n;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/about.html b/org.eclipse.gmf.runtime.emf.clipboard.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/build.properties b/org.eclipse.gmf.runtime.emf.clipboard.core/build.properties
deleted file mode 100644
index b1a7bf8..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               schema/,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               .options,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/plugin.properties b/org.eclipse.gmf.runtime.emf.clipboard.core/plugin.properties
deleted file mode 100644
index fc0a73a..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/plugin.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-Plugin.name = GMF EMF Clipboard Support
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/plugin.xml b/org.eclipse.gmf.runtime.emf.clipboard.core/plugin.xml
deleted file mode 100644
index e805368..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/plugin.xml
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension-point id="clipboardSupport" name="Clipboard Support" schema="schema/clipboardSupport.exsd"/>
-
-</plugin>

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/schema/clipboardSupport.exsd b/org.eclipse.gmf.runtime.emf.clipboard.core/schema/clipboardSupport.exsd
deleted file mode 100644
index 76736cd..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/schema/clipboardSupport.exsd
+++ /dev/null

@@ -1,174 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.emf.clipboard.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.emf.clipboard.core" id="clipboardSupport" name="Clipboard Support"/>
-      </appInfo>
-      <documentation>
-         Providers of EMF meta-models can implement extensions on this point
-to provide support for copying EMF objects to and pasting them from
-the system clipboard.  The clipboard support allows extensions to
-implement fairly complex metamodel-specific semantics for copy/paste
-operations, where some relationships between model elements need
-special treatment.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="factory" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="factory">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="nsURI"/>
-         </appInfo>
-         <documentation>
-            Registers an implementation of the
-&lt;code&gt;IClipboardSupportFactory&lt;/code&gt; interface that can create
-objects that provide metamodel-specific copy/paste semantics for
-EMF objects.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="nsURI" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Namespace URI identifying the EPackage for which the extension
-provides an &lt;code&gt;IClipboardSupportFactory&lt;/code&gt; implementation.
-The EPackage represents an EMF metamodel.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Fully-qualified name of a class implementing the
-&lt;code&gt;IClipboardSupportFactory&lt;/code&gt; interface.  This class will
-only be loaded and instantiated when needed to copy an EMF object
-to the clipboard or when pasting from the clipboard.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="priority" use="default" value="medium">
-            <annotation>
-               <documentation>
-                  Indicates the priority relative to other factories registered for
-the same metamodel.  The default is medium.
-
-This attribute is &lt;b&gt;deprecated&lt;/b&gt;; a new context-based approach
-will be devised soon.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="lowest">
-                  </enumeration>
-                  <enumeration value="low">
-                  </enumeration>
-                  <enumeration value="medium">
-                  </enumeration>
-                  <enumeration value="high">
-                  </enumeration>
-                  <enumeration value="highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         7.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         To register a clipboard support factory for the EMF Library example
-model:
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.gmf.runtime.emf.clipboard.core.clipboardSupport&quot;&gt;
-      &lt;factory
-            nsURI=&quot;http:///org/eclipse/emf/examples/library.ecore&quot;
-            class=&quot;com.example.emf.library.clipboard.LibraryClipboardSupportFactory&quot;&gt;
-      &lt;/factory&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Classes registered on this extension point must implement the
-&lt;code&gt;org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportFactory&lt;/code&gt;
-interface.  A support factory is responsible for creating
-&lt;code&gt;IClipboardSupport&lt;/code&gt;s for the packages on which it is
-registered on this extension point.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2005  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/AbstractClipboardSupport.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/AbstractClipboardSupport.java
deleted file mode 100644
index b05ae88..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/AbstractClipboardSupport.java
+++ /dev/null

@@ -1,271 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-
-/**
- * A convenient default implementation of most of the features required of
- * a clipboard support utility.
- * <p>
- * This class is intended to be extended by clients.
- * </p>
- *
- * @author Christian W. Damus (cdamus)
- */
-public class AbstractClipboardSupport
-	implements IClipboardSupport {
-
-	private static final Object NULL_TOKEN = Boolean.FALSE;
-	private final Map nameFeatureMap = new java.util.HashMap();
-	
-	/**
-	 * Initializes me.
-	 */
-	public AbstractClipboardSupport() {
-		super();
-	}
-
-	/**
-	 * By default, there are no collisions in pasting.
-	 * 
-	 * @return the {@link PasteAction#ADD} action, always
-	 */
-	public PasteAction getPasteCollisionAction(EClass eClass) {
-		return PasteAction.ADD;
-	}
-
-	/**
-	 * By default, the following paste options are supported:
-	 * <ul>
-	 * <li>{@link PasteOption#NORMAL}: always</li>
-	 * <li>others: never</li>
-	 * </ul>
-	 */
-	public boolean hasPasteOption(EObject contextEObject,
-			EStructuralFeature eStructuralFeature, PasteOption pasteOption) {
-		if (pasteOption.equals(PasteOption.NORMAL)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * By default, transient and derived references are never copied, and
-	 * containment references always are copied.
-	 */
-	public boolean isCopyAlways(EObject context, EReference eReference,
-			Object value) {
-		if ((eReference.isTransient()) || (eReference.isDerived())) {
-			return false;
-		} else {
-			return eReference.isContainment();
-		}
-	}
-
-	/**
-	 * By default, don't provide any child paste override behaviour.
-	 * 
-	 * @return <code>false</code>, always
-	 */
-	public boolean shouldOverrideChildPasteOperation(EObject parentElement,
-			EObject childEObject) {
-		return false;
-	}
-
-	/**
-	 * By default, don't provide any copy override behaviour.
-	 * 
-	 * @return <code>false</code>, always
-	 */
-	public boolean shouldOverrideCopyOperation(Collection eObjects, Map hintMap) {
-		return false;
-	}
-
-	/**
-	 * By default, don't provide any child paste override behaviour.
-	 * 
-	 * @return <code>null</code>, always
-	 */
-	public OverridePasteChildOperation getOverrideChildPasteOperation(
-			PasteChildOperation overriddenChildPasteOperation) {
-		return null;
-	}
-
-	/**
-	 * By default, don't provide any copy override behaviour.
-	 * 
-	 * @return <code>null</code>, always
-	 */
-	public OverrideCopyOperation getOverrideCopyOperation(
-			CopyOperation overriddenCopyOperation) {
-		return null;
-	}
-
-	/**
-	 * By default, don't exclude any objects from the copy operation.
-	 * 
-	 * @return an empty collection
-	 */
-	public Collection getExcludedCopyObjects(Set eObjects) {
-		return Collections.EMPTY_SET;
-	}
-
-	/**
-	 * By default, assumes that the <code>eObject</code> is attached to
-	 * an XML resource, and returns that.
-	 */
-	public XMLResource getResource(EObject eObject) {
-		return (XMLResource) eObject.eResource();
-	}
-
-	/**
-	 * By default, we always remember the containment feature of an object,
-	 * unless it is an Ecore element (such as an annotation) or it is a
-	 * detached element.
-	 * 
-	 * @return <code>false</code> if the <code>eObject</code> is an Ecore
-	 *     object or is detached; <code>true</code>, otherwise
-	 */
-	public boolean shouldSaveContainmentFeature(EObject eObject) {
-		if (EcorePackage.eINSTANCE == eObject.eClass().getEPackage()) {
-			return false;
-		}
-		
-		try {
-			eObject.eResource().getURIFragment(eObject);
-		} catch (Exception ex) {
-			return false;
-		}
-		
-		return true;
-	}
-
-	/**
-	 * By default, there is no post processing to be done.
-	 */
-	public void performPostPasteProcessing(Set pastedEObjects) {
-		// nothing to do
-	}
-
-	/**
-	 * Obtains the cached name attribute of an eClass, or <code>null</code>
-	 * if it has no attribute named "name".
-	 * 
-	 * @param eClass an EClass
-	 * @return the cached "name" attribute
-	 */
-	protected EAttribute getNameAttribute(EClass eClass) {
-		EAttribute result = null;
-		
-		Object value = nameFeatureMap.get(eClass);
-		if (value != NULL_TOKEN) {
-			result = (EAttribute) value;
-			
-			if (result == null) {
-				nameFeatureMap.put(eClass, NULL_TOKEN);
-				
-				// look for an attribute named "name"
-				for (Iterator iter = eClass.getEAllAttributes().iterator(); iter.hasNext();) {
-					EAttribute next = (EAttribute) iter.next();
-					
-					if ((next.getEType().getInstanceClass() == String.class)
-							&& next.getUpperBound() == 1
-							&& "name".equalsIgnoreCase(next.getName())) { //$NON-NLS-1$
-						
-						result = next;
-						nameFeatureMap.put(eClass, result);
-						break;
-					}
-				}
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * By default, elements are nameable if they have an {@link EAttribute}
-	 * named "name".
-	 */
-	public boolean isNameable(EObject eObject) {
-		return getNameAttribute(eObject.eClass()) != null;
-	}
-
-	public String getName(EObject eObject) {
-		EAttribute attr = getNameAttribute(eObject.eClass());
-		
-		if (attr == null) {
-			throw new IllegalArgumentException("eObject not nameable"); //$NON-NLS-1$
-		}
-		
-		return (String) eObject.eGet(attr);
-	}
-
-	public void setName(EObject eObject, String name) {
-		EAttribute attr = getNameAttribute(eObject.eClass());
-		
-		if (attr == null) {
-			throw new IllegalArgumentException("eObject not nameable"); //$NON-NLS-1$
-		}
-		
-		eObject.eSet(attr, name);
-	}
-
-	/**
-	 * Simply removes an <code>eObject</code> from its container.
-	 */
-	public void destroy(EObject eObject) {
-		EcoreUtil.remove(eObject);
-		
-		if (eObject.eResource() != null) {
-			// it was a cross-resource-contained element
-			eObject.eResource().getContents().remove(eObject);
-		}
-	}
-
-	/**
-	 * Default implementation does nothing, for those applications that do not
-	 * support creation notifications.
-	 */
-	public void sendCreateNotification(EObject eObject) {
-		// do nothing
-	}
-
-	/**
-	 * @return <code>true</code> if the <code>reference</code>'s type is
-	 *      compatible with the <code>containedType</code>; <code>false</code>,
-	 *      otherwise
-	 */
-	public boolean canContain(EObject container, EReference reference,
-			EClass containedType) {
-		return reference.getEContainingClass().isSuperTypeOf(container.eClass())
-			&& reference.getEReferenceType().isSuperTypeOf(containedType);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/BasePasteOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/BasePasteOperation.java
deleted file mode 100644
index fb65eab..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/BasePasteOperation.java
+++ /dev/null

@@ -1,348 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.MergedEObjectInfo;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ResourceInfo;
-
-
-/**
- * Abstract specification of all paste operations, providing common behaviours
- * and enforcing certain protocols.
- * <p>
- * <b>Note</b> that this class is not intended to be extended "directly"
- * by clients.  Clients may not instantiate it.  Clients that need to extend
- * or override the default paste operation should extend the
- * {@link OverridePasteChildOperation} class, instead.  Clients may also extend
- * the {@link PostPasteChildOperation}.
- * </p>
- * 
- * @author Yasser Lulu
- * 
- * @see OverridePasteChildOperation
- * @see PostPasteChildOperation 
- */
-public abstract class BasePasteOperation
-	extends ClipboardOperation {
-
-	/** A constant whose value is "paste". */
-	public static final String PASTE = "paste"; //$NON-NLS-1$
-
-	private Map loadOptionsMap;
-
-	private ResourceInfo resourceInfo;
-
-	private BasePasteOperation spawningPasteOperation;
-
-	private Map mergedElementsMap;
-
-	private Map unmodifiableMergedElementsMap;
-
-	private Set pastedElementSet;
-
-	private Set unmodifiablePastedElementSet;
-
-	private Set criticalResolveFailuresSet;
-
-	private Set unmodifiableCriticalResolveFailuresSet;
-
-	private Set pasteFailuresObjectSet;
-
-	private Set unmodifiablePasteFailuresObjectSet;
-
-	/**
-	 * Initializes me.
-	 * 
-	 * @param monitor an optional monitor to track paste progress
-	 * @param loadOptionsMap map of EMF resource load options for
-	 *     deserialization of the resource that was copied to the clipboard
-	 * @param resourceInfo the resource information data structure to fill in
-	 *     when deserializing the copied resource
-	 * @param clipboardSupport the clipboard support object governing this
-	 *     copy/paste operation
-	 */
-	public BasePasteOperation(IProgressMonitor monitor,
-			Map loadOptionsMap, ResourceInfo resourceInfo,
-			IClipboardSupport clipboardSupport) {
-		super(monitor, clipboardSupport);
-		this.loadOptionsMap = loadOptionsMap;
-		this.resourceInfo = resourceInfo;
-		mergedElementsMap = new HashMap();
-		pastedElementSet = new HashSet();
-		pasteFailuresObjectSet = new HashSet();
-		criticalResolveFailuresSet = new HashSet();
-	}
-
-	/**
-	 * Initializes me with a superordinate paste operation that has created me.
-	 * I copy much of my environment from it.
-	 * 
-	 * @param spawningPasteOperation the paste operation that created me
-	 */
-	public BasePasteOperation(BasePasteOperation spawningPasteOperation) {
-		this(spawningPasteOperation.getProgressMonitor(),
-			spawningPasteOperation.getLoadOptionsMap(), spawningPasteOperation
-				.getResourceInfo(), spawningPasteOperation
-				.getClipboardOperationHelper());
-		this.spawningPasteOperation = spawningPasteOperation;
-	}
-
-	/**
-	 * Obtains my resource meta-data structure.
-	 * 
-	 * @return my resource meta-data
-	 */
-	protected final ResourceInfo getResourceInfo() {
-		return resourceInfo;
-	}
-
-	/**
-	 * Obtains the EMF resource load options that are used to deserialize the
-	 * resource that was copied to the clipboard.
-	 * 
-	 * @return my load options
-	 */
-	protected final Map getLoadOptionsMap() {
-		return loadOptionsMap;
-	}
-
-	/**
-	 * Performs the paste operation.
-	 * 
-	 * @throws Exception if anything goes wrong in pasting
-	 */
-	public abstract void paste()
-		throws Exception;
-
-	/**
-	 * Obtains the superordinate paste operation that created me, if any.
-	 * 
-	 * @return my parent paste operation, or <code>null</code> if I am the
-	 *     root operation
-	 */
-	public BasePasteOperation getSpawningPasteOperation() {
-		return spawningPasteOperation;
-	}
-
-	/**
-	 * Obtains the overall set of all critical resolution failures for the
-	 * bigger paste operation, of which my own are a subset.
-	 * 
-	 * @return the set of all critical resolution failures
-	 * 
-	 * @see #getCriticalResolveFailuresSet()
-	 */
-	public final Set getAllCriticalResolveFailuresSet() {
-		if (getSpawningPasteOperation() != null) {
-			return getSpawningPasteOperation()
-				.getAllCriticalResolveFailuresSet();
-		} else {
-			return getCriticalResolveFailuresSet();
-		}
-	}
-
-	/**
-	 * Obtains the overall map of all merged elements for the
-	 * bigger paste operation, of which my own are a subset.
-	 * 
-	 * @return the map of all merged elements
-	 * 
-	 * @see #getMergedElementsMap()
-	 */
-	public final Map getAllMergedElementsMap() {
-		if (getSpawningPasteOperation() != null) {
-			return getSpawningPasteOperation().getAllMergedElementsMap();
-		} else {
-			return getMergedElementsMap();
-		}
-	}
-
-	/**
-	 * Obtains the overall set of all elements pasted by the
-	 * bigger paste operation, of which my own are a subset.
-	 * 
-	 * @return the set of all pasted elements
-	 * 
-	 * @see #getPastedElementSet()
-	 */
-	public final Set getAllPastedElementSet() {
-		if (getSpawningPasteOperation() != null) {
-			return getSpawningPasteOperation().getAllPastedElementSet();
-		} else {
-			return getPastedElementSet();
-		}
-	}
-
-	/**
-	 * Obtains my own subset of critical resolution failures.
-	 * 
-	 * @return my critical resolution failures
-	 * 
-	 * @see #getAllCriticalResolveFailuresSet()
-	 */
-	public final Set getCriticalResolveFailuresSet() {
-		if (unmodifiableCriticalResolveFailuresSet == null) {
-			unmodifiableCriticalResolveFailuresSet = Collections
-				.unmodifiableSet(criticalResolveFailuresSet);
-		}
-		return unmodifiableCriticalResolveFailuresSet;
-	}
-
-	/**
-	 * Adds a critical resolution failure to my set and the overall failures set
-	 * for the bigger paste operation.
-	 * 
-	 * @param nonResolvedObject an unresolvable object
-	 */
-	protected void addCriticalResolveFailure(EObject nonResolvedObject) {
-		criticalResolveFailuresSet.add(nonResolvedObject);
-		if (getSpawningPasteOperation() != null) {
-			getSpawningPasteOperation().addCriticalResolveFailure(
-				nonResolvedObject);
-		}
-	}
-
-	/**
-	 * Removes a critical resolution failure from my set and the overall
-	 * failures set for the bigger paste operation, for an object which has
-	 * turned out resolvable after all.
-	 * 
-	 * @param newlyResolvedObject an object that did resolve
-	 */
-	protected void removeCriticalResolveFailure(EObject newlyResolvedObject) {
-		if (criticalResolveFailuresSet.remove(newlyResolvedObject)
-			&& getSpawningPasteOperation() != null) {
-			getSpawningPasteOperation().removeCriticalResolveFailure(
-				newlyResolvedObject);
-		}
-	}
-
-	/**
-	 * Obtains my own subset map of merged elements.
-	 * 
-	 * @return my merged elements
-	 * 
-	 * @see #getMergedElementsMap()
-	 */
-	public final Map getMergedElementsMap() {
-		if (unmodifiableMergedElementsMap == null) {
-			unmodifiableMergedElementsMap = Collections
-				.unmodifiableMap(mergedElementsMap);
-		}
-		return unmodifiableMergedElementsMap;
-	}
-
-	/**
-	 * Adds a merged element to my map and the overall merges map
-	 * for the bigger paste operation.
-	 * 
-	 * @param mergedObject a merged object (key)
-	 * @param mergedEObjectInfo the information about the merge (value)
-	 */
-	protected void addMergedElementEntry(EObject mergedObject,
-			MergedEObjectInfo mergedEObjectInfo) {
-		mergedElementsMap.put(mergedObject, mergedEObjectInfo);
-		if (getSpawningPasteOperation() != null) {
-			getSpawningPasteOperation().addMergedElementEntry(mergedObject,
-				mergedEObjectInfo);
-		}
-	}
-
-	/**
-	 * Obtains my own subset of pasted elements.
-	 * 
-	 * @return my pasted elements
-	 * 
-	 * @see #getAllPastedElementSet()
-	 */
-	public final Set getPastedElementSet() {
-		if (unmodifiablePastedElementSet == null) {
-			unmodifiablePastedElementSet = Collections
-				.unmodifiableSet(pastedElementSet);
-		}
-		return unmodifiablePastedElementSet;
-	}
-
-	/**
-	 * Adds a successfully pasted element to my set and the overall pasted
-	 * elements set for the bigger paste operation.
-	 * 
-	 * @param pastedElement an element that was successfully pasted
-	 */
-	protected void addPastedElement(EObject pastedElement) {
-		pastedElementSet.add(pastedElement);
-		if (getSpawningPasteOperation() != null) {
-			getSpawningPasteOperation().addPastedElement(pastedElement);
-		}
-	}
-
-	/**
-	 * Obtains my own subset of objects that failed to paste.
-	 * 
-	 * @return my failed pastes
-	 * 
-	 * @see #getAllPasteFailuresObjectSet()
-	 */
-	public final Set getPasteFailuresObjectSet() {
-		if (unmodifiablePasteFailuresObjectSet == null) {
-			unmodifiablePasteFailuresObjectSet = Collections
-				.unmodifiableSet(pasteFailuresObjectSet);
-		}
-		return unmodifiablePasteFailuresObjectSet;
-	}
-
-	/**
-	 * Adds an element that did not successfully paste to my set and the
-	 * overall paste failures set for the bigger paste operation.
-	 * 
-	 * @param eObject an element that was not successfully pasted
-	 */
-	protected void addPasteFailuresObject(EObject eObject) {
-		pasteFailuresObjectSet.add(eObject);
-		if (getSpawningPasteOperation() != null) {
-			getSpawningPasteOperation().addPasteFailuresObject(eObject);
-		}
-	}
-
-	/**
-	 * Obtains my {@linkplain #getPasteFailuresObjectSet() failed pastes},
-	 * or my parent operation's if I have one.
-	 * 
-	 * @return my parent's paste failures, or my own if I am the
-	 *     root paste operation
-	 * 
-	 * @see #getPasteFailuresObjectSet()
-	 */
-	public final Set getAllPasteFailuresObjectSet() {
-		if (getSpawningPasteOperation() != null) {
-			return getSpawningPasteOperation().getAllPasteFailuresObjectSet();
-		} else {
-			return getPasteFailuresObjectSet();
-		}
-	}
-
-	/**
-	 * Throws an operation cancel exception to end a paste process.     
-	 */
-	protected void throwCancelException() {
-		throwCancelException(PASTE);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardOperation.java
deleted file mode 100644
index ed9666b..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardOperation.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ClipboardPlugin;
-
-/**
- * Abstract specification of a copy or paste operation.  Maintains a progress
- * monitor, support utility, and provides some reusable features.
- * <p>
- * <b>Note</b> that this class is not intended to be extended
- * by clients.  Clients may not instantiate it.
- * </p>
- * 
- * @author Yasser Lulu 
- */
-public abstract class ClipboardOperation {
-
-	/** The size of a single work unit in the progress monitor. */
-	public static final int WORK_UNIT = 1;
-
-	/** The total amount of work accorded to a progress monitor. */
-	public static final int TOTAL_WORK = 100;
-
-	private IProgressMonitor monitor;
-
-	private IClipboardSupport clipboardSupport;
-
-	/**
-	 * Initializes me with my progress monitor and clipboard support.
-	 * 
-	 * @param monitor a progress monitor, or <code>null</code> if
-	 *     no progress tracking is needed
-	 * @param clipboardSupport the clipboard support object
-	 */
-	public ClipboardOperation(IProgressMonitor monitor,
-			IClipboardSupport clipboardSupport) {
-		this.monitor = (monitor != null) ? monitor : new NullProgressMonitor();
-		this.clipboardSupport = clipboardSupport;
-	}
-
-	/**
-	 * Obtains my progress monitor.
-	 * 
-	 * @return my progress monitor (never <code>null</code>)
-	 */
-	public IProgressMonitor getProgressMonitor() {
-		return monitor;
-	}
-
-	/**
-	 * Queries whether I have been cancelled, by cancellation of my progress
-	 * monitor.
-	 * 
-	 * @return whether I have been cancelled
-	 */
-	protected boolean isCancelled() {
-		return getProgressMonitor().isCanceled();
-	}
-
-	/**
-	 * Obtains the clipboard support object that I rely on to make decisions
-	 * about copy/paste semantics.
-	 * 
-	 * @return my clipboard support
-	 */
-	public final IClipboardSupport getClipboardOperationHelper() {
-		// TODO: Rename this as getClipboardSupport()
-		return clipboardSupport;
-	}
-
-	/**
-	 * Traces and logs a caught exception.
-	 *  
-	 * @param methodName the method in which the exception was caught
-	 * @param ex the exception that was caught
-	 */
-	protected void catchException(String methodName, Exception ex) {
-		ClipboardPlugin.catching(getClass(), methodName, ex);
-	}
-
-	/**
-	 * Traces and logs a thrown exception.
-	 *  
-	 * @param methodName the method in which the exception was thrown
-	 * @param ex the exception that was thrown
-	 * 
-	 * @throws RuntimeException the <code>ex</code> parameter
-	 */
-	protected void throwException(String methodName, RuntimeException ex) {
-		ClipboardPlugin.throwing(getClass(), methodName, ex);
-		throw ex;
-	}
-
-	/**
-	 * Throws, traces, and logs a cancellation exception.
-	 *  
-	 * @param methodName the method in which the exception was caught
-	 * 
-	 * @throws OperationCanceledException always
-	 */
-	protected void throwCancelException(String methodName) {
-		throwException(methodName, new OperationCanceledException(
-			"Operation Canceled")); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardSupportUtil.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardSupportUtil.java
deleted file mode 100644
index abfabe7..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardSupportUtil.java
+++ /dev/null

@@ -1,861 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ClipboardPlugin;
-
-/**
- * Utilities to assist the implementation of {@link IClipboardSupport}s by
- * plug-ins extending the <tt>clipboardSupport</tt> extension point.
- * 
- * @author Yasser Lulu
- */
-public final class ClipboardSupportUtil {
-	/** Index in an array or list indicating absence of the element sought. */
-	public static final int NONE = -1;
-
-	private static final String ONE = "1"; //$NON-NLS-1$
-
-	private static final String UNDERSCORE = "_"; //$NON-NLS-1$
-
-	private static final String RESOLVE = "resolve"; //$NON-NLS-1$
-
-	private static final EReference[] EMPTY_REF_ARRAY = new EReference[0];
-
-	/**
-	 * Not instantiable by clients.
-	 */
-	private ClipboardSupportUtil() {
-		super();
-	}
-
-	/**
-	 * Removes from a collection of <code>elements</code> any elements that
-	 * should not be copied.  These are those that have containers that are
-	 * already in the <code>elements</code> collection.
-	 * 
-	 * @param elements the collection of elements to be whittled down to those
-	 *     that should be copied.  <b>Note</b> that this collection is modified
-	 *     in place
-	 * @return the <code>elements</code> collection, again
-	 */
-	public static Collection getCopyElements(Collection elements) {
-		Iterator it = elements.iterator();
-		EObject element = null;
-		Set set = new HashSet();
-		while (it.hasNext()) {
-			element = (EObject) it.next();
-			set.add(element);
-		}
-		elements.clear();
-		elements.addAll(getUniqueElementsAncestry(set));
-		return elements;
-	}
-
-	/**
-	 * Finds the subset of a set of elements that do not have ancestors in that
-	 * set.
-	 * 
-	 * @param elementSet a set of {@link EObject}s
-	 * @return the subset of the elements that are not contained within others
-	 *     in the set
-	 */
-	private static Set getUniqueElementsAncestry(Set elementSet) {
-		Iterator it = elementSet.iterator();
-		EObject container = null;
-		while (it.hasNext()) {
-			container = ((EObject) it.next()).eContainer();
-			while (container != null) {
-				if (elementSet.contains(container)) {
-					it.remove();
-					break;
-				}
-				container = container.eContainer();
-			}
-		}
-		return elementSet;
-	}
-	
-	/**
-	 * Replaces an object's many reference with an entirely new list of
-	 * references.  Does nothing if the <code>reference</code> specified is
-	 * not {@linkplain #isOkToSetEList(EObject, EReference) settable}.
-	 * 
-	 * @param eObject the element owning the reference to be set
-	 * @param reference the many reference to be set
-	 * @param referencedObjects the new value of the reference; must be an
-	 *     {@link org.eclipse.emf.common.util.EList} of {@link EObject}s
-	 * 
-	 * @return the <code>referencedObjects</code>
-	 * 
-	 * @see #isOkToSetEList(EObject, EReference)
-	 */
-	public static List setEObjectList(EObject eObject,
-			EReference reference, List referencedObjects) {
-		
-		if (isOkToSetEList(eObject, reference)) {
-			if (reference.isContainment()) {
-                for (Iterator referenced = referencedObjects.iterator();referenced.hasNext();) {
-                    EObject referencedObject = (EObject)referenced.next();
-                    ((InternalEObject)referencedObject).eSetResource(null,null);
-                }
-				sendCreateEvent(referencedObjects);
-			}
-			eObject.eSet(reference, referencedObjects);
-		}
-		return referencedObjects;
-	}
-
-	/**
-	 * Queries whether a reference is mutable.  A reference is considered
-	 * mutable if and only if it is changeable and it is either not derived
-	 * or it is a member of a feature map (though not itself a feature map).
-	 * 
-	 * @param reference the reference to test
-	 * 
-	 * @return <code>true</code> if the reference is mutable;
-	 *     <code>false</code>, otherwise
-	 */
-	static boolean isMutable(EReference reference) {
-		boolean result = reference.isChangeable();
-		
-		if (result) {
-			if (reference.isDerived()) {
-				// check whether it is a feature-map member that is not, itself,
-				//    a feature map
-				EStructuralFeature group = ExtendedMetaData.INSTANCE.getGroup(reference);
-				
-				result = (group != null) && !FeatureMapUtil.isFeatureMap(reference);
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Queries whether a many reference may be replaced with an entirely new
-	 * list of {@link EObject}s.
-	 * 
-	 * @param eObject the owner of the <code>reference</code>
-	 * @param reference a many reference to query whether it is settable
-	 * @return <code>true</code> if the <code>reference</code> is changeable
-	 *     and is not derived; <code>false</code>, otherwise
-	 */
-	public static boolean isOkToSetEList(EObject eObject, EReference reference) {
-		if (isMutable(reference)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Appends an object's many reference with a list of additional
-	 * references.
-	 * 
-	 * @param eObject the element owning the reference list to be appended
-	 * @param reference the many reference to be appended
-	 * @param referencedObjects {@link EObject}s to append to the list
-	 * 
-	 * @return those of the <code>referencedObjects</code> that were
-	 *    successfully appended
-	 * 
-	 * @see #appendEObjectAt(EObject, EReference, EObject)
-	 */
-	public static List appendEObjectListAt(EObject eObject,
-			EReference reference, List referencedObjects) {
-		List list = new ArrayList();
-		EObject childEObject = null;
-		Iterator childIt = referencedObjects.iterator();
-		while (childIt.hasNext()) {
-			childEObject = (EObject) childIt.next();
-			childEObject = appendEObjectAt(eObject, reference,
-				childEObject);
-			if (childEObject != null) {
-				list.add(childEObject);
-			}
-		}
-		return list;
-	}
-
-	/**
-	 * Appends an object's many reference with an additional reference.
-	 * Has no effect if this <code>reference</code> cannot be
-	 * {@linkplain #isOkToAppendEObjectAt(EObject, EReference, EObject) appended}.
-	 * 
-	 * @param eObject the element owning the reference list to be appended
-	 * @param reference the many reference to be appended
-	 * @param referencedObject an object to append to the list
-	 * 
-	 * @return <code>referencedObject</code> if it was successfully appended
-	 *     to the reference; <code>null</code>, otherwise
-	 * 
-	 * @see #appendEObjectAt(EObject, EReference, EObject)
-	 * @see #isOkToAppendEObjectAt(EObject, EReference, EObject)
-	 */
-	public static EObject appendEObjectAt(EObject eObject,
-			EReference reference, EObject referencedObject) {
-		if (isOkToAppendEObjectAt(eObject, reference, referencedObject) == false) {
-			return null;
-		}
-		if (reference.isContainment()) {
-            ((InternalEObject)referencedObject).eSetResource(null,null);
-			sendCreateEvent(referencedObject);
-		}
-		((Collection) eObject.eGet(reference)).add(referencedObject);
-		return referencedObject;
-	}
-
-	/**
-	 * Appends a resource's contents with an additional reference.
-	 * 
-	 * @param resource the resource
-	 * @param referencedObject an object to append to the list
-	 * 
-	 * @return <code>referencedObject</code> if it was successfully appended
-	 *     to the resource; <code>null</code>, otherwise
-	 * 
-	 */
-	public static EObject appendEObject(Resource resource, EObject referencedObject) {
-        ((InternalEObject)referencedObject).eSetResource(null,null);
-		sendCreateEvent(referencedObject);
-		resource.getContents().add(referencedObject);
-		return referencedObject;
-	}
-
-	/**
-	 * Replaces an object's scalar reference with an new element.
-	 * Does nothing if the <code>reference</code> specified is not
-	 * {@linkplain #isOkToSetEObject(EObject, EReference, EObject) settable}.
-	 * 
-	 * @param eObject the element owning the reference to be set
-	 * @param reference the scalar reference to be set
-	 * @param referencedObject the new value of the reference
-	 * 
-	 * @return the <code>referencedObjects</code>
-	 * 
-	 * @see #isOkToSetEObject(EObject, EReference, EObject)
-	 */
-	public static EObject setEObject(EObject eObject,
-			EReference reference, EObject referencedObject) {
-		if (isOkToSetEObject(eObject, reference, referencedObject) == false) {
-			return null;
-		}
-		if (reference.isContainment()) {
-            ((InternalEObject)referencedObject).eSetResource(null,null);
-			sendCreateEvent(referencedObject);
-		}
-		eObject.eSet(reference, referencedObject);
-		return referencedObject;
-	}
-
-	/**
-	 * Replaces an object's attribute with an new value.
-	 * Does nothing if the <code>attribute</code> specified is not
-	 * {@linkplain #isOkToSetEAttribute(EObject, EAttribute, Object) settable}.
-	 * 
-	 * @param eObject the element owning the attribute to be set
-	 * @param attribute the attribute to be set
-	 * @param value the new value of the attribute
-	 * 
-	 * @see #isOkToSetEAttribute(EObject, EAttribute, Object)
-	 */
-	public static void setEAttribute(EObject eObject,
-			EAttribute attribute, Object value) {
-		if (isOkToSetEAttribute(eObject, attribute, value)) {
-			eObject.eSet(attribute, value);
-		}
-	}
-
-	private static IClipboardSupport createClipboardSupport(EObject eObject) {
-		return ClipboardUtil.createClipboardSupport(eObject.eClass());
-	}
-	
-	/**
-	 * Broadcasts a creatio notification for a new {@link EObject}
-	 * via the appropriate clipboard support utility, if the metamodel support
-	 * such notifications.
-	 * 
-	 * @param eObject a newly created <code>EObject</code>
-	 * 
-	 * @see IClipboardSupport#sendCreateNotification(EObject)
-	 */
-	public static void sendCreateEvent(EObject eObject) {
-		IClipboardSupport cSupport = createClipboardSupport(eObject);
-		
-		if (null != cSupport)
-			cSupport.sendCreateNotification(eObject);
-	}
-	
-	/**
-	 * Broadcasts creation notifications for a list of new {@link EObject}s
-	 * via the appropriate clipboard support utility, if the metamodel support
-	 * such notifications.
-	 * 
-	 * @param eObjects a list of newly created {@link EObject}s
-	 * 
-	 * @see #sendCreateEvent(EObject)
-	 */
-	public static void sendCreateEvent(List eObjects) {
-		for (Iterator i = eObjects.iterator(); i.hasNext();)
-			sendCreateEvent((EObject) i.next());
-	}
-
-	/**
-	 * Queries whether an attribute may be set to the specified new value.
-	 * 
-	 * @param eObject the owner of the <code>attribute</code>
-	 * @param attribute an attribute to query whether it is settable
-	 * @param value the proposed new value of the <code>attribute</code>
-	 * 
-	 * @return <code>true</code> if the <code>attribute</code> is changeable
-	 *     and the <code>value</code> is not <code>null</code>;
-	 *     <code>false</code>, otherwise
-	 */
-	public static boolean isOkToSetEAttribute(EObject eObject,
-			EAttribute attribute, Object value) {
-		if ((value != null) && (attribute != null)) {
-			return attribute.isChangeable();
-		}
-		return false;
-	}
-
-	/**
-	 * Clears an object's scalar reference.
-	 * Has no effect if this <code>reference</code> cannot be
-	 * {@linkplain #isOkToDestroyEObject(EObject, EReference) cleared}.
-	 * 
-	 * @param eObject the element owning the reference to be cleared
-	 * @param reference the scalar reference to be cleared
-	 * 
-	 * @see #isOkToDestroyEObject(EObject, EReference)
-	 */
-	public static void destroyEObject(EObject eObject,
-			EReference reference) {
-		if (isOkToDestroyEObject(eObject, reference) == false) {
-			return;
-		}
-		EObject current = (EObject) eObject.eGet(reference);
-		if (current == null) {
-			return;
-		}
-		if (reference.isContainment()) {
-			createClipboardSupport(current).destroy(current);
-		} else {
-			eObject.eSet(reference, null);
-		}
-	}
-
-	/**
-	 * Removes an element from an object's many reference.
-	 * Has no effect if this <code>reference</code> cannot be
-	 * {@linkplain #isOkToDestroyEObjectInCollection(EObject, EReference) removed}.
-	 * 
-	 * @param eObject the element owning the reference list to be reduced
-	 * @param reference the many reference to be reduced
-	 * @param referencedObject an object to remove from the list
-	 * 
-	 * @see #isOkToDestroyEObjectInCollection(EObject, EReference)
-	 */
-	public static void destroyEObjectInCollection(EObject eObject,
-			EReference reference, EObject referencedObject) {
-		if (isOkToDestroyEObjectInCollection(eObject, reference) == false) {
-			return;
-		}
-		if (reference.isContainment()) {
-			createClipboardSupport(referencedObject).destroy(referencedObject);
-		} else {
-			((Collection) eObject.eGet(reference)).remove(referencedObject);
-		}
-	}
-
-	/**
-	 * Removes an element from a resource.
-	 * 
-	 * @param referencedObject an object to remove from the resource
-	 */
-	public static void destroyEObjectInResource(EObject referencedObject) {
-		createClipboardSupport(referencedObject).destroy(referencedObject);
-	}
-
-	/**
-	 * Queries whether a many reference may be appended with an new
-	 * {@link EObject}.
-	 * 
-	 * @param eObject the owner of the <code>reference</code>
-	 * @param reference a many reference to query whether it is appendable
-	 * @param referencedObject an object that is proposed to be appended
-	 *      to the <code>reference</code>
-	 * 
-	 * @return <code>true</code> if the <code>reference</code> is changeable
-	 *     and is not derived, and does not already contain the
-	 *     <code>referencedObject</code> or appending it would not violate
-	 *     the <code>reference</code>'s declared upper bound;
-	 *     <code>false</code>, otherwise
-	 */
-	public static boolean isOkToAppendEObjectAt(EObject eObject,
-			EReference reference, EObject referencedObject) {
-		if (isMutable(reference)) {
-			int lowerBound = reference.getLowerBound();
-			int upperBound = reference.getUpperBound();
-			if (lowerBound != upperBound) {
-				if (eObject.eIsSet(reference)) {
-					List list = (List) eObject.eGet(reference);
-					return (((upperBound == NONE) || (list.size() < upperBound)) && (list
-						.contains(referencedObject) == false));
-				} else {
-					return ((upperBound == NONE) || (upperBound > 0));
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Queries whether a scalar reference may be set to an new {@link EObject}.
-	 * 
-	 * @param eObject the owner of the <code>reference</code>
-	 * @param reference a scalar reference to query whether it is settable
-	 * @param referencedObject an object that is proposed to be assigned
-	 *      to the <code>reference</code>
-	 * 
-	 * @return <code>true</code> if the <code>reference</code> is changeable
-	 *     and is not derived, and does not already contain the
-	 *     <code>referencedObject</code> or the <code>referencedObject</code>
-	 *     is <code>null</code>; <code>false</code>, otherwise
-	 */
-	public static boolean isOkToSetEObject(EObject eObject,
-			EReference reference, EObject referencedObject) {
-		if (isMutable(reference)) {
-			Object value = eObject.eGet(reference);
-			return ((referencedObject != null) && (value != referencedObject));
-		}
-		return false;
-	}
-
-	/**
-	 * Queries whether a scalar reference may be cleared.
-	 * 
-	 * @param eObject the owner of the <code>reference</code>
-	 * @param reference a scalar reference to query whether it is clearable
-	 * 
-	 * @return <code>true</code> if the <code>reference</code> is changeable
-	 *     and its value is not already <code>null</code>;
-	 *     <code>false</code>, otherwise
-	 */
-	public static boolean isOkToDestroyEObject(EObject eObject,
-			EReference reference) {
-		if (reference.isChangeable()) {
-			Object value = eObject.eGet(reference);
-			return (value != null);
-		}
-		return false;
-	}
-
-	/**
-	 * Queries whether a many reference may have a reference removed from it.
-	 * 
-	 * @param eObject the owner of the <code>reference</code>
-	 * @param reference a many reference to query whether it is removable
-	 * 
-	 * @return <code>true</code> if the <code>reference</code> is changeable
-	 *     and is not derived, and removing an element would not violate
-	 *     its declared lower bound; <code>false</code>, otherwise
-	 */
-	public static boolean isOkToDestroyEObjectInCollection(EObject eObject,
-			EReference reference) {
-		if (isMutable(reference)) {
-			int lowerBound = reference.getLowerBound();
-			int upperBound = reference.getUpperBound();
-			if ((lowerBound != upperBound) && (eObject.eIsSet(reference))) {
-				List list = (List) eObject.eGet(reference);
-				return (list.size() > lowerBound);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Finds an Ecore element from a list of <code>elements</code> whose having
-	 * the specified <code>name</code>.  If an exact match is not found, and
-	 * <code>trySubNames</code> is <code>true</code>, then the match is
-	 * attempted again by trying to find an element whose name is a superset or
-	 * a subset of the <code>name</code>.
-	 * 
-	 * @param elements a list of elements to search
-	 * @param name the name to find
-	 * @param trySubNames whether to attempt a loose name match, if necessary
-	 * 
-	 * @return the first named element found, or <code>null</code> if none
-	 */
-	private static ENamedElement matchName(ENamedElement[] elements,
-			String name, boolean trySubNames) {
-		//match on exact name
-		for (int i = 0; i < elements.length; ++i) {
-			if (elements[i].getName().equalsIgnoreCase(name)) {
-				return elements[i];
-			}
-		}
-
-		if (trySubNames) {
-			//match on subname
-			for (int i = 0; i < elements.length; ++i) {
-				if ((elements[i].getName().indexOf(name) != NONE)
-					|| (name.indexOf(elements[i].getName()) != NONE)) {
-					return elements[i];
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Queries whether the specified <code>eObject</code> is contained within
-	 * another.  This differs from the
-	 * {@link org.eclipse.emf.ecore.util.EcoreUtil#isAncestor(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)}
-	 * method in checking for equality rather than identity.
-	 * 
-	 * @param eParent an element
-	 * @param eObject an element to see whether it is contained in the
-	 *    <code>eParent</code>
-	 * @return <code>true</code> if the <code>eObject</code> is contained within
-	 *     an element equal to the <code>eParent</code>;
-	 *      <code>false</code>, otherwise
-	 */
-	public static boolean isChild(EObject eParent, EObject eObject) {
-		EObject eContainer = eObject.eContainer();
-		while (eContainer != null) {
-			if (eContainer.equals(eParent)) {
-				return true;
-			}
-			eContainer = eContainer.eContainer();
-		}
-		return false;
-	}
-
-	/**
-	 * Queries whether two elements are both
-	 * {@linkplain IClipboardSupport#isNameable(EObject) nameable} and have
-	 * the same name (ignoring case).
-	 * 
-	 * @param eObject1 an object
-	 * @param eObject2 another object
-	 * @return <code>true</code> if both objects are nameable and have the
-	 *     same name (ignoring case); <code>false</code>, otherwise
-	 * 
-	 * @see IClipboardSupport#isNameable(EObject)
-	 */
-	public static boolean hasNameCollision(EObject eObject1, EObject eObject2) {
-		if (eObject1.eClass().equals(eObject2.eClass())) {
-			IClipboardSupport cs = createClipboardSupport(eObject1);
-			
-			//if the same object then no collision
-			if (eObject1.equals(eObject2)) {
-				return false;
-			} else if (isNameable(eObject1)) {
-				String childEObjectName = cs.getName(eObject2);
-				if (!isEmptyName(childEObjectName)) {
-					if (childEObjectName.equalsIgnoreCase(cs.getName(eObject1))) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Queries whether the specified element name is empty, indicating that the
-	 * element does not have a name. This is the case if the name is either the
-	 * <code>null</code> reference or an empty string. No consideration is
-	 * made for names that may be different if they were trimmed (for example, a
-	 * name consisting of just a bunch of blanks is not "empty").
-	 * 
-	 * @param elementName
-	 *            an element (eobject) name
-	 * @return <code>true</code> if the <code>elementName</code> is either
-	 *         <code>null</code> or empty; <code>false</code>, otherwise
-	 */
-	private static boolean isEmptyName(String elementName) {
-		return (elementName == null) || (elementName.length() == 0);
-	}
-
-	/**
-	 * Determines whether an object is nameable.
-	 * 
-	 * @param eObject an object
-	 * 
-	 * @return whether it is nameable
-	 */
-	private static boolean isNameable(EObject eObject) {
-		return createClipboardSupport(eObject).isNameable(eObject);
-	}
-
-	/**
-	 * Queries whether an object is
-	 * {@linkplain IClipboardSupport#isNameable(EObject) nameable} and have
-	 * the same name (ignoring case) as any element in a <code>list</code>.
-	 * 
-	 * @param list a ist of objects
-	 * @param eObject another object
-	 * @return <code>true</code> if the <code>eObject</code>is nameable and
-	 *     has the same name (ignoring case) as any object in the
-	 *     <code>list</code>; <code>false</code>, otherwise
-	 * 
-	 * @see IClipboardSupport#isNameable(EObject)
-	 */
-	public static boolean hasNameCollision(Collection list, EObject eObject) {
-		Iterator it = list.iterator();
-		EObject eOther = null;
-		while (it.hasNext()) {
-			eOther = (EObject) it.next();
-			if (hasNameCollision(eOther, eObject)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Given an object that has a name collision with one or more elements in 
-	 * a <code>list</code>, renames it to have a unique name.
-	 * 
-	 * @param list a list of objects
-	 * @param eObject another object whose name collides with the <code>list</code>
-	 * @param prefix the prefix to append; it will be modified by '_1', '_2',
-	 *     etc. as necessary
-	 * 
-	 * @see #hasNameCollision(Collection, EObject)
-	 */
-	public static void rename(Collection list, EObject eObject, String prefix) {
-		if (isNameable(eObject) == false) {
-			return;
-		}
-		String new_name = null;
-		String name = createClipboardSupport(eObject).getName(eObject);
-		String prefix_underscore = prefix + UNDERSCORE;
-		if (name.startsWith(prefix_underscore)) {
-			int close_index = name.indexOf(UNDERSCORE, prefix_underscore
-				.length());
-			if (close_index != NONE) {
-				String copy_prefix = name.substring(0, close_index);
-				int open_index = copy_prefix.indexOf(UNDERSCORE);
-				String copy_count_str = copy_prefix.substring(open_index + 1);
-				try {
-					int copy_count = Integer.parseInt(copy_count_str);
-					String name_proper = name.substring(close_index + 1).trim();
-					new_name = prefix_underscore + ++copy_count + UNDERSCORE
-						+ name_proper;
-				} catch (NumberFormatException nfe) {
-					ClipboardPlugin.catching(ClipboardSupportUtil.class,
-						"rename", nfe); //$NON-NLS-1$
-					new_name = null;
-				}
-			}
-		}
-
-		if (new_name == null) {
-			new_name = prefix_underscore + ONE + UNDERSCORE + name;
-		}
-
-		createClipboardSupport(eObject).setName(eObject, new_name);
-
-		//check this new name itself does not collide with an existing one
-		if (hasNameCollision(list, eObject)) {
-			rename(list, eObject, prefix);
-		}
-	}
-
-	/**
-	 * Queries whether two collections intersect.
-	 * 
-	 * @param collection1 a collection
-	 * @param collection2 another
-	 * 
-	 * @return <code>true</code> if they have any elements in common;
-	 *    <code>false</code>, otherwise
-	 */
-	public static boolean containsAny(Collection collection1,
-			Collection collection2) {
-		Iterator it = collection2.iterator();
-		while (it.hasNext()) {
-			if (collection1.contains(it.next())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Resolves a <code>proxy</code>, using the specified ID map.  If a proxy
-	 * resolves to another proxy, then this procedure repeats until either a
-	 * non-proxy is found or it is not resolved.
-	 * 
-	 * @param proxy a proxy
-	 * @param idToEObjectMap a mapping of element ID strings to {@link EObject}s
-	 * @return a resolved element, or a proxy if it could not be resolved.  In
-	 *     either case, the result may be different than the original
-	 *     <code>proxy</code> (this is different from the behaviour of the
-	 *     {@link org.eclipse.emf.ecore.util.EcoreUtil#resolve(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)}
-	 *     method
-	 */
-	public static EObject resolve(EObject proxy, Map idToEObjectMap) {
-		URI proxyUri = ((InternalEObject) proxy).eProxyURI();
-		if (proxyUri != null) {
-			try {
-				String id = getProxyID(proxyUri);
-				if ((id == null) || (id.length() == 0)) {
-					id = proxyUri.fragment();
-				}
-				EObject resolvedObject = (EObject) idToEObjectMap.get(id);
-				if (resolvedObject != null && resolvedObject != proxy) {
-					return resolve(resolvedObject, idToEObjectMap);
-				}
-			} catch (Exception exception) {
-				ClipboardPlugin.catching(ClipboardSupportUtil.class, RESOLVE, exception);
-			}
-		}
-		return proxy;
-	}
-
-	/**
-	 * Resolves a <code>proxy</code>, using the specified resource.  If a proxy
-	 * resolves to another proxy, then this procedure repeats until either a
-	 * non-proxy is found or it is not resolved.
-	 * 
-	 * @param proxy a proxy
-	 * @param resource the resource containing a mapping of element ID strings to {@link EObject}s
-	 * @return a resolved element, or a proxy if it could not be resolved.  In
-	 *     either case, the result may be different than the original
-	 *     <code>proxy</code> (this is different from the behaviour of the
-	 *     {@link org.eclipse.emf.ecore.util.EcoreUtil#resolve(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)}
-	 *     method
-	 */
-	public static EObject resolve(EObject proxy, XMLResource resource) {
-		URI proxyUri = ((InternalEObject) proxy).eProxyURI();
-		if (proxyUri != null) {
-			try {
-				String id = getProxyID(proxyUri);
-				if ((id == null) || (id.length() == 0)) {
-					id = proxyUri.fragment();
-				}
-				EObject resolvedObject = resource.getEObject(id);
-				if (resolvedObject != null && resolvedObject != proxy) {
-					return resolve(resolvedObject, resource);
-				}
-			} catch (Exception exception) {
-				ClipboardPlugin.catching(ClipboardSupportUtil.class, RESOLVE, exception);
-			}
-		}
-		return proxy;
-	}
-
-	/**
-	 * Obtains the proxy ID from a proxy, accounting for possible fragment
-	 * queries.
-	 * 
-	 * @param proxyUri a proxy URI
-	 * @return the fragment portion, minus the query (if any)
-	 */
-	private static String getProxyID(URI proxyUri) {
-
-		String uriFragment = proxyUri.fragment();
-
-		int index = uriFragment.indexOf('?');
-
-		return index != -1 ? uriFragment.substring(0, index)
-			: uriFragment;
-	}
-
-	/**
-	 * Obtains the containment feature of a parent element into which a child
-	 * should be pasted, that best matches the child's original containment
-	 * feature.
-	 * 
-	 * @param parentEObject the target element into which a child is to be
-	 *     pasted
-	 * @param eObject the child element to be pasted into the parent
-	 * @param originalReference the child's original containment reference
-	 * 
-	 * @return the best-match containment reference, or <code>null</code> if
-	 *     child <code>eObject</code> simply cannot be contained by the
-	 *     <code>parentEObject</code>
-	 */
-	public static EReference getPasteContainmentFeature(EObject parentEObject,
-			EObject eObject, EReference originalReference) {
-		//NOTE: originalReference could be null
-		List compatibleRefrencesList = new ArrayList();
-		EClass parentEClass = parentEObject.eClass();
-		EClass childEClass = eObject.eClass();
-		Iterator it = parentEClass.getEAllReferences().iterator();
-		EReference parentReference = null;
-		while (it.hasNext()) {
-			parentReference = (EReference) it.next();
-			// check if the parentReference is a containment reference
-			if (parentReference.isContainment()) {
-				if ((originalReference != null)
-					&& parentReference.equals(originalReference)) {
-					//perfect match...return it
-					return parentReference;
-				}
-				if (isMutable(parentReference)) {
-					if (createClipboardSupport(parentEObject).canContain(
-							parentEObject, parentReference, childEClass)) {
-						//holds same eObject type, collect it
-						compatibleRefrencesList.add(parentReference);
-					}
-				}
-			}
-		}
-
-		//found none
-		if (compatibleRefrencesList.size() == 0) {
-			return null;
-		} else if (compatibleRefrencesList.size() == 1) {
-			//only one, then return it
-			return (EReference) compatibleRefrencesList.get(0);
-		}
-
-		//didn't return from above, ok try to choose one based on name match.
-		EReference[] references = (EReference[]) compatibleRefrencesList
-			.toArray(EMPTY_REF_ARRAY);
-		//match on exact name of originalReference.
-		EReference ref = null;
-		if (originalReference != null) {
-			ref = (EReference) ClipboardSupportUtil.matchName(references,
-				originalReference.getName(), true);
-		}
-
-		return (ref == null) ? (EReference) ClipboardSupportUtil.matchName(
-			references, childEClass.getName(), true)
-			: ref;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardUtil.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardUtil.java
deleted file mode 100644
index 454e743..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardUtil.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ClipboardPlugin;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ClipboardSupportManager;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.DefaultClipboardSupport;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.PasteOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.SerializationEMFResource;
-
-
-/**
- * Utility for the creation of
- * {@link org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport} instances for
- * specific EMF metamodels, and for copy/paste operations to and from a String
- * form for use on the system clipboard.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class ClipboardUtil {
-	/**
-	 * Hint to perform "weak" merges when resolving paste collisions by merging.
-	 * Weak merges will merge the content of multiplicity-many features but
-	 * will not replace existing values in scalar features.
-	 * <p>
-	 * This hint is specified on a per-object basis.
-	 * </p>
-	 * 
-	 * @see #MERGE_HINT_STRONG
-	 */
-	public final static String MERGE_HINT_WEAK = "*merge=weak"; //$NON-NLS-1$
-
-	/**
-	 * Hint to perform "strong" merges when resolving paste collisions by merging.
-	 * Strong merges will merge the content of multiplicity-many features and
-	 * will also replace existing values in scalar features.  This is the
-	 * default merge behaviour.
-	 * <p>
-	 * This hint is specified on a per-object basis.
-	 * </p>
-	 * 
-	 * @see #MERGE_HINT_WEAK
-	 */
-	public final static String MERGE_HINT_STRONG = "*merge=strong"; //$NON-NLS-1$
-
-	/**
-	 * Hint to retain the original element's ID when pasting it.  Normally used
-	 * only when implementing a "move" operation, rather than a "copy".
-	 * <p>
-	 * This hint is specified on a per-object basis.
-	 * </p>
-	 */
-	public final static String RECYCLE_HINT_ID = "*recycle=id"; //$NON-NLS-1$
-
-	/**
-	 * Hint to ignore the recycle hint when pasting objects that were copied
-	 * with the recycle hint.  This essentially forces IDs to be regenerated
-	 * even when the copier asked for them to be reused.  This would be
-	 * appropriate, for example, on the second and subsequent paste of elements
-	 * that had been cut and already pasted once.
-	 * <p>
-	 * This hint applies to all objects:  use it as a key in the hint map with
-	 * a boolean value to indicate whether it is enabled.
-	 * </p>
-	 */
-	public final static String IGNORE_RECYCLE_HINT_ID = "*ignore_recycle=id"; //$NON-NLS-1$
-
-	/**
-	 * Hint to attempt to paste into the parent of target element if target
-	 * element doesn't accept the copied element.
-	 * <p>
-	 * This hint is specified on a per-object basis.
-	 * </p>
-	 */
-	public final static String PASTE_TO_TARGET_PARENT = "*paste=parent"; //$NON-NLS-1$
-
-	/**
-	 * Hint indicating that the elements to be pasted were harvested, rather
-	 * than just copied.
-	 * <p>
-	 * This hint is specified on a per-object basis.
-	 * </p>
-	 */
-	public final static String HARVESTED_ELEMENT = "*paste=harvest"; //$NON-NLS-1$
-
-
-	private static final String PASTE_SELECTION_FROM_STRING = "pasteElementsFromString"; //$NON-NLS-1$
-
-	private static final String COPY_SELECTION_TO_STRING = "copyElementsToString"; //$NON-NLS-1$
-
-	
-	/**
-	 * Not instantiable by clients.
-	 */
-	private ClipboardUtil() {
-		super();
-	}
-	
-	/**
-	 * Serializes elements to a string suitable for putting on the system
-	 * clipboard.
-	 * 
-	 * @param eObjects a collection of {@link EObject}s to be serialized
-	 * @param hints a mapping of hints (defined as constants on this class), or
-	 *     <code>null</code> to provide no hints
-	 * @param monitor a progress monitor to track progress, or
-	 *     <code>null</code> if no progress feedback is required
-	 * 
-	 * @return the serial form of the <code>eObjects</code>
-	 */
-	public static String copyElementsToString(Collection eObjects, Map hints,
-			IProgressMonitor monitor) {
-		try {
-			if (monitor == null) {
-				monitor = new NullProgressMonitor();
-			}
-			
-			monitor.beginTask(CopyOperation.COPY,
-				CopyOperation.TOTAL_WORK);
-			
-			// as long as we do not support heterogeneous copy, we need to
-			//   look at the first object in the client's original collection
-			//   in case they try to force a certain clipboard support by
-			//   ordering a particular element to the front (bug 136975)
-			EObject first = eObjects.isEmpty()? null : (EObject) eObjects.iterator().next();
-			eObjects = ClipboardSupportUtil.getCopyElements(eObjects);
-			
-			if (eObjects.isEmpty() == false) {
-				if (hints == null) {
-					hints = Collections.EMPTY_MAP;
-				}
-				CopyOperation copyOperation = new CopyOperation(
-					monitor,
-					createClipboardSupport(first.eClass()),
-					eObjects, hints);
-				return copyOperation.copy();
-			}
-		} catch (Exception ex) {
-			handleException(ex, COPY_SELECTION_TO_STRING);
-		} finally {
-			monitor.done();
-		}
-		return null;
-	}
-
-	/**
-	 * Deerializes elements from a string (obtained from the system clipboard)
-	 * and pastes them into the specified target element.
-	 * 
-	 * @param string the string containing the elements to be pasted
-	 * @param targetElement the element into which the new elements are to be
-	 *     pasted
-	 * @param hints a mapping of hints (defined as constants on this class), or
-	 *     <code>null</code> to provide no hints
-	 * @param monitor a progress monitor to track progress, or
-	 *     <code>null</code> if no progress feedback is required
-	 * 
-	 * @return the newly pasted {@link EObject}s
-	 */
-	public static Collection pasteElementsFromString(String string,
-			EObject targetElement, final Map hints, IProgressMonitor monitor) {
-		return pasteElementsFromStringDelagate(string, new PasteTarget(targetElement), hints, monitor);
-	}
-	
-	/**
-	 * Deerializes elements from a string (obtained from the system clipboard)
-	 * and pastes them into the specified target element.
-	 * 
-	 * @param string the string containing the elements to be pasted
-	 * @param targetElement the element into which the new elements are to be
-	 *     pasted
-	 * @param hints a mapping of hints (defined as constants on this class), or
-	 *     <code>null</code> to provide no hints
-	 * @param monitor a progress monitor to track progress, or
-	 *     <code>null</code> if no progress feedback is required
-	 * 
-	 * @return the newly pasted {@link EObject}s
-	 */
-	public static Collection pasteElementsFromString(String string,
-			Resource targetElement, final Map hints, IProgressMonitor monitor) {
-		return pasteElementsFromStringDelagate(string, new PasteTarget(targetElement), hints, monitor);
-	}
-
-	/**
-	 * Deerializes elements from a string (obtained from the system clipboard)
-	 * and pastes them into the specified target element.
-	 * 
-	 * @param string the string containing the elements to be pasted
-	 * @param targetElement the element into which the new elements are to be
-	 *     pasted
-	 * @param hints a mapping of hints (defined as constants on this class), or
-	 *     <code>null</code> to provide no hints
-	 * @param monitor a progress monitor to track progress, or
-	 *     <code>null</code> if no progress feedback is required
-	 * 
-	 * @return the newly pasted {@link EObject}s
-	 */
-	private static Collection pasteElementsFromStringDelagate(String string,
-			PasteTarget targetElement, final Map hints, IProgressMonitor monitor) {
-		Set result = null;
-		
-		try {
-			if (monitor == null) {
-				monitor = new NullProgressMonitor();
-			}
-			
-			monitor.beginTask(BasePasteOperation.PASTE,
-				PasteOperation.TOTAL_WORK);
-			IClipboardSupport helper = targetElement.isResource()
-				? DefaultClipboardSupport.getInstance()
-				: createClipboardSupport(((EObject)targetElement.getObject()).eClass());
-			if (string.length() == 0) {
-				return Collections.EMPTY_SET;
-			}
-			PasteOperation pasteProcess = new PasteOperation(
-				monitor, helper, string, targetElement,
-				SerializationEMFResource.LOAD_OPTIONS, hints);
-			pasteProcess.paste();
-			result = pasteProcess.getPastedElementSet();
-			helper.performPostPasteProcessing(result);
-		} catch (Exception ex) {
-			handleException(ex, PASTE_SELECTION_FROM_STRING);
-		} finally {
-			monitor.done();
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * handles the exception, does tracing ...etc.
-	 * 
-	 * @param ex
-	 *            the exception to hanlde
-	 * @param methodname
-	 *            the calling method
-	 */
-	private static void handleException(Exception ex, String methodname) {
-		if (ex instanceof OperationCanceledException) {
-			ClipboardPlugin.catching(ClipboardUtil.class,
-				methodname, ex);
-		} else {
-			ClipboardPlugin.throwing(ClipboardUtil.class,
-				methodname, ex);
-			throw (ex instanceof RuntimeException) ? (RuntimeException) ex
-				: new RuntimeException("Copy-Paste General Error", ex);//$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Obtains the clipboard copy/paste support utility, if any, for the
-	 * specified <code>eClass</code>'s metamodel.  If the metamodel does not
-	 * have a dedicated clipboard support implementation, then a default
-	 * implementation is provided that implements semantics similar to the
-	 * {@link org.eclipse.emf.ecore.util.EcoreUtil.Copier} class.
-	 * 
-	 * @param eClass a metaclass
-	 * @return the <code>eClass</code>'s metamodel's clipboard support
-	 *      utility, or a null implementation if none is registered for it
-	 *      (not actually <code>null</code>)
-	 */
-	public static IClipboardSupport createClipboardSupport(EClass eClass) {
-		IClipboardSupport result = DefaultClipboardSupport.getInstance();
-		EPackage ePackage = eClass.getEPackage();
-		IClipboardSupportFactory factory = ClipboardSupportManager.lookup(ePackage);
-		
-		if (factory != null) {
-			result = factory.newClipboardSupport(ePackage);
-		}
-		
-		return result;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyObjects.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyObjects.java
deleted file mode 100644
index 6e766e8..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyObjects.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A data structure that holds info needed through the copy process
- * @author Yasser Lulu 
- */
-public class CopyObjects {
-
-	public Collection originalObjects;
-
-	public Map copyParent2CopyMap = new HashMap();
-
-	public Map copyParent2ObjectsMap = new HashMap();
-
-	public Map copyAlwaysMap = new HashMap();
-
-	public Set combinedCopyAlwaysSet = new HashSet();
-
-	public Map objectsToCopyParentMap = new HashMap();
-
-	public Set totalCopyObjects = new HashSet();
-
-	/**
-	 * Initializes me with my original objects.
-	 * 
-	 * @param originalObjects the objects originally selected for copying
-	 */
-	public CopyObjects(Collection originalObjects) {
-		this.originalObjects = originalObjects;
-	}
-	
-	public void clear(){
-		originalObjects.clear();
-		copyParent2CopyMap.clear();
-		copyAlwaysMap.clear();
-		combinedCopyAlwaysSet.clear();
-		objectsToCopyParentMap.clear();
-		totalCopyObjects.clear();		
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java
deleted file mode 100644
index 1e7e02b..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java
+++ /dev/null

@@ -1,613 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ResourceInfoProcessor;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.SavingEMFResource;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.SerializationEMFResource;
-
-/**
- * The default copy operation.  Extensibility is provided by the callback
- * methods of the {@link IClipboardSupport} implementation for the specific
- * EMF metamodel.
- * <p>
- * <b>Note</b> that this class is not intended to be extended "directly"
- * by clients.  Clients may not instantiate it.  Clients that need to extend
- * or override this default copy operation should extend the
- * {@link OverrideCopyOperation} class, instead.
- * </p>
- * 
- * @see OverrideCopyOperation
- * 
- * @author Yasser Lulu
- */
-public class CopyOperation
-	extends ClipboardOperation {
-
-	private static final int KILOBYTE = 1024;
-
-	private static final int BUFFER_SIZE = 128 * KILOBYTE;
-
-	/** String constant for the value "copy". */
-	public static final String COPY = "copy"; //$NON-NLS-1$
-
-	private static final URI COPY_URI = URI.createFileURI(""); //$NON-NLS-1$
-
-	private Map hintMap;
-
-	private Collection eObjects;
-
-	private CopyParentsCopier copyParentsCopierCopier;
-
-	private OverrideCopyOperation overrideCopyOperation;
-
-	/**
-	 * Initializes me.
-	 * 
-	 * @param monitor the optional progress monitor (can be <code>null</code>)
-	 * @param clipboardSupport the clipboard support for the EMF metamodel
-	 * @param eObjects the {@link EObject}s to copy
-	 * @param hintMap the map of copy hints, possibly empty.  Hints are defined
-	 *     by the {@link org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil} class
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil#RECYCLE_HINT_ID
-	 * @see org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil#IGNORE_RECYCLE_HINT_ID
-	 */
-	public CopyOperation(IProgressMonitor monitor,
-		IClipboardSupport clipboardSupport, Collection eObjects,
-		Map hintMap) {
-		super(monitor, clipboardSupport);
-		this.eObjects = eObjects;
-		this.hintMap = hintMap;
-	}
-
-	/**
-	 * Obtains my hint map.
-	 * 
-	 * @return my hint map
-	 */
-	protected Map getEObjectsHintMap() {
-		return hintMap;
-	}
-
-	/**
-	 * Performs the copy operation.
-	 * 
-	 * @return the serialized form of the copied objects, suitable for placing
-	 *     on the system clipboard for later pasting
-	 * @throws Exception if anything goes wrong in performing the copy
-	 */
-	public String copy() throws Exception {
-		if (getClipboardOperationHelper().shouldOverrideCopyOperation(
-			getEObjects(), getEObjectsHintMap())) {
-			overrideCopyOperation = getClipboardOperationHelper()
-				.getOverrideCopyOperation(this);
-			//by returning a null op, it means disallow coying, thus return
-			// empty string
-			return (overrideCopyOperation != null) ? overrideCopyOperation
-				.copy() : ""; //$NON-NLS-1$
-		}
-        return doCopy();
-
-	}
-
-    protected String doCopy() throws Exception{
-        CopyObjects copyObjects = getAuxiliaryObjects();
-        if (isCancelled()) {
-            throwCancelException();
-        }
-        
-        return saveEObjects(copyObjects, COPY_URI, "UTF-8", //$NON-NLS-1$
-            SerializationEMFResource.SAVE_OPTIONS, getEObjectsHintMap());
-    }
-
-    
-	private String saveEObjects(CopyObjects copyObjects, URI uri,
-		String encoding, Map saveOptions, Map hints) throws Exception {
-		SavingEMFResource res = null;
-		try {
-			try {
-				res = new SavingEMFResource(uri, encoding, saveOptions,
-					getCopyParentsCopier().getCopy2ObjectMap(), copyObjects,
-					getClipboardOperationHelper());
-			} catch (Exception ex) {
-				//if the ctor of the saving resource threw an exception, then				
-				//something is wrong with elements we have, usually a problem with a
-				// detached view-element that renderes it un-copy-able.
-				throwUncopyableException();
-			}
-			ByteArrayOutputStream out = new ByteArrayOutputStream(BUFFER_SIZE);
-			res.save(out, null);
-			String dataStr = out.toString(encoding);
-			String infoStr = ResourceInfoProcessor.getResourceInfo(dataStr
-				.length(), encoding, res, hints, copyObjects);
-			return dataStr + infoStr;
-		} finally {
-			if (res != null) {
-				res.unload();
-			}
-		}
-	}
-
-	private void extractCopyAlwaysObjects(Collection mainObjects,
-		Set combinedCopyAlwaysSet, Map copyAlwaysMap) {
-		Iterator mainEObjectIt = mainObjects.iterator();
-		EObject originalEObject = null;
-		Set copyAlwaysSet = new HashSet();
-		while (mainEObjectIt.hasNext()) {
-			originalEObject = (EObject) mainEObjectIt.next();
-			getCopyAlwaysObjects(originalEObject, copyAlwaysSet,
-				combinedCopyAlwaysSet);
-			//now get copy-always for the originalObject's children,
-			//   recursively.  Use eAllContents() instead of
-			//   EcoreUtil.getAllProperContents() because we really need all
-			//   of the model sub-tree
-			Iterator childrenIt = originalEObject.eAllContents();
-			EObject directChild = null;
-			while (childrenIt.hasNext()) {
-				directChild = (EObject) childrenIt.next();
-				getCopyAlwaysObjects(directChild, copyAlwaysSet,
-					combinedCopyAlwaysSet);
-			}
-			if (copyAlwaysSet.isEmpty() == false) {
-				copyAlwaysMap.put(originalEObject, copyAlwaysSet);
-				copyAlwaysSet = new HashSet();
-			}
-		}
-
-		//just to be safe, remove non-copyables
-		removeNonCopyableObject(combinedCopyAlwaysSet);
-
-		//		we are doing this because copyAlways objects are copied with all
-		// their
-		//content recursively (i.e., treated as original objects
-		removeEmbeddedChildren(new ArrayList(combinedCopyAlwaysSet),
-			combinedCopyAlwaysSet);
-	}
-
-	private void extractCopyAlwaysObjects(CopyObjects copyObjects) {
-		extractCopyAlwaysObjects(copyObjects.originalObjects,
-			copyObjects.combinedCopyAlwaysSet, copyObjects.copyAlwaysMap);
-
-		//Now, remove copy always objects that are copied anyways
-		copyObjects.combinedCopyAlwaysSet
-			.removeAll(copyObjects.originalObjects);
-		removeEmbeddedChildren(copyObjects.originalObjects,
-			copyObjects.combinedCopyAlwaysSet);
-
-		if (copyObjects.combinedCopyAlwaysSet.isEmpty()) {
-			return;
-		}
-
-		Set nonCheckedCopyAlwaysSet = new HashSet(
-			copyObjects.combinedCopyAlwaysSet);
-		do {
-			Set startingCopyAlwaysSet = new HashSet(
-				copyObjects.combinedCopyAlwaysSet);
-			extractCopyAlwaysObjects(nonCheckedCopyAlwaysSet,
-				copyObjects.combinedCopyAlwaysSet, copyObjects.copyAlwaysMap);
-			Set newCopyAlwaysSet = new HashSet(
-				copyObjects.combinedCopyAlwaysSet);
-			newCopyAlwaysSet.removeAll(startingCopyAlwaysSet);
-			nonCheckedCopyAlwaysSet = newCopyAlwaysSet;
-		} while (nonCheckedCopyAlwaysSet.isEmpty() == false);
-	}
-
-	private Map removeEmbeddedChildren(Collection parents, Collection childs) {
-		Map removedEmbeddedChild2Parent = new HashMap();
-		Iterator parentsIt = parents.iterator();
-		EObject parent = null;
-		EObject child = null;
-		while (parentsIt.hasNext()) {
-			parent = (EObject) parentsIt.next();
-			Iterator childIt = childs.iterator();
-			while (childIt.hasNext()) {
-				child = (EObject) childIt.next();
-				if (ClipboardSupportUtil.isChild(parent, child)) {
-					childIt.remove();
-					removedEmbeddedChild2Parent.put(child, parent);
-				}
-			}
-		}
-		return removedEmbeddedChild2Parent;
-	}
-
-	private void extractCopyParentsObjects(CopyObjects copyObjects) {
-		List list = new ArrayList();
-		list.addAll(copyObjects.originalObjects);
-		list.addAll(copyObjects.combinedCopyAlwaysSet);
-
-		Iterator it = list.iterator();
-		EObject eObject = null;
-		EObject copyParent = null;
-		while (it.hasNext()) {
-			eObject = (EObject) it.next();
-			copyParent = getTopMostCopyParentObject(eObject);
-			if (copyParent != null) {
-				Set objectSet = (Set) copyObjects.copyParent2ObjectsMap
-					.get(copyParent);
-				if (objectSet == null) {
-					objectSet = new HashSet();
-					copyObjects.copyParent2ObjectsMap
-						.put(copyParent, objectSet);
-				}
-				objectSet.add(eObject);
-				//build initial objectsToCopyParentMap
-				copyObjects.objectsToCopyParentMap.put(eObject, copyParent);
-			}
-		}
-
-		if (copyObjects.copyParent2ObjectsMap.isEmpty()) {
-			return;
-		}
-
-		Set copyParentSet = copyObjects.copyParent2ObjectsMap.keySet();
-		removeEmbeddedChildren(copyObjects.originalObjects, copyParentSet);
-		Set copyParentSetCopy = new HashSet(copyParentSet);
-		//collapse the copyParent2ObjectsMap by removing embedded copy-parents
-		Map removedEmbeddedChild2Parent = removeEmbeddedChildren(
-			copyParentSetCopy, copyParentSet);
-
-		//build the ancestry path from each object to its top-most copyParent
-		Set embeddedCopyParents = new HashSet();
-		buildEmbeddedCopyParentChain(copyObjects.objectsToCopyParentMap
-			.keySet(), embeddedCopyParents, copyParentSet);
-
-		//add those who we won't indirectly copy by copier
-		list.addAll(copyParentSet);
-
-		Iterator copyParentsIt = copyParentSet.iterator();
-		copyParent = null;
-		EObject parentCopy = null;
-		while (copyParentsIt.hasNext()) {
-			copyParent = (EObject) copyParentsIt.next();
-			parentCopy = getCopyParentsCopier().copyParent(copyParent,
-				embeddedCopyParents, list);
-			copyObjects.copyParent2CopyMap.put(copyParent, parentCopy);
-		}
-		//now copy refs
-		getCopyParentsCopier().copyReferences();
-
-		//re-build objectsToCopyParentMap
-		list.removeAll(copyParentSet);
-		it = list.iterator();
-		while (it.hasNext()) {
-			eObject = (EObject) it.next();
-			copyParent = (EObject) copyObjects.objectsToCopyParentMap
-				.get(eObject);
-			EObject replacementCopyParent = (EObject) removedEmbeddedChild2Parent
-				.get(copyParent);
-			if (replacementCopyParent != null) {
-				copyObjects.objectsToCopyParentMap.put(eObject,
-					replacementCopyParent);
-			}
-		}
-	}
-
-	private void buildEmbeddedCopyParentChain(Set objectsWithCopyParent,
-		Set embeddedCopyParents, Set copyParentSet) {
-		Iterator it = objectsWithCopyParent.iterator();
-		EObject eObject = null;
-		while (it.hasNext()) {
-			eObject = (EObject) it.next();
-			while (copyParentSet.contains(eObject.eContainer()) == false) {
-				embeddedCopyParents.add(eObject.eContainer());
-				eObject = eObject.eContainer();
-			}
-		}
-	}
-
-	/**
-	 * Obtains my complete set of objects that must always be copied, that are
-	 * related to the original selection but not of it.
-	 * 
-	 * @return my combined set of "copy always" objects; may be empty
-	 */
-	public Set getCombinedCopyAlwaysSet() {
-		return getAuxiliaryObjects().combinedCopyAlwaysSet;
-	}
-	
-	protected CopyObjects getAuxiliaryObjects() {
-		CopyObjects copyObjects = new CopyObjects(getEObjects());
-		extractCopyAlwaysObjects(copyObjects);
-		extractCopyParentsObjects(copyObjects);
-		if (isCancelled()) {
-			throwCancelException();
-		}
-
-		//we are doing this because copyAlways objects are copied with all
-		// their
-		//content recursively (i.e., treated as original objects), so if a
-		//copyAlways happen to be a parent of an original object, then there is
-		//no need to copy the original.We will use a copy of the original
-		// object
-		//list to remove the embedded children from so that the list of
-		// originals
-		//is available for us later on.
-		List originalObjectsCopy = new ArrayList(copyObjects.originalObjects);
-		removeEmbeddedChildren(copyObjects.combinedCopyAlwaysSet,
-			originalObjectsCopy);
-
-		//now combine them all
-		copyObjects.totalCopyObjects.addAll(originalObjectsCopy);
-		copyObjects.totalCopyObjects.addAll(copyObjects.copyParent2CopyMap
-			.values());
-		copyObjects.totalCopyObjects.addAll(copyObjects.combinedCopyAlwaysSet);
-		return copyObjects;
-	}
-
-	private void removeNonCopyableObject(Collection collection) {
-		// model roots are not copyable
-		Iterator it = collection.iterator();
-		EObject eObject = null;
-		while (it.hasNext()) {
-			eObject = (EObject) it.next();
-			if (eObject.eContainer() == null) {
-				it.remove();
-			}
-		}
-	}
-
-	private EObject getTopMostCopyParentObject(EObject eChild) {
-		if ((eChild == null) || (eChild.eContainmentFeature() == null)
-			|| (eChild.eContainer() == null)) {
-			return null;
-		}
-		EObject copyParent = null;
-		if (getClipboardOperationHelper().hasPasteOption(eChild,
-			eChild.eContainmentFeature(), PasteOption.PARENT)) {
-			copyParent = getTopMostCopyParentObject(eChild.eContainer());
-			if (copyParent == null) {
-				if ((eChild.eContainer() != null)
-					&& (eChild.eContainer().eContainer() != null)) {
-					copyParent = eChild.eContainer();
-				}
-			}
-		}
-		return copyParent;
-	}
-
-	private void getCopyAlwaysObjects(EObject eObject, Set copyAlwaysObjects,
-		Set combinedCopyAlwaysSet) {
-		Iterator refIt = eObject.eClass().getEAllReferences().iterator();
-		EReference ref = null;
-		while (refIt.hasNext()) {
-			ref = (EReference) refIt.next();
-			if ((ref.isContainment() == false) && (eObject.eIsSet(ref))) {
-				Object value = eObject.eGet(ref, true);
-				if (getClipboardOperationHelper().isCopyAlways(eObject, ref,
-					value)) {
-					if (FeatureMapUtil.isMany(eObject,ref)) {
-						List vals = (List) value;
-						if (vals.isEmpty() == false) {
-							Iterator valIt = vals.iterator();
-							while (valIt.hasNext()) {
-								EObject val = (EObject) valIt.next();
-								if (combinedCopyAlwaysSet.contains(val) == false) {
-									copyAlwaysObjects.add(val);
-									combinedCopyAlwaysSet.add(val);
-								}
-							}
-						}
-					} else if (value != null) {
-						if (combinedCopyAlwaysSet.contains(value) == false) {
-							copyAlwaysObjects.add(value);
-							combinedCopyAlwaysSet.add(value);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private void throwCancelException() {
-		throwCancelException(COPY);
-	}
-
-	private void throwUncopyableException() {
-		throwException(COPY,
-			new IllegalArgumentException("Uncopyable Object")); //$NON-NLS-1$
-	}
-
-	private CopyParentsCopier getCopyParentsCopier() {
-		if (copyParentsCopierCopier == null) {
-			copyParentsCopierCopier = new CopyParentsCopier();
-		}
-		return copyParentsCopierCopier;
-
-	}
-
-	private class CopyParentsCopier
-		extends EcoreUtil.Copier {
-
-		private static final long serialVersionUID = 6178429496879264655L;
-
-		private Map copyToObjectMap = new HashMap();
-
-		private Collection doNotCopyEObjects;
-
-		private Collection embeddedCopyParents;
-
-		EObject copyParent(EObject eParent,
-			Collection embeddedCopyParentsCollection,
-			Collection doNotCopyEObjectsCollection) {
-			this.embeddedCopyParents = embeddedCopyParentsCollection;
-			this.doNotCopyEObjects = doNotCopyEObjectsCollection;
-			EObject copiedParent = copy(eParent);
-			this.doNotCopyEObjects = null;
-			embeddedCopyParents = null;
-			return copiedParent;
-		}
-
-		public EObject copy(EObject eObject) {
-			EObject copiedObject = (EObject) get(eObject);
-			if (copiedObject != null) {
-				return copiedObject;
-			}
-			copiedObject = super.copy(eObject);
-			copyToObjectMap.put(copiedObject, eObject);
-			return copiedObject;
-		}
-
-		Map getObject2CopyMap() {
-			return this;
-		}
-
-		Map getCopy2ObjectMap() {
-			return copyToObjectMap;
-		}
-
-		private Collection copyAll(EObject eOwnerObject, EReference eReference) {
-			if (!eOwnerObject.eIsSet(eReference))
-				return Collections.EMPTY_LIST;
-
-			List list = (List) eOwnerObject.eGet(eReference);
-			Collection result = new ArrayList(list.size());
-			int lowerBound = eReference.getLowerBound();
-			List noneCopied = new ArrayList(list.size());
-			Iterator it = list.iterator();
-			while (it.hasNext()) {
-				EObject eObject = (EObject) it.next();
-				if ((doNotCopyEObjects != null)
-					&& (doNotCopyEObjects.contains(eObject))) {
-					continue;
-				}
-				if ((embeddedCopyParents != null)
-					&& (embeddedCopyParents.contains(eObject))) {
-					result.add(copy(eObject));
-					if ((lowerBound != 0) && (result.size() == lowerBound)) {
-						return result;
-					}
-					continue;
-				}
-				noneCopied.add(eObject);
-			}
-
-			it = noneCopied.iterator();
-			while (it.hasNext()) {
-				EObject eObject = (EObject) it.next();
-				result.add(copy(eObject));
-				if ((lowerBound != 0) && (result.size() == lowerBound)) {
-					return result;
-				}
-			}
-			return result;
-		}
-
-		protected void copyAttribute(EAttribute eAttribute, EObject eObject,
-			EObject copiedEObject) {
-			//we don't test EAttributes for isCritical...
-			super.copyAttribute(eAttribute, eObject, copiedEObject);
-		}
-
-		protected void copyContainment(EReference eReference, EObject eObject,
-			EObject copiedEObject) {
-			if (eObject.eIsSet(eReference)) {
-				//do not copy the child that originated the copyParent request
-				// (copy-parent-request <-> non-null-child)
-				if (doNotCopyEObjects != null) {
-					//many-refs will be handled in copyAll function
-					if (!FeatureMapUtil.isMany(eObject,eReference)) {
-						if (doNotCopyEObjects
-							.contains(eObject.eGet(eReference))) {
-							return;
-						}
-					}
-				}
-				if (isCritical(eObject, eReference)) {
-					if (FeatureMapUtil.isMany(eObject,eReference)) {
-						((Collection) copiedEObject.eGet(eReference))
-							.addAll(copyAll(eObject, eReference));
-					} else {
-						EObject childEObject = (EObject) eObject
-							.eGet(eReference);
-						copiedEObject.eSet(eReference,
-							childEObject == null ? null : copy(childEObject));
-					}
-				}
-			}
-		}
-
-		protected void copyReference(EReference eReference, EObject eObject,
-			EObject copiedEObject) {
-			if (isCritical(eObject, eReference)) {
-				super.copyReference(eReference, eObject, copiedEObject);
-			}
-		}
-
-		private boolean isCritical(EObject eObject, EReference eReference) {
-			int lowerBound = eReference.getLowerBound();
-			int upperBound = eReference.getUpperBound();
-			if (upperBound == 0) {
-				return false;
-			}
-			if (FeatureMapUtil.isMany(eObject, eReference) && !eObject.eIsSet(eReference))
-				return false;
-			Object value = eObject.eGet(eReference);
-			if (value == null) {
-				return false;
-			}
-			if (eReference.isMany()) {
-				List list = (List) value;
-				if (list.isEmpty()) {
-					return false;
-				}
-				if (embeddedCopyParents != null) {
-					if (ClipboardSupportUtil.containsAny(list, embeddedCopyParents)) {
-						return true;
-					}
-				}
-				if (lowerBound == upperBound) {
-					return true;
-				}
-				if (lowerBound > 0) {
-					return true;
-				}
-				if (eReference.isChangeable() == false) {
-					return true;
-				}
-			} else if ((eReference.isUnsettable() == false)
-				|| ((embeddedCopyParents != null) && (embeddedCopyParents
-					.contains(value)))) {
-				return true;
-			}
-			return getClipboardOperationHelper().hasPasteOption(eObject,
-				eReference, PasteOption.CRITICAL);
-		}
-	} //CopyParentsCopier
-
-	/**
-	 * @return Returns the eObjectList.
-	 */
-	protected Collection getEObjects() {
-		return eObjects;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupport.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupport.java
deleted file mode 100644
index 3f47d75..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupport.java
+++ /dev/null

@@ -1,265 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-
-/**
- * An interface to be implemented by EMF metamodel providers to inject
- * metamodel-specific semantics into copy/paste operations.
- * Basically it has hints (e.g., what to do when pasted elements collide, what
- * related elements should always be copied together, etc.) that helps the
- * framework to make decisions.  For maximal flexibility, it is even possible
- * to override the paste operstion altogether.
- * <p>
- * This interface is intended to be implemented by plug-ins on the
- * <tt>clipboardSupport</tt> extension point.
- * See the {@link AbstractClipboardSupport} for a convenient superclass for
- * your implementation.
- * </p>
- * 
- * @see AbstractClipboardSupport
- * 
- * @author Yasser Lulu
- */
-public interface IClipboardSupport {
-
-    /**
-     * Queries what to do when a paste collision occurs on instances of a
-     * particular metaclass.
-     * 
-     * @param eClass the metaclass in question
-     * @return one of the enumerated paste actions
-     */
-    PasteAction getPasteCollisionAction(EClass eClass);
-
-    /**
-     * Queries whether a feature supports a particular paste option.
-     * 
-     * @param context and object being copied or pasted
-     * @param eStructuralFeature a feature of the <code>contextEObject</code>
-     * @param pasteOption the paste option to query
-     * 
-     * @return boolean whether the paste option is supported on this feature
-     */
-    boolean hasPasteOption(EObject context,
-            EStructuralFeature eStructuralFeature, PasteOption pasteOption);
-
-    /**
-     * Queries whether a reference needs to be copied even though the referenced
-     * element was not specifically included in the copy request.  It is
-     * recommended, though not required, that in general:
-     * <ul>
-     *   <li>containment references should always be copied</li>
-     *   <li>transient or derived references should not be copied</li>
-     * </ul>
-     * 
-     * @param context an object being copied that owns the reference
-     * @param eReference the reference being to query
-     * @param value the object(s) referenced by the <code>eReference</code>.
-     *     It is either an {@link EObject} or a collection of
-     *     <code>EObject</code>s, according to the multiplicity of the reference
-     * 
-     * @return boolean whether the <code>value</code> must also be copied
-     */
-    boolean isCopyAlways(EObject context, EReference eReference, Object value);
-
-    /**
-     * Queries whether it is necessary to completely override the default paste
-     * behaviour for pasting the specified (contained) child object into its
-     * parent.
-     * 
-     * @param parentElement the target element into which a child is to be pasted
-     * @param childEObject the child element to be pasted
-     * 
-     * @return boolean <code>true</code> if we want to completely override the
-     *     paste operation for this child; <code>false</code>, otherwise
-     */
-    boolean shouldOverrideChildPasteOperation(EObject parentElement,
-            EObject childEObject);
-
-    /**
-     * Queries whether it is necessary to completely override the default copy
-     * behaviour for copying the specified objects.
-     * 
-     * @param eObjects a collection of {@link EObject}s to be pasted
-     * @param hintMap the copy hints provided by the client of the
-     *     current copy operation
-     * 
-     * @return boolean <code>true</code> if we want to completely override the
-     *     copy operation for these objects; <code>false</code>, otherwise
-     */
-
-    boolean shouldOverrideCopyOperation(Collection eObjects, Map hintMap);
-
-    /**
-     * Obtains an override for the specified paste operation.  This method is
-     * called immediately after
-     * {@link #shouldOverrideChildPasteOperation(EObject, EObject)}, and then
-     * only if the latter returned <code>true</code>.
-     * 
-     * @param overriddenChildPasteOperation the paste operation to override
-     * @return the overriding paste operation, or <code>null</code> if it is not
-     *      appropriate to override (only in the case that
-     *      <code>shouldOverrideChildPasteOperation()</code> was <code>false</code>)
-     * 
-     * @see #shouldOverrideChildPasteOperation(EObject, EObject)
-     */
-    OverridePasteChildOperation getOverrideChildPasteOperation(
-            PasteChildOperation overriddenChildPasteOperation);
-
-    /**
-     * Obtains an override for the specified copy operation.  This method is
-     * called immediately after
-     * {@link #shouldOverrideCopyOperation(Collection, Map)}, and then
-     * only if the latter returned <code>true</code>.
-     * 
-     * @param overriddenCopyOperation the copy operation to override
-     * @return the overriding copy operation, or <code>null</code> if it is not
-     *      appropriate to override (only in the case that
-     *      <code>shouldOverrideCopyOperation()</code> was <code>false</code>)
-     * 
-     * @see #shouldOverrideChildPasteOperation(EObject, EObject)
-     */
-    OverrideCopyOperation getOverrideCopyOperation(
-            CopyOperation overriddenCopyOperation);
-
-    /**
-     * Queries whether any of a set of {@link EObject}s, or any objects
-     * contained in their sub-trees,
-     * should be excluded altogether from the copy operation.  These objects
-     * will not be copied.  It is up to the receiver to explicitly search the
-     * <code>eObjects</code> recursively for exclusions.
-     * 
-     * @param eObjects the objects considered for copying
-     * @return collection of object that we should not copy, or empty if none
-     */
-    Collection getExcludedCopyObjects(Set eObjects);
-    
-    /**
-     * Obtains the resource containing an <code>eObject</code> or, if the
-     * <code>eObject</code> is to be copied but is not attached to a resource,
-     * the resource containing some related element that the detached
-     * <code>eObject</code> would otherwise have been in.
-     * 
-     * @param eObject the object for which we need the associated resource
-     * @return the containing resource or, if the <code>eObject</code> is
-     *     detached, some resource from which it is reachable via some
-     *     other attached object
-     */
-    XMLResource getResource(EObject eObject);
-    
-    /**
-     * Queries whether an <code>eObject</code> should have a reference to the
-     * corresponding original element save along with a record of the original
-     * containment feature.  All original top-level copy objects must have
-     * this information saved.  As for their children (recursively), it is
-     * optional.
-     * 
-     * @param eObject the eObject to query whether the containment feature
-     *     should be saved
-     * @return whether that feature information should be saved
-     */
-    boolean shouldSaveContainmentFeature(EObject eObject);
-    
-    /**
-     *Performs what is necessary by the target paste model for the newly pasted elements
-     *This because we disable the semantic procedures, and they used to handle migration
-     *of profiles. now this function will end up doing that.
-     * 
-     * @param pastedEObjects the pasted objects to process     
-     */
-    void performPostPasteProcessing(Set pastedEObjects);
-    
-    /**
-     * Queries whether an <code>eObject</code>'s metamodel supports the concept
-     * of "naming" the <code>eObject</code>.  The "name" of an element may be
-     * assigned to copies with an adornment (e.g., "Copy of " as done by a
-     * certain well-known file system).
-     * 
-     * @param eObject an <code>EObject</code>
-     * @return whether the <code>eObject</code> supports a "name" of some kind
-     * 
-     * @see #getName(EObject)
-     * @see #setName(EObject, String)
-     */
-    boolean isNameable(EObject eObject);
-    
-    /**
-     * Obtains the "name" of an element, if the metamodel supports the
-     * concept of naming elements and this <code>eObject</code> has a name.
-     * 
-     * @param eObject an element
-     * @return the element's "name" if it has any, or <code>null</code> if not
-     * 
-     * @see #isNameable(EObject)
-     */
-    String getName(EObject eObject);
-    
-    /**
-     * Sets the "name" of an element, if the metamodel supports the
-     * concept of naming elements and this <code>eObject</code> is nameable.
-     * 
-     * @param eObject an element
-     * @param name the element's new "name", or <code>null</code> to clear it
-     * 
-     * @throws IllegalArgumentException if the <code>eObject</code> is not
-     *      nameable
-     * 
-     * @see #isNameable(EObject)
-     */
-    void setName(EObject eObject, String name);
-    
-    /**
-     * Destroys an <code>eObject</code>, to ensure that it no longer exists in
-     * its containing resource.  At a minimum, this method must remove the
-     * <code>eObject</code> from its container.  It may also do more, such as
-     * cleaning up references to the <code>eObject</code>.
-     * 
-     * @param eObject the object to be destroyed
-     */
-    void destroy(EObject eObject);
-    
-    /**
-     * Sends a notification that an <code>eObject</code> was created in its
-     * host editing domain.  This is an optional operation, for those
-     * applications that support the "create" notification type that is
-     * currently deprecated in EMF.
-     * 
-     * @param eObject an object newly created in the editing domain
-     */
-    void sendCreateNotification(EObject eObject);
-
-	/**
-	 * Queries whether an object can contain an object of a given type
-	 * in a specified containment reference.  The containment conditions
-	 * may be stricter than merely conformance to the declared type of the
-	 * containment reference.
-	 * 
-	 * @param container a prospective containing object
-	 * @param reference the containment reference to check
-	 * @param containedType the type of the prospective contained object
-	 * 
-	 * @return <code>true</code> if an element of the specified type is
-	 *     permitted to be contained as indicated; <code>false</code>, otherwise
-	 */
-	boolean canContain(EObject container, EReference reference, EClass containedType);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupportFactory.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupportFactory.java
deleted file mode 100644
index b378f57..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupportFactory.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * Interface for objects that can create {@link IClipboardSupport}s for
- * supporting clipboard copy/paste operations on EMF models.
- * <p>
- * This interface is intended to be implemented by plug-ins
- * on the <tt>clipboardSupport</tt> extension point.
- * </p>
- * 
- * @see IClipboardSupport
- *
- * @author Christian W. Damus (cdamus)
- */
-public interface IClipboardSupportFactory {
-	/**
-	 * Creates a new clipboard support utility instance.  This method may create
-	 * a new instance or may return always the same reusable instance.
-	 * Clipboard support utilities are not expected to retain any state that
-	 * needs to be disposed.
-	 * <p>
-	 * A single factory class can support any number of EMF metamodels.  Hence
-	 * the parameterization of the factory method by an <code>ePackage</code>.
-	 * </p>
-	 * 
-	 * @param ePackage the <code>EPackage</code> (representing an EMF metamodel)
-	 *     for which a clipboard support utility is required.
-	 * @return a new clipboard support utility
-	 */
-	IClipboardSupport newClipboardSupport(EPackage ePackage);
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ObjectInfo.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ObjectInfo.java
deleted file mode 100644
index f5cfdea..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ObjectInfo.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Data structure storing meta-data related to the copying of an element.
- * 
- * @author Yasser Lulu 
- */
-public class ObjectInfo {
-
-	private static final int NONE = -1;
-
-	/** Indicates the reason why the corresponding object was copied. */
-	public String objCopyType;
-
-	/** The corresponding object's original ID. */
-	public String objId;
-
-	/**
-	 * The corresponding object's original container's ID. This can be different
-	 * from the "parent" object's ID in cases where the "parent" object is not
-	 * the copied object's direct container.
-	 */
-	public String containerId;
-
-	/**
-	 * Fully-qualified name of the corresponding object's original parent's class
-	 */
-	public String containerClass;
-
-	/** The copy hints associated with the corresponding object. */
-	public String hints;
-
-	/**
-	 * The corresponding object's original parent's ID. This can be different
-	 * from the "container" object's ID in cases where the "parent" object is not
-	 * the copied object's direct container.
-	 */
-	public String copyParentId;
-
-	/**
-	 * IDs of objects related to the corresponding element that must be
-	 * copied along with it.
-	 */
-	public List copyAlwaysIds;
-
-	/**
-	 * The <code>ObjectInfo</code> meta-data for the associated copy-always
-	 * objects, corresponding one-for-one with the {@link #copyAlwaysIds}.
-	 * 
-	 * @see #copyAlwaysIds
-	 */
-	private List alwaysCopyEObjectInfoList;
-
-	/**
-	 * Initializes me.
-	 */
-	public ObjectInfo() {
-		copyAlwaysIds = new ArrayList();
-		alwaysCopyEObjectInfoList = new ArrayList();
-	}
-
-	/**
-	 * Queries whether my hints include the specified <code>hint</code>.
-	 * 
-	 * @param hint a hint to look for
-	 * @return <code>true</code> if I have this hint; <code>false</code>,
-	 *     otherwise
-	 */
-	public boolean hasHint(String hint) {
-		return hints.indexOf(hint) != NONE;
-	}
-
-	public void makeCopyAlwaysObjectInfoList(List allCopyAlwaysObjectsInfoList) {
-		Iterator it = allCopyAlwaysObjectsInfoList.iterator();
-		ObjectInfo objInfo = null;
-		while (it.hasNext()) {
-			objInfo = (ObjectInfo) it.next();
-			if (copyAlwaysIds.contains(objInfo.objId)) {
-				alwaysCopyEObjectInfoList.add(objInfo);
-			}
-		}
-	}
-
-	/**
-	 * Obtains the <code>ObjectInfo</code> meta-data for the associated
-	 * copy-always objects, corresponding one-for-one with the 
-	 * {@link #copyAlwaysIds}.
-	 * 
-	 * @return the copy-always object <code>ObjectInfo</code>s
-	 * 
-	 * @see #copyAlwaysIds
-	 */
-	public List getCopyAlwaysObjectInfoList() {
-		return alwaysCopyEObjectInfoList;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/OverrideCopyOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/OverrideCopyOperation.java
deleted file mode 100644
index 4531319..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/OverrideCopyOperation.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-/**
- * Abstract definition of an
- * {@link org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport}-defined
- * operation that completely overrides the default copy behaviour.
- * <p>
- * This class is intended to be extended by clients, to provide an alternative
- * copy operation in the clipboard support.
- * </p>
- * 
- * @see IClipboardSupport#getOverrideCopyOperation(CopyOperation)
- * 
- * @author Yasser Lulu
- */
-public abstract class OverrideCopyOperation extends CopyOperation {
-    private CopyOperation overriddenCopyOperation;
-
-    /**
-     * Initializes me with the default copy operation that I am overriding.
-     * I may want to access this default operation later in performing the
-     * copy.
-     * 
-     * @param overriddenCopyOperation the default copy operation that I override
-     */
-     public OverrideCopyOperation(CopyOperation overriddenCopyOperation) {
-        super(overriddenCopyOperation.getProgressMonitor(),
-                overriddenCopyOperation.getClipboardOperationHelper(),
-                overriddenCopyOperation.getEObjects(), overriddenCopyOperation
-                        .getEObjectsHintMap());
-        this.overriddenCopyOperation = overriddenCopyOperation;
-    }
-
-    /**
-     * Obtains the default copy operation that I am overriding.
-     * 
-     * @return the overridden copy operation
-     */
-    protected CopyOperation getOverriddenCopyOperation() {
-        return overriddenCopyOperation;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/OverridePasteChildOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/OverridePasteChildOperation.java
deleted file mode 100644
index 43c7e69..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/OverridePasteChildOperation.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-/**
- * Abstract definition of an
- * {@link org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport}-defined
- * operation that completely overrides the default paste-child behaviour.
- * <p>
- * This class is intended to be extended by clients, to provide an alternative
- * paste operation in the clipboard support.
- * </p>
- * 
- * @see IClipboardSupport#getOverrideChildPasteOperation(PasteChildOperation)
- * 
- * @author Yasser Lulu
- */
-public abstract class OverridePasteChildOperation
-	extends PasteChildOperation {
-
-	private PasteChildOperation overriddenChildPasteOperation;
-
-    /**
-     * Initializes me with the default paste operation that I am overriding.
-     * I may want to access this default operation later in performing the
-     * paste.
-     * 
-     * @param overriddenChildPasteOperation the default paste operation that I
-     *     override
-     */
-	public OverridePasteChildOperation(
-			PasteChildOperation overriddenChildPasteOperation) {
-		super(overriddenChildPasteOperation);
-		this.overriddenChildPasteOperation = overriddenChildPasteOperation;
-	}
-
-	/**
-     * Obtains the default child-paste operation that I am overriding.
-     * 
-     * @return the overridden paste operation
-	 */
-	protected PasteChildOperation getOverriddenPasteChildOperation() {
-		return overriddenChildPasteOperation;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteAction.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteAction.java
deleted file mode 100644
index b896ea9..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteAction.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-/**
- * An enumeration of actions to resolve paste collisions.
- * 
- * @author khussey
- */
-public class PasteAction
-	extends AbstractEnumerator {
-
-	/**
-	 * An internal unique identifier for this enumerated type.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * Indicates that that the collision should be resolved by just adding the
-	 * conflicting pasted element with an altered name to distinguish it from
-	 * the existing one.  Note that for scalar references, this is equivalent
-	 * to a {@link #REPLACE}.
-	 */
-	public static final PasteAction ADD = new PasteAction("Add"); //$NON-NLS-1$
-
-	/**
-	 * Indicates that that the collision should be resolved by just adding the
-	 * conflicting pasted element with an altered name to distinguish it from
-	 * the existing one.  Note that for scalar references, this is equivalent
-	 * to a {@link #REPLACE}.
-	 */
-	public static final PasteAction CLONE = new PasteAction("Clone"); //$NON-NLS-1$
-
-	/**
-	 * Indicates that the collision should be resolved by discarding the
-	 * new element (not pasting it).
-	 */
-	public static final PasteAction DISCARD = new PasteAction("Discard"); //$NON-NLS-1$
-
-	/**
-	 * Indicates that the collision should be resolved by just not doing
-	 * anything.  The new element will not be pasted.
-	 */
-	public static final PasteAction IGNORE = new PasteAction("Ignore"); //$NON-NLS-1$
-
-	/**
-	 * Indicates that the collision should be resolved by merging the
-	 * new element into the existing one.  The merge will be strong or weak
-	 * according to the merge hints provided to the paste operation.
-	 */
-	public static final PasteAction MERGE = new PasteAction("Merge"); //$NON-NLS-1$
-
-	/**
-	 * The "undefined" value.  This is an invalid paste action, which can be used
-	 * to indicate that the determination of an appropriate paste action has
-	 * not been done. 
-	 */
-	public static final PasteAction NO_ACTION = new PasteAction("No Action"); //$NON-NLS-1$
-
-	/**
-	 * Indicates that the collision should be resolved by replacing the
-	 * existing element with the new one.
-	 */
-	public static final PasteAction REPLACE = new PasteAction("Replace"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final PasteAction[] VALUES = {ADD, CLONE, DISCARD, IGNORE,
-		MERGE, NO_ACTION, REPLACE};
-
-	/**
-	 * Constructs a new paste action with the specified name.
-	 * 
-	 * @param name The name of the new paste action.
-	 */
-	private PasteAction(String name) {
-		super(nextOrdinal++,name);
-	}
-
-	/**
-	 * Retrieves the list of constants for this enumerated type.
-	 * 
-	 * @return The list of constants for this enumerated type.
-	 */
-	protected List getValues() {
-		return Collections.unmodifiableList(Arrays.asList(VALUES));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteChildOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteChildOperation.java
deleted file mode 100644
index de165b9..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteChildOperation.java
+++ /dev/null

@@ -1,1178 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.MergedEObjectInfo;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ObjectCopyType;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.PasteIntoParentOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.ResourceInfoProcessor;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.l10n.EMFClipboardCoreMessages;
-
-
-/**
- * An operation to paste a child object into a new target parent object.
- * 
- * @author Yasser Lulu
- */
-public class PasteChildOperation
-	extends BasePasteOperation {
-
-	/**
-	 * Localized prefix to prepend onto element names to disambiguate them
-	 * in resolving paste collisions.
-	 */
-	protected static final String COPY = EMFClipboardCoreMessages.pasteChildOperation_copyPrefix;
-
-	/**
-	 * A reusable empty array of paste child operations.
-	 */
-	protected static final PasteChildOperation[] EMPTY_ARRAY = new PasteChildOperation[0];
-
-	private Map auxiliaryChildPasteProcessMap;
-
-	private PasteChildOperation mainChildPasteProcess;
-
-	private PasteChildOperation postPasteOperation;
-
-	private List alwaysCopyObjectPasteOperations;
-
-	private ObjectInfo childObjectInfo;
-
-	private EObject childEObject;
-
-	private EObject pastedElement;
-
-	private EObject copyParentEObject;
-
-	private ObjectInfo copyParentObjectInfo;
-
-	private EObject directContainerEObject;
-
-	private OverridePasteChildOperation overrideChildPasteOperation;
-
-	private EReference containmentFeature;
-
-	private Map embeddedCopyParentObjectInfoMap = new HashMap();
-
-	/**
-	 * Initializes me.
-	 * 
-	 * @param parentPasteProcess my superordinate operation, that created me
-	 *      in order to paste one of its copied objects into its target parent
-	 *      object
-	 * @param childEObjectInfo the metadata for the child object to be pasted
-	 */
-	public PasteChildOperation(PasteIntoParentOperation parentPasteProcess,
-		ObjectInfo childEObjectInfo) {
-		super(parentPasteProcess);
-		this.childObjectInfo = childEObjectInfo;
-		auxiliaryChildPasteProcessMap = new HashMap();
-	}
-
-	/**
-	 * Gets the containment feature into which I would prefer to paste my child
-	 * element into the parent.
-	 * 
-	 * @return the preferred containment feature to paste into
-	 */
-	protected EReference getContainmentFeature() {
-		if (containmentFeature == null) {
-			containmentFeature = getParentPasteProcess().getContainmentFeature(
-				getEObject());
-		}
-		return containmentFeature;
-	}
-
-	/**
-	 * Initializes me as an auxiliary to another child paste operation.
-	 * 
-	 * @param mainChildPasteProcess the main child paste operation
-	 * @param childEObjectInfo the metadata for the child object to be pasted
-	 */
-	private PasteChildOperation(PasteChildOperation mainChildPasteProcess,
-		ObjectInfo childEObjectInfo) {
-		this(mainChildPasteProcess.getParentPasteProcess(), childEObjectInfo);
-		this.mainChildPasteProcess = mainChildPasteProcess;
-	}
-
-	/**
-	 * Initializes me as an override- or post-paste operation.
-	 * 
-	 * @param mainChildPasteProcess the paste-child process that I am overriding
-	 *     or extending
-	 */
-	protected PasteChildOperation(PasteChildOperation mainChildPasteProcess) {
-		this(mainChildPasteProcess.getParentPasteProcess(),
-			mainChildPasteProcess.childObjectInfo);
-	}
-
-	/**
-	 * Obtains the direct container object, from the deserialized copied elements,
-	 * of the object that I am pasting.
-	 * 
-	 * @return my object's direct container
-	 */
-	protected EObject getLoadedDirectContainerEObject() {
-		if (directContainerEObject == null) {
-			directContainerEObject = getLoadedEObject(getChildObjectInfo().containerId);
-		}
-		return directContainerEObject;
-	}
-
-	/**
-	 * Obtains the paste operation that created me to paste a child into the
-	 * target parent element.
-	 * 
-	 * @return my parent operation
-	 */
-	public PasteIntoParentOperation getParentPasteProcess() {
-		return (PasteIntoParentOperation) getSpawningPasteOperation();
-	}
-
-	/**
-	 * Obtains the paste operation that pastes the auxiliary object indicated
-	 * by the specified object info.
-	 * 
-	 * @param auxiliaryChildEObjectInfo the auxiliary object's info
-	 * @return the paste operation that pastes the auxiliary object
-	 */
-	protected PasteChildOperation getAuxiliaryChildPasteProcess(
-		ObjectInfo auxiliaryChildEObjectInfo) {
-		PasteChildOperation auxiliaryChildPasteProcess = (PasteChildOperation) auxiliaryChildPasteProcessMap
-			.get(auxiliaryChildEObjectInfo);
-		if (auxiliaryChildPasteProcess == null) {
-			auxiliaryChildPasteProcess = makeAuxiliaryChildPasteProcess(auxiliaryChildEObjectInfo);
-			if (auxiliaryChildPasteProcess != null) {
-				auxiliaryChildPasteProcessMap.put(auxiliaryChildEObjectInfo,
-					auxiliaryChildPasteProcess);
-			}
-		}
-		return auxiliaryChildPasteProcess;
-	}
-
-	/**
-	 * Constructs a paste operation to paste the auxiliary object indicated by
-	 * its object info.
-	 * 
-	 * @param auxiliaryChildEObjectInfo the auxiliary object's info
-	 * @return the appropriate paste child operation
-	 */
-	protected PasteChildOperation makeAuxiliaryChildPasteProcess(
-		ObjectInfo auxiliaryChildEObjectInfo) {
-		return new PasteChildOperation(this, auxiliaryChildEObjectInfo);
-	}
-
-	/**
-	 * Retrieves the object that I am pasting from the deserialized clipboard
-	 * string into the target parent object.
-	 * 
-	 * @return the object that I am pasting
-	 */
-	public EObject getEObject() {
-		if (childEObject == null) {
-			childEObject = getLoadedEObject(getChildObjectInfo().objId);
-		}
-		return childEObject;
-	}
-
-	/**
-	 * After pasting is completed, obtains the element that I pasted.
-	 * 
-	 * @return the pasted element, or <code>null</code> if I did not succeed
-	 *     in pasting
-	 */
-	public EObject getPastedElement() {
-		return pastedElement;
-	}
-
-	/**
-	 * Looks up an object deserialized from the clipboard string by its ID.
-	 *  
-	 * @param objId the object ID to look up
-	 * @return the corresponding object, or <code>null</code> if not found
-	 */
-	protected EObject getLoadedEObject(String objId) {
-		return getParentPasteProcess().getLoadedEObject(objId);
-	}
-
-	/**
-	 * Looks up the ID of an object deserialized from the clipboard string.
-	 *  
-	 * @param eObject the object whose ID we want to look up
-	 * @return the corresponding ID, or <code>null</code> if not found
-	 */
-	protected String getLoadedEObjectID(EObject eObject) {
-		return getParentPasteProcess().getLoadedEObjectID(eObject);
-	}
-
-	/**
-	 * Queries whether the object that I am pasting had its parent object
-	 * copied along with it, as an alternative element to try to paste when I
-	 * can't be directly pasted into the target element.
-	 * 
-	 * @return whether my copy object was copied with its parent
-	 */
-	protected boolean hasCopyParent() {
-		return (ResourceInfoProcessor.NONE
-			.equals(getChildObjectInfo().copyParentId) == false);
-	}
-
-	/**
-	 * Queries whether the object that I am pasting was copied because it
-	 * is always copied along with an element that was originally selected for
-	 * copying.
-	 * 
-	 * @return whether my copy object is copied because of a "copy always" rule
-	 */
-	protected boolean isCopyAlways() {
-		return (getChildObjectInfo().objCopyType
-			.equals(ObjectCopyType.OBJ_COPY_TYPE_ALWAYS));
-	}
-
-	/**
-	 * Gets the original parent of the object that I am pasting, if it was
-	 * copied along with the child.
-	 * 
-	 * @return the copy parent, or <code>null</code> if it was not copied
-	 * 
-	 * @see #hasCopyParent()
-	 */
-	protected EObject getCopyParentEObject() {
-		if (copyParentEObject == null) {
-			copyParentEObject = getLoadedEObject(getChildObjectInfo().copyParentId);
-		}
-		return copyParentEObject;
-	}
-
-	/**
-	 * Looks up an object in the resource to which we are pasting, by its ID.
-	 *  
-	 * @param objId the object ID to look up
-	 * @return the corresponding object, or <code>null</code> if not found
-	 */
-	protected EObject getEObject(String objId) {
-		return getParentPasteProcess().getEObject(objId);
-	}
-
-	/**
-	 * Looks up the ID of an object in the resource to which we are pasting.
-	 *  
-	 * @param eObject the object to look up its ID
-	 * @return the corresponding ID, or <code>null</code> if not found
-	 */
-	protected String getEObjectID(EObject eObject) {
-		return getParentPasteProcess().getEObjectID(eObject);
-	}
-
-	/**
-	 * Finds some parent in the containment chain (ancestry) of the parent
-	 * element into which I am pasting that my child element can be pasted into.
-	 * 
-	 * @param preferredTypeName the fully-qualified class name of the preferred
-	 *     element type to paste into
-	 * @return the suitable parent, if found, otherwise <code>null</code>
-	 */
-	protected PasteTarget getSuitableParentUsingAncestry(String preferredTypeName) {
-		PasteTarget suitableParent = getSuitableParentUsingAncestry(
-			getParentTarget(), preferredTypeName, true);
-		if (suitableParent == null) {
-			suitableParent = getSuitableParentUsingAncestry(getParentTarget(),
-				preferredTypeName, false);
-		}
-		return suitableParent;
-	}
-
-	private PasteTarget getSuitableParentUsingAncestry(
-			PasteTarget potentialParent, String preferredTypeName,
-		boolean strictMatch) {
-		PasteTarget suitableParent = checkPotentialParent(potentialParent,
-			preferredTypeName, strictMatch);
-		if (suitableParent == null && !potentialParent.isResource()) {
-			EObject potentialParentObject = (EObject)potentialParent.getObject();
-			while ((suitableParent == null)
-				&& (potentialParentObject.eContainer() != null)) {
-				potentialParentObject = potentialParentObject.eContainer();
-				suitableParent = checkPotentialParent(new PasteTarget(potentialParentObject),
-					preferredTypeName, strictMatch);
-			}
-		}
-		return suitableParent;
-	}
-
-	/**
-	 * After pasting has completed, obtains the pasted object corresponding
-	 * to the specified originally copied object.
-	 * 
-	 * @param eObject the originally copied object
-	 * @return the corresponding pasted object, or <code>null</code> if the
-	 *      <code>eObject</code> was not successfully pasted
-	 */
-	protected EObject getPastedEObject(EObject eObject) {
-		String id = getEObjectID(eObject);
-		if (id != null) {
-			//it has been pasted as is
-			return eObject;
-		} else {
-			//maybe it has been merged?
-			MergedEObjectInfo info = (MergedEObjectInfo) getAllMergedElementsMap()
-				.get(eObject);
-			if (info != null) {
-				if (info.targetEObjects.size() == 1) {
-					return (EObject) info.targetEObjects.get(0);
-				} else if (info.targetEObjects.size() > 1) {
-					//got merged more than once, pick most suitable!
-					Iterator it = info.targetEObjects.iterator();
-					while (it.hasNext()) {
-						EObject mergeTarget = (EObject) it.next();
-						if ((getParentTarget().isResource() &&
-								getParentTarget().getObject() == mergeTarget.eResource()) ||
-								ClipboardSupportUtil.isChild(getParentEObject(), mergeTarget)) {
-							return mergeTarget;
-						}
-					}
-					//no suitable one, then pick the first
-					return (EObject) info.targetEObjects.get(0);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * After pasting has completed, obtains the pasted object corresponding
-	 * to the specified originally copied object's parent.
-	 * 
-	 * @return the corresponding pasted object, or <code>null</code> if the
-	 *      copy parent was not successfully pasted
-	 */
-	protected EObject getPastedDirectCopyParent() {
-		return getPastedEObject(getLoadedDirectContainerEObject());
-	}
-
-	private EObject doPasteIntoNearestCopyParent(
-		EObject topMostCopyParentEObject) throws Exception {
-		EObject nearestParent = getLoadedEObject(getChildObjectInfo().containerId);
-		while (nearestParent.equals(topMostCopyParentEObject) == false) {
-			EObject parentElement = doPasteIntoCopyParent(makeEmbeddedCopyParentObjectInfo(nearestParent));
-			if (parentElement != null) {
-				return parentElement;
-			}
-			nearestParent = nearestParent.eContainer();
-		}
-
-		return null;
-	}
-
-	private EObject doPasteIntoCopyParent(ObjectInfo theCopyParentObjectInfo)
-		throws Exception {
-		PasteChildOperation copyParentProcess = getAuxiliaryChildPasteProcess(theCopyParentObjectInfo);
-		copyParentProcess.paste();
-		EObject pastedCopyParent = copyParentProcess.getPastedElement();
-		if (pastedCopyParent != null) {
-			//the direct copy parent should have been pasted correctly by now
-			return doPasteInto(getPastedDirectCopyParent());
-		}
-		return null;
-	}
-
-	private ObjectInfo makeEmbeddedCopyParentObjectInfo(
-		EObject embeddedCopyParent) {
-		ObjectInfo objectInfo = (ObjectInfo) embeddedCopyParentObjectInfoMap
-			.get(embeddedCopyParent);
-		if (objectInfo == null) {
-			objectInfo = new ObjectInfo();
-			objectInfo.objCopyType = ObjectCopyType.OBJ_COPY_TYPE_PARENT;
-			objectInfo.objId = getLoadedEObjectID(embeddedCopyParent);
-			objectInfo.containerId = getLoadedEObjectID(embeddedCopyParent
-				.eContainer());
-			objectInfo.containerClass = embeddedCopyParent.eContainer()
-				.eClass().getInstanceClassName();
-			if (objectInfo.objId.equals(getChildObjectInfo().copyParentId) == false) {
-				objectInfo.copyParentId = getChildObjectInfo().copyParentId;
-			} else {
-				objectInfo.copyParentId = ResourceInfoProcessor.NONE;
-			}
-			objectInfo.hints = ResourceInfoProcessor.NONE;
-			//cache it
-			embeddedCopyParentObjectInfoMap.put(embeddedCopyParent, objectInfo);
-		}
-
-		return objectInfo;
-	}
-
-	private EObject doPasteIntoCopyParent() throws Exception {
-
-		//check if copyParentEObject exists in the target model already
-		//try matching direct copy parent ID.
-		EObject existingCopyParentEObject = getEObject(getChildObjectInfo().containerId);
-		if (existingCopyParentEObject != null) {
-			return doPasteInto(existingCopyParentEObject);
-		}
-
-		//check if the copy-parent has been
-		//pasted already by a sibling paste operation that executed before us?
-		EObject pastedDirectCopyParent = getPastedDirectCopyParent();
-		if (pastedDirectCopyParent != null) {
-			//the direct copy parent should have been pasted correctly already
-			return doPasteInto(pastedDirectCopyParent);
-		}
-
-		EObject nearestParent = null;
-		if (isCopyParentDirectParent() == false) {
-			nearestParent = getLoadedEObject(getChildObjectInfo().containerId);
-			EObject perent = nearestParent.eContainer();
-			EObject root = getCopyParentEObject();
-			while ((perent != null) && (perent.equals(root) == false)) {
-				existingCopyParentEObject = getPastedEObject(perent);
-				if (existingCopyParentEObject != null) {
-					break;
-				}
-				nearestParent = perent;
-				perent = nearestParent.eContainer();
-			}
-			if (existingCopyParentEObject == null) {
-				//check the root itself
-				existingCopyParentEObject = getPastedEObject(root);
-			}
-		}
-
-		if (existingCopyParentEObject != null) {
-			//the nearestParent copy parent should have been pasted correctly
-			// already
-			//paste the nearest-parent itself first, the paste the child into
-			// it afterwards
-			return doPasteIntoCopyParent(makeEmbeddedCopyParentObjectInfo(nearestParent));
-		} else {
-			//no parent with same ID, and the copy-parent not pasted already,
-			//then try other ways to match a parent
-			PasteTarget possibleParent = getSuitableParentUsingAncestry(getLoadedDirectContainerEObject()
-				.eClass().getInstanceClassName());
-			if (possibleParent != null) {
-				return doPasteInto(possibleParent);
-			} else {
-				//no suitable exisiting parent then the copy-parent itself
-				//needs to be pasted first
-				EObject element = doPasteIntoNearestCopyParent(getCopyParentEObject());
-				if (element != null) {
-					//found a nearest copy parent and pasted it successfully
-					return element;
-				}
-				//now final try: use the root copy Parent?
-				return doPasteIntoCopyParent(getCopyParentObjectInfo());
-			}
-		}
-	}
-
-	/**
-	 * Gets the target object into which we are pasting a child.
-	 * 
-	 * @return the parent (target) object of the paste operation
-	 */
-	public EObject getParentEObject() {
-		return getParentPasteProcess().getEObject();
-	}
-
-	/**
-	 * Gets the target object into which we are pasting a child.
-	 * 
-	 * @return the parent (target) object of the paste operation
-	 */
-	public PasteTarget getParentTarget() {
-		return getParentPasteProcess().getPasteTarget();
-	}
-
-	/**
-	 * Obtains the XML resource into which we are pasting.
-	 * 
-	 * @return the target resource
-	 */
-	public XMLResource getParentResource() {
-		return getParentPasteProcess().getParentResource();
-	}
-
-	/**
-	 * Gets an operation to be invoked after I have completed my pasting, to do
-	 * some follow-up pasting.  {@link OverridePasteChildOperation}s can
-	 * redefine this method to provide custom post-paste behaviour.
-	 * <p>
-	 * <b>IMPORTANT:</b> This function must be invoked AFTER the paste()
-	 * function has been called.
-	 * </p>
-	 * 
-	 * @return an additional operation to do more pasting
-	 */
-	public PasteChildOperation getPostPasteOperation() {
-		return (overrideChildPasteOperation != null) ? overrideChildPasteOperation
-			.getPostPasteOperation()
-			: doGetPostPasteOperation();
-	}
-
-	private PasteChildOperation doGetPostPasteOperation() {
-		if ((postPasteOperation == null) && (getPastedElement() != null)
-			&& (getAlwaysCopyObjectPasteOperations().isEmpty() == false)) {
-			postPasteOperation = new PostPasteChildOperation(this,
-				getAlwaysCopyObjectPasteOperations());
-		}
-		return postPasteOperation;
-	}
-
-	public void paste() throws Exception {
-		//check if this object has been pasted/merged already for some reason:
-		//e.g, copied once because it is a copy-parent, and now we are asked
-		//to copy it because it is a copyAlways
-		if (getPastedEObject(getEObject()) != null) {
-			setPastedElement(getEObject());
-			addPastedElement(getPastedElement());
-			//set post paste to a NULL operation
-			postPasteOperation = PostPasteChildOperation
-				.makeNullPostPasteChildOperation(this);
-			return;
-		}
-		//handle diagrams
-		if (getClipboardOperationHelper().shouldOverrideChildPasteOperation(
-			getParentEObject(), getEObject())) {
-			overrideChildPasteOperation = getClipboardOperationHelper()
-				.getOverrideChildPasteOperation(this);
-			//if the parent was not suitable for pasting a diagram, this
-			// happens
-			if (overrideChildPasteOperation != null) {
-				overrideChildPasteOperation.paste();
-				setPastedElement(overrideChildPasteOperation.getPastedElement());
-			} else {
-				addPasteFailuresObject(getEObject());
-			}
-			return;
-		}
-
-		if (hasCopyParent()) {
-			setPastedElement(doPasteIntoCopyParent());
-		} else {
-			EObject element = null;
-			//either it is not a copyAlways, or it is a copyAlways
-			// whose
-			//original parent didn't resolve, thus, proceed normally
-			//by trying to paste in target obj
-			element = doPasteInto(getParentTarget());
-			
-			if (element == null) {
-				/*-------------
-				 //failed to copy in target parent...then check if it is a copy-always and its
-				 // original parent resolves in target model
-				 if (isCopyAlways()) {
-				 EObject resolvedCopyAlwaysParent = getEObject(getChildObjectInfo().containerId);
-				 if (resolvedCopyAlwaysParent != null) {
-				 //found original parent for this copyAlways object,
-				 // then use it,
-				 //instead of user selected parent
-				 element = doPasteInto(resolvedCopyAlwaysParent);
-				 }
-				 }
-				 -------------*/
-				if ((element == null)
-					&& ((getChildObjectInfo()
-						.hasHint(ClipboardUtil.PASTE_TO_TARGET_PARENT)) || (isCopyAlways()))) {
-					PasteTarget possibleParent = getSuitableParentUsingAncestry(getChildObjectInfo().containerClass);
-					if (possibleParent != null) {
-						element = doPasteInto(possibleParent);
-					}
-				}
-			}
-			setPastedElement(element);
-		}
-
-		//did we succeed?
-		if (getPastedElement() != null) {
-			addPastedElement(getPastedElement());
-		} else {
-			addPasteFailuresObject(getEObject());
-		}
-	}
-
-	/**
-	 * Pastes my child object into the specified object.
-	 * 
-	 * @param pasteIntoEObject the object to paste into
-	 * @return the newly pasted object, or <code>null</code> if the paste did
-	 *     not succeed
-	 */
-	protected EObject doPasteInto(EObject pasteIntoEObject) {
-		if (pasteIntoEObject != null) {
-			EReference reference = getPasteContainmentFeature(pasteIntoEObject);
-			if (reference != null) {
-				return doPasteInto(pasteIntoEObject, reference);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Pastes my child object into the specified object.
-	 * 
-	 * @param pasteTarget the object to paste into
-	 * @return the newly pasted object, or <code>null</code> if the paste did
-	 *     not succeed
-	 */
-	protected EObject doPasteInto(PasteTarget pasteTarget) {
-		if (pasteTarget != null) {
-			if (pasteTarget.isResource()) {
-				return doPasteInto((Resource)pasteTarget.getObject());
-			} else {
-				return doPasteInto((EObject)pasteTarget.getObject());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Pastes my child object into the specified containment reference of an
-	 * object.
-	 * 
-	 * @param pasteIntoEObject the object to paste into
-	 * @param reference the containment reference to paste into
-	 * @return the newly pasted object, or <code>null</code> if the paste did
-	 *     not succeed
-	 */
-	protected EObject doPasteInto(EObject pasteIntoEObject, EReference reference) {
-		EObject childElement = null;
-		Object value = pasteIntoEObject.eGet(reference, true);
-		if (FeatureMapUtil.isMany(pasteIntoEObject,reference)) {
-			if (handleCollision(reference, (List) value, getEObject(),
-				getChildObjectInfo())) {
-				childElement = ClipboardSupportUtil.appendEObjectAt(
-					pasteIntoEObject, reference, getEObject());
-			} else if (getPastedElement() != null) {
-				// our pasted element was already assigned by a merge action
-				childElement = getPastedElement();
-			}
-		} else {  // reference is single
-			if (handleCollision(reference, (EObject) value, getEObject(),
-				getChildObjectInfo())) {
-				childElement = ClipboardSupportUtil.setEObject(
-					pasteIntoEObject, reference, getEObject());
-			} else if (getPastedElement() != null) {
-				// our pasted element was already assigned by a merge action
-				childElement = getPastedElement();
-			}
-		}
-		return childElement;
-	}
-
-	/**
-	 * Pastes my child object into the specified resource
-	 * 
-	 * @param pasteIntoResource the resource to paste into
-	 * @return the newly pasted object, or <code>null</code> if the paste did
-	 *     not succeed
-	 */
-	protected EObject doPasteInto(Resource pasteIntoResource) {
-		EObject childElement = null;
-		if (handleCollision(null, pasteIntoResource.getContents(),
-				getEObject(), getChildObjectInfo())) {
-			childElement = ClipboardSupportUtil.appendEObject(
-				pasteIntoResource, getEObject());
-		} else if (getPastedElement() != null) {
-			// our pasted element was already assigned by a merge action
-			childElement = getPastedElement();
-		}
-
-		return childElement;
-	}
-
-	/**
-	 * Obtains a list of operations to paste the "copy always" objects related
-	 * to the object that I am pasting.  By default, these will be executed
-	 * as a post-paste operation following me.
-	 * 
-	 * @return the copy-always object paste operations (which may be empty)
-	 * 
-	 * @see #getPostPasteOperation()
-	 */
-	protected List getAlwaysCopyObjectPasteOperations() {
-		if (alwaysCopyObjectPasteOperations == null) {
-			alwaysCopyObjectPasteOperations = new ArrayList();
-			Iterator alwaysCopyEObjectInfoIt = getChildObjectInfo()
-				.getCopyAlwaysObjectInfoList().iterator();
-			while (alwaysCopyEObjectInfoIt.hasNext()) {
-				getProgressMonitor().worked(WORK_UNIT);
-				if (isCancelled()) {
-					throwCancelException();
-				}
-				ObjectInfo alwaysCopyObjectInfo = (ObjectInfo) alwaysCopyEObjectInfoIt
-					.next();
-				if (shouldPasteAlwaysCopyObject(alwaysCopyObjectInfo)) {
-					PasteChildOperation pasteOperation = getAuxiliaryChildPasteProcess(alwaysCopyObjectInfo);
-					if (pasteOperation != null) {
-						alwaysCopyObjectPasteOperations.add(pasteOperation);
-					}
-				}
-			} //while always-copy
-		}
-		return alwaysCopyObjectPasteOperations;
-	}
-
-	/**
-	 * Queries whether we should paste the specified "copy always" object
-	 * associated with the element we are pasting.  This accounts for the
-	 * possibility that the "copy always" object might collide with some element
-	 * already in the target resource.
-	 * 
-	 * @param alwaysCopyObjectInfo info indicating the "copy always" object
-	 * @return <code>true</code> if the "copy always" object should be pasted;
-	 *      <code>false</code>, otherwise
-	 */
-	protected boolean shouldPasteAlwaysCopyObject(
-		ObjectInfo alwaysCopyObjectInfo) {
-		//for a copy always object that exists in the model already, check if
-		// this
-		//kind of object is "critical", then we need to paste it, note that we
-		// are using
-		//the exisiting object to query for PasteOption since what matter is
-		// the type
-		//and not the particular instance itself
-		EObject existingObject = getEObject(alwaysCopyObjectInfo.objId);
-		EObject loadedEObject = getLoadedEObject(alwaysCopyObjectInfo.objId);
-		return ((existingObject == null) || (getClipboardOperationHelper()
-			.getPasteCollisionAction(loadedEObject.eClass()) == PasteAction.ADD));
-
-	}
-
-	private PasteTarget checkPotentialParent(PasteTarget potentialParent,
-		String preferredTypeName, boolean strictMatch) {
-		//match parent on type, if not then try ability to contain the child
-		if ((potentialParent.getObject() instanceof EAnnotation) == false) {
-			if (potentialParent.isResource()) {
-				if (preferredTypeName == null || strictMatch == false) {
-					return potentialParent;
-				}
-			} else {
-				EObject potentialParentObject = (EObject)potentialParent.getObject();
-				if (potentialParentObject.eClass().getInstanceClassName().equals(
-					preferredTypeName)) {
-					return potentialParent;
-				} else if ((strictMatch == false)
-					&& (getPasteContainmentFeature(potentialParentObject) != null)) {
-					return potentialParent;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Consults the clipboard support to get the best-match containment feature
-	 * of the specified parent object to paste my child object into, according
-	 * to the copied object's original containment feature.
-	 * 
-	 * @param parentEObject the parent to paste into
-	 * @return the most appropriate containment feature for the child, or
-	 *     <code>null</code> if the parent cannot contain the child at all
-	 */
-	public EReference getPasteContainmentFeature(EObject parentEObject) {
-		return ClipboardSupportUtil.getPasteContainmentFeature(parentEObject,
-			getEObject(), getContainmentFeature());
-	}
-
-	/**
-	 * Handles the collision of an <code>eObject</code> that is to be pasted
-	 * into the specified values of a reference, where it collides with one or
-	 * more of these existing elements.  This may involve, among other things,
-	 * renaming the object to be pasted in order to make its name unique.
-	 * 
-	 * @param reference the many containment reference into which we want to
-	 *     paste the <code>eObject</code>
-	 * @param list the current value (list of {@link EObject}s) of the
-	 *     containment reference
-	 * @param eObject the object that we want to paste, which collides with one
-	 *     or more elements in the <code>list</code>
-	 * @param eObjectInfo the <code>eObject</code>'s object info meta-data
-	 * 
-	 * @return <code>true</code> if the collision was resolved so that we
-	 *     can go ahead and paste the <code>eObject</code> as intended;
-	 *     false, otherwise
-	 */
-	protected boolean handleCollision(EReference reference, List list,
-		EObject eObject, ObjectInfo eObjectInfo) {
-
-		PasteAction pasteCollisionAction = (eObjectInfo.objCopyType
-			.equals(ObjectCopyType.OBJ_COPY_TYPE_ALWAYS)) ? PasteAction.CLONE
-			: getClipboardOperationHelper().getPasteCollisionAction(
-				eObject.eClass());
-
-		if (pasteCollisionAction == PasteAction.DISCARD) {
-			//Do not paste. Such elements are typically copied in order to find
-			// an appropriate parent
-			return false;
-		}
-
-		if (list.isEmpty()) {
-			return true;
-		}
-
-		EObject object = null;
-		Iterator it = list.iterator();
-		while (it.hasNext()) {
-			object = (EObject) it.next();
-			if (ClipboardSupportUtil.hasNameCollision(object, eObject)) {
-				if (pasteCollisionAction.equals(PasteAction.ADD)) {
-					//Create new element with different name
-					ClipboardSupportUtil.rename(list, eObject, COPY);
-					return true; //insert child
-				} else if (pasteCollisionAction.equals(PasteAction.REPLACE)) {
-					if (canBeReplaced(object)) {
-						//Remove collision element, if any. Create new element
-						// in the same location.
-						if (reference == null) {
-							// paste target is the resouce
-							ClipboardSupportUtil.destroyEObjectInResource(object);
-						} else {
-							ClipboardSupportUtil.destroyEObjectInCollection(object
-								.eContainer(), reference, object);
-						}
-						return true;
-					}
-					return false; //ignore it since we can't replace the other
-				} else if (pasteCollisionAction.equals(PasteAction.IGNORE)) {
-					//Leave existing element, if found. Otherwise create new
-					// element.
-					return false;
-				} else if (pasteCollisionAction.equals(PasteAction.MERGE)) {
-					mergeEObjects(eObjectInfo
-						.hasHint(ClipboardUtil.MERGE_HINT_WEAK), object,
-						eObject, eObjectInfo);
-					
-					// record the existing object that we collided with as the
-					//    pasted element, so that we will know that the logical
-					//    paste operation succeeded
-					setPastedElement(object);
-					return false; //don't insert child since we merged it
-				} else if (pasteCollisionAction.equals(PasteAction.CLONE)) {
-					//Always copy, even if indirectly selected.
-					//Y.L. treat it as add???
-					ClipboardSupportUtil.rename(list, eObject, COPY);
-					return true; //insert child
-				}
-			} //hasNameCollision
-		} //while
-		return true; //insert child
-	}
-
-	/**
-	 * Handles the collision of an <code>eObject</code> that is to be pasted
-	 * into the specified scalar reference, where it collides with the
-	 * existing element.
-	 * 
-	 * @param reference the scalar containment reference into which we want to
-	 *     paste the <code>eObject</code>
-	 * @param object the current value of the containment reference
-	 * @param eObject the object that we want to paste, which collides with one
-	 *     or more elements in the <code>list</code>
-	 * @param eObjectInfo the <code>eObject</code>'s object info meta-data
-	 * 
-	 * @return <code>true</code> if the collision was resolved so that we
-	 *     can go ahead and paste the <code>eObject</code> as intended;
-	 *     false, otherwise
-	 */
-	protected boolean handleCollision(EReference reference, EObject object,
-		EObject eObject, ObjectInfo eObjectInfo) {
-
-		PasteAction pasteCollisionAction = (eObjectInfo.objCopyType
-			.equals(ObjectCopyType.OBJ_COPY_TYPE_ALWAYS)) ? PasteAction.CLONE
-			: getClipboardOperationHelper().getPasteCollisionAction(
-				eObject.eClass());
-
-		if (pasteCollisionAction.equals(PasteAction.DISCARD)) {
-			//Do not paste. Such elements are typically copied in order to find
-			// an appropriate parent
-			return false;
-		}
-
-		if (object == null) {
-			return true;
-		}
-
-		if (pasteCollisionAction.equals(PasteAction.ADD)) {
-			if (canBeReplaced(object)) {
-				//Create new element with different name
-				//treat as Replace, since it is a single ref.???
-				ClipboardSupportUtil.destroyEObject(object.eContainer(), reference);
-				return true;
-			}
-			return false;
-		} else if (pasteCollisionAction.equals(PasteAction.REPLACE)) {
-			if (canBeReplaced(object)) {
-				//Remove collision element, if any. Create new element in the
-				// same location.
-				ClipboardSupportUtil.destroyEObject(object.eContainer(), reference);
-				return true;
-			}
-			return false;
-		} else if (pasteCollisionAction.equals(PasteAction.IGNORE)) {
-			//Leave existing element, if found. Otherwise create new element.
-			return false;
-		} else if (pasteCollisionAction.equals(PasteAction.MERGE)) {
-			mergeEObjects(eObjectInfo.hasHint(ClipboardUtil.MERGE_HINT_WEAK),
-				object, eObject, eObjectInfo);
-			
-			// record the existing object that we collided with as the
-			//    pasted element, so that we will know that the logical
-			//    paste operation succeeded
-			setPastedElement(object);
-			return false; //don't insert child since we merged it
-		} else if (pasteCollisionAction.equals(PasteAction.CLONE)) {
-			if (canBeReplaced(object)) {
-				//Always copy, even if indirectly selected.
-				//treat as Replace???
-				ClipboardSupportUtil.destroyEObject(object.eContainer(), reference);
-				return true;
-			}
-			return false;
-		}
-		return true; //insert child
-	}
-
-	/**
-	 * Merges the elements to be pasted into a many containment reference with
-	 * those objects already in that reference with which they collide.  This
-	 * is used in the resolution of
-	 * {@linkplain #handleCollision(EReference, List, EObject, ObjectInfo) collisions}
-	 * by {@linkplain PasteAction#MERGE merging}.
-	 * 
-	 * @param reference the many containment reference to merge objects into
-	 * @param targetObjectList the existing objects in the reference collection
-	 * @param objectList the objects that we need to merge into the targets
-	 * @param objectInfo object info
-	 * 
-	 * @return the merged lists
-	 * 
-	 * @see #handleCollision(EReference, List, EObject, ObjectInfo)
-	 * @see PasteAction#MERGE
-	 */
-	protected List mergeLists(EReference reference, List targetObjectList,
-		List objectList, ObjectInfo objectInfo) {
-		//we did this because the original objectList is unmodifiable
-		List mergedList = new ArrayList();
-		mergedList.addAll(targetObjectList);
-		//Sanity: no point to merge a list into itself
-		if (targetObjectList.equals(objectList)) {
-			return mergedList;
-		}
-		EObject eObject = null;
-		Iterator childIt = objectList.iterator();
-		while (childIt.hasNext()) {
-			eObject = (EObject) childIt.next();
-			if (handleCollision(reference, mergedList, eObject, objectInfo)) {
-				mergedList.add(eObject);
-			}
-		}
-		return mergedList;
-	}
-
-	/**
-	 * Merges an elements to be pasted with an existing element that collides.
-	 * 
-	 * @param weakMerge <code>true</code> to perform a
-	 *     {@linkplain ClipboardUtil#MERGE_HINT_WEAK weak merge};
-	 *     <code>false</code> for a
-	 *     {@linkplain ClipboardUtil#MERGE_HINT_STRONG strong merge}
-	 * @param targetEObject the existing object to merge into
-	 * @param eObject the object that we need to merge into the target
-	 * @param objectInfo the <code>eObject</code>'s object info
-	 * 
-	 * @see #handleCollision(EReference, List, EObject, ObjectInfo)
-	 * @see #handleCollision(EReference, EObject, EObject, ObjectInfo)
-	 * @see PasteAction#MERGE
-	 */
-	protected void mergeEObjects(boolean weakMerge, EObject targetEObject,
-		EObject eObject, ObjectInfo objectInfo) {
-		//Sanity: no point to merge an object into itself
-		if (targetEObject.equals(eObject)) {
-			return;
-		}
-
-		MergedEObjectInfo info = (MergedEObjectInfo) getAllMergedElementsMap()
-			.get(eObject);
-		//if it has been merged in the very same target, then just return
-		if ((info != null) && (info.targetEObjects.contains(targetEObject))) {
-			return;
-		}
-
-		//no record at all, then create new one
-		if (info == null) {
-			info = new MergedEObjectInfo();
-			info.mergedEObject = eObject;
-			info.mergedEObjectID = getLoadedEObjectID(eObject);
-			addMergedElementEntry(eObject, info);
-		}
-
-		//In the Clipboard Design document this is how it defines Merge types:
-		//Weak merges: preserve scalar data in the target element's slots. Only
-		// element vector slots are merged.
-		//Strong merges: overwrite scalar data in the target element's slots.
-		// Element vector slots are also merged.
-		//Our interpretation is that scalar == attributes, whereas vector ==
-		// references.
-
-		//keep track of what we merged, we need this to resolve refs at the
-		// post-paste.
-		info.targetEObjects.add(targetEObject);
-
-		//handle refs first
-		Iterator it = eObject.eClass().getEAllReferences().iterator();
-		EReference reference = null;
-		while (it.hasNext()) {
-			reference = (EReference) it.next();
-			if (reference.isChangeable()) {
-				Object unresolvedEObjectValue = eObject.eGet(reference, false);
-				if (FeatureMapUtil.isMany(eObject, reference)) {
-					List childList = (List) unresolvedEObjectValue;
-					if (childList.isEmpty() == false) {
-						List targetObjectList = (List) targetEObject.eGet(
-							reference, true);
-						List mergedList = mergeLists(reference,
-							targetObjectList, childList, objectInfo);
-						
-						// CWD: Don't remove the original -- we're merging!
-						// mergedList.removeAll(targetObjectList);
-						
-						ClipboardSupportUtil.setEObjectList(
-							targetEObject, reference, mergedList);
-					}
-				} else if (unresolvedEObjectValue != null) {
-					EObject targetObjectValue = (EObject) targetEObject.eGet(
-						reference, true);
-					if (handleCollision(reference, targetObjectValue,
-						(EObject) unresolvedEObjectValue, objectInfo)) {
-						ClipboardSupportUtil.setEObject(
-							targetEObject, reference,
-							(EObject) unresolvedEObjectValue);
-					}
-				}
-			} //reference.isChangeable()
-		} //while
-
-		//now handle attribs if it is a strong merge (default)
-		if (weakMerge == false) {
-			it = eObject.eClass().getEAllAttributes().iterator();
-			EAttribute attribute = null;
-			while (it.hasNext()) {
-				attribute = (EAttribute) it.next();
-				ClipboardSupportUtil.setEAttribute(targetEObject, attribute,
-					eObject.eGet(attribute));
-			}
-		}
-	}
-
-	/**
-	 * Gets the object info meta-data for the object that I am pasting.
-	 * 
-	 * @return my child object's meta-data
-	 */
-	protected ObjectInfo getChildObjectInfo() {
-		return childObjectInfo;
-	}
-
-	/**
-	 * Gets the child paste operation that I am overriding or extending, if I am
-	 * an {@linkplain #isAuxiliaryOperation() auxiliary} paste operation.
-	 * 
-	 * @return my main child paste process, or <code>null</code> if none
-	 */
-	protected PasteChildOperation getMainChildPasteProcess() {
-		return mainChildPasteProcess;
-	}
-
-	/**
-	 * Queries whether I am an auxiliary operation.
-	 * 
-	 * @return <code>true</code> if I am an auxiliary paste operation;
-	 *      <code>false</code>, otherwise
-	 */
-	public boolean isAuxiliaryOperation() {
-		return (getMainChildPasteProcess() != null);
-	}
-
-	/**
-	 * Gets the object meta-data for my copy object's parent, if it was
-	 * serialized along with the child.
-	 * 
-	 * @return my copy parent's object info, or <code>null</code> if none
-	 */
-	protected ObjectInfo getCopyParentObjectInfo() {
-		if (copyParentObjectInfo == null) {
-			copyParentObjectInfo = (ObjectInfo) getResourceInfo().objects
-				.get(getChildObjectInfo().copyParentId);
-		}
-		return copyParentObjectInfo;
-	}
-
-	/**
-	 * Queries whether my copy object's parent object that was copied along with
-	 * it was a direct container or not.
-	 * 
-	 * @return <code>true</code> if my copy object's parent was copied and was
-	 *    its direct container; <code>false</code>, otherwise
-	 */
-	protected boolean isCopyParentDirectParent() {
-		return getChildObjectInfo().containerId
-			.equals(getCopyParentObjectInfo().objId);
-	}
-
-	/**
-	 * After pasting has completed, records the element that I have successfully
-	 * (or not) pasted from the original copy.
-	 * 
-	 * @param pastedElement the pasted element, or <code>null</code> if pasting
-	 *     failed
-	 */
-	protected void setPastedElement(EObject pastedElement) {
-		this.pastedElement = pastedElement;
-	}
-
-	/**
-	 * Queries whether the specified object that already exists in the target
-	 * resource can be replaced by an element being pasted, in case of a
-	 * collision that is resolved by
-	 * {@linkplain PasteAction#REPLACE replacement}.
-	 * 
-	 * @param eObject an object in the target model that might be replaced
-	 * @return <code>true</code> if it can be replaced;
-	 *      <code>false</code>, otherwise
-	 * 
-	 * @see PasteAction#REPLACE
-	 */
-	protected boolean canBeReplaced(EObject eObject) {
-		if (!getParentTarget().isResource()) {
-			// we now know that the target is an EObject
-			if (eObject.equals(getParentEObject())) {
-				return false;
-			}
-			if (ClipboardSupportUtil.isChild(eObject, getParentEObject())) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteOption.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteOption.java
deleted file mode 100644
index 1fe8f5e..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteOption.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-/**
- * An enumeration of paste options.
- * 
- * @author khussey
- */
-public class PasteOption
-	extends AbstractEnumerator {
-
-	/**
-	 * An internal unique identifier for this enumerated type.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * Paste option indicating that the element(s) referenced by by an
-	 * {@link org.eclipse.emf.ecore.EReference} feature of a pasted object must
-	 * resolve in a successful paste operation.  If a referenced element
-	 * cannot be resolved (either by locating the existing element
-	 * in some model or by pasting a copy of it), then the referencing element
-	 * also fails to paste.  This applies to both containment and
-	 * non-containment references.
-	 */
-	public static final PasteOption CRITICAL = new PasteOption("Critical"); //$NON-NLS-1$
-
-	/**
-	 * Paste option indicating that the copying of the elements referenced by
-	 * some {@link org.eclipse.emf.ecore.EReference} feature of an object
-	 * being copied is supported for "distant" pastes.  These are pastes into
-	 * other application instances.
-	 */
-	public static final PasteOption DISTANT = new PasteOption("Distant"); //$NON-NLS-1$
-
-	/**
-	 * Paste option indicating that the element(s) referenced by by an
-	 * {@link org.eclipse.emf.ecore.EReference} feature of a pasted object must
-	 * be in the same model as the pasted object.  That is, the reference must
-	 * resolve to an element in the target model of the paste operation.
-	 */
-	public static final PasteOption LOCAL = new PasteOption("Local"); //$NON-NLS-1$
-
-	/**
-	 * Paste option indicating that the copying of the elements referenced by
-	 * some {@link org.eclipse.emf.ecore.EReference} feature of an object
-	 * being copied is critically important to a successful copy.  If the
-	 * referenced cannot be resolved (either by locating the existing element
-	 * in some model or by pasting a copy of it), then the referencing element
-	 * also fails to paste.  This applies to both containment and
-	 * non-containment references.
-	 */
-	public static final PasteOption NORMAL = new PasteOption("Normal"); //$NON-NLS-1$
-
-	/**
-	 * Paste option indicating that the container of an object (referenced by
-	 * a specific {@link org.eclipse.emf.ecore.EReference} should also be
-	 * copied, in case it the actual object can't be pasted at the intended
-	 * location but its container can (thus allowing the intended object also
-	 * to be pasted under it).
-	 */
-	public static final PasteOption PARENT = new PasteOption("Parent"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final PasteOption[] VALUES = {CRITICAL, DISTANT, LOCAL,
-		NORMAL, PARENT};
-
-	/**
-	 * Constructs a new paste option with the specified name.
-	 * 
-	 * @param name The name of the new paste option.
-	 */
-	private PasteOption(String name) {
-		super(nextOrdinal++,name);
-	}
-
-	/**
-	 * Retrieves the list of constants for this enumerated type.
-	 * 
-	 * @return The list of constants for this enumerated type.
-	 * 
-	 * @see EnumeratedType#getValues()
-	 */
-	protected List getValues() {
-		return Collections.unmodifiableList(Arrays.asList(VALUES));
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteTarget.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteTarget.java
deleted file mode 100644
index 42629c8..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteTarget.java
+++ /dev/null

@@ -1,64 +0,0 @@
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-
-/**
- * A class which stores the target object for the paste operation.
- * 
- * @author Christian Vogt (cvogt)
- */
-public class PasteTarget {
-
-	/**
-	 * The paste target object.
-	 */
-	private Object target;
-	
-	/**
-	 * True if the target object is of type <code>Resource</code>.
-	 */
-	private boolean isResource;
-
-	/**
-	 * Constructs a <code>PasteTarget</code> for the given
-	 * <code>EObject</code>.
-	 * 
-	 * @param target the 
-	 */
-	public PasteTarget(EObject target) {
-		this.target = target;
-		this.isResource = false;
-	}
-	
-	/**
-	 * Constructs a <code>PasteTarget</code> for the given
-	 * <code>Resource</code>.
-	 * 
-	 * @param target the 
-	 */
-	public PasteTarget(Resource target) {
-		this.target = target;
-		this.isResource = true;
-	}
-	
-	/**
-	 * Return the underlying target object.
-	 * 
-	 * @return the target object
-	 */
-	public Object getObject() {
-		return target;
-	}
-	
-	
-	/**
-	 * Return true if the target object is of type <code>Resource</code>.
-	 * 
-	 * @return true if the target object is of type <code>Resource</code>
-	 */
-	public boolean isResource() {
-		return isResource;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PostPasteChildOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PostPasteChildOperation.java
deleted file mode 100644
index f06de28..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PostPasteChildOperation.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Abstract definition of an
- * {@link org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport}-defined
- * operation that follows the pasting of a child element into the target parent,
- * to perform additional work.  Post paste operations are created by
- * the {@link PasteChildOperation#getPostPasteOperation() getPostPasteOperation()}
- * method of {@link OverridePasteChildOperation}s.
- * <p>
- * This class is intended to be extended by clients, to provide an auxiliary
- * paste operation in the clipboard support.
- * </p>
- * 
- * @see IClipboardSupport#getOverrideChildPasteOperation(PasteChildOperation)
- * @see PasteChildOperation#getPostPasteOperation()
- * 
- * @author Yasser Lulu
- */
-public class PostPasteChildOperation
-	extends PasteChildOperation {
-
-	private PasteChildOperation pasteChildOperation;
-
-	private PasteChildOperation[] pasteOperations;
-
-	/**
-	 * Initializes me with the paste operation that I am following.  I may
-	 * wish to access it later, to get its results.
-	 * 
-	 * @param pasteChildOperation the paste child operation that I follow
-	 * @param pasteOperations paste operations to execute.  By default, I
-	 *     will execute all of these operations first, then all of their
-	 *     post-paste operations (after all of the pastes have completed)
-	 */
-	public PostPasteChildOperation(PasteChildOperation pasteChildOperation,
-		List pasteOperations) {
-		this(pasteChildOperation, (PasteChildOperation[]) pasteOperations
-			.toArray(EMPTY_ARRAY));
-	}
-
-	/**
-	 * Creates an empty operation to follow the specified paste operation.
-	 * 
-	 * @param pasteChildOperation a paste operation
-	 * @return a post-paste operation that does nothing
-	 */
-	public static PostPasteChildOperation makeNullPostPasteChildOperation(
-		PasteChildOperation pasteChildOperation) {
-		return new PostPasteChildOperation(pasteChildOperation, EMPTY_ARRAY);
-	}
-
-	/**
-	 * Initializes me with the paste operation that I am following.  I may
-	 * wish to access it later, to get its results.
-	 * 
-	 * @param pasteChildOperation the paste child operation that I follow
-	 * @param pasteOperations paste operations to execute.  By default, I
-	 *     will execute all of these operations first, then all of their
-	 *     post-paste operations (after all of the pastes have completed)
-	 */
-	public PostPasteChildOperation(PasteChildOperation pasteChildOperation,
-		PasteChildOperation[] pasteOperations) {
-		super(pasteChildOperation);
-		this.pasteChildOperation = pasteChildOperation;
-		this.pasteOperations = pasteOperations;
-	}
-
-	/**
-	 * Invoked after the
-	 * {@linkplain #getPasteChildOperation() past-child operation} that I am
-	 * following has done its pasting, to do some more pasting.
-	 * <p>
-	 * By default, I just invoke the {@link PasteChildOperation#paste()} method
-	 * on all of my {@linkplain #getPasteOperations() additional} paste
-	 * operations.
-	 * </p>
-	 * 
-	 * @see #getPasteOperations()
-	 */
-	public void paste() throws Exception {
-		for (int i = 0; i < pasteOperations.length; ++i) {
-			pasteOperations[i].paste();
-		}
-	}
-
-	/**
-	 * By default, returns another post-paste operation that executes the
-	 * post-paste operations of all of my
-	 * {@link #getPasteOperations() additional} paste operations.
-	 * 
-	 * @see #getPasteOperations()
-	 */
-	public PasteChildOperation getPostPasteOperation() {
-		List list = getPostPasteOperations();
-		if (list.isEmpty() == false) {
-			return new PostPasteChildOperation(this,
-				(PasteChildOperation[]) list.toArray(EMPTY_ARRAY));
-		}
-		return null;
-	}
-
-	/**
-	 * Gathers the post-paste operations of the paste operations that I execute.
-	 * These will all be executed in sequence, after I have executed all of the
-	 * paste operations.
-	 * 
-	 * @return my paste operations' post-paste operations
-	 */
-	private List getPostPasteOperations() {
-		if (pasteOperations.length > 0) {
-			List list = new ArrayList();
-			for (int i = 0; i < pasteOperations.length; ++i) {
-				PasteChildOperation postPasteOperation = pasteOperations[i]
-					.getPostPasteOperation();
-				if (postPasteOperation != null) {
-					list.add(postPasteOperation);
-				}
-			}
-			return list;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Obtains the paste operation that I follow as a post-paste.
-	 * 
-	 * @return my paste operation
-	 */
-	protected PasteChildOperation getPasteChildOperation() {
-		return pasteChildOperation;
-	}
-
-	/**
-	 * Obtains the paste operations that I execute when I am executed.
-	 * 
-	 * @return my paste operations
-	 */
-	protected PasteChildOperation[] getPasteOperations() {
-		return pasteOperations;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardDebugOptions.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardDebugOptions.java
deleted file mode 100644
index f041f25..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardDebugOptions.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-
-/**
- * Tracing options for the plug-in.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class ClipboardDebugOptions {
-
-	/** Not instantiable by clients. */
-	private ClipboardDebugOptions() {
-		super();
-	}
-
-	public static final String DEBUG = ClipboardPlugin.getPlugin().getBundle().getSymbolicName() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardPlugin.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardPlugin.java
deleted file mode 100644
index 5f5dbe9..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardPlugin.java
+++ /dev/null

@@ -1,560 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ClipboardPlugin extends EMFPlugin {
-	//TODO This plugin class contains many of the tracing options in common with other plugins. Perhaps these should be conglomerated so that they share alot of this code?
-	
-	///
-	// TRACING STRINGS
-	//
-	
-	/**
-	 * String containing an open parenthesis.
-	 * 
-	 */
-	protected static final String PARENTHESIS_OPEN = "("; //$NON-NLS-1$
-
-	/**
-	 * String containing a close parenthesis.
-	 * 
-	 */
-	protected static final String PARENTHESIS_CLOSE = ")"; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the changing of values.
-	 * 
-	 */
-	protected static final String PREFIX_CHANGING = "CHANGING "; //$NON-NLS-1$
-	
-	/**
-	 * Prefix for tracing the catching of throwables.
-	 * 
-	 */
-	protected static final String PREFIX_CATCHING = "CAUGHT "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the throwing of throwables.
-	 * 
-	 */
-	protected static final String PREFIX_THROWING = "THROWN "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the entering of methods.
-	 * 
-	 */
-	protected static final String PREFIX_ENTERING = "ENTERING "; //$NON-NLS-1$
-
-	/**
-	 * Prefix for tracing the exiting of methods.
-	 * 
-	 */
-	protected static final String PREFIX_EXITING = "EXITING "; //$NON-NLS-1$
-
-	/**
-	 * Separator for methods.
-	 * 
-	 */
-	protected static final String SEPARATOR_METHOD = "#"; //$NON-NLS-1$
-
-	/**
-	 * Separator for parameters.
-	 * 
-	 */
-	protected static final String SEPARATOR_PARAMETER = ", "; //$NON-NLS-1$
-
-	/**
-	 * Separator for return values.
-	 * 
-	 */
-	protected static final String SEPARATOR_RETURN = ":"; //$NON-NLS-1$
-
-	/**
-	 * Separator containing a space.
-	 * 
-	 */
-	protected static final String SEPARATOR_SPACE = " "; //$NON-NLS-1$
-	
-	/**
-	 * Label indicating old value.
-	 * 
-	 */
-	protected static final String LABEL_OLD_VALUE = "old="; //$NON-NLS-1$
-
-	/**
-	 * Label indicating new value.
-	 * 
-	 */
-	protected static final String LABEL_NEW_VALUE = "new="; //$NON-NLS-1$
-
-    /**
-     * The shared plug-in instance.
-     */
-    public static final ClipboardPlugin INSTANCE = new ClipboardPlugin();
-
-    private static Implementation plugin;
-    
-	/** IClipboardSupport extension point ID. */
-	public static final String EXTPT_CLIPBOARDSUPPORT = "clipboardSupport"; //$NON-NLS-1$
-
-    /**
-     * Initializes me.
-     */
-    public ClipboardPlugin() {
-        super(new ResourceLocator[] {});
-    }
-
-    public ResourceLocator getPluginResourceLocator() {
-        return plugin;
-    }
-
-    /**
-     * Gets the shared Eclipse plug-in implementation.
-     * 
-     * @return the shared implementation plug-in
-     */
-    public static Implementation getPlugin() {
-        return plugin;
-    }
-
-    /**
-     * The Eclipse plug-in implementation that represents the EMF plug-in.
-     */
-    public static class Implementation extends EclipsePlugin {
-    	
-    	/** Initializes me. */
-        public Implementation() {
-            super();
-
-            // Remember the static instance.
-            //
-            plugin = this;
-        }
-        
-		public void start(BundleContext context) throws Exception {
-			super.start(context);
-
-			configureClipboardSupport();
-		}
-
-		private void configureClipboardSupport() {
-			ClipboardSupportManager.configureExtensions(Platform
-				.getExtensionRegistry().getConfigurationElementsFor(
-					ClipboardSupportManager.EP_CLIPBOARD_SUPPORT));
-		}
-    }
-    
-    public static class Tracing {
-    	/**
-    	 * The cached debug options (for optimization).
-    	 */
-    	private static final Map cachedOptions = new HashMap();
-
-    	/**
-    	 * Retrieves a Boolean value indicating whether tracing is enabled.
-    	 * 
-    	 * @return Whether tracing is enabled for the plug-in.
-    	 * 
-    	 */
-    	protected static boolean shouldTrace() {
-    		return plugin.isDebugging();
-    	}
-
-    	/**
-    	 * Retrieves a Boolean value indicating whether tracing is enabled for the
-    	 * specified debug option.
-    	 * 
-    	 * @return Whether tracing is enabled for the debug option of the plug-in.
-    	 * @param option The debug option for which to determine trace enablement.
-    	 * 
-    	 */
-    	public static boolean shouldTrace(String option) {
-    		if (shouldTrace()) {
-    			Boolean value = null;
-    			
-    			synchronized (cachedOptions) {
-    				value = (Boolean) cachedOptions.get(option);
-    	
-    				if (null == value) {
-    					value =
-    						new Boolean(
-    							Boolean.TRUE.toString().equalsIgnoreCase(
-    								org.eclipse.core.runtime.Platform.getDebugOption(option)));
-    	
-    					cachedOptions.put(option, value);
-    				}
-    			}
-    			
-    			return value.booleanValue();
-    		}
-
-    		return false;
-    	}
-
-    	/**
-    	 * Retrieves a textual representation of the specified argument.
-    	 * 
-    	 * @return A textual representation of the specified argument.
-    	 * @param argument The argument for which to retrieve a textual
-    	 *                  representation.
-    	 * 
-    	 */
-    	protected static String getArgumentString(Object argument) {
-    		return String.valueOf(argument);
-    	}
-
-    	/**
-    	 * Retrieves a textual representation of the specified arguments.
-    	 * 
-    	 * @return A textual representation of the specified arguments.
-    	 * @param arguments The arguments for which to retrieve a textual
-    	 *                   representation.
-    	 * 
-    	 */
-    	protected static String getArgumentsString(Object[] arguments) {
-    		StringBuffer buffer = new StringBuffer();
-
-    		for (int i = 0; i < arguments.length; i++) {
-    			buffer.append(getArgumentString(arguments[i]));
-
-    			if (i < arguments.length - 1) {
-    				buffer.append(SEPARATOR_PARAMETER);
-    			}
-    		}
-
-    		return buffer.toString();
-    	}
-
-    	/**
-    	 * Traces the specified message.
-    	 * 
-    	 * @param message The message to be traced.
-    	 * 
-    	 */
-    	public static void trace(String message) {
-    		if (shouldTrace()) {
-    			System.out.println(message);
-    		}
-    	}
-
-    	/**
-    	 * Traces the specified message for the specified
-    	 * debug option.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param message The message to be traced.
-    	 * 
-    	 */
-    	public static void trace(String option, String message) {
-    		if (shouldTrace(option)) {
-    			trace(message);
-    		}
-    	}
-    	
-    	/**
-    	 * Traces the changing of a value.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param valueDescription The description of the value which is changing.
-    	 * @param oldValue The old value.
-    	 * @param newValue The new value.
-    	 */
-    	public static void changing(
-    	        String option,
-    	        String valueDescription,
-    	        Object oldValue,
-    	        Object newValue) {
-    		    
-    	        if (shouldTrace(option)) {
-    	            trace(
-    	                PREFIX_CHANGING
-    	                	+ valueDescription
-    	                	+ SEPARATOR_SPACE
-    	                	+ LABEL_OLD_VALUE
-    	                	+ getArgumentString(oldValue)
-    	                	+ SEPARATOR_PARAMETER
-    	                   	+ LABEL_NEW_VALUE
-    	                	+ getArgumentString(newValue)
-    						);
-    	        }
-    	    }
-    	
-    	/**
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class in which the value is changing.
-    	 * @param methodName The name of the method in which the value is changing.
-    	 * @param valueDescription The description of the value which is changing.
-    	 * @param oldValue The old value.
-    	 * @param newValue The new value.
-    	 */
-    	public static void changing(
-            String option,
-            Class clazz,
-            String methodName,
-            String valueDescription,
-            Object oldValue,
-            Object newValue) {
-    	    
-            if (shouldTrace(option)) {
-                trace(
-                    PREFIX_CHANGING
-                    	+ valueDescription
-                    	+ SEPARATOR_SPACE
-                    	+ LABEL_OLD_VALUE
-                    	+ getArgumentString(oldValue)
-                    	+ SEPARATOR_PARAMETER
-                       	+ LABEL_NEW_VALUE
-                    	+ getArgumentString(newValue)
-                    	+ SEPARATOR_SPACE
-                    	+ PARENTHESIS_OPEN
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName
-    					+ PARENTHESIS_CLOSE
-    					);
-            }
-        }
-
-    	/**
-    	 * Traces the catching of the specified throwable in the specified method of
-    	 * the specified class.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class in which the throwable is being caught.
-    	 * @param methodName The name of the method in which the throwable is being
-    	 *                    caught.
-    	 * @param throwable The throwable that is being caught.
-    	 * 
-    	 */
-    	public static void catching(
-    		String option,
-    		Class clazz,
-    		String methodName,
-    		Throwable throwable) {
-
-    		if (shouldTrace(option)) {
-
-    			trace(
-    				PREFIX_CATCHING
-    					+ throwable.getMessage()
-    					+ SEPARATOR_SPACE
-    					+ PARENTHESIS_OPEN
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName
-    					+ PARENTHESIS_CLOSE);
-
-    			throwable.printStackTrace(System.err);
-    		}
-    	}
-
-    	/**
-    	 * Traces the throwing of the specified throwable from the specified method
-    	 * of the specified class.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class from which the throwable is being thrown.
-    	 * @param methodName The name of the method from which the throwable is
-    	 *                    being thrown.
-    	 * @param throwable The throwable that is being thrown.
-    	 * 
-    	 */
-    	public static void throwing(
-    		String option,
-    		Class clazz,
-    		String methodName,
-    		Throwable throwable) {
-
-    		if (shouldTrace(option)) {
-
-    			trace(
-    				PREFIX_THROWING
-    					+ throwable.getMessage()
-    					+ SEPARATOR_SPACE
-    					+ PARENTHESIS_OPEN
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName
-    					+ PARENTHESIS_CLOSE);
-
-    			throwable.printStackTrace(System.err);
-    		}
-    	}
-
-    	/**
-    	 * Traces the entering into the specified method of the specified class.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class whose method is being entered.
-    	 * @param methodName The name of method that is being entered.
-    	 * 
-    	 */
-    	public static void entering(
-    		String option,
-    		Class clazz,
-    		String methodName) {
-
-    		if (shouldTrace(option)) {
-
-    			trace(
-    				PREFIX_ENTERING
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName);
-    		}
-    	}
-
-    	/**
-    	 * Traces the entering into the specified method of the specified class,
-    	 * with the specified parameter.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class whose method is being entered.
-    	 * @param methodName The name of method that is being entered.
-    	 * @param parameter The parameter to the method being entered.
-    	 * 
-    	 */
-    	public static void entering(
-    		String option,
-    		Class clazz,
-    		String methodName,
-    		Object parameter) {
-
-    		if (shouldTrace(option)) {
-
-    			trace(
-    				PREFIX_ENTERING
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName
-    					+ PARENTHESIS_OPEN
-    					+ getArgumentString(parameter)
-    					+ PARENTHESIS_CLOSE);
-    		}
-    	}
-
-    	/**
-    	 * Traces the entering into the specified method of the specified class,
-    	 * with the specified parameters.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class whose method is being entered.
-    	 * @param methodName The name of method that is being entered.
-    	 * @param parameters The parameters to the method being entered.
-    	 * 
-    	 */
-    	public static void entering(
-    		String option,
-    		Class clazz,
-    		String methodName,
-    		Object[] parameters) {
-
-    		if (shouldTrace(option)) {
-
-    			trace(
-    				PREFIX_ENTERING
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName
-    					+ PARENTHESIS_OPEN
-    					+ getArgumentsString(parameters)
-    					+ PARENTHESIS_CLOSE);
-    		}
-    	}
-
-    	/**
-    	 * Traces the exiting from the specified method of the specified class.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class whose method is being exited.
-    	 * @param methodName The name of method that is being exited.
-    	 * 
-    	 */
-    	public static void exiting(
-    		String option,
-    		Class clazz,
-    		String methodName) {
-
-    		if (shouldTrace(option)) {
-
-    			trace(
-    				PREFIX_EXITING
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName);
-    		}
-    	}
-
-    	/**
-    	 * Traces the exiting from the specified method of the specified class,
-    	 * with the specified return value.
-    	 * 
-    	 * @param option The debug option for which to trace.
-    	 * @param clazz The class whose method is being exited.
-    	 * @param methodName The name of method that is being exited.
-    	 * @param returnValue The return value of the method being exited.
-    	 * 
-    	 */
-    	public static void exiting(
-    		String option,
-    		Class clazz,
-    		String methodName,
-    		Object returnValue) {
-
-    		if (shouldTrace(option)) {
-
-    			trace(
-    				PREFIX_EXITING
-    					+ clazz.getName()
-    					+ SEPARATOR_METHOD
-    					+ methodName
-    					+ SEPARATOR_RETURN
-    					+ getArgumentString(returnValue));
-    		}
-    	}
-    }
-
-	public static void catching(Class class1, String functionName, Throwable exception) {
-		Tracing.catching(ClipboardDebugOptions.EXCEPTIONS_CATCHING, class1, functionName, exception);
-	}
-	
-	public static void throwing(Class class1, String functionName, Throwable exception) {
-		Tracing.throwing(ClipboardDebugOptions.EXCEPTIONS_THROWING, class1, functionName, exception);
-	}
-
-	public static void log(int code, String message, Throwable exception) {
-		Status s = new Status(IStatus.INFO, plugin.getSymbolicName(),
-			code, message != null ? message : "", exception); //$NON-NLS-1$
-		
-		getPlugin().log(s);
-	}
-
-	public static void warning(int code, String message, Throwable exception) {
-		Status s = new Status(IStatus.WARNING, plugin.getSymbolicName(),
-			code, message != null ? message : "", exception); //$NON-NLS-1$
-		
-		getPlugin().log(s);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardStatusCodes.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardStatusCodes.java
deleted file mode 100644
index df50f0f..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardStatusCodes.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-
-/**
- * @author Yasser Lulu  
- */
-public final class ClipboardStatusCodes {
-
-	/**
-	 * 
-	 */
-	private ClipboardStatusCodes() {
-		super();
-	}
-	
-	public static final int OK = 0;
-	public static final int ERROR = 1;
-	public static final int IGNORED_EXCEPTION_WARNING = 10;
-
-	public static final int CLIPBOARDSUPPORT_MISSING_NSURI = 30;
-	public static final int CLIPBOARDSUPPORT_MISSING_CLASS = 31;
-	public static final int CLIPBOARDSUPPORT_UNRESOLVED_NSURI = 32;
-	public static final int CLIPBOARDSUPPORT_FACTORY_FAILED = 33;
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardSupportManager.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardSupportManager.java
deleted file mode 100644
index 0bba0de..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardSupportManager.java
+++ /dev/null

@@ -1,257 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportFactory;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.l10n.EMFClipboardCoreMessages;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * Manager for the <tt>clipboardSupport</tt> extension point.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class ClipboardSupportManager {
-	public static final String EP_CLIPBOARD_SUPPORT = "org.eclipse.gmf.runtime.emf.clipboard.core.clipboardSupport"; //$NON-NLS-1$
-	static final String E_NSURI = "nsURI"; //$NON-NLS-1$
-	static final String E_CLASS = "class"; //$NON-NLS-1$
-	
-	/** @deprecated need a context-based solution */
-	static final String E_PRIORITY = "priority"; //$NON-NLS-1$
-	
-	/** @deprecated need a context-based solution */
-	private static final List PRIORITIES = Arrays.asList(new String[] {
-		"lowest", "low", "medium", "high", "highest"});  //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$
-	
-	private static final Map clipboardSupportMap = new java.util.HashMap();
-	
-	/** Not instantiable by clients. */
-	private ClipboardSupportManager() {
-		super();
-	}
-
-	/**
-	 * Configures the extensions on the <tt>clipboardSupport</tt> extension
-	 * point.
-	 * <p>
-	 * <b>Note</b> that this method must only be called by the plug-in class
-	 * on initialization.
-	 * </p>
-	 * 
-	 * @param configs the configuration elements representing extensions
-	 */
-	public static void configureExtensions(IConfigurationElement[] configs) {
-		for (int i = 0; i < configs.length; i++) {
-			try {
-				Descriptor desc = new Descriptor(configs[i]);
-				Descriptor previous = (Descriptor) clipboardSupportMap.get(
-					desc.getEPackage());
-				
-				if ((previous == null)
-						|| (previous.getPriority() < desc.getPriority())) {
-					
-					clipboardSupportMap.put(desc.getEPackage(), desc);
-				}
-			} catch (CoreException e) {
-				ClipboardPlugin.getPlugin().log(e.getStatus());
-			}
-		}
-	}
-	
-	/**
-	 * Retrieves the clipboard support factory (if any) that handles the
-	 * specified <code>EPackage</code>.
-	 * 
-	 * @param ePackage an <code>EPackage</code>
-	 * @return the registered clipboard support factory, or <code>null</code>
-	 *     if none was registered or it could not be initialized
-	 */
-	public static IClipboardSupportFactory lookup(EPackage ePackage) {
-		IClipboardSupportFactory result = null;
-		
-		Descriptor desc = (Descriptor) clipboardSupportMap.get(ePackage);
-		if (desc != null) {
-			result = desc.getFactory();
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Retrieves the clipboard support factory (if any) that handles the
-	 * specified <code>EClass</code>.
-	 * 
-	 * @param eClass an <code>EClass</code>
-	 * @return the registered clipboard support factory, or <code>null</code>
-	 *     if none was registered or it could not be initialized
-	 */
-	public static IClipboardSupportFactory lookup(EClass eClass) {
-		return lookup(eClass.getEPackage());
-	}
-	
-	/**
-	 * Retrieves the clipboard support factory (if any) that handles the
-	 * specified <code>EObject</code>.
-	 * 
-	 * @param eObject an <code>EObject</code>
-	 * @return the registered clipboard support factory, or <code>null</code>
-	 *     if none was registered or it could not be initialized
-	 */
-	public static IClipboardSupportFactory lookup(EObject eObject) {
-		return lookup(eObject.eClass().getEPackage());
-	}
-	
-	/**
-	 * Creates an error status with the specified <code>message</code>.
-	 * 
-	 * @param code the error code
-	 * @param message the error message
-	 * @return the status object
-	 */
-	static IStatus createErrorStatus(int code, String message) {
-		return createErrorStatus(
-			code,
-			message,
-			null);
-	}
-	
-	/**
-	 * Creates an error status with the specified <code>message</code>.
-	 * 
-	 * @param code the error code
-	 * @param message the error message
-	 * @param exception an exception to log
-	 * @return the status object
-	 */
-	static IStatus createErrorStatus(int code, String message, Throwable exception) {
-		return new Status(
-			IStatus.ERROR,
-			ClipboardPlugin.getPlugin().getSymbolicName(),
-			code,
-			message,
-			exception);
-	}
-	
-	/**
-	 * Descriptor for an extension on the <tt>clipboardSupport</tt> point.
-	 * The descriptor is responsible for lazily initializing the
-	 * {@link IClipboardSupportFactory} on its first access.
-	 *
-	 * @author Christian W. Damus (cdamus)
-	 */
-	private static final class Descriptor {
-		private final EPackage ePackage;
-		private IClipboardSupportFactory factory;
-		private IConfigurationElement config;
-		private int priority = 2;
-		
-		Descriptor(IConfigurationElement config) throws CoreException {
-			this.config = config;
-			
-			String nsUri = config.getAttribute(E_NSURI);
-			if ((nsUri == null) || (nsUri.length() == 0)) {
-				throw new CoreException(createErrorStatus(
-					ClipboardStatusCodes.CLIPBOARDSUPPORT_MISSING_NSURI,
-					NLS.bind(EMFClipboardCoreMessages.missing_nsUri_ERROR_,
-						new Object[] {
-							ClipboardPlugin.EXTPT_CLIPBOARDSUPPORT,
-							config.getDeclaringExtension().getNamespaceIdentifier()})));
-			}
-			
-			ePackage = EPackage.Registry.INSTANCE.getEPackage(nsUri);
-			if (ePackage == null) {
-				throw new CoreException(createErrorStatus(
-					ClipboardStatusCodes.CLIPBOARDSUPPORT_UNRESOLVED_NSURI,
-					NLS.bind(EMFClipboardCoreMessages.unresolved_nsUri_ERROR_,
-						new Object[] {
-							ClipboardPlugin.EXTPT_CLIPBOARDSUPPORT,
-							nsUri,
-							config.getDeclaringExtension().getNamespaceIdentifier()})));
-			}
-			
-			String className = config.getAttribute(E_CLASS);
-			if ((className == null) || (className.length() == 0)) {
-				throw new CoreException(createErrorStatus(
-					ClipboardStatusCodes.CLIPBOARDSUPPORT_MISSING_CLASS,
-					NLS.bind(EMFClipboardCoreMessages.missing_class_ERROR_,
-						new Object[] {
-							ClipboardPlugin.EXTPT_CLIPBOARDSUPPORT,
-							config.getDeclaringExtension().getNamespaceIdentifier()})));
-			}
-			
-			String priorityStr = config.getAttribute(E_PRIORITY);
-			if (priorityStr != null) {
-				priorityStr = priorityStr.toLowerCase();
-				
-				if (PRIORITIES.contains(priorityStr)) {
-					priority = PRIORITIES.indexOf(priorityStr);
-				}
-			}
-		}
-		
-		EPackage getEPackage() {
-			return ePackage;
-		}
-		
-		/** @deprecated need a context-based solution */
-		int getPriority() {
-			return priority;
-		}
-		
-		IClipboardSupportFactory getFactory() {
-			if ((factory == null) && (config != null)) {
-				// we only keep the config element as long as we need it in
-				//    order to attempt to instantiate the class
-				factory = createFactory();
-			}
-			
-			return factory;
-		}
-		
-		private IClipboardSupportFactory createFactory() {
-			IClipboardSupportFactory result = null;
-			
-			try {
-				result = (IClipboardSupportFactory) config.createExecutableExtension(E_CLASS);
-			} catch (CoreException e) {
-				ClipboardPlugin.getPlugin().log(e.getStatus());
-			} catch (Exception e) {
-				// log any other exception, too (such as ClassCastException)
-				ClipboardPlugin.getPlugin().log(createErrorStatus(
-					ClipboardStatusCodes.CLIPBOARDSUPPORT_FACTORY_FAILED,
-					NLS.bind(EMFClipboardCoreMessages.factory_failed_ERROR_,
-						new Object[] {
-							IClipboardSupportFactory.class.getName(),
-							config.getAttribute(E_CLASS)}),
-					e));
-			} finally {
-				// we won't try again to instantiate this class
-				config = null;
-			}
-			
-			return result;
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/CopyObjects.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/CopyObjects.java
deleted file mode 100644
index a371c9e..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/CopyObjects.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.util.Collection;
-
-/**
- * A data structure that holds info needed through the copy process
- * 
- * @author Yasser Lulu
- */
-public class CopyObjects extends
-		org.eclipse.gmf.runtime.emf.clipboard.core.CopyObjects {
-	
-	/**
-	 * Initializes me with my original objects.
-	 * 
-	 * @param originalObjects
-	 *            the objects originally selected for copying
-	 */
-	public CopyObjects(Collection originalObjects) {
-		super(originalObjects);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/DefaultClipboardSupport.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/DefaultClipboardSupport.java
deleted file mode 100644
index 991e19d..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/DefaultClipboardSupport.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.AbstractClipboardSupport;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-
-/**
- * Default implementation of the {@link IClipboardSupport} API,
- * used in situations where no support has been provided for a metamodel.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class DefaultClipboardSupport
-	extends AbstractClipboardSupport {
-
-	private static final IClipboardSupport instance = new DefaultClipboardSupport();
-	
-	private DefaultClipboardSupport() {
-		super();
-	}
-
-	/**
-	 * Obtains the singleton instance of this class.
-	 * 
-	 * @return my instance
-	 */
-	public static IClipboardSupport getInstance() {
-		return instance;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ListIndexComparator.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ListIndexComparator.java
deleted file mode 100644
index 7e64a63..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ListIndexComparator.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A comparator that sorts elements according to their relative positions in
- * their containing <code>EList</code>s. The comparison is optimized by
- * caching the element indices so that they need not be repeatedly
- * recomputed (which would render the O(NlogN) algorithm as O(N <sup>2
- * </sup>logN)).
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class ListIndexComparator
-	implements Comparator {
-
-	private List list;
-
-	private Map map;
-
-	ListIndexComparator(List list) {
-		this.list = list;
-
-		// use an identity hash map because we are sorting based on the
-		//   order of object references, which are identities
-		map = new java.util.IdentityHashMap();
-	}
-
-	public int compare(Object obj_1, Object obj_2) {
-		Integer int_1 = (Integer) map.get(obj_1);
-		Integer int_2 = (Integer) map.get(obj_2);
-		if (int_1 == null) {
-			int_1 = new Integer(list.indexOf(obj_1));
-			map.put(obj_1, int_1);
-		}
-		if (int_2 == null) {
-			int_2 = new Integer(list.indexOf(obj_2));
-			map.put(obj_2, int_2);
-		}
-
-		return int_1.intValue() - int_2.intValue();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/LoadingEMFResource.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/LoadingEMFResource.java
deleted file mode 100644
index 399c117..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/LoadingEMFResource.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-
-/**
- * @author Yasser Lulu
- */
-class LoadingEMFResource
-	extends SerializationEMFResource {
-
-	private final ResourceSet rset;
-	
-	private Map idToEObjectMapCopy;
-
-	private Map eObjectToIDMapCopy;
-
-	LoadingEMFResource(ResourceSet rset, String encoding, Map defaultLoadOptions,
-		IClipboardSupport clipboardOperationHelper) {
-		super(encoding, clipboardOperationHelper);
-		this.rset = rset;
-		this.defaultLoadOptions = defaultLoadOptions;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doSave(java.io.OutputStream,
-	 *      java.util.Map)
-	 */
-	public void doSave(OutputStream outputStream, Map options)
-		throws IOException {
-		throwUnsupportedOperationException("doSave", //$NON-NLS-1$
-			new UnsupportedOperationException(
-				"Can't call save on deserializing resource")); //$NON-NLS-1$
-	}
-
-	public void doLoad(InputStream inputStream, Map options) throws IOException {
-		NonResolvingResourceSet nonResolvingResourceSet =
-			new NonResolvingResourceSet(rset);
-		nonResolvingResourceSet.getResources().add(this);
-		IOException exception = null;
-		try {
-			super.doLoad(inputStream, options);
-		} catch (IOException ex) {
-			exception = ex;
-		}
-		nonResolvingResourceSet.getResources().remove(this);
-		getIDToEObjectMapCopy().putAll(getIDToEObjectMap());
-		getEObjectToIDMapCopy().putAll(getEObjectToIDMap());
-		if (exception != null) {
-			throw exception;
-		}
-	}
-
-	Map getIDToEObjectMapCopy() {
-		if (idToEObjectMapCopy == null) {
-			idToEObjectMapCopy = new HashMap();
-		}
-		return idToEObjectMapCopy;
-	}
-
-	Map getEObjectToIDMapCopy() {
-		if (eObjectToIDMapCopy == null) {
-			eObjectToIDMapCopy = new HashMap();
-		}
-		return eObjectToIDMapCopy;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#detachedHelper(org.eclipse.emf.ecore.EObject)
-	 */
-	protected void detachedHelper(EObject eObject) {		
-		super.detachedHelper(eObject);
-		DETACHED_EOBJECT_TO_ID_MAP.remove(eObject);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/MergedEObjectInfo.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/MergedEObjectInfo.java
deleted file mode 100644
index 6977040..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/MergedEObjectInfo.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author Yasser Lulu 
- */
-public class MergedEObjectInfo {
-
-	public String mergedEObjectID;
-
-	public EObject mergedEObject;
-
-	public List targetEObjects;
-
-	/**
-	 * 
-	 */
-	public MergedEObjectInfo() {
-		targetEObjects = new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/NonResolvingResourceSet.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/NonResolvingResourceSet.java
deleted file mode 100644
index 1ad5a46..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/NonResolvingResourceSet.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-/**
- * @author Yasser Lulu
- */
-class NonResolvingResourceSet extends ResourceSetImpl {
-    private ResourceSet resourceSet;
-
-    NonResolvingResourceSet(ResourceSet resourceSet) {
-        this.resourceSet = resourceSet;
-    }
-
-    /**
-     * @return list of adapter factories
-     */
-    public EList getAdapterFactories() {
-        return resourceSet.getAdapterFactories();
-    }
-
-    /**
-     * @param uri
-     * @param loadOnDemand
-     * @return object from URI
-     */
-    public EObject getEObject(URI uri, boolean loadOnDemand) {
-        return null;//return null, don't resolve
-    }
-
-    /**
-     * @return package registry
-     */
-    public Registry getPackageRegistry() {
-        return resourceSet.getPackageRegistry();
-    }
-
-    /**
-     * @param uri
-     * @param loadOnDemand
-     * @return resource from URI
-     */
-    public Resource getResource(URI uri, boolean loadOnDemand) {
-        return resourceSet.getResource(uri, loadOnDemand);
-    }
-
-    /**
-     * @return resource factory registry
-     */
-    public org.eclipse.emf.ecore.resource.Resource.Factory.Registry getResourceFactoryRegistry() {
-        return resourceSet.getResourceFactoryRegistry();
-    }
-
-    /**
-     * @return URI converter
-     */
-    public URIConverter getURIConverter() {
-        return resourceSet.getURIConverter();
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ObjectCopyType.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ObjectCopyType.java
deleted file mode 100644
index b6663d3..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ObjectCopyType.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-/**
- * types representing the reason a given object was serialized (copied)
- *  
- * @author Yasser Lulu 
- */
-public class ObjectCopyType {
-
-	/**
-	 * 
-	 */
-	private ObjectCopyType() {
-		//private
-	}
-
-	public static final String OBJ_COPY_TYPE_PARENT = "OCT_PARENT"; //$NON-NLS-1$
-
-	public static final String OBJ_COPY_TYPE_ALWAYS = "OCT_ALWAYS"; //$NON-NLS-1$
-
-	static final String OBJ_COPY_TYPE_ORIGINAL = "OCT_ORIGINAL"; //$NON-NLS-1$
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteIntoParentOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteIntoParentOperation.java
deleted file mode 100644
index 0615a06..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteIntoParentOperation.java
+++ /dev/null

@@ -1,797 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-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 org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.gmf.runtime.emf.clipboard.core.BasePasteOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardSupportUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ObjectInfo;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteTarget;
-import org.eclipse.gmf.runtime.emf.clipboard.core.internal.l10n.EMFClipboardCoreMessages;
-/**
- * A paste operation that pastes copied elements into their new parent.
- * <p>
- * <b>Note</b> that this class is not intended to be extended
- * by clients.  Clients may not instantiate it.
- * </p>
- * 
- * @author Yasser Lulu
- */
-public class PasteIntoParentOperation
-	extends BasePasteOperation {
-
-	private PasteTarget element;
-
-	private LoadingEMFResource eLoadedResource;
-
-	private Map childPasteProcessMap;
-
-	private List originalChildObjectInfo;
-
-	private XMLResource parentResource;
-
-	private List containmentAnnotationReferences;
-
-	private EAnnotation serializationAnnotation;
-
-	private Map contentObject2ProxyMap;
-
-	private Map hintsMap = Collections.EMPTY_MAP;
-
-	/**
-	 * Gets the XML resource containing the parent element into which I am
-	 * pasting child objects.
-	 * 
-	 * @return the parent object's XML resource
-	 */
-	public final XMLResource getParentResource() {
-		if (parentResource == null) {
-			if (element.isResource()) {
-				parentResource = (XMLResource)element.getObject();
-			} else {
-				parentResource = getClipboardOperationHelper().getResource(
-					getEObject());
-			}
-		}
-		return parentResource;
-	}
-
-	/**
-	 * Gets the resource loaded from the clipboard string.
-	 * 
-	 * @return the clipboard loading resource
-	 */
-	final LoadingEMFResource getLoadedResource() {
-		return eLoadedResource;
-	}
-
-	/**
-	 * Looks up an object deserialized from the clipboard string by ID.
-	 * 
-	 * @param objId the object ID to retrieve
-	 * @return the corresponding object, or <code>null</code> if not found
-	 */
-	public EObject getLoadedEObject(String objId) {
-		return (EObject) getLoadedResource().getIDToEObjectMapCopy().get(objId);
-	}
-
-	/**
-	 * Looks up the ID of an object deserialized from the clipboard string.
-	 * 
-	 * @param eObject the object whose ID is to be retrieved
-	 * @return the corresponding ID, or <code>null</code> if not found
-	 */
-	public String getLoadedEObjectID(EObject eObject) {
-		return (String) getLoadedResource().getEObjectToIDMapCopy()
-			.get(eObject);
-	}
-
-	/**
-	 * Retrieves the map of hints with which I was initialized.
-	 * 
-	 * @return my hints
-	 */
-	public Map getHintsMap() {
-		return hintsMap;
-	}
-
-	/**
-	 * Initializes me.
-	 * 
-	 * @param pasteProcess the paste operation that will paste child objects
-	 *     into my designated parent object
-	 * @param element the designated parent object into which I paste children
-	 * @param hintsMap the map of hints for the paste operation
-	 * 
-	 * @throws Exception if anything goes wrong
-	 */
-	public PasteIntoParentOperation(PasteOperation pasteProcess,
-			PasteTarget element, Map hintsMap)
-		throws Exception {
-		super(pasteProcess);
-		this.element = element;
-		this.hintsMap = hintsMap;
-		childPasteProcessMap = new HashMap();
-		
-		//IMPORTANT: ALWAYS LOAD/RELOAD a fresh copy for every parent
-		eLoadedResource = loadEObjects();
-		
-		// Bug 112516: Ensure that we will not attempt to insert GUIDs that
-		//    already exist
-		if (getHintsMap().containsKey(ClipboardUtil.IGNORE_RECYCLE_HINT_ID) == false) {
-			Iterator childEObjectInfoIt = getOriginalChildObjectInfo().iterator();
-
-			while (childEObjectInfoIt.hasNext()) {
-				ObjectInfo objectInfo = (ObjectInfo) childEObjectInfoIt.next();
-				if (objectInfo.hasHint(ClipboardUtil.RECYCLE_HINT_ID)
-						&& findDuplicateGUID(getLoadedEObject(objectInfo.objId))) {
-					throwException(
-						"PasteIntoParentOperation", //$NON-NLS-1$
-						new IllegalArgumentException(
-							EMFClipboardCoreMessages.copypaste_duplicateId));
-				}
-			}
-		}
-		
-		getContentObject2ProxyMap();
-	}
-
-	private PasteIntoParentOperation(
-			PasteIntoParentOperation pasteIntoParentOperation, PasteTarget element) {
-		//use itself as spawner in order to know about any newly pasted
-		// elements by
-		//this newly cloned operation
-		super(pasteIntoParentOperation);
-		this.element = element;
-		this.hintsMap = pasteIntoParentOperation.getHintsMap();
-		childPasteProcessMap = pasteIntoParentOperation.childPasteProcessMap;
-		eLoadedResource = pasteIntoParentOperation.getLoadedResource();
-		originalChildObjectInfo = pasteIntoParentOperation
-			.getOriginalChildObjectInfo();
-		parentResource = pasteIntoParentOperation.getParentResource();
-		containmentAnnotationReferences = pasteIntoParentOperation
-			.getContainmentAnnotationReferences();
-		serializationAnnotation = pasteIntoParentOperation
-			.getSerializationAnnotation();
-		contentObject2ProxyMap = pasteIntoParentOperation
-			.getContentObject2ProxyMap();
-	}
-
-	/**
-	 * Determines whether we will be attempting to paste an element into the
-	 * destination resource that already contains the pasted element's GUID.
-	 * When this occurs, we fail the paste operation.  The check for duplicate
-	 * GUIDs is recursive over the content tree of the element to be pasted.
-	 *
-	 * @param toPaste the element to be pasted
-	 *
-	 * @return <code>true</code> if we would be pasting an element whose ID
-	 *     already exists in the target resource; <code>false</code>, otherwise
-	 */
-	private boolean findDuplicateGUID(EObject toPaste) {
-		XMLResource parentRes = getParentResource();
-		EObject original = (EObject) getContentObject2ProxyMap().get(toPaste);
-		URI sourceUri = (original == null)
-			? null
-			: EcoreUtil.getURI(original).trimFragment();  // this is a proxy
-
-		boolean result = false;
-
-		if (!parentRes.getURI().equals(sourceUri)) {
-			// don't need to check anything when pasting into the source
-			//    resource (from which we cut in the first place).  OK to
-			//    get all contents of 'toPaste' because the clipboard resource
-			//    has no cross-resource containment
-			Iterator iter = EcoreUtil.getAllContents(Collections.singleton(toPaste));
-			while (!result && iter.hasNext()) {
-				result = parentRes.getEObject(
-					getLoadedEObjectID((EObject) iter.next())) != null;
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Creates another paste-into-parent operation just like me, that pastes
-	 * into the specified new parent element.
-	 * 
-	 * @param newElement a new parent element
-	 * @return the clone
-	 */
-	public PasteIntoParentOperation clone(EObject newElement) {
-		return new PasteIntoParentOperation(this, new PasteTarget(newElement));
-	}
-
-	private void performPostPasteOperations(List operations)
-		throws Exception {
-		if (operations.isEmpty() == false) {
-			List postPasteOperations = new ArrayList();
-			Iterator it = operations.iterator();
-			while (it.hasNext()) {
-				getProgressMonitor().worked(WORK_UNIT);
-				if (isCancelled()) {
-					throwCancelException();
-				}
-				PasteChildOperation pasteOperation = (PasteChildOperation) it
-					.next();
-				pasteOperation.paste();
-				PasteChildOperation postPasteOperation = pasteOperation
-					.getPostPasteOperation();
-				if (postPasteOperation != null) {
-					postPasteOperations.add(postPasteOperation);
-				}
-			}
-			//perform those newly added post paste operations
-			performPostPasteOperations(postPasteOperations);
-		}
-	}
-
-	private void resolveLocalProxies() {
-		Iterator it = getLoadedResource().getContents().iterator();
-		while (it.hasNext()) {
-			EObject eObj = (EObject) it.next();
-			if ((eObj instanceof EAnnotation) == false) {
-				resolveLocalProxies(eObj);
-				
-				// OK to get all contents of 'eObj' because the clipboard resource
-				//    has no cross-resource containment
-				Iterator contentIt = eObj.eAllContents();
-				while (contentIt.hasNext()) {
-					resolveLocalProxies((EObject) contentIt.next());
-				}
-			}
-		}
-	}
-
-	private void resolveLocalProxies(EObject eObject) {
-		Iterator it = eObject.eClass().getEAllReferences().iterator();
-		EReference ref = null;
-		while (it.hasNext()) {
-			ref = (EReference) it.next();
-			if ((ref.isContainment() == false) && ref.isChangeable()) {
-				Object value = eObject.eGet(ref, true);
-				if (FeatureMapUtil.isMany(eObject, ref)) {
-					Collection collection = (Collection) value;
-					boolean withInverseElist = (collection instanceof EObjectWithInverseEList);
-					Iterator valIt = new ArrayList(collection).iterator();
-					while (valIt.hasNext()) {
-						EObject eObj = (EObject) valIt.next();
-						if (eObj.eIsProxy()) {
-							EObject resolved = ClipboardSupportUtil.resolve(eObj,
-								getLoadedResource().getIDToEObjectMapCopy());
-							if (resolved.eIsProxy() == false) {
-								//because we are resolving locally, the
-								// inverse-resolving list
-								//could get in a situation where the first
-								// element resolved itself
-								//and then added itself to the reverse list,
-								// and now we are trying to do the
-								//the same for the reversed list and hence we
-								// have this problem.
-								if (collection.contains(resolved)) {
-									collection.remove(eObj);
-								} else {
-									EcoreUtil.replace(eObject, ref, eObj,
-										resolved);
-								}
-							} else if (withInverseElist) {
-								collection.remove(eObj);
-							}
-						}
-					}
-				} else if (value != null) {
-					EObject eObj = (EObject) value;
-					if (eObj.eIsProxy()) {
-						EObject resolved = ClipboardSupportUtil.resolve(eObj,
-							getLoadedResource().getIDToEObjectMapCopy());
-						if (resolved.eIsProxy() == false) {
-							EcoreUtil.replace(eObject, ref, eObj, resolved);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public void paste()
-		throws Exception {
-		try {
-			resolveLocalProxies();
-			Iterator childEObjectInfoIt = getOriginalChildObjectInfo()
-				.iterator();
-			List postPasteOperations = new ArrayList();
-			//FIRST: handle original copy elements(explicitly chosen by user)
-			while (childEObjectInfoIt.hasNext()) {
-				getProgressMonitor().worked(WORK_UNIT);
-				if (isCancelled()) {
-					throwCancelException();
-				}
-				ObjectInfo objectInfo = (ObjectInfo) childEObjectInfoIt.next();
-				PasteChildOperation childPasteProcess = getChildPasteProcess(objectInfo);
-				childPasteProcess.paste();
-				PasteChildOperation postPasteOperation = childPasteProcess
-					.getPostPasteOperation();
-				if (postPasteOperation != null) {
-					postPasteOperations.add(postPasteOperation);
-				}
-			} //while original-copy
-
-			//now, do post-paste processing -recursively
-			performPostPasteOperations(postPasteOperations);
-
-			if (getPastedElementSet().isEmpty() == false) {
-				//one more chance to cancel, NO CANCELLATION past this point
-				getProgressMonitor().worked(WORK_UNIT);
-				if (isCancelled()) {
-					throwCancelException();
-				}
-				resolveReferences();
-				if (getCriticalResolveFailuresSet().isEmpty()) {
-					recycleObjectIds();
-				}
-				fireCreateEvents();
-			}
-		} finally {
-			if (getLoadedResource() != null) {
-				getLoadedResource().unload();
-			}
-		}
-	}
-
-	private void fireCreateEvents() {
-		List elements = new ArrayList();
-		
-		// OK to get all contents because the elements were all pasted into
-		//    a single resource (no cross-resource containments)
-		Iterator it = EcoreUtil.getAllContents(getPastedElementSet());
-		while (it.hasNext()) {
-			elements.add(it.next());
-		}
-		elements.removeAll(getPastedElementSet());
-		it = elements.iterator();
-		while (it.hasNext()) {
-			ClipboardSupportUtil.sendCreateEvent((EObject) it.next());
-		}
-	}
-
-	private List getOriginalChildObjectInfo() {
-		if (originalChildObjectInfo == null) {
-			originalChildObjectInfo = getResourceInfo().getObjectInfoTypes(
-				ObjectCopyType.OBJ_COPY_TYPE_ORIGINAL);
-			//sort them as they are in the resouce content list
-			Collections.sort(originalChildObjectInfo,
-				new ListIndexComparator(getLoadedResource()
-					.getContents()) {
-
-					public int compare(Object obj_1, Object obj_2) {
-						return super.compare(
-							getLoadedEObject(((ObjectInfo) obj_1).objId),
-							getLoadedEObject(((ObjectInfo) obj_2).objId));
-					}
-				});
-		}
-		return originalChildObjectInfo;
-	}
-
-	/**
-	 *  
-	 */
-	private void recycleObjectIds() {
-		if (getHintsMap().containsKey(ClipboardUtil.IGNORE_RECYCLE_HINT_ID)) {
-			return;
-		}
-		Iterator childEObjectInfoIt = getOriginalChildObjectInfo().iterator();
-		while (childEObjectInfoIt.hasNext()) {
-			ObjectInfo objectInfo = (ObjectInfo) childEObjectInfoIt.next();
-			if (objectInfo.hasHint(ClipboardUtil.RECYCLE_HINT_ID)) {
-				EObject pastedChildElement = getChildPasteProcess(objectInfo)
-					.getPastedElement();
-				if (getPastedElementSet().contains(pastedChildElement)) {
-					recycleObjectId(pastedChildElement);
-					
-					// OK to get all contents of 'pastedChildElement' because we
-					//    paste all elements into the same resource (no
-					//    cross-resource containment)
-					TreeIterator contentIt = pastedChildElement.eAllContents();
-					while (contentIt.hasNext()) {
-						recycleObjectId((EObject) contentIt.next());
-					}
-				}
-			}
-		}
-	}
-
-	private void recycleObjectId(EObject pastedEObject) {
-		String newId = getParentResource().getID(pastedEObject);
-		if (newId != null) {
-			String originalId = (String) getLoadedEObjectToIDMapCopy().get(
-				pastedEObject);
-			getParentResource().setID(pastedEObject, originalId);
-		} else {
-			getParentResource().setID(pastedEObject, null);
-		}
-	}
-
-	private LoadingEMFResource loadEObjects()
-		throws Exception {
-		ByteArrayInputStream inputStream = new ByteArrayInputStream(
-			getResourceInfo().data.getBytes(getResourceInfo().encoding));
-		LoadingEMFResource resource = new LoadingEMFResource(
-			getParentResource().getResourceSet(),
-			getResourceInfo().encoding, getLoadOptionsMap(),
-			getClipboardOperationHelper());
-		resource.load(inputStream, null);
-		return resource;
-	}
-
-	private PasteChildOperation getChildPasteProcess(ObjectInfo childEObjectInfo) {
-		PasteChildOperation originalChildPasteProcess = (PasteChildOperation) childPasteProcessMap
-			.get(childEObjectInfo);
-		if (originalChildPasteProcess == null) {
-			originalChildPasteProcess = new PasteChildOperation(this,
-				childEObjectInfo);
-			childPasteProcessMap.put(childEObjectInfo,
-				originalChildPasteProcess);
-		}
-		return originalChildPasteProcess;
-	}
-
-	private void resolveReferences() {
-		Iterator it = getPastedElementSet().iterator();
-		EObject pastedEObject = null;
-		while (it.hasNext()) {
-			pastedEObject = (EObject) it.next();
-			checkReferences(pastedEObject);
-			//now, resolveReferences for contained elements recursively
-			// OK to get all contents of 'pastedEObject' because we
-			//    paste all elements into the same resource (no
-			//    cross-resource containment)
-			TreeIterator contentIt = pastedEObject.eAllContents();
-			while (contentIt.hasNext()) {
-				checkReferences((EObject) contentIt.next());
-			}
-		} //while
-	}
-
-	private void checkReferences(EObject pastedEObject) {
-		List references = pastedEObject.eClass().getEAllReferences();
-		Iterator refIt = references.iterator();
-		EReference reference = null;
-		while (refIt.hasNext()) {
-			reference = (EReference) refIt.next();
-			//Here we will handle non-containment refs only because
-			// containments (and, inversely, containers)
-			//are copied and/or will be resolved too from
-			// pasteSelectionFromString(..)
-			if (!reference.isContainment() && !reference.isContainer()
-				&& reference.isChangeable()) {
-				if (FeatureMapUtil.isMany(pastedEObject, reference)) {
-					if (!pastedEObject.eIsSet(reference)) {
-						continue;
-					}
-					Collection currentList = (Collection) pastedEObject
-						.eGet(reference);
-					if (currentList.isEmpty()) {
-						continue;//it has been emptied by the paste process,
-						// then ignore it
-					}
-					Object[] currentValues = currentList.toArray();
-					resolveProxyReferences(currentValues);
-					currentValues = removeNullEntries(currentValues);
-					//replace merged elements if any
-					checkMergedElements(currentValues);
-					List checkedList = Arrays.asList(currentValues);
-					if (currentList.equals(checkedList) == false) {
-						ClipboardSupportUtil.setEObjectList(
-							pastedEObject, reference, checkedList);
-					}
-				} else {
-					Object currentValue = pastedEObject.eGet(reference);
-					if (currentValue == null) {
-						continue;//it has been nullified by the paste process,
-						// then ignore it
-					}
-					Object[] currentValues = new Object[] {currentValue};
-					resolveProxyReferences(currentValues);
-					if (currentValues[0] == null) {
-						ClipboardSupportUtil.destroyEObject(pastedEObject,
-							reference);
-					} else {
-						//replace merged element if any
-						checkMergedElements(currentValues);
-						if (currentValues[0] != currentValue) {
-							ClipboardSupportUtil.setEObject(
-								pastedEObject, reference,
-								(EObject) currentValues[0]);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private Object[] removeNullEntries(Object[] objects) {
-		List newList = new ArrayList();
-		for (int i = 0; i < objects.length; ++i) {
-			if (objects[i] != null) {
-				newList.add(objects[i]);
-			}
-		}
-		return newList.toArray();
-	}
-
-	private void resolveProxyReferences(Object[] currentValues) {
-		EObject val = null;
-		EObject resolvedVal = null;
-		for (int i = 0; i < currentValues.length; ++i) {
-			boolean replaced = false;
-			val = (EObject) currentValues[i];
-			if (val.eResource() == getLoadedResource()) {
-				//must replace
-				val = (EObject) getContentObject2ProxyMap().get(val);
-				replaced = true;
-				if (val == null) {
-					currentValues[i] = null;
-					continue;
-				}
-			}
-			if (val.eIsProxy()) {
-				resolvedVal = ClipboardSupportUtil.resolve(val, getParentResource());
-				if (resolvedVal.eIsProxy()) {
-					resolvedVal = EcoreUtil.resolve(val, getParentResource());
-				}
-				if (resolvedVal.eIsProxy() == false) {
-					currentValues[i] = resolvedVal;
-				} else if (replaced) {
-					//been replaced and still not resolved, then we have two
-					// options:
-					//Option (1): make proxy again:
-					((InternalEObject) currentValues[i])
-						.eSetProxyURI(((InternalEObject) val).eProxyURI());
-					//Or, Option (2): it's not valid anymore, nullify it:
-					//					currentValues[i] = null;
-				}
-			}
-		}
-	}
-
-	private void checkMergedElements(Object[] resolvedReferencedEObjects) {
-		//This function is called after the merge -if any- has happened,
-		//which means a record for the mergedObject must exist keyed by its
-		// instance
-		//even if when we merged that element we found out that it has been
-		// merged already
-		//a record would have been entered.
-		for (int i = 0; i < resolvedReferencedEObjects.length; ++i) {
-			//use the target object only if this object is not in the current
-			// "pasted-into" resource
-			//Please note that an object could have a merge entry AND be pasted
-			//as well in the target resource. This could happen if it played a
-			// multi
-			//role when copying/pasting: it was copy-parent for some original
-			// element +
-			//copyAlways for another + it also happened to be a child of an
-			// original element.
-			if (getEObjectID((EObject) resolvedReferencedEObjects[i]) == null) {
-				MergedEObjectInfo info = (MergedEObjectInfo) getAllMergedElementsMap()
-					.get(resolvedReferencedEObjects[i]);
-				if (info != null) {
-					if (info.targetEObjects.size() == 1) {
-						resolvedReferencedEObjects[i] = info.targetEObjects
-							.get(0);
-					} else if (info.targetEObjects.size() > 1) {
-						boolean found = false;
-						//got merged more than once, pick most suitable!
-						Iterator it = info.targetEObjects.iterator();
-						while (it.hasNext()) {
-							EObject mergeTarget = (EObject) it.next();
-							if (isChild(mergeTarget)) {
-								resolvedReferencedEObjects[i] = mergeTarget;
-								found = true;
-								break;
-							}
-						}
-						if (found == false) {
-							//no suitable one, then pick the first
-							resolvedReferencedEObjects[i] = info.targetEObjects
-								.get(0);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Retrieves the element into which I am pasting children.
-	 * 
-	 * @return the paste target
-	 */
-	public final EObject getEObject() {
-		if (!element.isResource()) {
-			return (EObject)element.getObject();
-		}
-		return null;
-	}
-
-	/**
-	 * Retrieves the element into which I am pasting children.
-	 * 
-	 * @return the paste target
-	 */
-	public final PasteTarget getPasteTarget() {
-		return element;
-	}
-
-	/**
-	 * Retrieves the mapping of copied objects (deserialized from the
-	 * clipboard string) to their IDs.
-	 * 
-	 * @return the mapping of copied {@link EObject}s to string IDs
-	 */
-	public Map getLoadedEObjectToIDMapCopy() {
-		return getLoadedResource().getEObjectToIDMapCopy();
-	}
-
-	/**
-	 * Retrieves the mapping of IDs to copied objects (deserialized from the
-	 * clipboard string).
-	 * 
-	 * @return the mapping of string IDs to copied {@link EObject}s
-	 */
-	public Map getLoadedIDToEObjectMapCopy() {
-		return getLoadedResource().getIDToEObjectMapCopy();
-	}
-
-	/**
-	 * Looks up an object in the resource that I am pasting into, by ID.
-	 * 
-	 * @param objId the object ID to look up in the parent resource
-	 * @return the matching object, or <code>null</code> if not found
-	 * 
-	 * @see #getParentResource()
-	 */
-	public EObject getEObject(String objId) {
-		return getParentResource().getEObject(objId);
-	}
-
-	/**
-	 * Looks up an object's ID in the resource that I am pasting into.
-	 * 
-	 * @param eObject the object in the parent resource to find the ID for
-	 * @return the matching ID, or <code>null</code> if not found
-	 * 
-	 * @see #getParentResource()
-	 */
-	public String getEObjectID(EObject eObject) {
-		return getParentResource().getID(eObject);
-	}
-
-	/**
-	 * Queries whether the specified <code>eObject</code> is contained within
-	 * the subtree of the element that I am pasting into.
-	 * 
-	 * @param eObject an element
-	 * @return <code>true</code> if it is in the containment tree of my paste
-	 *     target; <code>false</code>, otherwise
-	 */
-	protected boolean isChild(EObject eObject) {
-		return (eObject != null) ? ClipboardSupportUtil.isChild(getEObject(),
-			eObject)
-			: false;
-	}
-
-	/**
-	 * Gets the feature that originally contained the specified object
-	 * when it was copied to the clipboard.  This is the feature into which we
-	 * would like to paste it, if possible, in my paste target element.
-	 * 
-	 * @param eObject an eObject being pasted
-	 * @return its original containment feature, if it is known;
-	 *     <code>null</code>, otherwise
-	 */
-	public EReference getContainmentFeature(EObject eObject) {
-		Iterator it = getContainmentAnnotationReferences().iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			Object ref = it.next();
-			if (eObject.equals(obj)) {
-				return (EReference) ref;
-			}
-		}
-		return null;
-	}
-
-	private EAnnotation getSerializationAnnotation() {
-		if (serializationAnnotation == null) {
-			Iterator it = getLoadedResource().getContents().iterator();
-			while (it.hasNext()) {
-				Object obj = it.next();
-				if (obj instanceof EAnnotation) {
-					EAnnotation eAnnotation = ((EAnnotation) obj)
-						.getEAnnotation(SerializationEMFResource.SERIALIZATION_ANNOTATIONS);
-					if (eAnnotation != null) {
-						serializationAnnotation = eAnnotation;
-						break;
-					}
-				}
-			}
-		}
-		return serializationAnnotation;
-	}
-
-	private Map getContentObject2ProxyMap() {
-		if (contentObject2ProxyMap == null) {
-			contentObject2ProxyMap = new HashMap();
-			Iterator annotations = getSerializationAnnotation()
-				.getEAnnotations().iterator();
-			while (annotations.hasNext()) {
-				EAnnotation ref_obj_Annotation = (EAnnotation) annotations
-					.next();
-				EObject proxy = (EObject) ref_obj_Annotation.getReferences()
-					.get(0);
-				EObject eObj = ClipboardSupportUtil.resolve(proxy,
-					getLoadedIDToEObjectMapCopy());
-				assert proxy != eObj: "proxy is the same as eObj"; //we must succeed //$NON-NLS-1$
-				contentObject2ProxyMap.put(eObj, proxy);
-			}
-		}
-		return contentObject2ProxyMap;
-	}
-
-	/**
-	 * @return Returns the containmentAnnotations.
-	 */
-	protected List getContainmentAnnotationReferences() {
-		if (containmentAnnotationReferences == null) {
-			containmentAnnotationReferences = new ArrayList();
-			Iterator annotations = getSerializationAnnotation()
-				.getEAnnotations().iterator();
-			while (annotations.hasNext()) {
-				EAnnotation ref_obj_Annotation = (EAnnotation) annotations
-					.next();
-				if (ref_obj_Annotation.getReferences().size() >= 2) {
-					EObject eObj = ClipboardSupportUtil.resolve(
-						(EObject) ref_obj_Annotation.getReferences().get(0),
-						getLoadedIDToEObjectMapCopy());
-					containmentAnnotationReferences.add(eObj);
-					EObject eRef = EcoreUtil.resolve((EObject) ref_obj_Annotation
-						.getReferences().get(1), getParentResource());
-					containmentAnnotationReferences.add(eRef);
-				}
-			}
-		}
-		return containmentAnnotationReferences;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteOperation.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteOperation.java
deleted file mode 100644
index c874e17..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteOperation.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.emf.clipboard.core.BasePasteOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteTarget;
-
-/**
- * The default paste operation.  Extensibility is provided by the callback
- * methods of the {@link IClipboardSupport} implementation for the specific
- * EMF metamodel.
- * <p>
- * <b>Note</b> that this class is not intended to be extended
- * by clients.  Clients may not instantiate it.
- * </p>
- * 
- * @see org.eclipse.gmf.runtime.emf.clipboard.core.OverrideCopyOperation
- * 
- * @author Yasser Lulu
- */
-public class PasteOperation
-	extends BasePasteOperation {
-
-	private Map parentPasteRecordMap;
-
-	private PasteTarget parent;
-
-	private Map hintsMap;
-
-	/**
-	 * Initializes me.
-	 * 
-	 * @param monitor an optional monitor to track paste progress
-	 * @param clipboardSupport the clipboard support object governing this
-	 *     copy/paste operation
-	 * @param string the string obtained from the system clipboard, that
-	 *     contains the serial form of the copied objects that are to be
-	 *     pasted
-	 * @param parent the target object into which the copied elements are to
-	 *     be pasted.  This object will be their "parent"
-	 * @param loadOptionsMap map of EMF resource load options for
-	 *     deserialization of the resource that was copied to the clipboard
-	 * @param hintsMap the map of copy hints, possibly empty.  Hints are defined
-	 *     by the {@link org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil} class
-	 * 
-	 * @throws Exception if anything goes wrong in initializing the paste
-	 *     operation
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil#MERGE_HINT_WEAK
-	 * @see org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil#MERGE_HINT_STRONG
-	 */
-	public PasteOperation(IProgressMonitor monitor,
-			IClipboardSupport clipboardSupport, String string,
-			PasteTarget parent, Map loadOptionsMap, Map hintsMap)
-		throws Exception {
-		super(monitor, loadOptionsMap, ResourceInfoProcessor
-			.getResourceInfo(string), clipboardSupport);
-		this.hintsMap = (hintsMap == null) ? Collections.EMPTY_MAP
-			: hintsMap;
-		parentPasteRecordMap = new HashMap();
-		this.parent = parent;
-	}
-
-	private final PasteIntoParentOperation getParentPasteProcess(
-			PasteTarget parentElement)
-		throws Exception {
-		PasteIntoParentOperation parentPasteProcess = (PasteIntoParentOperation) parentPasteRecordMap
-			.get(parentElement);
-		if (parentPasteProcess == null) {
-			parentPasteProcess = new PasteIntoParentOperation(this,
-				parentElement, getHintsMap());
-			parentPasteRecordMap.put(parentElement, parentPasteProcess);
-		}
-		return parentPasteProcess;
-	}
-
-	public void paste()
-		throws Exception {
-		getProgressMonitor().worked(WORK_UNIT);
-		if (isCancelled()) {
-			throwCancelException();
-		}
-		PasteIntoParentOperation parentPasteProcess = getParentPasteProcess(parent);
-		if (isCancelled()) {
-			throwCancelException();
-		}
-		parentPasteProcess.paste();
-		if (getCriticalResolveFailuresSet().isEmpty() == false) {
-			throwException(PASTE, new IllegalStateException(
-				"Critical Resolve Failure While Pasting")); //$NON-NLS-1$
-		}
-	}
-
-	public BasePasteOperation getSpawningPasteOperation() {
-		//for emphasis only
-		return null;
-	}
-
-	/**
-	 * Obtains the paste hints with which I was initialized.
-	 * 
-	 * @return my hints
-	 */
-	public Map getHintsMap() {
-		return hintsMap;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfo.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfo.java
deleted file mode 100644
index 75030de..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfo.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.ObjectInfo;
-
-
-/**
- * Meta-data on the resource that is serialized to a string by the copy
- * operation.  The resource info is (de)serialized by the
- * {@link ResourceInfoProcessor}.
- * 
- * @author Yasser Lulu
- * 
- * @see ResourceInfoProcessor
- */
-public class ResourceInfo {
-
-	/**
-	 * Initializes me.
-	 */
-	public ResourceInfo() {
-		super();
-	}
-
-	String data;
-
-	String info;
-
-	String version;
-
-	String type;
-
-	String encoding;
-
-	public Map objects = new HashMap();
-
-	private Map objectInfoTypeMap;
-
-	Map getObjectInfoTypeMap() {
-		if (objectInfoTypeMap == null) {
-			objectInfoTypeMap = new HashMap();
-			Iterator it = objects.values().iterator();
-			ObjectInfo objectInfo = null;
-			while (it.hasNext()) {
-				objectInfo = (ObjectInfo) it.next();
-				List list = (List)objectInfoTypeMap
-					.get(objectInfo.objCopyType);
-				if (list == null) {
-					list = new ArrayList();
-					objectInfoTypeMap.put(objectInfo.objCopyType, list);
-				}
-				list.add(objectInfo);
-			}
-		}
-		return objectInfoTypeMap;
-	}
-
-	List getObjectInfoTypes(String objectInfoType) {
-		List list = (List)getObjectInfoTypeMap().get(objectInfoType);
-		return (list != null) ? list
-			: Collections.EMPTY_LIST;
-	}
-
-	void completeEObjectInitialization() {
-		Iterator it = objects.values().iterator();
-		ObjectInfo objectInfo = null;
-		while (it.hasNext()) {
-			objectInfo = (ObjectInfo) it.next();
-			objectInfo
-				.makeCopyAlwaysObjectInfoList(getObjectInfoTypes(ObjectCopyType.OBJ_COPY_TYPE_ALWAYS));
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java
deleted file mode 100644
index 66faf1e..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfoProcessor.java
+++ /dev/null

@@ -1,309 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.clipboard.core.CopyObjects;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ObjectInfo;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * Codec for the {@link ResourceInfo meta-data} stored with the resource that
- * is serialized to a string by the copy operation.  The meta-data are
- * implemented as XML comments following the <tt>&lt;XMI&gt;</tt> document
- * element.
- * 
- * @author Yasser Lulu
- * 
- * @see ResourceInfo 
- */
-public class ResourceInfoProcessor {
-
-	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	private static final String BEGIN_COMMENT = "<!-- "; //$NON-NLS-1$
-
-	private static final String END_COMMENT = " -->"; //$NON-NLS-1$
-
-	private static final String ENDL = "\n"; //$NON-NLS-1$
-
-	private static final String SEPARATOR = "|"; //$NON-NLS-1$
-
-	private static final String PLUS = "+"; //$NON-NLS-1$
-
-	private static final String COMMA = ","; //$NON-NLS-1$	
-
-	private static final String PROPERTY_DELIM = SEPARATOR + PLUS;	
-
-	private static final String VERSION = "VERSION"; //$NON-NLS-1$
-
-	private static final String VERSION_VALUE = "1.0"; //$NON-NLS-1$
-
-	private static final String TYPE = "TYPE"; //$NON-NLS-1$
-
-	private static final String TYPE_VALUE = "EMF"; //$NON-NLS-1$
-
-	private static final String OFFSET = "OFFSET"; //$NON-NLS-1$
-
-	private static final String ENCODING = "ENCODING"; //$NON-NLS-1$
-
-	private static final String OBJ_ID = "OBJ_ID"; //$NON-NLS-1$
-
-	private static final String OBJ_COPY_TYPE = "OBJ_COPY_TYPE"; //$NON-NLS-1$
-
-	private static final String CONTAINER_ID = "CONTAINER_ID"; //$NON-NLS-1$
-
-	private static final String CONTAINER_CLASS = "CONTAINER_CLASS"; //$NON-NLS-1$
-
-	private static final String HINTS = "HINTS"; //$NON-NLS-1$
-
-	public static final String NONE = "NONE"; //$NON-NLS-1$
-
-	private static final String COPY_PARENT_ID = "COPY_PARENT_ID"; //$NON-NLS-1$
-
-	private static final String COPY_ALWAYS_IDS = "COPY_ALWAYS_IDS"; //$NON-NLS-1$
-
-	private ResourceInfoProcessor() {
-		//private
-	}
-
-	private static Properties getProperties(String commnetedString) {
-		String str = removeCommnetTags(commnetedString);
-		StringTokenizer tokenizer = new StringTokenizer(str, PROPERTY_DELIM);
-		Properties properties = new Properties();
-		String key = null;
-		String value = null;
-		while (tokenizer.hasMoreTokens()) {
-			key = tokenizer.nextToken();
-			value = tokenizer.nextToken();
-			properties.setProperty(key.trim(), value.trim());
-		}
-		return properties;
-	}
-
-	private static List getCommaSeparatedStringsList(String string) {
-		List list = new ArrayList();
-		StringTokenizer tokenizer = new StringTokenizer(string, COMMA);
-		while (tokenizer.hasMoreTokens()) {
-			list.add(tokenizer.nextToken().trim());
-		}
-		return list;
-	}
-
-	private static String removeCommnetTags(String commnetedString) {
-		return trimStrings(commnetedString, BEGIN_COMMENT, END_COMMENT);
-	}
-
-	private static String trimStrings(String string, String beginStr,
-			String endStr) {
-		int begin = string.indexOf(beginStr);
-		int end = string.indexOf(endStr);
-		String result = string.substring(begin + beginStr.length(), end);
-		return result.trim();
-	}
-
-	private static void processOffset(StringBuffer stringBuffer, int offset) {
-		stringBuffer.append(BEGIN_COMMENT);
-		stringBuffer.append(OFFSET).append(SEPARATOR).append(offset);
-		stringBuffer.append(END_COMMENT);
-		stringBuffer.append(ENDL);
-	}
-
-	private static void processOffset(ResourceInfo resourceInfo, String str) {
-		StringBuffer buffer = new StringBuffer(str);
-		int baseLenStrOffset = str.lastIndexOf(BEGIN_COMMENT);
-		String baseLenStr = buffer.substring(baseLenStrOffset);
-		buffer.delete(baseLenStrOffset, buffer.length());
-		int infoStrOffset = Integer.parseInt(getProperties(baseLenStr)
-			.getProperty(OFFSET));
-		resourceInfo.info = buffer.substring(infoStrOffset);
-		buffer.delete(infoStrOffset, buffer.length());
-		resourceInfo.data = buffer.toString();
-	}
-
-	private static void processEObject(ResourceInfo resourceInfo, String line) {
-		ObjectInfo objectInfo = new ObjectInfo();
-		Properties properties = getProperties(line);
-		objectInfo.objCopyType = properties.getProperty(OBJ_COPY_TYPE);
-		objectInfo.objId = properties.getProperty(OBJ_ID);
-		objectInfo.containerId = properties.getProperty(CONTAINER_ID);
-		objectInfo.containerClass = properties.getProperty(CONTAINER_CLASS);
-		objectInfo.hints = properties.getProperty(HINTS);
-		objectInfo.copyParentId = properties.getProperty(COPY_PARENT_ID);
-		String copyAlwaysIdStr = properties.getProperty(COPY_ALWAYS_IDS);
-		if (copyAlwaysIdStr.equals(NONE) == false) {
-			List ids = getCommaSeparatedStringsList(copyAlwaysIdStr);
-			objectInfo.copyAlwaysIds.addAll(ids);
-		}
-
-		resourceInfo.objects.put(objectInfo.objId, objectInfo);
-	}
-
-	private static void processEObject(StringBuffer stringBuffer,
-			EObject eObject, SavingEMFResource emfResource, Map hintMap,
-			CopyObjects copyObjects) {
-
-		stringBuffer.append(BEGIN_COMMENT);
-
-		String copyType = null;
-		String containerId = null;
-		String containerClass = null;
-		EObject eObjectWithValidContainer = eObject;
-
-		if (copyObjects.originalObjects.contains(eObject)) {
-			copyType = ObjectCopyType.OBJ_COPY_TYPE_ORIGINAL;
-		} else if (copyObjects.combinedCopyAlwaysSet.contains(eObject)) {
-			copyType = ObjectCopyType.OBJ_COPY_TYPE_ALWAYS;
-		} else {
-			copyType = ObjectCopyType.OBJ_COPY_TYPE_PARENT;
-			eObjectWithValidContainer = emfResource.getOriginalEObject(eObject);
-		}
-
-		stringBuffer.append(OBJ_COPY_TYPE).append(SEPARATOR).append(copyType)
-			.append(PLUS);
-
-		stringBuffer.append(OBJ_ID).append(SEPARATOR).append(
-			emfResource.getID(eObject)).append(PLUS);
-		
-		if (eObjectWithValidContainer != null && eObjectWithValidContainer.eContainer() != null) {
-			containerId = emfResource.getID(eObjectWithValidContainer.eContainer());
-			containerClass = eObjectWithValidContainer.eContainer().eClass()
-				.getInstanceClassName();
-
-			stringBuffer.append(CONTAINER_ID).append(SEPARATOR).append(containerId)
-				.append(PLUS);
-	
-			stringBuffer.append(CONTAINER_CLASS).append(SEPARATOR).append(
-				containerClass).append(PLUS);
-		}
-
-		String hints = (String) hintMap.get(eObject);
-		stringBuffer.append(HINTS).append(SEPARATOR).append(
-			(hints == null) ? NONE
-				: hints).append(PLUS);
-
-		EObject copyParent = (EObject) copyObjects.objectsToCopyParentMap
-			.get(eObject);
-		stringBuffer.append(COPY_PARENT_ID).append(SEPARATOR).append(
-			(copyParent == null) ? NONE
-				: emfResource.getID(copyParent)).append(PLUS);
-
-		String copyAlwaysIdsStr = null;
-		Set copyAlwaysSet = (Set) copyObjects.copyAlwaysMap.get(eObject);
-		if ((copyAlwaysSet != null) && (copyAlwaysSet.isEmpty() == false)) {
-			copyAlwaysSet.retainAll(copyObjects.combinedCopyAlwaysSet);
-			if (copyAlwaysSet.isEmpty() == false) {
-				copyAlwaysIdsStr = EMPTY_STRING; //init
-				Iterator copyAlwaysSetIt = copyAlwaysSet.iterator();
-				while (copyAlwaysSetIt.hasNext()) {
-					EObject copyAlwaysObject = (EObject) copyAlwaysSetIt.next();
-					copyAlwaysIdsStr = copyAlwaysIdsStr
-						+ emfResource.getID(copyAlwaysObject);
-					if (copyAlwaysSetIt.hasNext()) {
-						copyAlwaysIdsStr = copyAlwaysIdsStr + COMMA;
-					}
-				}
-			}
-		}
-		stringBuffer.append(COPY_ALWAYS_IDS).append(SEPARATOR).append(
-			(copyAlwaysIdsStr == null) ? NONE
-				: copyAlwaysIdsStr);
-
-		stringBuffer.append(END_COMMENT);
-		stringBuffer.append(ENDL);
-	}
-
-	private static void processResource(ResourceInfo resourceInfo, String line) {
-		Properties properties = getProperties(line);
-		resourceInfo.encoding = properties.getProperty(ENCODING);
-	}
-
-	private static void processResource(StringBuffer stringBuffer,
-			String encoding) {
-		stringBuffer.append(BEGIN_COMMENT);
-		stringBuffer.append(ENCODING).append(SEPARATOR).append(encoding);
-		stringBuffer.append(END_COMMENT);
-		stringBuffer.append(ENDL);
-	}
-
-	private static void processVersion(ResourceInfo resourceInfo, String line) {
-		Properties properties = getProperties(line);
-		resourceInfo.type = properties.getProperty(TYPE);
-		resourceInfo.version = properties.getProperty(VERSION);
-	}
-
-	private static void processVersion(StringBuffer stringBuffer) {
-		stringBuffer.append(BEGIN_COMMENT);
-		stringBuffer.append(TYPE).append(SEPARATOR).append(TYPE_VALUE).append(
-			PLUS);
-		stringBuffer.append(VERSION).append(SEPARATOR).append(VERSION_VALUE);
-		stringBuffer.append(END_COMMENT);
-		stringBuffer.append(ENDL);
-	}
-
-	static ResourceInfo getResourceInfo(String str)
-		throws Exception {
-		ResourceInfo resourceInfo = new ResourceInfo();
-		processOffset(resourceInfo, str);
-		BufferedReader reader = new BufferedReader(new StringReader(
-			resourceInfo.info));
-		processVersion(resourceInfo, reader.readLine());
-		processResource(resourceInfo, reader.readLine());
-		String line = reader.readLine();
-		while (line != null) {
-			processEObject(resourceInfo, line);
-			line = reader.readLine();
-		}
-
-		resourceInfo.completeEObjectInitialization();
-
-		return resourceInfo;
-	}
-
-	public static String getResourceInfo(int offset, String encoding,
-			SavingEMFResource emfResource, Map hintMap, CopyObjects copyObjects) {
-
-		StringBuffer stringBuffer = new StringBuffer();
-
-		//(1)type + version
-		processVersion(stringBuffer);
-
-		//(2)general model + resource stuff
-		processResource(stringBuffer, encoding);
-
-		//(3)generate ObjectInfo entries
-		Set objectInfoSet = new HashSet(copyObjects.totalCopyObjects);
-		objectInfoSet.addAll(copyObjects.originalObjects);
-		Iterator it = objectInfoSet.iterator();
-		while (it.hasNext()) {
-			processEObject(stringBuffer, (EObject) it.next(), emfResource,
-				hintMap, copyObjects);
-		}
-
-		//write offset at the end
-		processOffset(stringBuffer, offset);
-
-		return stringBuffer.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java
deleted file mode 100644
index 65d18f0..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java
+++ /dev/null

@@ -1,370 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
-import org.eclipse.gmf.runtime.emf.clipboard.core.CopyObjects;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-
-/**
- * @author Yasser Lulu
- */
-public class SavingEMFResource
-	extends SerializationEMFResource {
-
-	private Map copy2ObjectMap;
-
-	private EList contentList;
-
-	private Set contentSet;
-
-	private CopyObjects copyObjects;
-
-	private Collection excludedObjects;
-
-	public SavingEMFResource(URI uri, String encoding, Map defaultSaveOptions,
-		Map copy2ObjectMap, CopyObjects copyObjects,
-		IClipboardSupport clipboardOperationHelper) {
-		super(encoding, uri, clipboardOperationHelper);
-		this.defaultSaveOptions = defaultSaveOptions;
-		this.eObjectToIDMap = new HashMap();
-		this.idToEObjectMap = new HashMap();
-		this.copy2ObjectMap = copy2ObjectMap;
-		this.contentSet = new HashSet(copyObjects.totalCopyObjects);
-		this.copyObjects = copyObjects;
-		this.excludedObjects = clipboardOperationHelper
-			.getExcludedCopyObjects(copyObjects.totalCopyObjects);
-		//we must ensure that every EObject in the contentSet has a resource,
-		//becuase the serialization process needs that. Those who don't, will
-		// be added to us.
-		setMissingResource();
-		//set containment refs.
-		setContainmentFeatures();
-		//needed to allow calls to unload() to proceed
-		setLoaded(true);
-		sortContentSetOnOriginalStorageOrder();
-	}
-
-	private void sortContentSetOnOriginalStorageOrder() {
-		Map parentObjectMap = new HashMap();
-		List roots = new ArrayList();
-		Iterator it = contentSet.iterator();
-		while (it.hasNext()) {
-			EObject eObj = (EObject) it.next();
-			EObject eParent = eObj.eContainer();
-			if (eParent == null) {
-				roots.add(eObj);
-			} else {
-				List children = (List) parentObjectMap.get(eParent);
-				if (children == null) {
-					children = new ArrayList();
-					parentObjectMap.put(eParent, children);
-				}
-				children.add(eObj);
-			}
-		}//while
-
-		List list = new ArrayList(roots);
-		Iterator entryIt = parentObjectMap.entrySet().iterator();
-		while (entryIt.hasNext()) {
-			Map.Entry entry = (Map.Entry) entryIt.next();
-			
-			// get the basic list view of the contents list to avoid resolving
-			//    cross-resource containment proxies
-			Collections.sort((List) entry.getValue(), new ListIndexComparator(
-				((InternalEList) ((EObject) entry.getKey()).eContents()).basicList()));
-			list.addAll((List) entry.getValue());
-		}
-		contentSet = new LinkedHashSet(list);
-	}
-
-	private void setContainmentFeatures() {
-		EAnnotation containmentAnnotations = EcoreFactory.eINSTANCE
-			.createEAnnotation();
-		EAnnotation eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-		eAnnotation.setSource(SERIALIZATION_ANNOTATIONS);
-		containmentAnnotations.getEAnnotations().add(eAnnotation);
-		Set set = new HashSet(contentSet);
-		set.addAll(copyObjects.originalObjects);
-		Iterator it = set.iterator();
-		while (it.hasNext()) {
-			EObject eObj = (EObject) it.next();
-			addToSerializationAnnotation(eAnnotation, eObj);
-			
-			// OK to resolve containment proxies because we must load the
-			//    entire model sub-tree in order to copy it
-			TreeIterator contentIt = eObj.eAllContents();
-			while (contentIt.hasNext()) {
-				EObject childEObj = (EObject) contentIt.next();
-				if (getClipboardOperationHelper().shouldSaveContainmentFeature(
-					childEObj) == false) {
-					contentIt.prune();
-					continue;
-				}
-				addToSerializationAnnotation(eAnnotation, childEObj);
-			}
-		}
-		super.getContents().add(containmentAnnotations);
-		contentSet.add(containmentAnnotations);
-	}
-
-	private void addToSerializationAnnotation(EAnnotation eAnnotation,
-		EObject eObj) {
-		EObject eObjectWithValidContainer = (eObj.eContainer() == null) ? getOriginalEObject(eObj)
-			: eObj;
-		EAnnotation ref_obj_Annotation = EcoreFactory.eINSTANCE
-			.createEAnnotation();
-		ref_obj_Annotation.getReferences().add(eObj);
-		if (eObjectWithValidContainer != null) {
-			ref_obj_Annotation.getReferences().add(
-				eObjectWithValidContainer.eContainmentFeature());
-		} else {
-			// If there is no containment feature, which is the case when copying a
-			// root element, then an unattached EReference is added to the annotation.
-			// This EReference ensures that that the annotation references
-			// are serialized using CROSS_DOC.
-			// A better fix would be to add some intelligence to the sameDocMany(..) method
-			// of the XMISameImpl class created in method createXMLSave().
-			ref_obj_Annotation.getReferences().add(EcoreFactory.eINSTANCE.createEReference());
-		}
-		eAnnotation.getEAnnotations().add(ref_obj_Annotation);
-	}
-
-	private void setMissingResource() {
-		Iterator it = contentSet.iterator();
-		EObject eObject = null;
-		while (it.hasNext()) {
-			eObject = (EObject) it.next();
-			if (eObject.eResource() == null) {
-				//no resource (detached view-element), therefore add the
-				// top-most
-				//parent to the us so that a newer call to getResource will
-				// succeed.
-				// don't add the element itself, since adding the element to a
-				//resource will set its container to null,and we want to
-				// preserve
-				//the container of the original detached element. This means
-				// that
-				//if the element itself has no container (top-most
-				// copyAlwaysCopy),
-				//then we'll add it regardless since its parent is already
-				// null.
-				//therefore add the container of the detached original element
-				// so
-				//that the container's container will be set to null
-				while (eObject.eContainer() != null) {
-					eObject = eObject.eContainer();
-				}
-				super.getContents().add(eObject);
-			}
-		}
-
-		//let's make sure that things went OK, for if they didn't, the
-		//paste process or even the serialization process will fail
-		it = contentSet.iterator();
-		while (it.hasNext()) {
-			eObject = (EObject) it.next();
-			if (eObject.eResource() == null) {
-
-				RuntimeException e = new IllegalArgumentException();
-
-				ClipboardPlugin.throwing(getClass(),
-					"setMissingResource", e); //$NON-NLS-1$
-
-				throw e;
-			}
-		}
-	}
-
-	public void doLoad(InputStream inputStream, Map options) throws IOException {
-		throwUnsupportedOperationException("doLoad", //$NON-NLS-1$
-			new UnsupportedOperationException(
-				"Can't call load on serializing resource"));//$NON-NLS-1$
-	}
-
-	protected XMLSave createXMLSave() {
-		return new XMISaveImpl(createXMLHelper()) {
-
-			protected void saveElement(InternalEObject o, EStructuralFeature f) {
-				// do not save cross-resource-contained objects as hrefs, because
-				//    the clipboard resource must actually duplicate all of the
-				//    original data
-				saveElement((EObject) o, f);
-			}
-
-			protected void saveElement(EObject o, EStructuralFeature f) {
-				if (excludedObjects.contains(o)) {
-					return;
-				}
-				super.saveElement(o, f);
-			}
-
-			/**
-			 * @see org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl#sameDocMany(org.eclipse.emf.ecore.EObject,
-			 *      org.eclipse.emf.ecore.EStructuralFeature)
-			 */
-			protected int sameDocMany(EObject o, EStructuralFeature f) {
-				InternalEList values = (InternalEList) helper.getValue(o, f);
-				if (values.isEmpty()) {
-					return SKIP;
-				}
-
-				for (Iterator i = values.basicIterator(); i.hasNext();) {
-					InternalEObject value = (InternalEObject) i.next();
-					if (value.eIsProxy()
-						|| (isInSavingResource(value) == false)) {
-						return CROSS_DOC;
-					}
-				}
-
-				return SAME_DOC;
-			}
-
-			/**
-			 * @see org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl#sameDocSingle(org.eclipse.emf.ecore.EObject,
-			 *      org.eclipse.emf.ecore.EStructuralFeature)
-			 */
-			protected int sameDocSingle(EObject o, EStructuralFeature f) {
-				InternalEObject value = (InternalEObject) helper.getValue(o, f);
-				if (value == null) {
-					return SKIP;
-				} else if (value.eIsProxy()) {
-					return CROSS_DOC;
-				} else {
-					return (isInSavingResource(value)) ? SAME_DOC : CROSS_DOC;
-				}
-			}
-
-		};
-	}
-
-	boolean isInSavingResource(EObject eObject) {
-		if (eObject.eResource() == this) {
-			return true;
-		} else if ((copyObjects.originalObjects.contains(eObject))
-			|| (copyObjects.copyParent2CopyMap.values().contains(eObject))
-			|| (copyObjects.combinedCopyAlwaysSet.contains(eObject))) {
-			return true;
-		}
-		EObject eContainer = eObject.eContainer();
-		while (eContainer != null) {
-			if ((copyObjects.originalObjects.contains(eContainer))
-				|| (copyObjects.copyParent2CopyMap.values().contains(eContainer))
-				|| (copyObjects.combinedCopyAlwaysSet.contains(eContainer))) {
-				return true;
-			}
-			eContainer = eContainer.eContainer();
-		}
-		return false;
-	}
-
-	EObject getOriginalEObject(EObject copiedEObject) {
-		return (EObject) copy2ObjectMap.get(copiedEObject);
-	}
-
-	private String getOriginalID(EObject eObject) {
-		Resource res = eObject.eResource();
-		
-		if ((res != this) && (res != null)) {
-			return ((XMLResource) res).getID(eObject);
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.XMLResource#getID(org.eclipse.emf.ecore.EObject)
-	 */
-	public String getID(EObject eObject) {
-
-		//is this an original object?
-		String id = getOriginalID(eObject);
-		if (id == null) {
-			//no, then, is it a copied object?
-			EObject original = (EObject) copy2ObjectMap.get(eObject);
-			if (original != null) {
-				id = getOriginalID(original);
-			} else {
-				Resource res = eObject.eResource();
-				
-				if (res != null) {
-					//we'll use our own assigned ids, (detached view-elements bug)
-					assert eObject.eResource() == this: "eObject.eResource not same as self"; //$NON-NLS-1$
-					id = super.getID(eObject);
-				}
-			}
-		}
-		return id;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#getContents()
-	 */
-
-	private static class ContentBasicEList
-		extends EcoreEList.UnmodifiableEList
-		implements InternalEList {
-
-		private static final long serialVersionUID = -2551747854798104709L;
-
-		ContentBasicEList(Set contentSet) {
-			super(null, null, contentSet.size(), contentSet.toArray());
-		}
-	}
-
-	public EList getContents() {
-		if (contentList == null) {
-			contentList = new ContentBasicEList(contentSet);
-		}
-		return contentList;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#doUnload()
-	 */
-	protected void doUnload() {
-		//unset resource for those whom we've actually added to ourselves -in the setMissingResource() above
-		//be carefull that the super.getContents() list is a ContentsEList and therefore calling clear on it
-		//it will end up calling eInverseRemove on the EObjects it holds and they in turn would end up
-		//calling the getResource().getContents() to remove themselves, but as we know that our own getContents()
-		// list is unmodifiable and this will throw an exception, therefore replace our own getContents() list
-		//with our parent's super.getContents() list before we clear it
-		contentList = super.getContents(); 
-		super.getContents().clear();
-
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SerializationEMFResource.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SerializationEMFResource.java
deleted file mode 100644
index 6bdd0bf..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SerializationEMFResource.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.UnresolvedReferenceException;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMILoadImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-
-/**
- * @author Yasser Lulu
- */
-public abstract class SerializationEMFResource
-	extends XMIResourceImpl {
-
-	// default load options.
-	public static final Map LOAD_OPTIONS = new HashMap();
-
-	// default save options.
-	public static final Map SAVE_OPTIONS = new HashMap();
-
-	static {
-
-		XMIResource resource = new XMIResourceImpl();
-
-		// default load options.
-		LOAD_OPTIONS.putAll(resource.getDefaultLoadOptions());
-
-		// default save options.
-		SAVE_OPTIONS.putAll(resource.getDefaultSaveOptions());
-		SAVE_OPTIONS.put(XMIResource.OPTION_DECLARE_XML, Boolean.TRUE);
-		SAVE_OPTIONS.put(XMIResource.OPTION_PROCESS_DANGLING_HREF,
-			XMIResource.OPTION_PROCESS_DANGLING_HREF_DISCARD);
-		SAVE_OPTIONS.put(XMIResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		SAVE_OPTIONS.put(XMIResource.OPTION_USE_XMI_TYPE, Boolean.TRUE);
-		SAVE_OPTIONS.put(XMIResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
-	}
-
-	public static String SERIALIZATION_ANNOTATIONS = "serialization_annotations";//$NON-NLS-1$
-
-	private IClipboardSupport clipboardOperationHelper;
-
-	public SerializationEMFResource(String encoding,
-		IClipboardSupport clipboardOperationHelper) {
-		this(encoding, URI.createFileURI(""), //$NON-NLS-1$
-			clipboardOperationHelper);
-	}
-
-	public SerializationEMFResource(String encoding, URI uri,
-		IClipboardSupport clipboardOperationHelper) {
-		super(uri);
-		setEncoding(encoding);
-		this.clipboardOperationHelper = clipboardOperationHelper;
-	}
-
-	protected final IClipboardSupport getClipboardOperationHelper() {
-		return clipboardOperationHelper;
-	}
-
-	protected boolean useIDAttributes() {
-		return false;
-	}
-
-	protected boolean useUUIDs() {
-		return true;
-	}
-
-	protected XMLLoad createXMLLoad() {
-		// return an XML Load that suppresses UnresolvedReferenceExceptions
-		return new XMILoadImpl(createXMLHelper()) {
-
-			public void load(XMLResource r, InputStream s, Map o)
-				throws IOException {
-
-				try {
-
-					super.load(r, s, o);
-
-				} catch (Resource.IOWrappedException e) {
-
-					if (!(e.getCause() instanceof UnresolvedReferenceException))
-						throw e;
-				}
-			}};
-	}
-
-	protected void unloaded(InternalEObject internalEObject) {
-		//disable parent
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.NotifierImpl#eNotificationRequired()
-	 */
-	public boolean eNotificationRequired() {
-		return false;
-	}
-
-	public void setIDToEObjectMap(Map idToEObjectMap) {
-		this.idToEObjectMap = idToEObjectMap;
-	}
-
-	public void setEObjectToIDMap(Map eObjectToIDMap) {
-		this.eObjectToIDMap = eObjectToIDMap;
-	}
-
-	protected void throwUnsupportedOperationException(String methodName,
-		UnsupportedOperationException ex) {
-		ClipboardPlugin.throwing(getClass(), methodName, ex);
-		throw ex;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/EMFClipboardCoreMessages.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/EMFClipboardCoreMessages.java
deleted file mode 100644
index abf445d..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/EMFClipboardCoreMessages.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.clipboard.core.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- * 
- * @author Christian Vogt (cvogt)
- */
-public class EMFClipboardCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.emf.clipboard.core.internal.l10n.EMFClipboardCoreMessages"; //$NON-NLS-1$
-
-	public static String copypaste_duplicateId;
-	public static String pasteChildOperation_copyPrefix;
-	public static String missing_nsUri_ERROR_;
-	public static String unresolved_nsUri_ERROR_;
-	public static String missing_class_ERROR_;
-	public static String factory_failed_ERROR_;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFClipboardCoreMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/EMFClipboardCoreMessages.properties b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/EMFClipboardCoreMessages.properties
deleted file mode 100644
index d0a84cb..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/EMFClipboardCoreMessages.properties
+++ /dev/null

@@ -1,63 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-#
-# Error message logged on attempt to paste an object into a resource when that
-# resource already has an element with the ID we are trying to paste.
-#
-copypaste_duplicateId = Cannot paste: object already exists in destination resource
-
-# Prefix for copies of objects that distinguishes them from other copies
-# of the same object or from other existing objects.
-#
-pasteChildOperation_copyPrefix=Copy
-
-# Indicates that a userModelSupport/clipboardSupport extension <factory> element
-# is missing the required "nsURI" attribute.
-#
-# args:
-#   0 - the extension point ID
-#   1 - the ID of the plug-in defining the offending extension
-#
-missing_nsUri_ERROR_ = Missing EPackage namespace URI in {0} extension in plug-in {1}.
-
-# Indicates that a userModelSupport/clipboardSupport extension <factory> element
-# specified a a namespace URI that could not be resolved to a registered EPackage.
-#
-# args:
-#   0 - the extension point ID
-#   1 - the namespace URI that could not be resolved
-#   2 - the ID of the plug-in defining the offending extension
-#
-unresolved_nsUri_ERROR_ = No such EPackage "{1}" in {0} extension in plug-in {2}.
-
-# Indicates that a userModelSupport/clipboardSupport extension <factory> element
-# is missing the required "class" attribute.
-#
-# args:
-#   0 - the extension point ID
-#   1 - the ID of the plug-in defining the offending extension
-#
-missing_class_ERROR_ = Missing class name in {0} extension in plug-in {1}.
-
-# Indicates that a userModelSupport/clipboardSupport extension failed to
-# instantiate the factory class implementing the factory interface.
-#
-# args:
-#   0 - the factory interface name
-#   1 - the factory implementation class
-#
-factory_failed_ERROR_ = Failed to instantiate {0} extension "{1}".
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/package.html b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/package.html
deleted file mode 100644
index 9b5d554..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/l10n/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Localization strings for the EMF Clipboard Core plug-in.
-Clients of EMF Clipboard Core should not use this package.
-
-<h2>Package Specification</h2>
-<p>
-The {@link org.eclipse.gmf.runtime.emf.clipboard.core.internal.l10n.EMFClipboardCoreMessages} class 
-manages strings for the EMF Clipboard Core plug-in.  Strings are maintained in the 
-<tt>EMFClipboardCoreMessages.properties</tt> file in this package.
-</p>
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/package.html b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/package.html
deleted file mode 100644
index 282017f..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-<P>Aurora internal packages.</P>
-<H2>Package Specification</H2>
-<P>Nothing in this package is available outside the clipboard plug-in</P>
-<P>This package consists of the following classes:</P>
-<UL>
-	<LI>ClipboardDebugOptions</LI>
-	<LI>ClipboardPlugin</LI>
-	<LI>ClipboardStatusCodes</LI>
-</UL>
-<P>Defines the {@link org.eclipse.gmf.runtime.emf.clipboard.core.internal.ClipboardSupportManager}
-class that manages the configurations elements associated with the extension point &quot;org.eclipse.gmf.runtime.emf.clipboard.core.clipboardSupport&quot;.</P>
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/package.html b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/package.html
deleted file mode 100644
index 9e1480f..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/package.html
+++ /dev/null

@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-API for clipboard-oriented copy/paste services that are customizable for
-metamodel-specific semantics.  For invocation of the copy/paste functionality,
-see {@link org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil}.
-
-<h2>Package Specification</h2>
-<p>
-The primary mechanism for customization of a meta-model's copy/paste requirements
-is the {@link org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport}
-interface.  Where this interface is not sufficient to control copy/paste
-behaviour, the specialization of the following classes is permitted to define
-custom copy and paste operations:
-<ul>
-<li>{@link org.eclipse.gmf.runtime.emf.clipboard.core.OverrideCopyOperation}:
-    for special copying behaviour.  This class inherits a number of useful
-    operations from the
-    {@link org.eclipse.gmf.runtime.emf.clipboard.core.CopyOperation} class to
-    find out about the objects that the user selected for copying, additional
-    objects required my the <code>IClipboardSupport</code>, and the
-    relationships between them.  It also has methods for adding elements to be
-    copied</li>
-<li>{@link org.eclipse.gmf.runtime.emf.clipboard.core.OverridePasteChildOperation}:
-    for special pasting behaviour.  This class inherits a wealth of useful
-    operations from the
-    {@link org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation} class to
-    find out about the objects that the user selected for copying, additional
-    objects required my the <code>IClipboardSupport</code>, and the
-    relationships between them.  It also has methods do find which elements have
-    failed to paste, to paste additional elements (including handling paste
-    collisions), etc.</li>
-</ul>
-</p>
-
-@see org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil#copyElementsToString
-@see org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil#pasteElementsFromString
-@see org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil#createClipboardSupport
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/.classpath b/org.eclipse.gmf.runtime.emf.commands.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.emf.commands.core/.cvsignore b/org.eclipse.gmf.runtime.emf.commands.core/.cvsignore
deleted file mode 100644
index edfb53f..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-doc
-org

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/.options b/org.eclipse.gmf.runtime.emf.commands.core/.options
deleted file mode 100644
index 0eea644..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.options
+++ /dev/null

@@ -1,17 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.emf.commands.core plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.emf.core plug-in
-org.eclipse.gmf.runtime.emf.commands.core/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting=false
-
-# Trace events
-org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing=false

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/.project b/org.eclipse.gmf.runtime.emf.commands.core/.project
deleted file mode 100644
index 97a3080..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.commands.core</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/org.eclipse.gmf.runtime.emf.commands.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.emf.commands.core/META-INF/MANIFEST.MF
deleted file mode 100644
index fb59a2f..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.emf.commands.core
-Bundle-Version: 1.0.3.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.emf.commands.core.internal.MSLCommandsPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.emf.commands.core.command,
- org.eclipse.gmf.runtime.emf.commands.core.commands,
- org.eclipse.gmf.runtime.emf.commands.core.internal;x-internal:=true,
- org.eclipse.gmf.runtime.emf.commands.core.internal.l10n;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.workspace;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/about.html b/org.eclipse.gmf.runtime.emf.commands.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/build.properties b/org.eclipse.gmf.runtime.emf.commands.core/build.properties
deleted file mode 100644
index 86a4e94..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               .options,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/plugin.properties b/org.eclipse.gmf.runtime.emf.commands.core/plugin.properties
deleted file mode 100644
index 84c91de..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Commands
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/AbstractTransactionalCommand.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/AbstractTransactionalCommand.java
deleted file mode 100644
index 5564a3c..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/AbstractTransactionalCommand.java
+++ /dev/null

@@ -1,321 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.command;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationApprover;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.CompositeChangeDescription;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.internal.command.ICommandWithSettableResult;
-
-/**
- * An abstract superclass for GMF {@link IUndoableOperation}s that modify EMF
- * model resources.
- * <p>
- * The operation provides a list of {@link IFile}s that are expected to be
- * modified when the operation is executed, undone or redone. An
- * {@link IOperationApprover} is registered with the
- * {@link OperationHistoryFactory#getOperationHistory()} to validate the
- * modification to these resources.
- * <p>
- * Subclasses must return the command execution result in their implementation
- * of {@link #doExecuteWithResult(IProgressMonitor, IAdaptable)}.
- * <p>
- * This class is meant to be extended by clients.
- * 
- * @author ldamus
- */
-public abstract class AbstractTransactionalCommand
-    extends AbstractEMFOperation
-    implements ICommand, ICommandWithSettableResult {
-
-    /**
-     * Convenience method to get a list of workspaces files associated with
-     * <code>eObject</code>.
-     * 
-     * @param eObject
-     *            the model object, may be <code>null</code>
-     * @return the list of {@link IFile}s
-     */
-    protected static List getWorkspaceFiles(EObject eObject) {
-        List result = new ArrayList();
-
-        if (eObject != null) {
-            Resource resource = eObject.eResource();
-            
-            if (resource != null) {
-                IFile file = WorkspaceSynchronizer.getFile(resource);
-    
-                if (file != null) {
-                    result.add(file);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Convenience method to get a list of workspaces files associated with
-     * {@link EObject}s in <code>eObject</code>.
-     * 
-     * @param eObjects
-     *            the list of model object
-     * @return the list of {@link IFile}s
-     */
-    protected static List getWorkspaceFiles(List eObjects) {
-        List result = new ArrayList();
-
-        for (Iterator i = eObjects.iterator(); i.hasNext();) {
-            Object next = i.next();
-
-            if (next instanceof EObject) {
-                Resource resource = ((EObject) next).eResource();
-                
-                if (resource != null) {
-                    IFile file = WorkspaceSynchronizer.getFile(resource);
-    
-                    if (file != null) {
-                        result.add(file);
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-    private final List affectedFiles;
-
-    private CommandResult commandResult;
-
-    /**
-     * Initializes me with the editing domain in which I am making model
-     * changes, a label, and a list of {@link IFile}s that I anticipate
-     * modifying when I am executed, undone or redone.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label
-     * @param affectedFiles
-     *            the list of affected {@link IFile}s; may be <code>null</code>
-     */
-    public AbstractTransactionalCommand(TransactionalEditingDomain domain,
-            String label, List affectedFiles) {
-        this(domain, label, null, affectedFiles);
-    }
-
-    /**
-     * Initializes me with the editing domain, a label, transaction options, and
-     * a list of {@link IFile}s that anticipate modifying when I am executed,
-     * undone or redone.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label
-     * @param options
-     *            for the transaction in which I execute myself, or
-     *            <code>null</code> for the default options
-     * @param affectedFiles
-     *            the list of affected {@link IFile}s; may be <code>null</code>
-     */
-    public AbstractTransactionalCommand(TransactionalEditingDomain domain,
-            String label, Map options, List affectedFiles) {
-        super(domain, label, options);
-
-        if (affectedFiles == null) {
-            this.affectedFiles = new ArrayList();
-
-        } else {
-            this.affectedFiles = affectedFiles;
-        }
-    }
-
-    /**
-     * Returns the {@link IFile}s for resources that may be modified when the
-     * operation is executed, undone or redone.
-     */
-    public List getAffectedFiles() {
-        return affectedFiles;
-    }
-
-    // Documentation copied from the interface
-    public final CommandResult getCommandResult() {
-        return commandResult;
-    }
-
-    /**
-     * Sets the command result.
-     * 
-     * @param result
-     *            the new result for this command.
-     */
-    protected final void setResult(CommandResult result) {
-        this.commandResult = result;
-    }
-
-    // Documentation copied from the interface
-    public ICommand compose(IUndoableOperation operation) {
-
-        if (operation != null) {
-
-            return new CompositeTransactionalCommand(getEditingDomain(), getLabel())
-                .compose(this).compose(operation);
-        }
-        return this;
-    }
-
-    // Documentation copied from the interface
-    public ICommand reduce() {
-        return this;
-    }
-
-    /**
-     * Implemented by subclasses to perform the model changes.  These changes
-     * are applied by manipulation of the EMF metamodel's API, <em>not</em>
-     * by executing commands on the editing domain's command stack.
-     * 
-     * @param monitor the progress monitor provided by the operation history
-     * @param info the adaptable provided by the operation history
-     * 
-     * @return the result of the execution
-     * 
-     * @throws ExecutionException if, for some reason, I fail to complete
-     *     the operation
-     */
-    protected abstract CommandResult doExecuteWithResult(
-            IProgressMonitor monitor, IAdaptable info)
-        throws ExecutionException;
-
-    protected void didUndo(Transaction tx) {
-    	// We will amalgamate any change description that were added by the DiagramEditingDomain's
-    	//  special post-commit listener. See DiagramEditingDomainFactory for more details.
-    	if (tx.getChangeDescription() != null && !tx.getChangeDescription().isEmpty()) {
-    		((CompositeChangeDescription)getChange()).add(tx.getChangeDescription());
-    	}
-    }
-    
-    protected void didRedo(Transaction tx) {
-    	// We will amalgamate any change description that were added by the DiagramEditingDomain's
-    	//  special post-commit listener. See DiagramEditingDomainFactory for more details.
-    	if (tx.getChangeDescription() != null && !tx.getChangeDescription().isEmpty()) {
-    		((CompositeChangeDescription)getChange()).add(tx.getChangeDescription());
-    	}
-    }
-    
-    /**
-     * Delegates to {@link #doExecuteWithResult(IProgressMonitor, IAdaptable)}
-     * to perform the model changes. Sets the command result and calls
-     * {@link #cleanup()} to give subclasses a chance to dispose of any objects
-     * that were required for the execution but will not be required for undo or
-     * redo.
-     */
-    protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
-        throws ExecutionException {
-
-        CommandResult result = doExecuteWithResult(monitor, info);
-        setResult(result);
-        cleanup();
-        return result != null ? result.getStatus()
-            : Status.OK_STATUS;
-    }
-
-    /**
-     * Overrides superclass to set the command result.
-     */
-    protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info)
-        throws ExecutionException {
-
-        IStatus status = super.doUndo(monitor, info);
-        CommandResult result = new CommandResult(status);
-        setResult(result);
-
-        return status;
-    }
-
-    /**
-     * Overrides superclass to set the command result.
-     */
-    protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info)
-        throws ExecutionException {
-
-        IStatus status = super.doRedo(monitor, info);
-        CommandResult result = new CommandResult(status);
-        setResult(result);
-
-        return status;
-    }
-    
-    /**
-	 * Considers that the aggregate status may be different from the present
-	 * status, and updates the command result accordingly.
-	 */
-    protected IStatus aggregateStatuses(List statuses) {
-
-		IStatus status = super.aggregateStatuses(statuses);
-		CommandResult result = getCommandResult();
-
-		if (result == null) {
-			result = new CommandResult(status);
-			setResult(result);
-			
-		} else if (status != result.getStatus()) {
-			result = new CommandResult(status, result.getReturnValue());
-			setResult(result);
-		}
-
-		return status;
-	}
-
-    /**
-	 * Subclasses may implement this method to dispose of objects that were
-	 * required for execution, but are no longer require to undo or redo this
-	 * operation.
-	 * <P>
-	 * This method is invoked at the end of
-	 * {@link #doExecute(IProgressMonitor, IAdaptable)}.
-	 */
-    protected void cleanup() {
-        // subclasses can use this to cleanup
-    }
-    
-    /**
-     * Internal method to set the command result.
-     * 
-     * @param result CommandResult to set
-     * @deprecated internal API
-     */
-    public void internalSetResult(CommandResult result) {
-        this.commandResult = result;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/CompositeTransactionalCommand.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/CompositeTransactionalCommand.java
deleted file mode 100644
index 937748a..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/CompositeTransactionalCommand.java
+++ /dev/null

@@ -1,282 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.command;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.operations.IOperationApprover;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.emf.workspace.CompositeEMFOperation;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
-import org.eclipse.gmf.runtime.common.core.internal.command.ICommandWithSettableResult;
-
-/**
- * An undoable operation that is composed of child {@link IUndoableOperation}s
- * that are expected to modify EMF model resources.
- * <p>
- * The operation provides a list of {@link IFile}s that are expected to be
- * modified when the operation is executed, undone or redone. An
- * {@link IOperationApprover} is registered with the
- * {@link OperationHistoryFactory#getOperationHistory()} to validate the
- * modification to these resources.
- * <P>
- * This class is meant to be instantiated by clients.
- * 
- * @author ldamus
- */
-public class CompositeTransactionalCommand
-    extends CompositeEMFOperation
-    implements ICompositeCommand, ICommandWithSettableResult {
-
-    private CommandResult commandResult;
-
-    /**
-     * Initializes me with the editing domain in which I am making model changes
-     * and a label.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label
-     */
-    public CompositeTransactionalCommand(TransactionalEditingDomain domain,
-            String label) {
-        super(domain, label);
-    }
-
-    /**
-     * Initializes me with the editing domain, a label, and transaction options.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label
-     * @param options
-     *            for the transaction in which I execute myself, or
-     *            <code>null</code> for the default options
-     */
-    public CompositeTransactionalCommand(TransactionalEditingDomain domain,
-            String label, Map options) {
-        super(domain, label, options);
-    }
-
-    /**
-     * Initializes me with the editing domain, a label, and child operations.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label
-     * @param children
-     *            a list of operations to compose
-     */
-    public CompositeTransactionalCommand(TransactionalEditingDomain domain,
-            String label, List children) {
-        super(domain, label, children);
-    }
-
-    /**
-     * Initializes me with the editing domain, a label, and child operations,
-     * and transaction options.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label
-     * @param children
-     *            a list of operations to compose
-     * @param options
-     *            for the transaction in which I execute myself, or
-     *            <code>null</code> for the default options
-     */
-    public CompositeTransactionalCommand(TransactionalEditingDomain domain,
-            String label, List children, Map options) {
-        super(domain, label, children, options);
-    }
-
-    /**
-     * Returns the {@link IFile}s for resources that may be modified when the
-     * operation is executed, undone or redone.
-     */
-    public List getAffectedFiles() {
-
-        HashSet result = new HashSet();
-
-        for (Iterator i = iterator(); i.hasNext();) {
-            IUndoableOperation nextOperation = (IUndoableOperation) i.next();
-
-            if (nextOperation instanceof ICommand) {
-                List nextAffected = ((ICommand) nextOperation)
-                    .getAffectedFiles();
-
-                if (nextAffected != null) {
-                    result.addAll(nextAffected);
-                }
-            }
-        }
-        return new ArrayList(result);
-    }
-
-    // Documentation copied from the interface
-    public CommandResult getCommandResult() {
-        return commandResult;
-    }
-
-    /**
-     * Sets the command result.
-     * 
-     * @param result
-     *            the new result for this command.
-     */
-    protected void setResult(CommandResult result) {
-        this.commandResult = result;
-    }
-
-    /**
-     * Returns a list containing all of the return values from
-     * <code>ICommand</code> children.
-     */
-    protected List getReturnValues() {
-
-        List returnValues = new ArrayList();
-
-        for (Iterator i = iterator(); i.hasNext();) {
-            IUndoableOperation operation = (IUndoableOperation) i.next();
-
-            if (operation instanceof ICommand) {
-                ICommand command = (ICommand) operation;
-
-                CommandResult result = command.getCommandResult();
-
-                if (result != null) {
-                    Object returnValue = result.getReturnValue();
-
-                    if (returnValue != null) {
-
-                        if (getClass().isInstance(command)) {
-                            // unwrap the values from other composites
-                            if (returnValue != null
-                                && returnValue instanceof Collection) {
-                                returnValues.addAll((Collection) returnValue);
-
-                            } else {
-                                returnValues.add(returnValue);
-                            }
-
-                        } else {
-                            returnValues.add(returnValue);
-                        }
-                    }
-                }
-            }
-        }
-
-        return returnValues;
-    }
-
-    /**
-     * Overrides the superclass implementation to set the command result.
-     */
-    protected IStatus aggregateStatuses(List statuses) {
-        IStatus aggregate = super.aggregateStatuses(statuses);
-        setResult(new CommandResult(aggregate, getReturnValues()));
-        return aggregate;
-    }
-
-    // Documentation copied from the interface
-    public final ICommand compose(IUndoableOperation operation) {
-
-        if (operation != null) {
-            add(operation);
-        }
-        return this;
-    }
-
-    /**
-     * Returns the simplest form of this command that is equivalent. This is
-     * useful for removing unnecessary nesting of commands.
-     * <P>
-     * If the composite has a single command, it returns the reduction of that
-     * single command. Otherwise, it returns itself.
-     * 
-     * @return the simplest form of this command that is equivalent
-     */
-    public ICommand reduce() {
-        switch (size()) {
-            case 1:
-                IUndoableOperation child = (IUndoableOperation) iterator()
-                    .next();
-
-                if (child instanceof ICommand
-                    && (child instanceof CompositeEMFOperation || child instanceof AbstractEMFOperation)) {
-                    // return the single command if is a kind of EMF operation;
-                    // otherwise this composite will be returned to preserve the
-                    // EMF transaction behaviour.
-                    return ((ICommand) child).reduce();
-                }
-        }
-        return this;
-    }
-
-    /**
-     * Answers whether or not this composite operation has children.
-     * 
-     * @return <code>true</code> if the operation does not have children,
-     *         <code>false</code> otherwise.
-     */
-    public final boolean isEmpty() {
-        return size() < 1;
-    }
-    
-    /**
-     * I can execute if I am not empty and all of my children can execute.
-     */
-    public boolean canExecute() {
-    	return !isEmpty() && super.canExecute();
-    }
-    
-    /**
-     * I can redo if I am not empty and all my children can all be redone.
-     */
-    public boolean canRedo() {
-    	return !isEmpty() && super.canRedo();
-    }
-    
-    /**
-     * I can undo if I am not empty and all my children can all be undone.
-     */
-    public boolean canUndo() {
-    	return !isEmpty() && super.canUndo();
-    }
-    
-    /**
-     * Internal method to set the command result.
-     * 
-     * @param result CommandResult to set
-     * @deprecated internal API
-     */
-    public void internalSetResult(CommandResult result) {
-        this.commandResult = result;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/EditingDomainUndoContext.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/EditingDomainUndoContext.java
deleted file mode 100644
index 5d1a739..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/EditingDomainUndoContext.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.command;
-
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.gmf.runtime.emf.commands.core.internal.l10n.EMFCommandsCoreMessages;
-
-/**
- * An {@link IUndoContext} that tags an EMF operation with the editing domain
- * that it affects. Two editing domain contexts match if and only if they
- * reference the same {@link EditingDomain} instance.
- * 
- * @author ldamus
- */
-public final class EditingDomainUndoContext
-    implements IUndoContext {
-
-    private final EditingDomain editingDomain;
-
-    /**
-     * Initializes me with the editing domain that I represent.
-     * 
-     * @param domain
-     *            the editing domain
-     */
-    public EditingDomainUndoContext(EditingDomain domain) {
-        this.editingDomain = domain;
-    }
-
-    // Documentation copied from the interface
-    public String getLabel() {
-        return EMFCommandsCoreMessages.editingDomainContext;
-    }
-
-    /**
-     * I match another <code>context</code> if it is a
-     * <code>EditingDomainUndoContext</code> representing the same editing
-     * domain as I.
-     */
-    public boolean matches(IUndoContext context) {
-        return this.equals(context);
-    }
-
-    /**
-     * I am equal to other <code>EditingDomainUndoContext</code> on the same
-     * editing domain as mine.
-     */
-    public boolean equals(Object o) {
-        boolean result = false;
-
-        if (o instanceof EditingDomainUndoContext) {
-            result = getEditingDomain() == ((EditingDomainUndoContext) o)
-                .getEditingDomain();
-        }
-
-        return result;
-    }
-
-    // Redefines the inherited method
-    public int hashCode() {
-        return editingDomain == null ? 0
-            : editingDomain.hashCode();
-    }
-
-    /**
-     * Obtains the editing domain.
-     * 
-     * @return my editing domain
-     */
-    public final EditingDomain getEditingDomain() {
-        return editingDomain;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/package.html b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/package.html
deleted file mode 100644
index ef4f22d..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Specification of the command API for operations that modify EMF models.
-These commands implement the interfaces from {@link org.eclipse.gmf.runtime.common.core} and
-extend the undoable operations from {@link org.eclipse.emf.workspace}.
-
-
-<h2>Package Specification</h2>
-<p></p>
-
-@see org.eclipse.gmf.runtime.common.core.command
-
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/DuplicateEObjectsCommand.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/DuplicateEObjectsCommand.java
deleted file mode 100644
index ab6b82c..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/DuplicateEObjectsCommand.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.commands;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardSupportUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-
-/**
- * This command duplicates a list of <code>EObjects</code> and adds each
- * duplicate to it's originator's container. All references between objects that
- * are duplicated are updated to refer to the new duplicated objects.
- * <p>
- * The command returns a map which contains all the <code>EObjects</code> that
- * were duplicated mapped to their new duplicated objects. This map can also be
- * retrieved prior to having executed the command (it will be populated when the
- * command is executed). NOTE: The keyset of this map is not just the original
- * objects passed in; more objects may have been duplicated as well (e.g.
- * contained objects).
- * </p>
- * 
- * @author cmahoney
- */
-public abstract class DuplicateEObjectsCommand
-	extends AbstractTransactionalCommand {
-
-	/**
-	 * The list of <code>EObjects</code> to be duplicated.
-	 */
-	private List objectsToBeDuplicated;
-
-	/**
-	 * The map of all duplicated objects to be populated at command execution time..
-	 */
-	private Map allDuplicatedObjects;
-
-	/**
-	 * Constructs a new duplicate EObjects command with the specified label and
-	 * list of EObjects.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label
-	 *            The label for the new command.
-	 * @param eObjectsToBeDuplicated
-	 *            The list of <code>EObjects</code> to be duplicated.
-	 */
-	public DuplicateEObjectsCommand(TransactionalEditingDomain editingDomain, String label, List eObjectsToBeDuplicated) {
-		super(editingDomain, label,
-            getWorkspaceFiles(eObjectsToBeDuplicated));
-        this.objectsToBeDuplicated = eObjectsToBeDuplicated;
-		allDuplicatedObjects = new HashMap();
-	}
-
-	/**
-	 * Constructs a new duplicate EObjects command with the specified label and
-	 * list of EObjects.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label
-	 *            The label for the new command.
-	 * @param eObjectsToBeDuplicated
-	 *            The list of <code>EObjects</code> to be duplicated.
-	 * @param allDuplicatedObjectsMap
-	 * 			An empty map to be populated with the duplicated objects.
-	 */
-	public DuplicateEObjectsCommand(TransactionalEditingDomain editingDomain, String label, List eObjectsToBeDuplicated, Map allDuplicatedObjectsMap) {
-        super(editingDomain, label,
-            getWorkspaceFiles(eObjectsToBeDuplicated));
-		this.objectsToBeDuplicated = eObjectsToBeDuplicated;
-		this.allDuplicatedObjects = allDuplicatedObjectsMap;
-	}
-	
-	/**
-	 * Returns a map which contains all the <code>EObjects</code> that were
-	 * duplicated mapped to their new duplicated objects. NOTE: The keyset of
-	 * this map is not just the original objects passed in; more objects may
-	 * have been duplicated as well (e.g. contained objects). This map can be
-	 * retrieved prior to command execution time. It will be populated when the
-	 * command is executed.
-	 * 
-	 * @return The map of duplicated objects.
-	 */
-	protected Map getAllDuplicatedObjectsMap() {
-		return allDuplicatedObjects;
-	}
-
-	/**
-	 * Returns the list of objects to be duplicated.
-	 * 
-	 * @return The list of objects to be duplicated.
-	 */
-	protected List getObjectsToBeDuplicated() {
-		return objectsToBeDuplicated;
-	}
-
-	/**
-	 * Verifies that the container of all the original objects can contain
-	 * multiple objects.
-	 * 
-	 */
-	public boolean canExecute() {
-		for (Iterator iter = objectsToBeDuplicated.iterator(); iter.hasNext();) {
-			EObject original = (EObject) iter.next();
-
-			EReference reference = original.eContainmentFeature();
-			if (reference == null || !FeatureMapUtil.isMany(original.eContainer(),reference)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Executes this command by duplicating the orignal eobjects, adding the
-	 * duplicates to the original's container, and populating the map of
-	 * duplicates to be returned.
-	 * 
-	 */
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-		
-		// Remove elements whose container is getting copied.
-		ClipboardSupportUtil.getCopyElements(getObjectsToBeDuplicated());
-
-		// Perform the copy and update the references.
-		EcoreUtil.Copier copier = new EcoreUtil.Copier();
-		copier.copyAll(objectsToBeDuplicated);
-		copier.copyReferences();
-
-		// Update the map with all elements duplicated.
-		getAllDuplicatedObjectsMap().putAll(copier);
-
-		// Add the duplicates to the original's container.
-		for (Iterator i = objectsToBeDuplicated.iterator(); i.hasNext();) {
-			EObject original = (EObject) i.next();
-			EObject duplicate = (EObject) copier.get(original);
-
-			EReference reference = original.eContainmentFeature();
-			if (reference != null
-				&& FeatureMapUtil.isMany(original.eContainer(),reference)
-				&& ClipboardSupportUtil.isOkToAppendEObjectAt(
-					original.eContainer(), reference, duplicate)) {
-				
-				ClipboardSupportUtil.appendEObjectAt(original.eContainer(),
-					reference, duplicate);
-			}
-		}
-		return CommandResult.newOKCommandResult(getAllDuplicatedObjectsMap());
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/RepositionEObjectCommand.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/RepositionEObjectCommand.java
deleted file mode 100644
index bebc8da..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/RepositionEObjectCommand.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-
-/**
- * This command is there to reposition elements in a list.
- * 
- * @author tisrar
- */
-public class RepositionEObjectCommand
-	extends AbstractTransactionalCommand {
-
-	/**
-	 * the element to operate on
-	 */
-	private EObject element;
-
-	/**
-	 * the amount to move element by relative to its position
-	 */
-	private int displacement;
-
-	/**
-	 * The list of elements in which reposition will take place.
-	 */
-	private EList elements;
-
-	/**
-	 * Constructs a runtime instance of <code>RepositionEObjectCommand</code>.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label label for command
-	 * @param elements the list of elements in which reposition will take place
-	 * @param element target element
-	 * @param displacement amount of movement
-	 */
-	public RepositionEObjectCommand(TransactionalEditingDomain editingDomain, String label, EList elements, EObject element,
-		int displacement) {
-
-		super(editingDomain, label, getWorkspaceFiles(element));
-		this.element = element;
-		this.displacement = displacement;
-		this.elements = elements;
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-		CommandResult commandResult = null;
-		try {
-    		int currentPosition = elements.indexOf(element);
-    		elements.move(currentPosition + displacement, element);
-        }catch (RuntimeException exp){
-            commandResult = CommandResult.newErrorCommandResult(exp);
-        }
-		return (commandResult == null) ? CommandResult.newOKCommandResult()
-			: commandResult;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/package.html b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/package.html
deleted file mode 100644
index c3583fb..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/package.html
+++ /dev/null

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-A collection of concrete (or at least partially realized) commands that may
-be reused by any MSL client application.  These commands implement the
-API of the {@link org.eclipse.gmf.runtime.emf.commands.core.command} package
-and offer such generic capabilities as "create an <tt>EObject</tt>" or
-"reposition an <tt>EObject</tt> in an <tt>EList</tt>."
-
-
-<h2>Package Specification</h2>
-<p></p>
-
-@see org.eclipse.gmf.runtime.emf.commands.core.command
-
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsDebugOptions.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsDebugOptions.java
deleted file mode 100644
index a9b4fc0..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsDebugOptions.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.internal;
-
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author Christian W. Damus
- */
-public final class MSLCommandsDebugOptions {
-
-	private MSLCommandsDebugOptions() {
-		// private
-	}
-
-	/** Debug option. */
-	public static final String DEBUG = MSLCommandsPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	/** Debug option to trace exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	/** Debug option to trace exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	/** Debug option to trace method entering. */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	/** Debug option to trace method exiting. */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-	
-	/** Debug option to trace execution of model operations. */
-	public static final String MODEL_OPERATIONS = DEBUG + "/model/operations"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsPlugin.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsPlugin.java
deleted file mode 100644
index 747062b..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsPlugin.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.internal;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class MSLCommandsPlugin
-	extends Plugin {
-
-	// The shared instance.
-	private static MSLCommandsPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public MSLCommandsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the shared instance of <code>MSLCommandsPlugin</code>
-	 */
-	public static MSLCommandsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Get plugin ID.
-	 * 
-	 * @return plugin id as <code>String</code>
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsStatusCodes.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsStatusCodes.java
deleted file mode 100644
index 16ad299..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/MSLCommandsStatusCodes.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.commands.core.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author Christian W. Damus
- */
-public final class MSLCommandsStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private MSLCommandsStatusCodes() {
-		// private constructor.
-	}
-
-	/** Status code indicating command executed succesfully. */
-	public static final int OK = 0;
-
-	/** Statis code indicating model command failed. */
-	public static final int MODEL_COMMAND_FAILURE = 1;
-
-	/**
-	 * Status code indicating that an operation was rolled back due to live
-	 * validation errors.
-	 */
-	public static final int VALIDATION_FAILURE = 7;
-}

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/EMFCommandsCoreMessages.java b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/EMFCommandsCoreMessages.java
deleted file mode 100644
index 2051bc6..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/EMFCommandsCoreMessages.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.emf.commands.core.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EMFCommandsCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.emf.commands.core.internal.l10n.EMFCommandsCoreMessages";//$NON-NLS-1$
-
-	private EMFCommandsCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String AbstractModelCommand__ERROR__abandonedActionErrorMessage;
-	public static String editingDomainContext;
-    
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFCommandsCoreMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/EMFCommandsCoreMessages.properties b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/EMFCommandsCoreMessages.properties
deleted file mode 100644
index 18d84a7..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/EMFCommandsCoreMessages.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-
-# Error Messages
-AbstractModelCommand__ERROR__abandonedActionErrorMessage = IRJA0305E Problems encountered in updating the model. The change was not applied to the model.  Please consult the console for further details.
-
-# Label for editing domain undo contexts
-editingDomainContext = Affected Editing Domain
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/package.html b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/package.html
deleted file mode 100644
index e4b2849..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/l10n/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Localization utility for the MSL Commands plug-in.
-
-
-<h2>Package Specification</h2>
-<p></p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.commands.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/package.html b/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/package.html
deleted file mode 100644
index 4f4c42b..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/internal/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Plug-in lifecycle, debugging, and status classes for the MSL Commands plug-in.
-
-
-<h2>Package Specification</h2>
-<p></p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.commands.core.*
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/.classpath b/org.eclipse.gmf.runtime.emf.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.emf.core/.cvsignore b/org.eclipse.gmf.runtime.emf.core/.cvsignore
deleted file mode 100644
index 4c19605..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-doc
-org
-org

diff --git a/org.eclipse.gmf.runtime.emf.core/.options b/org.eclipse.gmf.runtime.emf.core/.options
deleted file mode 100644
index 7e2d3a0..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.options
+++ /dev/null

@@ -1,20 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.emf.core plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.emf.core plug-in
-org.eclipse.gmf.runtime.emf.core/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.emf.core/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.emf.core/debug/methods/exiting=false
-
-# Trace events
-org.eclipse.gmf.runtime.emf.core/debug/events/tracing=false
-
-# Trace operations on resources
-org.eclipse.gmf.runtime.emf.core/debug/resources=false

diff --git a/org.eclipse.gmf.runtime.emf.core/.project b/org.eclipse.gmf.runtime.emf.core/.project
deleted file mode 100644
index b495bbd..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.core</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.emf.core/.template b/org.eclipse.gmf.runtime.emf.core/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/org.eclipse.gmf.runtime.emf.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.emf.core/META-INF/MANIFEST.MF
deleted file mode 100644
index cdf0cb5..0000000
--- a/org.eclipse.gmf.runtime.emf.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.emf.core; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.core.clipboard,
- org.eclipse.gmf.runtime.emf.core.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.emf.core.internal.plugin;x-internal:=true,
- org.eclipse.gmf.runtime.emf.core.internal.resources;x-friends:="org.eclipse.gmf.runtime.emf.ui",
- org.eclipse.gmf.runtime.emf.core.internal.util;x-friends:="org.eclipse.gmf.runtime.emf.type.core",
- org.eclipse.gmf.runtime.emf.core.internal.validation;x-internal:=true,
- org.eclipse.gmf.runtime.emf.core.resources,
- org.eclipse.gmf.runtime.emf.core.util
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.workspace;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.clipboard.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.emf.core/about.html b/org.eclipse.gmf.runtime.emf.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.emf.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/build.properties b/org.eclipse.gmf.runtime.emf.core/build.properties
deleted file mode 100644
index 260070f..0000000
--- a/org.eclipse.gmf.runtime.emf.core/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               .options,\
-               META-INF/,\
-               .,\
-               schema/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.emf.core/plugin.properties b/org.eclipse.gmf.runtime.emf.core/plugin.properties
deleted file mode 100644
index f592246..0000000
--- a/org.eclipse.gmf.runtime.emf.core/plugin.properties
+++ /dev/null

@@ -1,34 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Modeling Service Layer
-Plugin.providerName = Eclipse.org
-extPoint.modelProviders = GMF Core Model Providers
-
-# Referential Integrity Validation
-# This section to be translated
-referentialIntegrityCategory.name = Referential Integrity
-resourceFixupValidation.name = References resolve into a loadable resource.
-resourceFixupValidation.description = Checks references to ensure that they resolve to a resource that is loadable.
-eobjectFixupValidation.name = References resolve into an EObject in a loadable resource.
-eobjectFixupValidation.description = Checks references to ensure that they resolve to an actual object that exists.
-actionNotAbandoned.name = Changes Not Rolled Back
-actionNotAbandoned.description = Constraint checking that a model change listener has not requested that the changes be rolled back.
-
-# This section not to be translated
-resourceFixupValidation.message =  The feature ''{0}'' of ''{1}'' contains an unresolved proxy ''{2}''
-eObjectFixupVlidation.message = The feature ''{0}'' of ''{1}'' contains an unresolved proxy ''{2}''
-
-#UUID = Universally Unique Identifier
-UUIDConstraint.name = Element Identity Constraint
-UUIDConstraint.description = This constraint validates each element's identity is unique and referenceable.
-UUIDConstraint.message = Unreferenceable element: {0}

diff --git a/org.eclipse.gmf.runtime.emf.core/plugin.xml b/org.eclipse.gmf.runtime.emf.core/plugin.xml
deleted file mode 100644
index 731a927..0000000
--- a/org.eclipse.gmf.runtime.emf.core/plugin.xml
+++ /dev/null

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2006  IBM Corporation and others.                 -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-   <extension-point id="Pathmaps" name="Path Maps" schema="schema/Pathmaps.exsd"/>
-   
-   <extension
-         point="org.eclipse.emf.validation.constraintProviders">
-      <category
-            mandatory="true"
-            name="%referentialIntegrityCategory.name"
-            id="org.eclipse.gmf.runtime.emf.core.references"/>
-      <constraintProvider>
-         <package namespaceUri="*"/>
-         <package namespaceUri="http://www.eclipse.org/emf/2002/Ecore"/>
-         <constraints categories="org.eclipse.gmf.runtime.emf.core.references">
-            <constraint
-                  lang="Java"
-                  class="org.eclipse.gmf.runtime.emf.core.internal.validation.ProxiesResolveConstraint"
-                  severity="ERROR"
-                  mode="Batch"
-                  name="%resourceFixupValidation.name"
-                  id="org.eclipse.gmf.runtime.emf.core.ResourceFixup"
-                  statusCode="1">
-               <target class="EObject"/>
-               <description>
-                  %resourceFixupValidation.description
-               </description>
-               <message>
-                 %resourceFixupValidation.message
-               </message>
-            </constraint>
-            <constraint
-                  lang="Java"
-                  class="org.eclipse.gmf.runtime.emf.core.internal.validation.ProxiesResolveConstraint"
-                  severity="ERROR"
-                  mode="Batch"
-                  name="%eobjectFixupValidation.name"
-                  id="org.eclipse.gmf.runtime.emf.core.IdFixup"
-                  statusCode="2">
-               <target class="EObject"/>
-               <description>
-                  %eobjectFixupValidation.description
-               </description>
-               <message>
-                  %eObjectFixupVlidation.message
-               </message>
-            </constraint>
-            <constraint
-                  lang="Java"
-                  class="org.eclipse.gmf.runtime.emf.core.internal.validation.ActionNotAbandonedConstraint"
-                  severity="ERROR"
-                  mode="Live"
-                  name="%actionNotAbandoned.name"
-                  id="org.eclipse.gmf.runtime.emf.core.ActionNotAbandoned"
-                  statusCode="3">
-               <description>
-                  %actionNotAbandoned.description
-               </description>
-               <!-- Pass-through error message -->
-               <message>
-                  {0}
-               </message>
-            </constraint>
-         </constraints>
-      </constraintProvider>
-   </extension>
-
-   <extension
-         point="org.eclipse.emf.validation.constraintProviders">
-      <constraintProvider>
-         <package namespaceUri="*"/>
-         <constraints categories="org.eclipse.gmf.runtime.emf.core.references">
-            <constraint
-                  lang="Java"
-                  class="org.eclipse.gmf.runtime.emf.core.internal.validation.UUIDConstraint"
-                  severity="ERROR"
-                  mode="Batch"
-                  name="%UUIDConstraint.name"
-                  id="UUIDConstraint"
-                  statusCode="1">
-               <description>
-                  %UUIDConstraint.description
-               </description>
-               <message>
-                 %UUIDConstraint.message
-               </message>
-            </constraint>
-         </constraints>
-      </constraintProvider>
-   </extension>
-   
-   <extension point="org.eclipse.core.expressions.propertyTesters">
-       <propertyTester
-           id="org.eclipse.gmf.runtime.emf.core.EObjectTester"
-           type="org.eclipse.emf.ecore.EObject"
-           namespace="org.eclipse.gmf.runtime.emf.core"
-           properties="editingDomain"
-           class="org.eclipse.gmf.runtime.emf.core.internal.util.EObjectTester">
-       </propertyTester>
-   </extension>
-   
- </plugin>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/schema/Pathmaps.exsd b/org.eclipse.gmf.runtime.emf.core/schema/Pathmaps.exsd
deleted file mode 100644
index 3e11320..0000000
--- a/org.eclipse.gmf.runtime.emf.core/schema/Pathmaps.exsd
+++ /dev/null

@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.emf.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.emf.core" id="Pathmaps" name="Path Maps"/>
-      </appInfo>
-      <documentation>
-         Extension point for the definition of path map variables.  Path map variables allow for portability of URIs, in similar fashion to path Eclipse&apos;s core path variables.  The actual location indicated by a URI depends on the run-time binding of the path variable.  Thus, different environments can work with the same resource URIs even though the resources are stored in different physical locations.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="pathmap"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="pathmap">
-      <annotation>
-         <documentation>
-            Specifies a path map variable to be registered with the MSL.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The variable name.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="plugin" type="string">
-            <annotation>
-               <documentation>
-                  The plugin containing the path, if different from the plug-in defining the extension.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The path, relative to the plug-in location (as indicated by the &lt;tt&gt;plugin&lt;/tt&gt; attribute if specified, or the current plug-in if not).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         6.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-This example illustrates the definition of a path map to locate libraries
-in the org.eclipse.uml2.  Using this path map, URIs such as &quot;pathmap://UML2_LIBRARIES/Ecore.library.uml2&quot; can be used to reference UML2 library resources.
-&lt;/p&gt;
-&lt;pre&gt;
-   &lt;extension
-         id=&quot;UML2Libraries&quot;
-         name=&quot;UML2 Libraries&quot;
-         point=&quot;org.eclipse.gmf.runtime.emf.core.Pathmaps&quot;&gt;
-      &lt;pathmap
-            name=&quot;UML2_LIBRARIES&quot;
-            plugin=&quot;org.eclipse.uml2.resources&quot;
-            path=&quot;libraries&quot;&gt;
-      &lt;/pathmap&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         There is no API associated with this extension point.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-        Copyright (c) 2003, 2005  IBM Corporation and others.&lt;br&gt;
-	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 
-	&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/GMFEditingDomainFactory.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/GMFEditingDomainFactory.java
deleted file mode 100644
index dd06480..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/GMFEditingDomainFactory.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
-import org.eclipse.gmf.runtime.emf.core.internal.resources.PathmapManager;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-
-
-/**
- * Factory for {@link TransactionalEditingDomain}s that are properly configured
- * to support a GMF application.  This factory should be preferred over the
- * {@link org.eclipse.emf.workspace.WorkspaceEditingDomainFactory} because it
- * attaches adapters and sets up other other properties of the resource set
- * and/or editing domain on the client's behalf.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class GMFEditingDomainFactory
-	extends WorkspaceEditingDomainFactory {
-
-    /**
-     * The single shared instance of the GMF editing domain factory.
-     */
-    private static GMFEditingDomainFactory instance  = new GMFEditingDomainFactory();
-
-    /**
-     * Gets the single shared instance of the GMF editing domain factory.
-     * 
-     * @return the editing domain factory
-     */
-    public static WorkspaceEditingDomainFactory getInstance() {
-        return instance;
-    }
-    
-	public TransactionalEditingDomain createEditingDomain() {
-		TransactionalEditingDomain result = super.createEditingDomain();
-		configure(result);
-		return result;
-	}
-
-	public TransactionalEditingDomain createEditingDomain(IOperationHistory history) {
-		TransactionalEditingDomain result = super.createEditingDomain(history);
-		configure(result);
-		return result;
-	}
-
-	public TransactionalEditingDomain createEditingDomain(ResourceSet rset, IOperationHistory history) {
-		TransactionalEditingDomain result = super.createEditingDomain(rset, history);
-		configure(result);
-		return result;
-	}
-
-	public TransactionalEditingDomain createEditingDomain(ResourceSet rset) {
-		TransactionalEditingDomain result = super.createEditingDomain(rset);
-		configure(result);
-		return result;
-	}
-
-	/**
-	 * Configures the specified editing domain for correct functioning in the
-	 * GMF environment.
-	 * 
-	 * @param domain the new editing domain
-	 */
-	protected void configure(TransactionalEditingDomain domain) {
-		ResourceSet rset = domain.getResourceSet();
-		
-		// ensure that the cross-referencing adapter is installed
-		if (CrossReferenceAdapter.getExistingCrossReferenceAdapter(rset) == null) {
-			rset.eAdapters().add(new CrossReferenceAdapter());
-		}
-		
-		// ensure that the path map manager is installed
-		if (PathmapManager.getExistingPathmapManager(rset) == null) {
-			rset.eAdapters().add(new PathmapManager());
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/AbstractClipboardSupport.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/AbstractClipboardSupport.java
deleted file mode 100644
index 313c578..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/AbstractClipboardSupport.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.core.clipboard;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-
-
-/**
- * A partial implementation of the {@link IClipboardSupport} interface that
- * uses MSL facilities to implement some of the metamodel-specific hooks that
- * MSL, itself, provides support for.
- *
- * @author Christian W. Damus (cdamus)
- */
-public abstract class AbstractClipboardSupport implements IClipboardSupport {
-
-	/**
-	 * Initializes me.
-	 */
-	public AbstractClipboardSupport() {
-		super();
-	}
-
-	/**
-	 * MSL has extensions for metamodels to indicate which objects can have
-	 * names.
-	 */
-	public boolean isNameable(EObject eObject) {
-		return PackageUtil.getNameAttribute(eObject.eClass()) != null;
-	}
-	
-	/**
-	 * MSL has extensions for metamodels to get object names.
-	 */
-	public String getName(EObject eObject) {
-		return EMFCoreUtil.getName(eObject);
-	}
-	
-	/**
-	 * MSL has extensions for metamodels to set object names.
-	 */
-	public void setName(EObject eObject, String name) {
-		if (!isNameable(eObject)) {
-			throw new IllegalArgumentException("eObject not nameable"); //$NON-NLS-1$
-		}
-		
-		EMFCoreUtil.setName(eObject, name);
-	}
-
-	public XMLResource getResource(EObject eObject) {
-		return (XMLResource) eObject.eResource();
-	}
-	
-	/**
-	 * MSL implements creation notifications.
-	 */
-	public void sendCreateNotification(EObject eObject) {
-		Resource res = eObject.eResource();
-		
-		if (res != null) {
-			Notification createNotification = new ENotificationImpl(
-				(InternalEObject) eObject, 0, // classical CREATE event type
-				(EStructuralFeature) null, (Object) null, (Object) null, -1);
-			
-			eObject.eNotify(createNotification);
-		}
-	}
-	
-	/**
-	 * MSL has extensions for metamodels to implement containment conditions.
-	 */
-	public boolean canContain(EObject container, EReference reference,
-			EClass containedType) {
-		return PackageUtil.canContain(
-			container.eClass(),
-			reference,
-			containedType,
-			false);  // not recursive
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/CopyingResource.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/CopyingResource.java
deleted file mode 100644
index 04de45a..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/CopyingResource.java
+++ /dev/null

@@ -1,386 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.clipboard;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMIHelperImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCoreDebugOptions;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin;
-import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;
-import org.eclipse.gmf.runtime.emf.core.internal.util.Util;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-
-/**
- * @author Yasser Lulu
- */
-public class CopyingResource
-	extends XMIResourceImpl {
-
-	private XMLResource xmlResource;
-	
-	private CopyingResourceSet copyingResourceSet;
-
-	public CopyingResource(XMLResource resource, URI uri,
-			CopyingResourceSet copyingResourceSet) {
-		this(resource, uri, copyingResourceSet, true);
-	}
-
-	public CopyingResource(XMLResource resource, URI uri,
-			CopyingResourceSet copyingResourceSet, boolean regenerateIds) {
-		super(uri);
-		this.xmlResource = resource;
-		this.copyingResourceSet = copyingResourceSet;
-		setEncoding(resource.getEncoding());
-		//needed to allow calls to unload() to proceed
-		setLoaded(true);
-		getDefaultSaveOptions().putAll(resource.getDefaultSaveOptions());
-		copyingResourceSet.getResources().add(this);
-		copyingResourceSet.getResourcesMap().put(resource, this);
-		if (regenerateIds) {
-			createNewIDs();
-		} else {
-			copyIDs();
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void createNewIDs() {
-		// OK to get all contents because we have to copy
-		//    the entire model content of this resource
-		Iterator it = getXMLResource().getAllContents();
-		while (it.hasNext()) {
-			setID((EObject) it.next(), EcoreUtil.generateUUID());
-		}
-	}
-
-	protected XMLLoad createXMLLoad() {
-		throwUnsupportedOperationException("createXMLLoad", //$NON-NLS-1$
-			new UnsupportedOperationException(
-				"Can't call load on CopyingResource resource"));//$NON-NLS-1$
-		return null;
-	}
-
-	protected XMLHelper createXMLHelper() {
-		return new CopyingHelper(this);
-	}
-
-	protected void unloaded(InternalEObject internalEObject) {
-		//disable parent
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.NotifierImpl#eNotificationRequired()
-	 */
-	public boolean eNotificationRequired() {
-		return false;
-	}
-
-	private void throwUnsupportedOperationException(String methodName,
-			UnsupportedOperationException ex) {
-		Trace.throwing(EMFCorePlugin.getDefault(),
-			EMFCoreDebugOptions.EXCEPTIONS_THROWING, getClass(), methodName, ex);
-		throw ex;
-	}
-
-	/**
-	 * @return Returns the resourcesMap.
-	 */
-	private Map getResourcesMap() {
-		return getMslCopyingResourceSet().getResourcesMap();
-	}
-
-	public void doLoad(InputStream inputStream, Map options)
-		throws IOException {
-		throwUnsupportedOperationException("doLoad", //$NON-NLS-1$
-			new UnsupportedOperationException(
-				"Can't call load on CopyingResource resource"));//$NON-NLS-1$
-	}
-
-	protected XMLSave createXMLSave() {
-		return new CopyingSave(createXMLHelper());
-	}
-
-	private boolean isInResource(EObject eObject) {
-		// in case of cross-resource containment, the 'eObject' may be in a
-		//     different resource than xmlResource, though one of its containers
-		//     may be
-		while (eObject != null) {
-			if (((InternalEObject) eObject).eDirectResource() == getXMLResource()) {
-				return true;
-			}
-			
-			eObject = eObject.eContainer();
-		}
-		
-		return false;
-	}
-
-	public EList getContents() {
-		return getXMLResource().getContents();
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#doUnload()
-	 */
-	protected void doUnload() {
-		//disable parent's
-	}
-
-	public EObject getEObject(String uriFragment) {
-		int index = uriFragment.indexOf('?');
-		if (-1 != index) {
-			uriFragment = uriFragment.substring(0, index);
-		}
-		return super.getEObject(uriFragment);
-	}
-
-	/**
-	 * Returns the object based on the fragment as an ID.
-	 */
-	protected EObject getEObjectByID(String id) {
-		EObject eObj = getXMLResource().getEObject(id);
-		if (eObj == null) {
-			return super.getEObjectByID(id);
-		}
-		return eObj;
-	}
-
-	/**
-	 * @return Returns the CopyingResourceSet.
-	 */
-	public CopyingResourceSet getMslCopyingResourceSet() {
-		return copyingResourceSet;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#getResourceSet()
-	 */
-	public ResourceSet getResourceSet() {
-		return getMslCopyingResourceSet();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.Resource.Internal#attached(org.eclipse.emf.ecore.EObject)
-	 */
-	public void attached(EObject eObject) {
-		//disable
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.Resource.Internal#detached(org.eclipse.emf.ecore.EObject)
-	 */
-	public void detached(EObject eObject) {
-		//disable
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.XMLResource#getEObjectToExtensionMap()
-	 */
-	public Map getEObjectToExtensionMap() {
-		return getXMLResource().getEObjectToExtensionMap();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.Resource#isTrackingModification()
-	 */
-	public boolean isTrackingModification() {
-		return false;
-	}
-
-	private void copyIDs() {
-		// OK to get all contents because we have to copy
-		//    the entire model content of this resource
-		XMLResource lastRes = null;
-		
-		for (Iterator iter = getXMLResource().getAllContents(); iter.hasNext(); ) {
-			InternalEObject eObject = (InternalEObject)iter.next();
-			
-			if (eObject.eDirectResource() != null) {
-				// ensure that we only ask the resource that actually contains
-				//    an object for that object's ID
-				lastRes = (XMLResource) eObject.eDirectResource();
-			}
-			
-			getEObjectToIDMap().put(eObject, lastRes.getID(eObject));
-			getIDToEObjectMap().put(lastRes.getID(eObject), eObject);
-		}
-	}
-	
-	/**
-	 * Gets the XML resource that contains the model content to be copied.
-	 * 
-	 * @return the XML resource
-	 */
-	protected XMLResource getXMLResource() {
-		return xmlResource;
-	}
-	
-	/**
-	 * Helper implementation for the CopyingResource.
-	 */
-	protected class CopyingHelper extends XMIHelperImpl {
-		
-		public CopyingHelper() {
-			super();
-		}
-		  
-		public CopyingHelper(XMLResource resource) {
-		    super(resource);
-		}
-
-		/**
-		 * @see org.eclipse.emf.ecore.xmi.XMLHelper#deresolve(org.eclipse.emf.common.util.URI)
-		 */
-		public URI deresolve(URI anUri) {
-
-			// if this both target and container are within a platform resource and
-			// projects
-			// or plugins are different then do not deresolve.
-			if (((EMFCoreConstants.PLATFORM_SCHEME.equals(anUri.scheme())) && (EMFCoreConstants.PLATFORM_SCHEME
-				.equals(resourceURI.scheme())))
-				&& ((anUri.segmentCount() > 2) && (resourceURI.segmentCount() > 2))
-				&& ((!anUri.segments()[0].equals(resourceURI.segments()[0])) || (!anUri
-					.segments()[1].equals(resourceURI.segments()[1]))))
-				return anUri;
-
-			return super.deresolve(anUri);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getHREF(org.eclipse.emf.ecore.EObject)
-		 */
-		public String getHREF(EObject obj) {
-			EObject eObj = obj;
-			
-			if (obj.eIsProxy()) {
-				eObj = EcoreUtil.resolve(obj, getXMLResource());
-				if (eObj == obj) {
-					// use super.getHREF() if we can't resolve the proxy
-					eObj = null;
-				}
-			}
-			
-			if (eObj != null) {
-				Resource resource = eObj.eResource();
-				if (resource != null) {
-					URI objectURI = getHREF(resource, eObj);
-					objectURI = deresolve(objectURI);
-					return objectURI.toString();
-				}
-			}
-			
-			return super.getHREF(obj);
-		}
-
-		protected URI getHREF(Resource otherResource, EObject obj) {
-			if (!(otherResource instanceof CopyingResource)) {
-				CopyingResource copyingResource = (CopyingResource) getResourcesMap()
-					.get(otherResource);
-				if (copyingResource != null) {
-					otherResource = copyingResource;
-				}
-			}
-			
-			return super.getHREF(otherResource, obj);
-		}
-	};
-	
-	/**
-	 * Save implementation for the CopyingResource.
-	 */
-	public class CopyingSave extends XMISaveImpl {
-		
-		public CopyingSave(XMLHelper helper) {
-			super(helper);
-		}
-		
-		public CopyingSave(Map options, XMLHelper helper, String encoding) {
-			super(options, helper, encoding);
-		}
-
-		public CopyingSave(Map options, XMLHelper helper, String encoding,
-				String xmlVersion) {
-			super(options, helper, encoding, xmlVersion);
-		}
-
-		/**
-		 * @see org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl#sameDocMany(org.eclipse.emf.ecore.EObject,
-		 *      org.eclipse.emf.ecore.EStructuralFeature)
-		 */
-		protected int sameDocMany(EObject o, EStructuralFeature f) {
-			InternalEList values = (InternalEList) helper.getValue(o, f);
-			if (values.isEmpty()) {
-				return SKIP;
-			}
-
-			for (Iterator i = values.basicIterator(); i.hasNext();) {
-				EObject value = (EObject) i.next();
-				if (value.eIsProxy() || (isInResource(value) == false)) {
-					return CROSS_DOC;
-				}
-			}
-
-			return SAME_DOC;
-		}
-
-		/**
-		 * @see org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl#sameDocSingle(org.eclipse.emf.ecore.EObject,
-		 *      org.eclipse.emf.ecore.EStructuralFeature)
-		 */
-		protected int sameDocSingle(EObject o, EStructuralFeature f) {
-			EObject value = (EObject) helper.getValue(o, f);
-			if (value == null) {
-				return SKIP;
-			} else if (value.eIsProxy()) {
-				return CROSS_DOC;
-			} else {
-				return (isInResource(value)) ? SAME_DOC
-					: CROSS_DOC;
-			}
-		}
-
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/CopyingResourceSet.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/CopyingResourceSet.java
deleted file mode 100644
index b5f8af1..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/CopyingResourceSet.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.core.clipboard;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCoreDebugOptions;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin;
-
-
-/**
- * @author Yasser Lulu 
- */
-public class CopyingResourceSet
-	extends ResourceSetImpl {
-
-	private ResourceSetImpl mslResourceSet;
-
-	private Map resourcesMap;
-
-	/**
-	 * 
-	 */
-	public CopyingResourceSet(ResourceSet resourceSet) {
-		mslResourceSet = (ResourceSetImpl) resourceSet;
-		resourcesMap = new HashMap();
-		setURIResourceMap(new HashMap());
-	}
-
-	public Map getResourcesMap() {
-		return resourcesMap;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.ResourceSet#getEObject(org.eclipse.emf.common.util.URI, boolean)
-	 */
-	public EObject getEObject(URI uri, boolean loadOnDemand) {
-		EObject eObject = mslResourceSet.getEObject(uri, loadOnDemand);
-		if (eObject == null) {
-			return super.getEObject(uri, loadOnDemand);
-		}
-		return eObject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.ResourceSet#getResource(org.eclipse.emf.common.util.URI, boolean)
-	 */
-	public Resource getResource(URI uri, boolean loadOnDemand) {
-		Resource resource = mslResourceSet.getResource(uri, loadOnDemand);
-		if (resource == null) {
-			return super.getResource(uri, loadOnDemand);
-		}
-		return resource;
-	}
-	
-	
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getURIResourceMap()
-	 */
-	public Map getURIResourceMap() {
-		return mslResourceSet.getURIResourceMap();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#createResource(org.eclipse.emf.common.util.URI)
-	 */
-	public Resource createResource(URI uri) {
-		throwUnsupportedOperationException("createResource",//$NON-NLS-1$
-			new UnsupportedOperationException(
-				"Can't create resources on MSLCopyingResourceSet"));//$NON-NLS-1$
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.impl.BasicNotifierImpl#eNotificationRequired()
-	 */
-	public boolean eNotificationRequired() {
-		return false;
-	}
-
-	private void throwUnsupportedOperationException(String methodName,
-		UnsupportedOperationException ex) {
-		Trace.throwing(EMFCorePlugin.getDefault(),
-			EMFCoreDebugOptions.EXCEPTIONS_THROWING, getClass(), methodName, ex);
-		throw ex;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getAdapterFactories()
-	 */
-	public EList getAdapterFactories() {
-		return mslResourceSet.getAdapterFactories();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getLoadOptions()
-	 */
-	public Map getLoadOptions() {
-		return mslResourceSet.getLoadOptions();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getPackageRegistry()
-	 */
-	public Registry getPackageRegistry() {
-		return mslResourceSet.getPackageRegistry();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getResourceFactoryRegistry()
-	 */
-	public org.eclipse.emf.ecore.resource.Resource.Factory.Registry getResourceFactoryRegistry() {
-		return mslResourceSet.getResourceFactoryRegistry();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getURIConverter()
-	 */
-	public URIConverter getURIConverter() {
-		return mslResourceSet.getURIConverter();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/package.html
deleted file mode 100644
index 100d009..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-MSL extensions to the clipboard copy/paste framework.
-
-<h2>Package Specification</h2>
-<p>
-MSL extensions to the clipboard copy/paste framework.
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.java
deleted file mode 100644
index 1f7b53c..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- * 
- * @author Christian Vogt (cvogt)
- */
-public class EMFCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.emf.core.internal.l10n.EMFCoreMessages"; //$NON-NLS-1$
-
-	public static String validation_multi;
-	public static String validation_none;
-	public static String validation_nullStatus;
-	public static String operation_canceled;
-	public static String operation_ok;
-	public static String operation_failed;
-	public static String logError_badListener;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFCoreMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.properties b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.properties
deleted file mode 100644
index 0537807..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.properties
+++ /dev/null

@@ -1,50 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-#
-# The error message indicating that multiple constraint violations occurred.
-# It is used as the "message" of a multi-status.
-#
-validation_multi= Multiple constraints violated.
-
-#
-# The error message indicating that no validators are registered to validate
-# the elements of a resource.
-#
-validation_none = No validation was required.
-validation_nullStatus = Null Status.
-
-#
-# Message in the CANCEL status indicating that an MRunnable was canceled
-# during its execution.
-#
-operation_canceled= Operation canceled
-
-#
-# Message in the OK status indicating that a ResourceSetOperation completed
-# successfully.
-#
-operation_ok= Operation completed successfully
-
-#
-# Message in the ERROR status indicating that a ResourceSetOperation failed
-# with an exception.
-#
-operation_failed= Operation failed with an exception
-
-#
-# The error message indicating that an event handler has failed.
-logError_badListener = Event handler failed.

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/package.html
deleted file mode 100644
index b1d5193..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Localization strings for the EMF Core plug-in.
-Clients of EMF Core should not use this package.
-
-<h2>Package Specification</h2>
-<p>
-The {@link org.eclipse.gmf.runtime.emf.core.internal.l10n.EMFCoreMessages} class 
-manages strings for the EMF Core plug-in.  Strings are maintained in the 
-<tt>EMFCoreMessages.properties</tt> file in this package.
-</p>
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCoreDebugOptions.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCoreDebugOptions.java
deleted file mode 100644
index 0326fe7..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCoreDebugOptions.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.plugin;
-
-
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author rafikj
- */
-public final class EMFCoreDebugOptions {
-
-	private EMFCoreDebugOptions() {
-		// private
-	}
-
-	public static final String DEBUG = EMFCorePlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-	
-	public static final String MODEL_OPERATIONS = DEBUG + "/model/operations"; //$NON-NLS-1$
-
-	public static final String EVENTS = DEBUG + "/events/tracing"; //$NON-NLS-1$	
-	
-	public static final String RESOURCES = DEBUG + "/resources"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCorePlugin.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCorePlugin.java
deleted file mode 100644
index 0913ea7..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCorePlugin.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * EMF Core plugin class.
- * 
- * @author rafikj
- */
-public class EMFCorePlugin
-	extends Plugin {
-
-	private static EMFCorePlugin plugin;
-		
-	/**
-	 * Constructor.
-	 */
-	public EMFCorePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Get one instance of MSL plugin.
-	 */
-	public static EMFCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Get plugin ID.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCoreStatusCodes.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCoreStatusCodes.java
deleted file mode 100644
index af901dd..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/EMFCoreStatusCodes.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.plugin;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class EMFCoreStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private EMFCoreStatusCodes() {
-		// private constructor.
-	}
-
-	public static final int OK = 0;
-
-	public static final int IGNORED_EXCEPTION_WARNING = 10;
-	public static final int OPERATION_FAILED = 11;
-	public static final int OPERATION_CANCELED_BY_USER = 12;
-	
-	public static final int VALIDATOR_PROTOCOL_ERROR = 20;
-	
-	public static final int TRANSACTION_ABORTED = 30;
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/package.html
deleted file mode 100644
index 4fb62c0..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Private infrastructure classes for the plug-in lifecycle management, tracing,
-and error reporting.
-
-
-<h2>Package Specification</h2>
-<p>
-Defines the Aurora standard classes for tracing and error reporting and the
-"main" plug-in class.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java
deleted file mode 100644
index 43c98b8..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java
+++ /dev/null

@@ -1,794 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.resources;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.WeakHashMap;
-import java.util.Map.Entry;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IPathVariableChangeEvent;
-import org.eclipse.core.resources.IPathVariableChangeListener;
-import org.eclipse.core.resources.IPathVariableManager;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCoreDebugOptions;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin;
-import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
-import org.eclipse.gmf.runtime.emf.core.resources.IPathmapManager;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.osgi.framework.Bundle;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * This class manages GMF path mappings for URI conversion.
- * 
- * @author rafikj
- */
-public class PathmapManager extends AdapterImpl implements IPathmapManager {
-	// path maps can be defined using an extension point: Pathmaps
-	//  or by referencing an eclipse path variable
-	//  or by adding a pathmap manually
-
-	// The variable name.
-	private static final String NAME = "name"; //$NON-NLS-1$
-
-	//The plugin containing the path.
-	private static final String PLUGIN = "plugin"; //$NON-NLS-1$
-
-	// The path.
-	private static final String PATH = "path"; //$NON-NLS-1$
-	
-	private static final String NODE_QUALIFIER = EMFCorePlugin.getDefault().getBundle().getSymbolicName();
-	private static final String PREFERENCE_KEY = "referenced.path.variables"; //$NON-NLS-1$
-
-	// The path map as defined by the extensions and the referenced path variables and the manually
-	//  added pathmaps.
-	private static final Map PATH_MAP = Collections.synchronizedMap(configure());
-	
-	private static final Map instances = Collections.synchronizedMap(new WeakHashMap());
-	
-	// The list of eclipse path variables that are being used in this path map manager
-	private static Set referencedPathVariablesList;
-	
-	private static IEclipsePreferences preferenceStore = null;
-	
-	static {
-		IPathVariableManager pathManager = ResourcesPlugin.getWorkspace().getPathVariableManager();
-		
-		// We will get the initial list of referenced path variables from our preference store
-		IEclipsePreferences preferences = getPreferenceStore();
-		String referencedPathVariables = preferences.get(PREFERENCE_KEY, ""); //$NON-NLS-1$
-		StringTokenizer tokenizer = new StringTokenizer(referencedPathVariables, " "); //$NON-NLS-1$
-		referencedPathVariablesList = new HashSet(tokenizer.countTokens());
-		for (;tokenizer.hasMoreTokens();) {
-			String pathVariable = tokenizer.nextToken();
-			addPathVariableReference(pathVariable);
-		}
-		// Update the preference store in case some path variables have been deleted since the
-		//  last time we saved the store.
-		updatePreferenceStore();
-		
-		// Register this listener to keep up-to-date with the eclipse path variables and update our
-		//  referenced path variables appropriately.
-		pathManager.addChangeListener(new IPathVariableChangeListener() {
-			public void pathVariableChanged(IPathVariableChangeEvent event) {
-				switch (event.getType()) {
-					case IPathVariableChangeEvent.VARIABLE_DELETED:
-						removePathVariableReference(event.getVariableName());
-						updatePreferenceStore();
-						break;
-					case IPathVariableChangeEvent.VARIABLE_CHANGED:
-						// We only care about variables that we are referencing that
-						//  have changed.
-						if (referencedPathVariablesList.contains(event.getVariableName())) {
-							// Check to see if it has become incompatible
-							if (!isDirectory(event.getValue())) {
-								removePathVariableReference(event.getVariableName());
-							} else {
-								setPathVariable(event.getVariableName(), URI.createFileURI(event.getValue().toString()).toString());
-							}
-							
-							updatePreferenceStore();
-						}
-						break;
-				}
-			}
-		});
-	}
-
-	private static IEclipsePreferences getPreferenceStore() {
-		if (preferenceStore == null) {
-			IScopeContext ctx = new InstanceScope();
-			preferenceStore = ctx.getNode(NODE_QUALIFIER);
-		}
-		
-		return preferenceStore;
-	}
-	
-	/**
-	 * Adds a new reference to a path variable defined in eclipse
-	 *  to be used by this pathmap manager. It is assumed that this
-	 *  path variable is declared in the eclipes path variable manager
-	 *  and that it is a valid path variable for our purposes. 
-	 *  See {@link #isCompatiblePathVariable(String)} for more details.
-	 *  
-	 * @param pathVariable A valid path variable that has been defined in the
-	 *  eclipse {@link IPathVariableManager} and is compatible with our path maps.
-	 */
-	public static void addPathVariableReference(String pathVariable) {
-		if (getAllPathVariables().contains(pathVariable)) {
-			// We already reference this path variable so we can assume that it is added
-			//  and is compatible.
-			return;
-		}
-		
-		if (!isCompatiblePathVariable(pathVariable)) {
-			return;
-		}
-		
-		IPathVariableManager pathManager = ResourcesPlugin.getWorkspace().getPathVariableManager();
-		IPath value = pathManager.getValue(pathVariable);
-		if (value != null) {
-			referencedPathVariablesList.add(pathVariable);
-			setPathVariable(pathVariable, URI.createFileURI(value.toString()).toString());
-		}
-	}
-	
-	/**
-	 * Updates the preference store with the current set of path variables that this manager
-	 *  is currently referencing from the eclipse {@link IPathVariableManager}.
-	 */
-	public static void updatePreferenceStore() {
-		StringBuffer referencedPathVariables = new StringBuffer();
-		for (Iterator i = referencedPathVariablesList.iterator(); i.hasNext();) {
-			referencedPathVariables.append((String)i.next());
-			referencedPathVariables.append(' ');
-		}
-		
-		getPreferenceStore().put(PREFERENCE_KEY, referencedPathVariables.toString());
-		try {
-			getPreferenceStore().flush();
-		} catch (BackingStoreException e) {
-			EMFCorePlugin.getDefault().getLog().log(new Status(IStatus.ERROR, EMFCorePlugin.getPluginId(), IStatus.ERROR, e.getMessage(), e));
-		}
-	}
-	
-	/**
-	 * Removes a reference to a path variable defined in eclipse that was being
-	 *  used by this pathmap manager.
-	 *  
-	 * @param pathVariable A path variable that was once referenced by this pathmap
-	 *  manager pointing to a variable declared in the eclipse {@link IPathVariableManager}.
-	 */
-	public static void removePathVariableReference(String pathVariable) {
-		if (referencedPathVariablesList.contains(pathVariable)) {
-			referencedPathVariablesList.remove(pathVariable);
-			unsetPathVariable(pathVariable);
-		}
-	}
-	
-	public static Set getPathVariableReferences() {
-		return Collections.unmodifiableSet(referencedPathVariablesList);
-	}
-	
-	/**
-	 * Obtains a set of all path variable names, registered on the extension
-	 * point and referenced from Eclipse Platform path variables.
-	 * 
-	 * @return the set of all mapped path variables
-	 */
-	public static Set getAllPathVariables() {
-		return Collections.unmodifiableSet(PATH_MAP.keySet());
-	}
-	
-	/**
-	 * Queries whether the specified path variable name is registered on the
-	 * extension point (versus selected by the user from the platform variables).
-	 * 
-	 * @param variable the variable name
-	 * 
-	 * @return <code>true</code> if this variable name is registered on the
-	 *     path maps extension point; <code>false</code>, otherwise
-	 */
-	public static boolean isRegisteredPathVariable(String variable) {
-		return PATH_MAP.containsKey(variable)
-				&& !referencedPathVariablesList.contains(variable);
-	}
-	
-	/**
-	 * If the specified <code>variable</code> is registered on the extension
-	 * point, then retrieve its value.
-	 * 
-	 * @param variable the registered variable to retrieve
-	 * @return the registered variable's value or <code>null</code> if
-	 *     it is not registered
-	 */
-	public static String getRegisteredValue(String variable) {
-		return (String) PATH_MAP.get(variable);
-	}
-	
-	public static boolean isCompatiblePathVariable(String variable) {
-		if (referencedPathVariablesList.contains(variable)) {
-			// We assume that if this variable is already referenced then it is valid.
-			return true;
-		}
-		
-		IPathVariableManager pathManager = ResourcesPlugin.getWorkspace().getPathVariableManager();
-		IPath value = pathManager.getValue(variable);
-		
-		if (value == null)
-			return false;
-		
-		// Check to see if it is a directory first.
-		// EMF will not correctly handle extension parsing
-		//  of a pathmap URI if we point directly to a file. This
-		//  means that the wrong resource factory could be called.
-		// This could possibly change in the future.
-		return isDirectory(value);
-	}
-
-	private static boolean isDirectory(IPath value) {
-		File f = new File(value.toString());
-		return (f.isDirectory());
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public PathmapManager() {
-
-		super();
-
-		instances.put(this, Boolean.TRUE);
-	}
-
-	/**
-	 * Obtains all of the instances of this class.
-	 * 
-	 * @return my instances
-	 */
-	private static Set allInstances() {
-		return instances.keySet();
-	}
-	
-	/**
-	 * Obtains the pathmap manager attached to the specified resource set, if any.
-	 * 
-	 * @param rset a resource set
-	 * @return the attached pathmap manager, or <code>null</code> if none
-	 */
-	public static PathmapManager getExistingPathmapManager(ResourceSet rset) {
-		PathmapManager result = null;
-		List adapters = rset.eAdapters();
-		
-		for (int i = 0, size = adapters.size(); (result == null) && (i < size); i++) {
-			Object next = adapters.get(i);
-			
-			if (next instanceof PathmapManager) {
-				result = (PathmapManager) next;
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Set the value of a pathmap variable.
-	 * 
-	 * @param var the path map variable name
-	 * @param val the path map variable value (must be an encoded URI)
-	 */
-	public static void setPathVariable(String var, String val) {
-		// We must try to determine if this pathmap resides in the workspace as some container
-		//  so that we store into the pathmap a substitution that is a platform:/resource 
-		//  type of substitution. This is required because otherwise, pathmap URIs normalize
-		//  to file URIs while platform URIs do not normalize, they remain as platform URIs.
-		//  This will break some comparisons that might occur when trying to load a resource
-		//  that is already loaded because the normalized version of the platform URI to be loaded
-		//  will not match the normalized version of the pathmap URI causing two instances of
-		//  the same resource to be loaded.
-		java.net.URI valURI = java.net.URI.create(val);
-		IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(valURI);
-		if (containers.length == 1) {
-			val = URI.createPlatformResourceURI(containers[0].getFullPath().toString(),true).toString();
-		}
-		IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(valURI);
-		if (files.length == 1) {
-			val = URI.createPlatformResourceURI(files[0].getFullPath().toString(),true).toString();
-		}
-		
-		PATH_MAP.put(var, val);
-
-		for (Iterator i = allInstances().iterator(); i.hasNext();) {
-			((PathmapManager) i.next()).resyncEntries(true);
-		}
-	}
-
-	public IStatus addPathVariable(String name, String value) {
-		setPathVariable(name, value);
-		
-		return Status.OK_STATUS; // TODO: report accurate status
-	}
-	
-	/**
-	 * Remove a pathmap variable.
-	 */
-	public static void unsetPathVariable(String var) {
-		PATH_MAP.remove(var);
-
-		for (Iterator i = allInstances().iterator(); i.hasNext();) {
-			((PathmapManager) i.next()).resyncEntries(true);
-		}
-	}
-	
-	public IStatus removePathVariable(String name) {
-		unsetPathVariable(name);
-		
-		return Status.OK_STATUS; // TODO: report accurate status
-	}
-	
-	/**
-	 * Obtains the resource set for which I manage the path mappings.
-	 * 
-	 * @return my resource set
-	 */
-	private ResourceSet getResourceSet() {
-		return (ResourceSet) getTarget();
-	}
-
-	/**
-	 * Get the value of a pathmap variable.
-	 * 
-	 * @param var the path map variable name
-	 * @return the path map variable value (a URI) or an empty string if
-	 *    the specified variable is undefined
-	 */
-	public String getPathVariable(String var) {
-
-		URI varURI = makeURI(var);
-
-		if (varURI != null) {
-
-			URI valURI = (URI) getURIMap().get(varURI);
-
-			if (valURI != null) {
-
-				String val = valURI.toString();
-
-				if (val != null) {
-
-					int len = val.length();
-
-					if (len != 0) {
-
-						if (val.charAt(len - 1) == EMFCoreConstants.PATH_SEPARATOR)
-							val = val.substring(0, len - 1);
-
-						return val;
-					}
-				}
-			}
-		}
-
-		return EMFCoreConstants.EMPTY_STRING;
-	}
-
-	/**
-	 * Configure the Pathmaps extension point.
-	 */
-	private static Map configure() {
-		Map paths = new HashMap();
-		
-		IConfigurationElement[] configs = Platform.getExtensionRegistry()
-				.getExtensionPoint(EMFCorePlugin.getPluginId(), "Pathmaps") //$NON-NLS-1$
-				.getConfigurationElements();
-
-		for (int i = 0; i < configs.length; ++i) {
-
-			IConfigurationElement element = configs[i];
-
-			String var = element.getAttribute(NAME);
-
-			if ((var == null) || (var.length() == 0))
-				continue;
-
-			String path = element.getAttribute(PATH);
-
-			if (path == null)
-				path = EMFCoreConstants.EMPTY_STRING;
-
-			String plugin = element.getAttribute(PLUGIN);
-
-			if ((plugin == null) || (plugin.length() == 0))
-				plugin = element.getDeclaringExtension().getNamespaceIdentifier();
-
-			Bundle bundle = Platform.getBundle(plugin);
-
-			if (bundle == null)
-				continue;
-
-			URL url = bundle.getEntry(path);
-
-			if (url == null)
-				continue;
-
-			try {
-				url = FileLocator.resolve(url);
-
-				if (url == null)
-					continue;
-				
-				// We must encode here because everything that is placed into the path
-				//  map must be encoded to match the encoded URI's on each resource
-				//  in the resource set.
-				paths.put(var, URI.createURI(url.toString(),true).toString());
-			} catch (IOException e) {
-				Trace.catching(EMFCorePlugin.getDefault(),
-					EMFCoreDebugOptions.EXCEPTIONS_CATCHING, PathmapManager.class,
-					"configure", e); //$NON-NLS-1$
-			}
-		}
-
-		return paths;
-	}
-	
-	public void notifyChanged(Notification msg) {
-		if (msg.getFeatureID(ResourceSet.class) == ResourceSet.RESOURCE_SET__RESOURCES) {
-			switch (msg.getEventType()) {
-			case Notification.ADD:
-				denormalize((Resource) msg.getNewValue(), getResourceSet().getURIConverter());
-				break;
-			case Notification.ADD_MANY:
-				List resources = (List)msg.getNewValue();
-				if (resources == null)
-					break;
-				
-				for (Iterator i = resources.iterator(); i.hasNext();) {
-					denormalize((Resource)msg.getNewValue(), getResourceSet().getURIConverter());
-				}
-				break;
-			case Notification.REMOVE:
-				normalize((Resource)msg.getOldValue(), getResourceSet().getURIConverter());
-				break;
-			case Notification.REMOVE_MANY:
-				resources = (List)msg.getNewValue();
-				if (resources == null)
-					break;
-				
-				for (Iterator i = resources.iterator(); i.hasNext();) {
-					normalize((Resource)msg.getNewValue(), getResourceSet().getURIConverter());
-				}
-				break;
-			}
-		}
-	}
-
-	public void setTarget(Notifier newTarget) {
-		// get the old resource set
-		ResourceSet rset = getResourceSet();
-		
-		if (rset != null) {
-			// remove all path mappings from existing resources
-			resyncEntries(false);
-		}
-		
-		super.setTarget(newTarget);
-		
-		// get the new resource set
-		rset = getResourceSet();
-		
-		if (rset != null) {
-			// denormalize all resources using the path mappings
-			resyncEntries(true);
-		}
-	}
-	
-	/**
-	 * Add all entries.
-	 */
-	private void resyncEntries(boolean resync) {
-
-		// save URIs of all resources.
-		Map savedURIs = new HashMap();
-
-		ResourceSet rset = getResourceSet();
-		
-		if (rset == null)
-			return;
-
-		for (Iterator i = rset.getResources().iterator(); i.hasNext();) {
-
-			Resource resource = (Resource) i.next();
-
-			URI uri = resource.getURI();
-
-			savedURIs.put(resource, uri);
-		}
-
-		// normalize all resource URIs before clearing the map.
-		normalizeAll();
-
-		// get the URI Map.
-		Map uriMap = getURIMap();
-
-		// save the URI Map.
-		Map savedURIMap = new HashMap();
-
-		for (Iterator i = uriMap.keySet().iterator(); i.hasNext();) {
-
-			URI key = (URI) i.next();
-
-			if ((key != null)
-				&& (!EMFCoreConstants.PATH_MAP_SCHEME.equals(key.scheme())))
-				savedURIMap.put(key, uriMap.get(key));
-		}
-
-		// clear the map.
-		getURIMap().clear();
-
-		if (resync) {
-			synchronized(PATH_MAP) {
-				// rebuild the map.
-				for (Iterator i = PATH_MAP.entrySet().iterator(); i.hasNext();) {
-		
-					Map.Entry entry = (Entry) i.next();
-		
-					addEntry((String) entry.getKey(), (String) entry.getValue());
-				}
-			}
-		}
-		
-		// restore the map.
-		for (Iterator i = savedURIMap.keySet().iterator(); i.hasNext();) {
-
-			URI key = (URI) i.next();
-
-			if (key != null)
-				uriMap.put(key, savedURIMap.get(key));
-		}
-
-		if (resync) {
-			// denormalize all.
-			denormalizeAll();
-		}
-		
-		// if some resources have changed their URI, ensure their exports are
-		// dirtied.
-		for (Iterator i = rset.getResources().iterator(); i.hasNext();) {
-
-			Resource resource = (Resource) i.next();
-
-			URI uri = resource.getURI();
-
-			URI savedURI = (URI) savedURIs.get(resource);
-
-			if (uri != savedURI) {
-
-				if ((uri != null) && (!uri.equals(savedURI))) {
-
-					Collection exports = EMFCoreUtil.getExports(resource);
-
-					for (Iterator j = exports.iterator(); j.hasNext();) {
-
-						Resource export = (Resource) j.next();
-
-						if (!export.isModified())
-							export.setModified(true);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add entry to map.
-	 */
-	private void addEntry(String var, String val) {
-
-		URI varURI = makeURI(var);
-
-		if (varURI != null) {
-
-			int len = val.length();
-
-			if (len == 0)
-				return;
-
-			StringBuffer uri = new StringBuffer();
-
-			uri.append(val);
-
-			if (val.charAt(len - 1) != EMFCoreConstants.PATH_SEPARATOR)
-				uri.append(EMFCoreConstants.PATH_SEPARATOR);
-
-			URI valURI = URI.createURI(uri.toString());
-
-			getURIMap().put(varURI, valURI);
-		}
-	}
-
-	/**
-	 * Normalize the URI of a set of resources.
-	 */
-	private void normalizeAll() {
-
-		ResourceSet rset = getResourceSet();
-
-		URIConverter converter = rset.getURIConverter();
-
-		if (converter != null) {
-
-			for (Iterator i = rset.getResources().iterator(); i
-				.hasNext();) {
-
-				Resource resource = (Resource) i.next();
-				normalize(resource, converter);
-			}
-		}
-	}
-	
-	private void normalize(Resource resource, URIConverter converter) {
-		URI uri = resource.getURI();
-		
-		if (uri == null)
-			return;
-		
-		if ((EMFCoreConstants.PATH_MAP_SCHEME.equals(uri.scheme()))
-				&& (resource instanceof GMFResource)) {
-
-				((GMFResource) resource)
-					.setRawURI(converter.normalize(uri));
-			}
-	}
-
-	/**
-	 * Denormalize the URI of a set of resources.
-	 */
-	private void denormalizeAll() {
-
-		ResourceSet rset = getResourceSet();
-
-		URIConverter converter = rset.getURIConverter();
-
-		if (converter != null) {
-
-			for (Iterator i = rset.getResources().iterator(); i
-				.hasNext();) {
-
-				Resource resource = (Resource) i.next();
-				denormalize(resource, converter);
-			}
-		}
-	}
-	
-	private void denormalize(Resource resource, URIConverter converter) {
-		URI uri = resource.getURI();
-		
-		if (uri == null)
-			return;
-
-		if (resource instanceof GMFResource)
-			((GMFResource) resource).setURI(converter.normalize(uri));
-	}
-
-	/**
-	 * Make a pathmap uri from a pathmap variable name.
-	 */
-	private static URI makeURI(String var) {
-
-		int len = var.length();
-
-		if (len == 0)
-			return null;
-
-		StringBuffer uri = new StringBuffer();
-
-		uri.append(EMFCoreConstants.PATH_MAP_SCHEME);
-		uri.append(EMFCoreConstants.SCHEME_SEPARATOR);
-		uri.append(EMFCoreConstants.PATH_SEPARATOR);
-		uri.append(EMFCoreConstants.PATH_SEPARATOR);
-		uri.append(var);
-
-		if (var.charAt(len - 1) != EMFCoreConstants.PATH_SEPARATOR)
-			uri.append(EMFCoreConstants.PATH_SEPARATOR);
-
-		return URI.createURI(uri.toString());
-	}
-
-	/**
-	 * Get EMF's URI map.
-	 */
-	private Map getURIMap() {
-		return getResourceSet().getURIConverter().getURIMap();
-	}
-
-	/**
-	 * Denormalizes a given resource's URI to a pathmap URI if it is possible.
-	 * 
-	 * @param uri A file or platform URI that has been denormalized as much
-	 *  possible.
-	 *  
-	 * @return The original URI if it could not be denormalized any further
-	 *  or a new pathmap URI otherwise.
-	 */
-	public static URI denormalizeURI(URI uri) {
-		String uriAsString = uri.toString();
-		
-		String maxValueString = null;
-		String maxKey = null;
-		
-		synchronized(PATH_MAP) {
-			for (Iterator i = PATH_MAP.entrySet().iterator(); i.hasNext();) {
-				Map.Entry entry = (Map.Entry)i.next();
-				String valueString = (String)entry.getValue();
-				
-				// Wipe out the trailing separator from the value if necessary
-				if (valueString.endsWith("/")) { //$NON-NLS-1$
-					valueString = valueString.substring(0,valueString.length()-1);
-				}
-				
-				if (uriAsString.startsWith(valueString)
-					&& (maxValueString == null || 
-							maxValueString.length() < valueString.length())) {
-					maxValueString = valueString;
-					maxKey = (String)entry.getKey();
-				}
-			}
-		}
-		
-		if (maxKey != null) {
-			URI valueURI = URI.createURI(maxValueString);
-			URI pathmapURI = makeURI(maxKey);
-			
-			int segmentStart = valueURI.segmentCount();
-			int segmentCount = uri.segmentCount();
-			
-			for (int j=segmentStart; j < segmentCount; j++) {
-				pathmapURI = pathmapURI.appendSegment(uri.segment(j));
-			}
-			
-			return pathmapURI;
-		}
-		
-		return uri;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/package.html
deleted file mode 100644
index c339a49..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/package.html
+++ /dev/null

@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-MSL resource implementation.  This package provides the MSL implementation of
-the EMF {@link org.eclipse.emf.ecore.resource.Resource} interface, and the
-resource factory responsible for creating MSL resources.
-
-<h2>Package Specification</h2>
-<p>
-The {@link org.eclipse.gmf.runtime.emf.core.internal.resources.MResource} interface
-is the abstract specification of an MSL resource, which extensions of the
-MSL can implement to customize certain key MSL behaviours such as creating,
-destroying, iterating, and managing the IDs of model elements.
-</p>
-<p>
-Custom <code>MResource</code>s are typically created by custom implementations
-of the {@link org.eclipse.gmf.runtime.emf.core.internal.resources.MResourceFactory}
-interface, which must also implement the EMF
-{@link org.eclipse.emf.ecore.resource.Resource.Factory Resource.Factory} interface.
-<code>MResourceFactory</code> also defines an API for customization proxy resolution.
-</p>
-<p>
-If required, custom <code>MResource</code>s should consider extending
-the {@link org.eclipse.gmf.runtime.emf.core.internal.resources.LogicalResource} class
-to inherit support for decomposition of resources into multiple "physical" parts.
-This is typically useful only if the resource is to be persisted in files
-in a version-control system.
-</p>
-<p>
-Other classes in this package are responsible for the MSL's customization of
-EMF's XMI persistence capabilities and the handling of dangling references
-and other problems in serialization and deserialization.
-</p>
-
-@see org.eclipse.gmf.runtime.emf.core.util.EObjectUtil
-@see org.eclipse.gmf.runtime.emf.core.util.ResourceUtil
-@see org.eclipse.gmf.runtime.emf.core.util.ProxyUtil
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/EMFCoreConstants.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/EMFCoreConstants.java
deleted file mode 100644
index 0861963..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/EMFCoreConstants.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.util;
-
-/**
- * Various internal constants.
- * 
- * @author rafikj
- */
-public class EMFCoreConstants {
-
-	public final static String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	public final static char META_CLASS_BEGIN = '<';
-
-	public final static char META_CLASS_END = '>';
-
-	public final static char ID_SEPARATOR = '.';
-
-	public final static char PATH_SEPARATOR = '/';
-
-	public final static char REF_SEPARATOR = ',';
-
-	public final static char FRAGMENT_SEPARATOR = '?';
-
-	public final static char SCHEME_SEPARATOR = ':';
-
-	public final static String QUALIFIED_NAME_SEPARATOR = "::"; //$NON-NLS-1$
-
-	public final static String XMI_ENCODING = "UTF-8"; //$NON-NLS-1$
-
-	public final static String PATH_MAP_SCHEME = "pathmap"; //$NON-NLS-1$
-
-	public final static String PLATFORM_SCHEME = "platform"; //$NON-NLS-1$
-
-	public final static String RESOURCE = "resource"; //$NON-NLS-1$
-
-	public final static String PLUGIN = "plugin"; //$NON-NLS-1$
-
-	public final static String FILE_SCHEME = "file"; //$NON-NLS-1$
-
-	public final static Integer OUTPUT_BUFFER_SIZE = new Integer(256 * 1024);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/EObjectTester.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/EObjectTester.java
deleted file mode 100644
index d0effb4..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/EObjectTester.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.util;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-
-/**
- * Property tester for {@link EObject}s. Currently supported properties are
- * <dl>
- * <dt>editingDomain</dt>
- * <dd>string-valued property denoting the unique identifier of a
- * <code>TransactionalEditingDomain</code> registered in the
- * {@link TransactionalEditingDomain.Registry#INSTANCE}.</dd>
- * </dl>
- * 
- * @author ldamus
- */
-public class EObjectTester extends PropertyTester {
-
-	private static final String EDITING_DOMAIN_PROPERTY = "editingDomain"; //$NON-NLS-1$
-
-	public boolean test(Object receiver, String property, Object[] args,
-			Object expectedValue) {
-
-		EObject eObject = (EObject) receiver;
-
-		if (property.equals(EDITING_DOMAIN_PROPERTY)) {
-			String expectedID = (String) expectedValue;
-
-			if (expectedID != null) {
-				TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(eObject);
-				
-				if (domain != null) {
-					return expectedID.equals(domain.getID());
-				}
-			}
-		}
-
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/MetamodelManager.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/MetamodelManager.java
deleted file mode 100644
index 91f7017..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/MetamodelManager.java
+++ /dev/null

@@ -1,418 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.util;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCoreDebugOptions;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin;
-
-/**
- * This class manages meta-models and provide localization of meta-class names.
- * 
- * @author rafikj
- * @author Christian W. Damus (cdamus)
- */
-public class MetamodelManager {
-
-	// used to get resource locators when none are provided to us
-	private static final ComposedAdapterFactory adapterFactory =
-		new ComposedAdapterFactory(
-			ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-	
-	private final static Map METAMODEL_MAP = new HashMap();
-
-	private final static Map REVERSE_METAMODEL_MAP = new HashMap();
-
-	/**
-	 * Register meta-model object.
-	 */
-	public static void register(ENamedElement element) {
-		register(element, null);
-	}
-	
-	/**
-	 * Register meta-model object.
-	 */
-	public static void register(ENamedElement element,
-			ResourceLocator resourceLocator) {
-
-		if (element instanceof EOperation)
-			return;
-
-		if (element instanceof EParameter)
-			return;
-
-		String id = getNonCachedID(element);
-
-		String name = element.getName();
-
-		String displayName = null;
-
-		if ((resourceLocator == null) && (element instanceof EPackage)) {
-			// get a resource locator from the adapter factory registered
-			//     against the IItemLabelProvider adapter type
-			resourceLocator = findResourceLocator((EPackage) element);
-		}
-		
-		if (resourceLocator != null) {
-
-			if (element instanceof EClass) {
-				displayName = resourceLocator.getString("_UI_" + name //$NON-NLS-1$
-					+ "_type"); //$NON-NLS-1$
-
-			} else if (element instanceof EStructuralFeature) {
-
-				EClass eClass = ((EStructuralFeature) element)
-					.getEContainingClass();
-
-				if (eClass != null)
-					displayName = resourceLocator.getString("_UI_" //$NON-NLS-1$
-						+ eClass.getName() + "_" + name + "_feature"); //$NON-NLS-1$//$NON-NLS-2$
-
-			} else if (element instanceof EEnumLiteral) {
-
-				EEnum eEnum = ((EEnumLiteral) element).getEEnum();
-
-				if (eEnum != null)
-					displayName = resourceLocator.getString("_UI_" //$NON-NLS-1$
-						+ eEnum.getName() + "_" + name + "_literal"); //$NON-NLS-1$//$NON-NLS-2$
-			}
-		}
-
-		if (displayName == null)
-			displayName = name;
-
-		METAMODEL_MAP.put(element, new MetaModelDescriptor(id, displayName));
-
-		REVERSE_METAMODEL_MAP.put(id, element);
-
-		for (Iterator i = element.eContents().iterator(); i.hasNext();) {
-
-			Object child = i.next();
-
-			if (child instanceof ENamedElement)
-				register((ENamedElement) child, resourceLocator);
-		}
-	}
-	
-	/**
-	 * Attempts to find a resource locator for the specified metamodel package,
-	 * using a heuristic that assumes that item-provider adapters implement
-	 * the ResourceLocator interface (which is the default code generation).
-	 * 
-	 * @param pkg a package for which we need a resource locator
-	 * 
-	 * @return the resource locator if we could find one; <code>null</code> otherwise
-	 */
-	private static ResourceLocator findResourceLocator(EPackage pkg) {
-		ResourceLocator result = null;
-		
-		// the compased adapter factory has a registry of pairs by EPackage
-		//    and adapter class
-		List types = new java.util.ArrayList(2);
-		types.add(pkg);
-		types.add(IItemLabelProvider.class);
-		
-		AdapterFactory factory = adapterFactory.getFactoryForTypes(types);
-		
-		if (factory != null) {
-			// find some EClass to instantiate to get an item provider for it
-			EObject instance = null;
-			
-			for (Iterator iter = pkg.getEClassifiers().iterator(); iter.hasNext();) {
-				Object next = iter.next();
-				
-				if ((next instanceof EClass) && !((EClass) next).isAbstract()) {
-					instance = pkg.getEFactoryInstance().create((EClass) next);
-					break;
-				}
-			}
-			
-			if (instance != null) {
-				Object adapter = factory.adapt(instance, IItemLabelProvider.class);
-				
-				if (adapter instanceof ResourceLocator) {
-					result = (ResourceLocator) adapter;
-				}
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Get the ID of a meta-model object.
-	 */
-	public static String getID(ENamedElement element) {
-
-		if (element instanceof EOperation) {
-
-			RuntimeException e = new IllegalArgumentException(
-				"EOperation does not support IDs"); //$NON-NLS-1$
-
-			Trace.throwing(EMFCorePlugin.getDefault(),
-				EMFCoreDebugOptions.EXCEPTIONS_THROWING, MetamodelManager.class,
-				"getID", e); //$NON-NLS-1$
-
-			throw e;
-		}
-
-		if (element instanceof EParameter) {
-
-			RuntimeException e = new IllegalArgumentException(
-				"EParameter does not support IDs"); //$NON-NLS-1$
-
-			Trace.throwing(EMFCorePlugin.getDefault(),
-				EMFCoreDebugOptions.EXCEPTIONS_THROWING, MetamodelManager.class,
-				"getID", e); //$NON-NLS-1$
-
-			throw e;
-		}
-
-		MetaModelDescriptor descriptor = (MetaModelDescriptor) METAMODEL_MAP
-			.get(element);
-
-		if (descriptor != null)
-			return descriptor.id;
-
-		return getNonCachedID(element);
-	}
-
-	/**
-	 * Get the localized name of a meta-model object. Name does not contain
-	 * spaces.
-	 */
-	public static String getLocalName(ENamedElement element) {
-
-		tryRegisterElement(element);
-		
-		MetaModelDescriptor descriptor = (MetaModelDescriptor) METAMODEL_MAP
-			.get(element);
-
-		if (descriptor != null)
-			return descriptor.localName;
-		
-		
-
-		return element.getName();
-	}
-
-	/**
-	 * Get the localized name of a meta-model object. Name may contain spaces.
-	 */
-	public static String getDisplayName(ENamedElement element) {
-
-		tryRegisterElement(element);
-
-		MetaModelDescriptor descriptor = (MetaModelDescriptor) METAMODEL_MAP
-			.get(element);
-
-		if (descriptor != null)
-			return descriptor.displayName;
-
-		return element.getName();
-	}
-
-	/**
-	 * Find meta-model object given its ID.
-	 */
-	public static ENamedElement getElement(String id) {
-		ENamedElement result = (ENamedElement) REVERSE_METAMODEL_MAP.get(id);
-		
-		if ((result == null) && (id != null)) {
-			// not registered, yet.  Look it up in the registry
-			result = findInPackageRegistry(id);
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Find the specified named element by ID in the global package registry.
-	 * <b>Side-effect:</b>  registers the package when found so that we don't
-	 * need to do this again.
-	 * 
-	 * @param id the ID to find.  Must not be <code>null</code>
-	 * @return the named element, or <code>null</code> if not found
-	 */
-	private static ENamedElement findInPackageRegistry(String id) {
-		ENamedElement result = null;
-		
-		int dot = id.indexOf('.');
-		
-		String pkgName = (dot >= 0)? id.substring(0, dot) : id;
-		
-		for (Iterator iter = EPackage.Registry.INSTANCE.values().iterator(); iter.hasNext();) {
-			Object next = iter.next();
-			
-			if (next instanceof EPackage) {
-				// skip descriptors because if the EPackage hasn't been
-				//    instantiated then it cannot be in use by the client
-				EPackage pkg = (EPackage) next;
-				
-				if (pkgName.equals(pkg.getName())) {
-					result = findElement(pkg, id);
-					if (result != null) {
-						// register the package for subsequent look-ups
-						register(pkg, null);
-						break;
-					}
-				}
-			}
-		}
-		
-		return result;
-	}
-	
-	private static ENamedElement findElement(ENamedElement element, String id) {
-		ENamedElement result = null;
-		int dot = id.indexOf('.');
-		
-		if (dot < 0) {
-			if (id.equals(element.getName())) {
-				// got the final result
-				result = element;
-			} // else the element is not found here
-		} else {
-			String name = id.substring(0, dot);
-			
-			if (name.equals(element.getName())) {
-				// search recursively in the sub-tree
-				id = id.substring(dot + 1);
-				
-				for (Iterator iter = element.eContents().iterator();
-						(result == null) && iter.hasNext();) {
-					
-					Object next = iter.next();
-					
-					if (next instanceof ENamedElement) {
-						result = findElement((ENamedElement) next, id);
-					}
-				}
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Get the non-cached ID of a meta-model object.
-	 */
-	private static String getNonCachedID(ENamedElement element) {
-
-		StringBuffer id = new StringBuffer();
-		ENamedElement current = element;
-
-		while (current != null) {
-
-			id.insert(0, current.getName());
-			EObject container = current.eContainer();
-
-			current = null;
-
-			if (container != null) {
-				if ((container instanceof ENamedElement)) {
-	
-					current = (ENamedElement) container;
-	
-					id.insert(0, '.');
-				} else {
-					// ENamedElements not contained by named elements (e.g.,
-					//     contained in annotations) are not supported
-					return null;
-				}
-			}
-		}
-
-		return id.toString();
-	}
-
-	/**
-	 * This class describes a meta-model object.
-	 */
-	private static class MetaModelDescriptor {
-
-		public String id = null;
-
-		public String localName = null;
-
-		public String displayName = null;
-
-		public MetaModelDescriptor(String id, String displayName) {
-
-			super();
-
-			this.id = id.intern();
-			this.localName = displayName.replaceAll(" ", "").intern(); //$NON-NLS-1$//$NON-NLS-2$
-			this.displayName = displayName.intern();
-		}
-	}
-	
-	/**
-	 * Registers the package an element belongs to. All elements of the package
-	 * are registered with the package
-	 * 
-	 * @param element An element that will be tried to get registered
-	 */
-	private static void tryRegisterElement(ENamedElement element)
-	{
-		// EOperation and EParameter can't have ids and hence cannot be registered
-		if (element instanceof EOperation || element instanceof EParameter)
-			return;
-		
-		String id = getID(element);
-		
-		if (id == null)
-			return;
-		
-		int dot = id.indexOf('.');
-		
-		// It is assumed that package names are equal to their IDs
-		String pkgName = (dot >= 0)? id.substring(0, dot) : id;
-		
-		// If package is registered than no need to register it again
-		if (REVERSE_METAMODEL_MAP.get(pkgName)!=null)
-			return;
-		
-		for (Iterator iter = EPackage.Registry.INSTANCE.values().iterator(); iter.hasNext();) {
-			Object next = iter.next();
-			
-			if (next instanceof EPackage) {
-				// skip descriptors because if the EPackage hasn't been
-				//    instantiated then it cannot be in use by the client
-				EPackage pkg = (EPackage) next;
-				
-				if (pkgName.equals(pkg.getName())) {
-					register(pkg, null);
-				}
-			}
-		}		
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/ReferenceVisitor.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/ReferenceVisitor.java
deleted file mode 100644
index 04329ac..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/ReferenceVisitor.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.util;
-
-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.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-
-/**
- * This class is used to visit the referencers of an EObject.
- * 
- * @author rafikj
- * @author Christian W. Damus (cdamus)
- */
-public abstract class ReferenceVisitor {
-
-	protected CrossReferenceAdapter crossReferencer = null;
-
-	protected EObject referencedObject = null;
-
-	/**
-	 * Constructor.
-	 */
-	public ReferenceVisitor(EObject eObject) {
-		this.crossReferencer = CrossReferenceAdapter.getExistingCrossReferenceAdapter(
-			eObject);
-		this.referencedObject = eObject;
-	}
-
-
-	/**
-	 * Visit all the referencers.
-	 */
-	public void visitReferencers() {
-
-		if (crossReferencer != null) {
-			Map featureMap = getGroupedReferencers(referencedObject);
-	
-			// operate on a clone to prevent concurrent access exceptions.
-			Object[] references = featureMap.keySet().toArray();
-	
-			for (int i = 0; i < references.length; i++) {
-	
-				EReference reference = (EReference) references[i];
-	
-				List referencerList = (List)featureMap.get(reference);
-	
-				// operate on a clone to prevent concurrent access exceptions.
-				Object[] referencers = referencerList.toArray();
-	
-				for (int j = 0; j < referencers.length; j++) {
-					EObject referencer = (EObject) referencerList.get(j);
-	
-					visitedReferencer(reference, referencer);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Override to implement processing the visit.
-	 */
-	protected abstract void visitedReferencer(EReference reference,
-			EObject referencer);
-
-	/**
-	 * For the given referenced EObject, returns a Map whose keys are EReferences
-	 * and values are EObjects that reference the referenced EObject with the key
-	 * EReference.
-	 * 
-	 * @param referenced the referenced EObject
-	 * @return a Map of referencers
-	 */
-	private Map getGroupedReferencers(EObject referenced) {
-
-		Map newMap = new HashMap();
-
-		// first group all the inverse referencers
-		Collection nonNavigableInverseReferences = 
-			crossReferencer.getNonNavigableInverseReferences(referenced);
-
-		if (nonNavigableInverseReferences != null &&
-				!nonNavigableInverseReferences.isEmpty()) {
-			for (Iterator iter = nonNavigableInverseReferences.iterator(); iter
-					.hasNext();) {
-				Setting setting = (Setting) iter.next();
-				List list = (List)newMap.get(setting.getEStructuralFeature());
-				if (list == null) {
-					list = new ArrayList();
-					list.add(setting.getEObject());
-					newMap.put(setting.getEStructuralFeature(), list);
-				} else {
-					list.add(setting.getEObject());
-				}
-			}
-		}
-
-		// next loop through all the EReferences to find referencers
-		// for those EReferences with opposites
-		List features = referenced.eClass().getEAllReferences();
-
-		for (Iterator i = features.iterator(); i.hasNext();) {
-
-			EReference reference = (EReference) i.next();
-
-			EReference opposite = reference.getEOpposite();
-
-			if (opposite != null && reference.isChangeable()
-					&& !reference.isContainer() && !reference.isContainment()) {
-
-				Set referencers = crossReferencer.getInverseReferencers(
-					referenced, opposite, null);
-
-				if (!referencers.isEmpty()) {
-
-					newMap.put(opposite, new ArrayList(referencers));
-				}
-			}
-		}
-
-		if (newMap != null) {
-			return Collections.unmodifiableMap(newMap);
-		} else {
-			return Collections.EMPTY_MAP;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/Trace.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/Trace.java
deleted file mode 100644
index 110fc2a..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/Trace.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.core.internal.util;
-
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCoreDebugOptions;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin;
-
-
-
-public class Trace {
-	/** Cannot be instantiated. */
-	private Trace() {
-		super();
-	}
-
-	/**
-	 * Queries whether the specified trace <code>option</code> is enabled.
-	 * 
-	 * @param option a trace option
-	 * @return whether if it is enabled
-	 */
-	public static boolean isEnabled(String option) {
-		return org.eclipse.gmf.runtime.common.core.util.Trace.shouldTrace(
-			EMFCorePlugin.getDefault(),
-			option);
-	}
-	
-	/**
-	 * Traces the specified <code>message</code> under the given
-	 * <code>option</code>.
-	 * 
-	 * @param option the trace option
-	 * @param message the message to trace
-	 * 
-	 * @see #isEnabled(String)
-	 */
-	public static void trace(String option, String message) {
-		org.eclipse.gmf.runtime.common.core.util.Trace.trace(
-			EMFCorePlugin.getDefault(),
-			option,
-			message);
-	}
-	
-	/**
-	 * Traces a caught exception.
-	 * 
-	 * @param clazz the class that caught the exception
-	 * @param methodName the method in which it was caught
-	 * @param t the exception
-	 */
-	public static void catching(Class clazz, String methodName, Throwable t) {
-		org.eclipse.gmf.runtime.common.core.util.Trace.catching(
-			EMFCorePlugin.getDefault(),
-			EMFCoreDebugOptions.EXCEPTIONS_CATCHING,
-			clazz,
-			methodName,
-			t);
-	}
-	
-	/**
-	 * Traces a thrown exception.
-	 * 
-	 * @param clazz the class that is throwing the exception
-	 * @param methodName the method from which it is being thrown
-	 * @param t the exception
-	 */
-	public static void throwing(Class clazz, String methodName, Throwable t) {
-		org.eclipse.gmf.runtime.common.core.util.Trace.throwing(
-			EMFCorePlugin.getDefault(),
-			EMFCoreDebugOptions.EXCEPTIONS_THROWING,
-			clazz,
-			methodName,
-			t);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/Util.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/Util.java
deleted file mode 100644
index 40c657a..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/Util.java
+++ /dev/null

@@ -1,255 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.util;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.core.internal.resources.PathmapManager;
-import org.eclipse.gmf.runtime.emf.core.resources.IResourceHelper;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * Internal utilities, for private use of the EMF Core plug-in.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class Util {
-	private static final String pathDelimiter = String
-		.valueOf(EMFCoreConstants.PATH_SEPARATOR);
-
-	private static final String colonEscaped = "%3A"; //$NON-NLS-1$
-
-	/** Cannot instantiate. */
-	private Util() {
-		super();
-	}
-
-	/**
-	 * Gets the helper for the specified resource, if any.
-	 * 
-	 * @param resource a resource (may be <code>null</code>)
-	 * 
-	 * @return the helper, if one is attached, or <code>null</code> if none
-	 *     or if no resource is specified
-	 */
-	public static IResourceHelper getHelper(Resource resource) {
-		IResourceHelper result = null;
-		
-		if (resource != null) {
-			result = (IResourceHelper) EcoreUtil.getExistingAdapter(
-				resource,
-				IResourceHelper.class);
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Encodes the specified qualified name.
-	 * 
-	 * @param qName
-	 *            The qualified name to be encoded.
-	 * @return The encoded qualified name.
-	 */
-	public static String encodeQualifiedName(String qName) {
-		return appendQualifiedName(new StringBuffer(), qName).toString();
-	}
-
-	/**
-	 * Appends an encoded version of the specified qualified name to the
-	 * specified buffer. All excluded characters, such as space and
-	 * <code>#</code>, are escaped, as are <code>/</code> and
-	 * <code>?</code>.
-	 * 
-	 * @param buffer
-	 *            The buffer to which to append.
-	 * @param qName
-	 *            The qualified name to be encoded.
-	 * @return The buffer.
-	 */
-	public static StringBuffer appendQualifiedName(StringBuffer buffer, String qName) {
-
-		String[] segments = qName.split(EMFCoreConstants.QUALIFIED_NAME_SEPARATOR);
-
-		for (int i = 0; i < segments.length; i++) {
-
-			String encodedSegment = URI.encodeSegment(segments[i], true);
-
-			for (int j = 0, length = encodedSegment.length(); j < length; j++) {
-
-				char c = encodedSegment.charAt(j);
-
-				if (':' == c) {
-					// EMF treats :'s as special characters in fragments...
-					buffer.append(colonEscaped);
-				} else {
-					buffer.append(c);
-				}
-			}
-
-			if (i + 1 < segments.length) {
-				buffer.append(EMFCoreConstants.PATH_SEPARATOR);
-			}
-		}
-
-		return buffer;
-	}
-	
-	/**
-	 * Decodes the specified qualified name by replacing each three-digit escape
-	 * sequence by the character that it represents.
-	 * 
-	 * @param qName
-	 *            The qualified name to be decoded.
-	 * @return The decoded qualified name.
-	 */
-	public static String decodeQName(String qName) {
-
-		StringBuffer buffer = new StringBuffer();
-
-		for (StringTokenizer st = new StringTokenizer(qName, pathDelimiter); st
-			.hasMoreTokens();) {
-
-			buffer.append(URI.decode(st.nextToken()));
-
-			if (st.hasMoreTokens())
-				buffer.append(EMFCoreConstants.QUALIFIED_NAME_SEPARATOR);
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 * Attempts to obtain the most abstract URI possible for the specified URI,
-	 * preferring "platform:" scheme over "file:" scheme for files in the
-	 * workspace, and "pathmap:" scheme over these where a file resides in a
-	 * path-mapped location.
-	 * 
-	 * @param uri the URI to denormalize
-	 * @param rset the resource set context for this URI (defining, among other
-	 *     things, a URI converter)
-	 * @return the URI denormalized as much as possible
-	 */
-	public static URI denormalizeURI(URI uri, ResourceSet rset) {
-		URI denormalizedURI = uri;
-
-		// First, check to see if this is a file URI and it is in the workspace.
-		//  If so, we will denormalize first to a platform URI.
-		if ("file".equals(denormalizedURI.scheme())) { //$NON-NLS-1$
-			IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(java.net.URI.create(denormalizedURI.toString()));
-			if (containers.length == 1) {
-				denormalizedURI = URI.createPlatformResourceURI(containers[0].getFullPath().toString(),true);
-			}
-		}
-		
-		// Second, we will now attempt to find a pathmap for this URI
-		denormalizedURI = PathmapManager.denormalizeURI(denormalizedURI);
-
-		return denormalizedURI;
-	}
-
-	/**
-	 * Gets the proxy ID by parsing the proxy URI.
-	 * 
-	 * @param proxy
-	 *            The proxy object.
-	 * @return The ID.
-	 */
-	public static String getProxyID(EObject proxy) {
-
-		URI uri = EcoreUtil.getURI(proxy);
-		
-		String uriFragment = uri.fragment();
-
-		int index = uriFragment.indexOf(EMFCoreConstants.FRAGMENT_SEPARATOR);
-
-		return index != -1 ? uriFragment.substring(0, index)
-			: uriFragment;
-	}
-
-	/**
-	 * Attempts to resolve the specified <code>proxy</code> object, returning
-	 * <code>null</code> (rather than the original proxy) if it is unresolvable.
-	 * 
-	 * @param domain
-	 *            The editing domain.
-	 * @param proxy
-	 *            The proxy object.
-	 * @return The resolved object, or <code>null</code> if not resolved
-	 */
-	public static EObject resolve(TransactionalEditingDomain domain,
-			EObject proxy) {
-		
-		EObject resolved = EcoreUtil.resolve(proxy, domain.getResourceSet());
-
-		return (resolved.eIsProxy() ? null : resolved);
-	}
-
-	/**
-	 * Can an instance of class1 contain an instance of class2.
-	 */
-	public static boolean canContain(EClass class1, EClass class2, Set visited) {
-
-		Iterator i = class1.getEAllReferences().iterator();
-
-		while (i.hasNext()) {
-
-			EReference reference = (EReference) i.next();
-
-			if (reference.isContainment()) {
-
-				EClass eType = (EClass) reference.getEType();
-
-				if ((eType.equals(class2)) || (eType.isSuperTypeOf(class2))) {
-
-					return true;
-				}
-			}
-		}
-
-		if ((visited != null) && (!visited.contains(class1))) {
-
-			visited.add(class1);
-
-			i = class1.getEAllReferences().iterator();
-
-			while (i.hasNext()) {
-
-				EReference reference = (EReference) i.next();
-
-				if (reference.isContainment()) {
-
-					EClass eType = (EClass) reference.getEType();
-
-					if (canContain(eType, class2, visited))
-						return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/package.html
deleted file mode 100644
index 4eb1de8..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Miscellaneous utility classes for working with MSL-managed models and meta-models.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ActionAbandonedNotification.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ActionAbandonedNotification.java
deleted file mode 100644
index 658977b..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ActionAbandonedNotification.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.core.internal.validation;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-
-
-/**
- * A fake notification that is inserted into the notifications to be validated,
- * to cause abandonment of the write action.  The
- * {@link DestroyableObjectsConstraint} detects the presence of this
- * notification and causes live validation to fail.
- *
- * @author Christian W. Damus (cdamus)
- * 
- * @see DestroyableObjectsConstraint
- */
-public class ActionAbandonedNotification
-	extends NotificationImpl {
-
-	private IStatus status;
-	
-	/**
-	 * Initializes me with my status.
-	 * 
-	 * @param status my status
-	 */
-	public ActionAbandonedNotification(IStatus status) {
-		super(-1, null, null);
-		
-		this.status = status;
-	}
-
-	/**
-	 * Gets the status describing the abandonment of the action.
-	 * 
-	 * @return the action abandonment status
-	 */
-	public IStatus getStatus() {
-		return status;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ActionNotAbandonedConstraint.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ActionNotAbandonedConstraint.java
deleted file mode 100644
index 4e628c8..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ActionNotAbandonedConstraint.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.core.internal.validation;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.emf.validation.AbstractModelConstraint;
-import org.eclipse.emf.validation.IValidationContext;
-
-/**
- * A constraint that ensures that a write action was not abandoned by some
- * listener adding an abandon-action command to the write action.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class ActionNotAbandonedConstraint
-	extends AbstractModelConstraint {
-	
-	/**
-	 * Initializes me.
-	 */
-	public ActionNotAbandonedConstraint() {
-		super();
-	}
-	
-	public IStatus validate(IValidationContext ctx) {
-    	if (ctx.getCurrentConstraintData() == null) {
-    		// put myself as a token to prevent calling me again
-    		ctx.putCurrentConstraintData(this);
-    		
-    		List events = ctx.getAllEvents();
-    		
-    		for (Iterator iter = events.iterator(); iter.hasNext();) {
-    			Object next = iter.next();
-    			
-    			if (next instanceof ActionAbandonedNotification) {
-    				return ctx.createFailureStatus(new Object[] {
-    					((ActionAbandonedNotification) next).getStatus().getMessage()
-    				});
-    			}
-    		}
-    	}
-    	
-    	return ctx.createSuccessStatus();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ProxiesResolveConstraint.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ProxiesResolveConstraint.java
deleted file mode 100644
index 1a91fe4..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/ProxiesResolveConstraint.java
+++ /dev/null

@@ -1,356 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.emf.core.internal.validation;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentsEList;
-
-import org.eclipse.emf.validation.AbstractModelConstraint;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-
-/**
- * Implements a validator that collects model reference errors and forwards them on to
- * the EMF model validation service.
- *
- * @author Steve Gutz (sgutz)
- */
-public class ProxiesResolveConstraint
-	extends AbstractModelConstraint {
-	
-	/** The rule ID for resource file path errors */
-	public static final String	RESOURCE_RULE_ID	= "org.eclipse.gmf.runtime.emf.core.ResourceFixup"; //$NON-NLS-1$
-	/** The rule ID for element ID errors */
-	public static final String	ELEMENT_RULE_ID		= "org.eclipse.gmf.runtime.emf.core.IdFixup"; //$NON-NLS-1$
-
-	public static final String DIAGNOSTIC_SOURCE = EMFCorePlugin.getPluginId();
-	
-	/**
-	 * Initializes me.
-	 */
-	public ProxiesResolveConstraint() {
-		super();
-	}
-
-	private String getObjectLabel(EObject eObject)
-	{
-		return EMFCoreUtil.getQualifiedName(eObject,true);
-	}
-	
-	private String getFeatureLabel(EStructuralFeature eStructuralFeature)
-	{
-		return eStructuralFeature.getName();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.validation.AbstractModelConstraint#validate(org.eclipse.emf.validation.IValidationContext)
-	 */
-	public IStatus validate(IValidationContext ctx) {
-    	EObject target = ctx.getTarget();
-    	
-    	EStructuralFeature feature = null;
-    	EObject proxyObject = null;
-    	
-		for (EContentsEList.FeatureIterator i = (EContentsEList.FeatureIterator) target
-			.eCrossReferences().iterator(); i.hasNext();) {
-			
-			EObject eCrossReferenceObject = (EObject) i.next();
-			
-			if (!i.feature().isDerived() && eCrossReferenceObject.eIsProxy()) {
-				feature = i.feature();
-				proxyObject = eCrossReferenceObject;
-				ctx.addResult(proxyObject);
-				break;
-			}
-		}
-		
-		if (feature != null) {
-			ResourceSet rSet = target.eResource().getResourceSet();
-			
-			// Load the resource for the broken element
-			URI proxyURI = ((InternalEObject)proxyObject).eProxyURI().trimFragment();
-			Resource resource = rSet.getResource(proxyURI, false);
-
-			// If we found a resource and it is loaded then the ID must be
-			// incorrect
-			if (resource != null && resource.isLoaded()) {
-				
-				// If we have been asked to find this case through the element fixup
-				//  constraint then we will report this problem.
-				if (ctx.getCurrentConstraintId().equals(ELEMENT_RULE_ID)) {
-					return ctx.createFailureStatus(new Object[] {
-						getFeatureLabel(feature), getObjectLabel(target),
-						getObjectLabel(proxyObject)});
-				}
-				
-				return ctx.createSuccessStatus();
-			}
-			// If we have been asked to find this case through the resource fixup
-			//  constraint then we will report this problem.
-			else if (ctx.getCurrentConstraintId().equals(RESOURCE_RULE_ID)) {
-				return ctx.createFailureStatus(new Object[] {
-					getFeatureLabel(feature), getObjectLabel(target),
-					getObjectLabel(proxyObject)});
-			}
-		}
-    	return ctx.createSuccessStatus();
-	}
-
-// cmcgee: KEEPING THIS CODE AROUND FOR FUTURE INSPECTION
-//	/**
-//	 * A simple status implementation to convert an EMF disagnostic
-//	 *
-//	 * @author Steve Gutz (sgutz)
-//	 */
-//	private final class FixupStatus implements IConstraintStatus {
-//		
-//		Diagnostic diagnostic;
-//		IModelConstraint constraint;
-//
-//		public FixupStatus(Diagnostic diagnostic, IModelConstraint constraint) {
-//			this.diagnostic = diagnostic;
-//			this.constraint = constraint;
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#getChildren()
-//		 */
-//		public IStatus[] getChildren() {
-//			List l = diagnostic.getChildren();
-//			List paredList = new ArrayList();
-//			for (int iCtr = l.size() - 1; iCtr >= 0; iCtr--) {
-//				Diagnostic child = (Diagnostic) l.get(iCtr);
-//
-//				// Only collect diagnostic errors for things we care about
-//				if (child.getData().size() == 3) {
-//					paredList.add(child);
-//				}
-//			}
-//
-//			IStatus[] converted = new FixupStatus[paredList.size()];
-//			int iCtr = 0;
-//			for (Iterator it = paredList.iterator(); it.hasNext();) {
-//				converted[iCtr++] = new FixupStatus((Diagnostic) it.next(), constraint);
-//			}
-//			return converted;
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#getCode()
-//		 */
-//		public int getCode() {
-//			return diagnostic.getCode();
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#getMessage()
-//		 */
-//		public String getMessage() {
-//			String msg = diagnostic.getMessage();
-//			String source = ProxyUtil.getProxyQName( (InternalEObject)diagnostic.getData().get(0));
-//			String target = ProxyUtil.getProxyQName( (InternalEObject)diagnostic.getData().get(2));
-//
-//			boolean foundSource = false;
-//			int index = 0;
-//			while ( index != -1 && index < msg.length()) {
-//				
-//				index = msg.indexOf('\'', index);
-//				if (index > -1) {
-//					int nextQuoteIndex = msg.indexOf('\'', index+1);
-//					if( nextQuoteIndex != -1 ) {
-//						String sub = msg.substring(index, nextQuoteIndex);
-//						
-//						if( sub.indexOf( '@') != -1 && sub.indexOf( '}') != -1) {
-//							if( !foundSource ) {
-//								msg = msg.substring(0, index+1)
-//										+ source + msg.substring(nextQuoteIndex);
-//								nextQuoteIndex = index+source.length()+1;
-//								foundSource = true;
-//							} else {
-//								msg = msg.substring(0, index+1)
-//								+ target + msg.substring(nextQuoteIndex);
-//								nextQuoteIndex = index+target.length()+1;
-//							}
-//						}
-//						index = nextQuoteIndex+1;
-//					}
-//				}
-//			}
-//			return msg;
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#getSeverity()
-//		 */
-//		public int getSeverity() {
-//			return diagnostic.getSeverity();
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#getException()
-//		 */
-//		public Throwable getException() {
-//			return null;
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#getPlugin()
-//		 */
-//		public String getPlugin() {
-//			return MSLPlugin.getPluginId();
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#isMultiStatus()
-//		 */
-//		public boolean isMultiStatus() {
-//			List l = diagnostic.getChildren();
-//			if (l == null || l.size() == 0)
-//				return false;
-//			return true;
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#isOK()
-//		 */
-//		public boolean isOK() {
-//			return false;
-//		}
-//	
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.core.runtime.IStatus#matches(int)
-//		 */
-//		public boolean matches(int severityMask) {
-//			return (diagnostic.getSeverity() & severityMask) != 0;
-//		}
-//
-//		/* (non-Javadoc)
-//		 * @see org.eclipse.gmf.runtime.emf.core.IValidationStatus#getTarget()
-//		 */
-//		public EObject getTarget() {
-//			if (diagnostic.getData() == null)
-//				return null;
-//
-//			Object obj = diagnostic.getData().get(0);
-//			if (obj instanceof EObject)
-//				return (EObject) obj;
-//			return null;
-//		}
-//
-//		/*
-//		 * (non-Javadoc)
-//		 * 
-//		 * @see org.eclipse.gmf.runtime.emf.core.IValidationStatus#getRelatedObjects()
-//		 */
-//		public Set getRelatedObjects() {
-//			HashSet set = new HashSet();
-//			set.add(diagnostic.getData().get(2));
-//			return set;
-//		}
-//
-//		/* (non-Javadoc)
-//		 * @see org.eclipse.emf.validation.model.IConstraintStatus#getConstraint()
-//		 */
-//		public IModelConstraint getConstraint() {
-//			return constraint;
-//		}
-//
-//		/* (non-Javadoc)
-//		 * @see org.eclipse.emf.validation.model.IConstraintStatus#getResultLocus()
-//		 */
-//		public Set getResultLocus() {
-//			if (diagnostic.getData() == null || diagnostic.getData().size() > 0) {
-//				Object o = diagnostic.getData().get(0);
-//				
-//				// If the first object is an EObject, then we assume that this
-//				//  is the EObject for which there is a problem. See the
-//				//  javadoc for emf.common.util.Diagnostic.getData() for more
-//				//  information.
-//				if (o instanceof EObject) {
-//					return Collections.singleton(o);
-//				}
-//			}
-//			
-//			return Collections.EMPTY_SET;
-//		}
-//	}
-//	
-//	/**
-//	 * Overrides the basic EObjectValidator's proxy-resolvableness constraint
-//	 * to check only those features that are not derived.
-//	 *
-//	 * @author Christian W. Damus (cdamus)
-//	 */
-//	private static final class EFixupValidator
-//		extends EObjectValidator {
-//
-//		public boolean validate_EveryProxyResolves(EObject eObject,
-//				DiagnosticChain diagnostics, Map context) {
-//			boolean result = true;
-//			for (EContentsEList.FeatureIterator i = (EContentsEList.FeatureIterator) eObject
-//				.eCrossReferences().iterator(); i.hasNext();) {
-//				
-//				EObject eCrossReferenceObject = (EObject) i.next();
-//				
-//				if (!i.feature().isDerived() && eCrossReferenceObject.eIsProxy()) {
-//					result = false;
-//					if (diagnostics != null) {
-//						diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
-//							ProxiesResolveConstraint.DIAGNOSTIC_SOURCE,
-//							EObjectValidator.EOBJECT__EVERY_PROXY_RESOLVES,
-//							EcorePlugin.INSTANCE.getString(
-//								"_UI_UnresolvedProxy_diagnostic", //$NON-NLS-1$
-//								new Object[] {
-//									getFeatureLabel(i.feature(), context),
-//									getObjectLabel(eObject, context),
-//									getObjectLabel(
-//										eCrossReferenceObject,
-//										context)}),
-//								new Object[] {
-//									eObject,
-//									i.feature(),
-//									eCrossReferenceObject}));
-//					} else {
-//						break;
-//					}
-//				}
-//			}
-//			return result;
-//		}
-//	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/UUIDConstraint.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/UUIDConstraint.java
deleted file mode 100644
index c9a7c5f..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/UUIDConstraint.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.internal.validation;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.validation.AbstractModelConstraint;
-import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-
-/**
- * A constraint that enforces universally unique IDs (UUIDs), that is, it fails
- * if multiple eObjects have the same UUID.
- * 
- * @author Scott Cowan
- */
-public class UUIDConstraint
-	extends AbstractModelConstraint {
-
-	/** The rule ID for ambiguous ID errors */
-	public static final String RULE_ID = "org.eclipse.gmf.runtime.emf.core.UUIDConstraint"; //$NON-NLS-1$
-
-	public UUIDConstraint() {
-		super();
-	}
-
-	/**
-	 * Return a label for an eObject.
-	 * 
-	 * @param eObject
-	 *            an eObject
-	 * @return a label
-	 */
-	private String getEObjectLabel(EObject eObject) {
-		return EMFCoreUtil.getQualifiedName(eObject, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.validation.AbstractModelConstraint#validate(org.eclipse.emf.validation.IValidationContext)
-	 */
-	public IStatus validate(IValidationContext ctx) {
-
-		EObject target = ctx.getTarget();
-		Resource resource = target.eResource();
-
-		if (!(resource instanceof XMLResource))
-			return ctx.createSuccessStatus();
-
-		// Fail constraint if target is the key of an eObject to ID map entry,
-		// but not the value of an ID to eObject map entry.
-		XMLResource xmlResource = (XMLResource) resource;
-		String id = xmlResource.getID(target);
-
-		EObject eObject = xmlResource.getEObject(id);
-		if (eObject != target) {
-			return ctx
-				.createFailureStatus(new Object[] {getEObjectLabel(target)});
-		}
-
-		return ctx.createSuccessStatus();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/package.html
deleted file mode 100644
index f5fd14a..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/package.html
+++ /dev/null

@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Validation constraints provided by the MSL Core.
-
-<h2>Package Specification</h2>
-
-<p>
-This package defines the constraints that MSL Core provides to the
-EMF Validation Framework.  These include, but are not necessarily limited to:
-<ul>
-   <li>check for unresolvable proxies (references)</li>
-</ul>
-</p>
-
-@see org.eclipse.emf.validation
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/AbortResourceLoadException.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/AbortResourceLoadException.java
deleted file mode 100644
index a4094f2..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/AbortResourceLoadException.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-/**
- * This exception is intended to be thrown during Resource load when an
- * error occurs. This RuntimeException wrapper is required in order to
- * abort loading at any time.
- * 
- * @author Christian Vogt (cvogt)
- */
-public class AbortResourceLoadException extends RuntimeException {
-
-	private static final long serialVersionUID = -5621491416138595586L;
-
-	/**
-	 * Initializes me without any details.
-	 */
-	public AbortResourceLoadException() {
-		super();
-	}
-
-	/**
-	 * Initializes me with a useful message.
-	 * 
-	 * @param message
-	 *            a message
-	 */
-	public AbortResourceLoadException(String message) {
-		super(message);
-	}
-
-	/**
-	 * Initializes me with a cause.
-	 * 
-	 * @param cause
-	 *            the cause of this exception.
-	 */
-	public AbortResourceLoadException(Throwable cause) {
-		super(null == cause ? null
-			: cause.toString(), cause);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFHandler.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFHandler.java
deleted file mode 100644
index eda0146..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFHandler.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.emf.ecore.xmi.XMIException;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMIHandler;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-
-/**
- * The SAX handler for MSL resources. Updates demand-created packages with their
- * namespace prefixes and schema locations.
- * 
- * @author khussey
- */
-public class GMFHandler
-	extends SAXXMIHandler {
-
-	protected final Map urisToProxies;
-	
-	protected boolean abortOnError;
-
-	/**
-	 * Constructs a new MSL handler for the specified resource with the
-	 * specified helper and options.
-	 * 
-	 * @param xmiResource
-	 *            The resource for the new handler.
-	 * @param helper
-	 *            The helper for the new handler.
-	 * @param options
-	 *            The load options for the new handler.
-	 */
-	public GMFHandler(XMLResource xmiResource, XMLHelper helper, Map options) {
-		super(xmiResource, helper, options);
-
-		urisToProxies = new HashMap();
-		if (Boolean.TRUE.equals(options.get(GMFResource.OPTION_ABORT_ON_ERROR))) {
-			abortOnError = true;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#endDocument()
-	 */
-	public void endDocument() {
-		super.endDocument();
-
-		if (null != extendedMetaData) {
-
-			for (Iterator demandedPackages = extendedMetaData
-				.demandedPackages().iterator(); demandedPackages.hasNext();) {
-
-				EPackage ePackage = (EPackage) demandedPackages.next();
-				String nsURI = ePackage.getNsURI();
-
-				if (null != nsURI) {
-
-					if (null != urisToLocations) {
-						URI locationURI = (URI) urisToLocations.get(nsURI);
-
-						if (null != locationURI) {
-							// set the schema location
-							Resource resource = new ResourceImpl();
-							resource.setURI(locationURI);
-							resource.getContents().add(ePackage);
-						}
-					}
-
-					for (Iterator entries = helper.getPrefixToNamespaceMap()
-						.iterator(); entries.hasNext();) {
-
-						Map.Entry entry = (Map.Entry) entries.next();
-
-						if (nsURI.equals(entry.getValue())) {
-							// set the namespace prefix
-							ePackage.setNsPrefix((String) entry.getKey());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#validateCreateObjectFromFactory(org.eclipse.emf.ecore.EFactory,
-	 *      java.lang.String, org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	protected EObject validateCreateObjectFromFactory(EFactory factory,
-			String typeName, EObject newObject, EStructuralFeature feature) {
-
-		if (!(objects.peek() instanceof AnyType) && null != newObject
-			&& newObject.eIsProxy() && !sameDocumentProxies.contains(newObject)) {
-
-			URI proxyURI = ((InternalEObject) newObject).eProxyURI();
-
-			Map typeNamesToProxies = (Map) urisToProxies.get(proxyURI);
-
-			if (null == typeNamesToProxies) {
-				urisToProxies.put(proxyURI, typeNamesToProxies = new HashMap());
-			}
-
-			EObject proxy = (EObject) typeNamesToProxies.get(typeName);
-
-			if (null == proxy) {
-				typeNamesToProxies.put(typeName, proxy = newObject);
-			}
-
-			// canonicalize proxies
-			newObject = proxy;
-		}
-
-		return super.validateCreateObjectFromFactory(factory, typeName,
-			newObject, feature);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#error(org.eclipse.emf.ecore.xmi.XMIException)
-	 */
-	public void error(XMIException e) {
-		super.error(e);
-		if (abortOnError) {
-			if (e.getCause() != null) {
-				throw new AbortResourceLoadException(e.getCause());
-			}
-			throw new AbortResourceLoadException(e);
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFHelper.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFHelper.java
deleted file mode 100644
index 9c77d6e..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFHelper.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIHelperImpl;
-import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;
-
-/**
- * This class changes the behavior of the default XMIHelper so that references
- * between projects are not deresolved.
- * 
- * @author rafikj
- */
-public class GMFHelper
-	extends XMIHelperImpl {
-
-	/**
-	 * Constructor.
-	 */
-	public GMFHelper(XMLResource resource) {
-		super(resource);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.XMLHelper#deresolve(org.eclipse.emf.common.util.URI)
-	 */
-	public URI deresolve(URI uri) {
-
-		// if this both target and container are within a platform resource and
-		// projects
-		// or plugins are different then do not deresolve.
-		if (((EMFCoreConstants.PLATFORM_SCHEME.equals(uri.scheme())) && (EMFCoreConstants.PLATFORM_SCHEME
-			.equals(resourceURI.scheme())))
-			&& ((uri.segmentCount() > 2) && (resourceURI.segmentCount() > 2))
-			&& ((!uri.segments()[0].equals(resourceURI.segments()[0])) || (!uri
-				.segments()[1].equals(resourceURI.segments()[1]))))
-			return uri;
-
-		return super.deresolve(uri);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFLoad.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFLoad.java
deleted file mode 100644
index 05aad3e..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFLoad.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.UnresolvedReferenceException;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.SAXWrapper;
-import org.eclipse.emf.ecore.xmi.impl.XMILoadImpl;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * This class changes the behavior of the default XMILoader so that
- * UnresolvedReferenceExceptions are not thrown back.
- * 
- * @author rafikj
- */
-public class GMFLoad
-	extends XMILoadImpl {
-
-	/**
-	 * Constructor.
-	 */
-	public GMFLoad(XMLHelper helper) {
-		super(helper);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.XMLLoad#load(org.eclipse.emf.ecore.xmi.XMLResource,
-	 *      java.io.InputStream, java.util.Map)
-	 */
-	public void load(XMLResource r, InputStream s, Map o)
-		throws IOException {
-
-		try {
-
-			super.load(r, s, o);
-
-		} catch (Resource.IOWrappedException e) {
-			if (!(e.getCause() instanceof UnresolvedReferenceException))
-				throw e;
-		} catch (AbortResourceLoadException arle) {
-			throw new Resource.IOWrappedException((Exception)arle.getCause());
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl#makeDefaultHandler()
-	 */
-	protected DefaultHandler makeDefaultHandler() {
-		return new SAXWrapper(new GMFHandler(resource, helper, options));
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResource.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResource.java
deleted file mode 100644
index 6a65181..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResource.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
-import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;
-import org.eclipse.gmf.runtime.emf.core.internal.util.Util;
-
-/**
- * Custom implementation of an XMIResource.
- * 
- * @author rafikj
- */
-public class GMFResource
-	extends XMIResourceImpl {
-
-	/**
-	 * Use this option to abort loading a resource immediately when an error occurs.
-	 * The default is <code>Boolean.FALSE</code> unless set to <code>Boolean.TRUE</code> explicitly.
-	 */
-	public static final String OPTION_ABORT_ON_ERROR = "ABORT_ON_ERROR"; //$NON-NLS-1$
-
-	private boolean useIDAttributes = false;
-	
-	/**
-	 * Constructor.
-	 */
-	public GMFResource(URI uri) {
-
-		super(uri);
-		
-		setTrackingModification(true);
-	}
-
-	protected boolean useUUIDs() {
-		return true;
-	}
-	
-	/**
-	 * Should we use ID attribute?
-	 */
-	public void setUseIDAttributes(boolean b) {
-		useIDAttributes = b;
-	}
-
-	/**
-	 * Should we use ID attribute?
-	 */
-	protected boolean useIDAttributes() {
-		return useIDAttributes;
-	}
-
-	protected XMLHelper createXMLHelper() {
-		return new GMFHelper(this);
-	}
-
-	protected XMLLoad createXMLLoad() {
-		return new GMFLoad(createXMLHelper());
-	}
-
-	protected XMLSave createXMLSave() {
-		return new XMISaveImpl(createXMLHelper());
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.Resource#getEObject(java.lang.String)
-	 */
-	public EObject getEObject(String uriFragment) {
-
-		int index = uriFragment.indexOf(EMFCoreConstants.FRAGMENT_SEPARATOR);
-
-		if (index != -1)
-			uriFragment = uriFragment.substring(0, index);
-
-		return super.getEObject(uriFragment);
-	}
-
-	/**
-	 * Get the saved ID of an EObject.
-	 */
-	public static String getSavedID(EObject eObject) {
-		return (String) DETACHED_EOBJECT_TO_ID_MAP.get(eObject);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.Resource#setURI(org.eclipse.emf.common.util.URI)
-	 */
-	public void setURI(URI uri) {
-
-		if (getResourceSet() != null) {
-			setRawURI(Util.denormalizeURI(uri, getResourceSet()));
-		}
-	}
-	
-	public NotificationChain basicSetResourceSet(ResourceSet rset, NotificationChain notifications) {
-		// when I am added to a new resource set, my optimally denormalized URI
-		//     may change according to its different URI converter
-		if (rset != null) {
-			setURI(getURI());
-		}
-		
-		return super.basicSetResourceSet(rset, notifications);
-	}
-
-	/**
-	 * Set the URI of the resource without processing it.
-	 */
-	public void setRawURI(URI uri) {
-
-		URI oldURI = getURI();
-
-		if ((uri == oldURI) || ((uri != null) && (uri.equals(oldURI))))
-			return;
-
-		super.setURI(uri);
-	}
-	
-	/**
-	 * The inherited implementation creates an adapter that <em>always</em> sets
-	 * the modified state.  We prefer to check, first, whether the resource
-	 * is already modified so that we don't generate redundant notifications.
-	 * Moreover, we additionally set modified state only for changes that are
-	 * in non-transient features of objects contained (recursively) by
-	 * non-transient references.
-	 */
-	protected Adapter createModificationTrackingAdapter() {
-		return new ModificationTrackingAdapter() {
-			public void notifyChanged(Notification notification) {
-				if (!isModified() && !isTransient(
-						notification.getNotifier(), notification.getFeature())) {
-					
-					super.notifyChanged(notification);
-				}
-			}
-
-			/**
-			 * Check if the feature or one of the notifier's containers is
-			 * transient.
-			 * 
-			 * @param notifier a notifier
-			 * @param feature the feature that changed
-			 * 
-			 * @return <code>true</code> if the feature is transient or if the
-			 *    notifier or any of its ancestors is contained by a transient
-			 *    reference; <code>false</code>, otherwise
-			 */
-			private boolean isTransient(Object notifier, Object feature) {
-				if (feature instanceof EStructuralFeature) {
-					if (((EStructuralFeature) feature).isTransient())
-						return true;
-					else
-						// calling isTransient could be a lengthy operation.
-						//   It is safe to cast because the adapter is only
-						//   attached to EObjects, not to the resource
-						return isTransient((EObject) notifier);
-				}
-				return false;
-			}
-			
-			/**
-			 * Is object transient?
-			 */
-			private boolean isTransient(EObject eObject) {
-				EStructuralFeature containmentFeature = eObject.eContainmentFeature();
-				while (containmentFeature != null) {
-					if (containmentFeature.isTransient())
-						return true;
-					eObject = eObject.eContainer();
-					if (eObject != null)
-						containmentFeature =  eObject.eContainmentFeature();
-					else
-						break;
-				}
-				return false;
-			}};
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResourceFactory.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResourceFactory.java
deleted file mode 100644
index 7c9f7d4..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResourceFactory.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-
-import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;
-
-/**
- * A custom implementation of a resource factory. This factory when registered
- * against some file extensions or protocol schemas will create an GMFResource
- * and assigns it default save a load options.
- * 
- * @author rafikj
- */
-public class GMFResourceFactory
-	extends XMIResourceFactoryImpl {
-
-	public GMFResourceFactory() {
-		super();
-	}
-
-	// default load options.
-	private static final Map loadOptions = new HashMap();
-
-	// default save options.
-	private static final Map saveOptions = new HashMap();
-
-	static {
-
-		XMIResource resource = new XMIResourceImpl();
-
-		// default load options.
-		loadOptions.putAll(resource.getDefaultLoadOptions());
-		loadOptions.put(XMIResource.OPTION_LAX_FEATURE_PROCESSING, Boolean.TRUE);
-
-		// default save options.
-		saveOptions.putAll(resource.getDefaultSaveOptions());
-		saveOptions.put(XMIResource.OPTION_DECLARE_XML, Boolean.TRUE);
-		saveOptions.put(XMIResource.OPTION_PROCESS_DANGLING_HREF,
-			XMIResource.OPTION_PROCESS_DANGLING_HREF_DISCARD);
-		saveOptions.put(XMIResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-		saveOptions.put(XMIResource.OPTION_USE_XMI_TYPE, Boolean.TRUE);
-		saveOptions.put(XMIResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
-		saveOptions.put(XMIResource.OPTION_SKIP_ESCAPE_URI, Boolean.FALSE);
-		saveOptions.put(XMIResource.OPTION_ENCODING, EMFCoreConstants.XMI_ENCODING);
-	}
-
-	/**
-	 * Get default load options.
-	 */
-	public static Map getDefaultLoadOptions() {
-		return loadOptions;
-	}
-
-	/**
-	 * Get default save options.
-	 */
-	public static Map getDefaultSaveOptions() {
-		return saveOptions;
-	}
-
-	public Resource createResource(URI uri) {
-
-		XMIResource resource = new GMFResource(uri);
-
-		resource.getDefaultLoadOptions().putAll(loadOptions);
-		resource.getDefaultSaveOptions().putAll(saveOptions);
-
-		if (!resource.getEncoding().equals(EMFCoreConstants.XMI_ENCODING))
-			resource.setEncoding(EMFCoreConstants.XMI_ENCODING);
-
-		return resource;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IExtendedResourceFactory.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IExtendedResourceFactory.java
deleted file mode 100644
index 75e7464..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IExtendedResourceFactory.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-
-/**
- * Mix-in interface to be implemented by {@link Resource.Factory} implementations
- * that provide extended object name/type/ID information in proxy URIs and/or
- * custom proxy resolution strategies.
- *
- * @author Christian W. Damus (cdamus)
- */
-public interface IExtendedResourceFactory {
-	/**
-	 * Obtains the name of the specified <code>proxy</code> object from its
-	 * proxy URI.
-	 * 
-	 * @param proxy a proxy object
-	 * 
-	 * @return its name, or <code>null</code> to defer to the default proxy name
-	 *     algorithm
-	 */
-	String getProxyName(EObject proxy);
-
-	/**
-	 * Obtains the qualified name of the specified <code>proxy</code> object from its
-	 * proxy URI.
-	 * 
-	 * @param proxy a proxy object
-	 * 
-	 * @return its qualified name, or <code>null</code> to defer to the default
-	 *     proxy qualified name algorithm
-	 */
-	String getProxyQualifiedName(EObject proxy);
-
-	/**
-	 * Obtains the ID of the specified <code>proxy</code> object from its
-	 * proxy URI.
-	 * 
-	 * @param proxy a proxy object
-	 * 
-	 * @return its ID, or <code>null</code> to defer to the default proxy ID
-	 *     algorithm
-	 */
-	String getProxyID(EObject proxy);
-
-	/**
-	 * Obtains the ID of the specified <code>proxy</code> object's EClass from its
-	 * proxy URI.
-	 * 
-	 * @param proxy a proxy object
-	 * 
-	 * @return its EClass ID, or <code>null</code> to defer to the default proxy
-	 *     EClass ID algorithm
-	 */
-	String getProxyClassID(EObject proxy);
-
-	/**
-	 * Resolves the specified <code>proxy</code> object.
-	 * 
-	 * @param domain the editing domain in which to resolve the proxy (provides,
-	 *     among other things, the resource set context)
-	 * @param proxy a proxy object
-	 * 
-	 * @return the resolved object, or <code>null</code> if the proxy
-	 *     cannot be resolved
-	 */
-	EObject resolve(TransactionalEditingDomain domain, EObject proxy);
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IPathmapManager.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IPathmapManager.java
deleted file mode 100644
index 804788c..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IPathmapManager.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Specification of an object that manages URI mappings (path variables) for
- * the <code>pathmap</code> URI scheme on an editing domain's resource set.
- * 
- * @author rafikj
- */
-public interface IPathmapManager {
-	
-	/**
-	 * Set the value of a path variable.
-	 * 
-	 * @param name the path variable name
-	 * @param value the path variable value (a file URI)
-	 * 
-	 * @return a status indicating success (OK) or failure (ERROR) to set the
-	 *     path variable.  In case of error, the status message provides a
-	 *     user-friendly explanation of the reason 
-	 */
-	IStatus addPathVariable(String name, String value);
-	
-	/**
-	 * Removes a path variable and its value.
-	 * 
-	 * @param name the path variable name
-	 * 
-	 * @return a status indicating success (OK) or failure (ERROR) to remove the
-	 *     path variable.  In case of error, the status message provides a
-	 *     user-friendly explanation of the reason 
-	 */
-	IStatus removePathVariable(String name);
-
-	/**
-	 * Queries the current value of a path variable.
-	 * 
-	 * @param name the path variable name
-	 * @return the path variable value (a URI) or an empty string if
-	 *    the specified variable is undefined
-	 */
-	String getPathVariable(String name);
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IResourceHelper.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IResourceHelper.java
deleted file mode 100644
index bae1c43..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IResourceHelper.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * Interface of an adapter for {@link Resource}s that provides
- * services such as creation of objects in that resource.
- * This interface is used by the {@link EMFCoreUtil} class to implement
- * extensible/overrideable object creation behaviours.
- *
- * @author Christian W. Damus (cdamus)
- */
-public interface IResourceHelper extends Adapter {
-	/**
-	 * Creates an instance of the specified <code>EClass</code> for the
-	 * intention of attention of attaching it to the resource providing this
-	 * helper.
-	 * 
-	 * @param eClass the <code>EClass</code> to instantiate
-	 * 
-	 * @return the instance
-	 */
-	EObject create(EClass eClass);
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/ResourceHelperImpl.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/ResourceHelperImpl.java
deleted file mode 100644
index 5f2983b..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/ResourceHelperImpl.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.resources;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-
-
-/**
- * Default implementation of a resource helper, useful for subclassing.
- * Implements the default algorithms for the interface methods.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class ResourceHelperImpl
-	extends AdapterImpl
-	implements IResourceHelper {
-
-	/**
-	 * Obtains the resource that I help.
-	 * 
-	 * @return my resource
-	 */
-	protected Resource getResource() {
-		return (Resource) getTarget();
-	}
-	
-	public boolean isAdapterForType(Object type) {
-		return type == IResourceHelper.class;
-	}
-	
-	/**
-	 * Default algorithm just uses the associated EFactory to instantiate the
-	 * EClass.  If the resource is under the control of a transactional editing
-	 * domain, then it will be managed already by that domain before it is
-	 * attached to the resource.
-	 */
-	public EObject create(EClass eClass) {
-
-		EObject eObject = eClass.getEPackage().getEFactoryInstance().create(
-			eClass);
-
-		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(getResource());
-		
-		if (domain != null) {
-			// this object is to be managed by this editing domain
-			eObject.eAdapters().add(
-				((InternalTransactionalEditingDomain) domain).getChangeRecorder());
-		}
-
-		return eObject;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/package.html
deleted file mode 100644
index 935bc5a..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/package.html
+++ /dev/null

@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-GMF resource API.  This package provides the GMF 
-resource factory responsible for creating GMF resources.
-
-<h2>Package Specification</h2>
-<p>
-This package defines the
-{@link org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory} class that
-creates GMF resources.  It is not intended to be used by client code, but to
-be referenced on the EMF <tt>org.eclipse.emf.ecore.extension_parser</tt>
-extension point to associate the client application's file extension with the
-resource factory.  Associated with this factory is the
-{@link org.eclipse.gmf.runtime.emf.core.resources.GMFResource} class which is
-GMF's custom resource implementation, supporting path map URIs and automatic
-URI denormalization and modification tracking.
-</p>
-<p>
-This package also defines a {@link org.eclipse.gmf.runtime.emf.core.resources.PathmapManager}
-class which has static API methods for managing path map variables, in particular
-for defining path maps statically for your plug-in's resources.
-</p>
-
-@see org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory
-@see org.eclipse.gmf.runtime.emf.core.resources.PathmapManager
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/CrossReferenceAdapter.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/CrossReferenceAdapter.java
deleted file mode 100644
index e2ff563..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/CrossReferenceAdapter.java
+++ /dev/null

@@ -1,1112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
-import org.eclipse.emf.ecore.util.ECrossReferenceEList;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * An adapter that maintains itself as an adapter for all contained objects. It
- * can be installed for an {@link EObject}, a {@link Resource}, or a
- * {@link ResourceSet}.
- * <p>
- * This adapter maintain information on inverse references, resource imports,
- * and resource exports.
- * 
- * @author Christian Vogt (cvogt)
- * @author Christian W. Damus (cdamus)
- */
-public class CrossReferenceAdapter extends ECrossReferenceAdapter {
-
-	private Map imports = new HashMap();
-
-	private Map exports = new HashMap();
-
-	private boolean resolve = true;
-	
-    private static Map eClassToChangeableFeatures = new HashMap();
-
-    private static List nullList = new ArrayList(1);
-
-	/**
-	 * Initializes me.
-	 */
-	public CrossReferenceAdapter() {
-		this(true);
-	}
-
-	/**
-	 * Initializes me.
-	 * 
-	 * @param resolve
-	 *            flag to determine if the proxies need to be resolved
-	 */
-	public CrossReferenceAdapter(boolean resolve) {
-		super();
-
-		this.resolve = resolve;
-	}
-
-	/**
-	 * Updates imports and exports maps.
-	 * 
-	 * @param notification
-	 *            the event notification
-	 */
-	public void selfAdapt(Notification notification) {
-		super.selfAdapt(notification);
-		Object notifier = notification.getNotifier();
-		Object feature = notification.getFeature();
-
-		// update import / export information when a resource
-		// is unloaded or loaded
-		if (notifier instanceof Resource) {
-			if (notification.getFeatureID(Resource.class) == Resource.RESOURCE__IS_LOADED) {
-				if (!notification.getNewBooleanValue()) {
-					deregisterReferences((Resource) notifier);
-				} else {
-					for (Iterator i = ((Resource) notifier).getContents()
-							.iterator(); i.hasNext();) {
-						EObject child = (EObject) i.next();
-						if (child != null) {
-							updateImportsAndExports((Resource) notifier, child,
-									true);
-						}
-					}
-				}
-			}
-
-			return;
-		}
-
-		// interested in maintaining import / export information
-		// when the notifier is an EObject and the feature is a
-		// non-containment EReference
-		if (!(notifier instanceof EObject) || !(feature instanceof EReference)) {
-			return;
-		}
-
-		EReference reference = (EReference) feature;
-		if (!isImportExportCapable(reference, (EObject) notifier)) {
-			return;
-		}
-
-		switch (notification.getEventType()) {
-		case Notification.RESOLVE:
-		case Notification.SET:
-		case Notification.UNSET: {
-			EObject oldValue = (EObject) notification.getOldValue();
-			if (oldValue != null) {
-				deregisterReference(((EObject) notification.getNotifier())
-						.eResource(), oldValue.eResource());
-			}
-			EObject newValue = (EObject) notification.getNewValue();
-			if (newValue != null) {
-				registerReference(((EObject) notification.getNotifier())
-						.eResource(), newValue.eResource());
-			}
-			break;
-		}
-		case Notification.ADD: {
-			EObject newValue = (EObject) notification.getNewValue();
-			if (newValue != null) {
-				registerReference(((EObject) notification.getNotifier())
-						.eResource(), newValue.eResource());
-			}
-			break;
-		}
-		case Notification.ADD_MANY: {
-			Collection newValues = (Collection) notification.getNewValue();
-			for (Iterator i = newValues.iterator(); i.hasNext();) {
-				EObject newValue = (EObject) i.next();
-				registerReference(((EObject) notification.getNotifier())
-						.eResource(), newValue.eResource());
-			}
-			break;
-		}
-		case Notification.REMOVE: {
-			EObject oldValue = (EObject) notification.getOldValue();
-			if (oldValue != null) {
-				deregisterReference(((EObject) notification.getNotifier())
-						.eResource(), oldValue.eResource());
-			}
-			break;
-		}
-		case Notification.REMOVE_MANY: {
-			Collection oldValues = (Collection) notification.getOldValue();
-			for (Iterator i = oldValues.iterator(); i.hasNext();) {
-				EObject oldValue = (EObject) i.next();
-				deregisterReference(((EObject) notification.getNotifier())
-						.eResource(), oldValue.eResource());
-			}
-			break;
-		}
-		}
-	}
-
-	/**
-	 * Extends the superclass method to handle the removal cases of containment,
-	 * to tear down aggregate (resource-level) cross-references.
-	 */
-	protected void handleContainment(Notification notification) {
-		super.handleContainment(notification);
-
-		Object notifier = notification.getNotifier();
-		if (notifier instanceof ResourceSet) {
-			// not interested in removal of resources from the resource set
-			return;
-		}
-
-		switch (notification.getEventType()) {
-		case Notification.ADD: {
-			EObject newValue = (EObject) notification.getNewValue();
-
-			if (newValue != null) {
-				Resource resource;
-				if (notifier instanceof Resource) {
-					resource = (Resource) notifier;
-				} else {
-					resource = ((EObject) notification.getNotifier())
-							.eResource();
-				}
-
-				// handle processing of the new value that has been added
-				updateImportsAndExports(resource, newValue, true);
-			}
-
-			break;
-		}
-		case Notification.ADD_MANY: {
-			Resource resource;
-			if (notifier instanceof Resource) {
-				resource = (Resource) notifier;
-			} else {
-				resource = ((EObject) notification.getNotifier()).eResource();
-			}
-
-			Collection newValues = (Collection) notification.getNewValue();
-
-			for (Iterator iter = newValues.iterator(); iter.hasNext();) {
-				EObject next = (EObject) iter.next();
-
-				if (next != null) {
-					// handle processing of the new value that has been added
-					updateImportsAndExports(resource, next, true);
-				}
-			}
-			break;
-		}
-
-		case Notification.REMOVE: {
-			EObject oldValue = (EObject) notification.getOldValue();
-
-			if (oldValue != null) {
-				Resource resource;
-				if (notifier instanceof Resource) {
-					resource = (Resource) notifier;
-				} else {
-					resource = ((EObject) notification.getNotifier())
-							.eResource();
-				}
-
-				// handle processing of the old value that has been removed
-				updateImportsAndExports(resource, oldValue, false);
-			}
-			break;
-		}
-		case Notification.REMOVE_MANY: {
-			Resource resource;
-			if (notifier instanceof Resource) {
-				resource = (Resource) notifier;
-                
-                if (!resource.isLoaded()) {
-                    // purge the resource from the imports/exports map
-                    deregisterReferences(resource);
-                    return;
-                }
-			} else {
-				resource = ((EObject) notification.getNotifier()).eResource();
-			}
-
-			Collection oldValues = (Collection) notification.getOldValue();
-
-			for (Iterator iter = oldValues.iterator(); iter.hasNext();) {
-				EObject next = (EObject) iter.next();
-
-				if (next != null) {
-					// handle processing of the old value that has been removed
-					updateImportsAndExports(resource, next, false);
-				}
-			}
-			break;
-		}
-		}
-	}
-
-	/**
-	 * Updates the imports and exports map for the specified eObject
-	 * 
-	 * @param resource
-	 *            a resource
-	 * @param eObject
-	 *            the specified eObject
-	 * @param register
-	 *            boolean flag to indicate whether to register imports or
-	 *            unregister imports
-	 */
-	public void updateImportsAndExports(Resource resource, EObject value,
-			boolean register) {
-		CrossReferenceAdapter adapter = getExistingCrossReferenceAdapter(value);
-
-		if (register) {
-			if (adapter != null) {
-				// now, register incoming unidirectional references and
-				// opposites
-				for (Iterator iter = adapter.getInverseReferences(value).iterator();
-                        iter.hasNext();) {
-                    EStructuralFeature.Setting next = (EStructuralFeature.Setting) iter.next();
-                    EReference ref = (EReference) next.getEStructuralFeature();
-                    EObject owner = next.getEObject();
-                    
-                    if (isImportExportCapable(ref, owner)) {
-                        registerReference(owner.eResource(), resource);
-                    }
-				}
-			}
-		} else {
-			// deregister the outgoing references and incoming bidirectionals
-            EContentsEList.FeatureIterator crossReferences = getOptimizedCrossReferenceIterator(
-            		value);
-            
-			while (crossReferences.hasNext()) {
-				EObject referent = (EObject) crossReferences.next();
-
-				if (referent != null) {
-					EReference eReference = (EReference) crossReferences
-							.feature();
-
-					if (isImportExportCapable(eReference, referent)) {
-						Resource referencedResource = referent.eResource();
-						deregisterReference(resource, referencedResource);
-					}
-				}
-			}
-
-			// now, deregister incoming unidirectional references and opposites
-			if (adapter != null) {
-                for (Iterator iter = adapter.getInverseReferences(value).iterator();
-                        iter.hasNext();) {
-                    EStructuralFeature.Setting next = (EStructuralFeature.Setting) iter.next();
-                    EReference ref = (EReference) next.getEStructuralFeature();
-                    EObject owner = next.getEObject();
-                    
-                    if (isImportExportCapable(ref, owner)) {
-                        deregisterReference(owner.eResource(), resource);
-                    }
-                }
-			}
-		}
-
-		// process contents
-		if (adapter != null) {
-			adapter.updateImportsAndExportsForContents(resource, value,
-					register);
-		}
-	}
-
-	/**
-	 * Updates the imports and exports map for the contents of the specified
-	 * eObject
-	 * 
-	 * @param resource
-	 *            a resource
-	 * @param eObject
-	 *            the specified eObject
-	 * @param register
-	 *            boolean flag to indicate whether to register imports or
-	 *            unregister imports
-	 */
-	public void updateImportsAndExportsForContents(Resource resource,
-			EObject value, boolean register) {
-		// go through the children of the eObject
-		for (Iterator i = resolve() ? value.eContents().iterator()
-				: ((InternalEList) value.eContents()).basicIterator(); i
-				.hasNext();) {
-			updateImportsAndExports(resource, (EObject) i.next(), register);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.util.ECrossReferenceAdapter#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier target) {
-		super.setTarget(target);
-
-		if (target instanceof EObject) {
-			EObject eObject = (EObject) target;
-			Resource resource = eObject.eResource();
-
-			// register the outgoing references and incoming bidirectionals
-			EContentsEList.FeatureIterator crossReferences = getOptimizedCrossReferenceIterator(
-					eObject);
-			
-			while (crossReferences.hasNext()) {
-				EObject referent = (EObject) crossReferences.next();
-
-				if (referent != null) {
-					EReference eReference = (EReference) crossReferences
-							.feature();
-
-					if (isImportExportCapable(eReference, referent)) {
-						Resource referencedResource = referent.eResource();
-						registerReference(resource, referencedResource);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.util.ECrossReferenceAdapter#unsetTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void unsetTarget(Notifier notifier) {
-		super.unsetTarget(notifier);
-		if (notifier instanceof Resource) {
-			deregisterReferences((Resource) notifier);
-		}
-	}
-
-	/**
-	 * Gets the imports of a resource.
-	 * 
-	 * @param referencer
-	 *            the resource to retrieve imports for
-	 * @return a Set of resource imports
-	 */
-	public Set getImports(Resource referencer) {
-
-		Map importsMap = getImportsMap(referencer);
-
-		if (importsMap != null) {
-			return Collections.unmodifiableSet(importsMap.keySet());
-		} else {
-			return Collections.EMPTY_SET;
-		}
-	}
-
-	/**
-	 * Gets the exports of a resource.
-	 * 
-	 * @param referenced
-	 *            the resource to retrieve exports for
-	 * @return a Set of resource exports
-	 */
-	public Set getExports(Resource referenced) {
-
-		Map exportsMap = getExportsMap(referenced);
-
-		if (exportsMap != null) {
-			return Collections.unmodifiableSet(exportsMap.keySet());
-		} else {
-			return Collections.EMPTY_SET;
-		}
-	}
-
-	/**
-	 * Returns the imports map of the given resource.
-	 * 
-	 * @param resource
-	 * @return imports map of the given resource
-	 */
-	private Map getImportsMap(Resource resource) {
-		return (Map) imports.get(resource);
-	}
-
-	/**
-	 * Returns the exports map of the given resource.
-	 * 
-	 * @param resource
-	 * @return exports map of the given resource
-	 */
-	private Map getExportsMap(Resource resource) {
-		return (Map) exports.get(resource);
-	}
-
-	/**
-	 * Registers a reference updating the imports and exports maps accordingly.
-	 * 
-	 * @param referencer
-	 *            the referencing resource
-	 * @param referenced
-	 *            the referenced resouce
-	 */
-	private void registerReference(final Resource referencer,
-			final Resource referenced) {
-
-		if ((referencer != null) && (referenced != null)
-				&& (referencer != referenced)) {
-
-			Map importsMap = getImportsMap(referencer);
-
-			if (importsMap == null) {
-				importsMap = new HashMap();
-				imports.put(referencer, importsMap);
-			}
-
-			Counter importsCount = (Counter) importsMap.get(referenced);
-
-			if (importsCount == null) {
-
-				importsCount = new Counter();
-				importsMap.put(referenced, importsCount);
-
-				importAdded(referencer, referenced);
-			} else {
-				importsCount.inc();
-			}
-
-			Map exportsMap = getExportsMap(referenced);
-
-			if (exportsMap == null) {
-				exportsMap = new HashMap();
-				exports.put(referenced, exportsMap);
-			}
-
-			Counter exportsCount = (Counter) exportsMap.get(referencer);
-
-			if (exportsCount == null) {
-
-				exportsCount = new Counter();
-				exportsMap.put(referencer, exportsCount);
-
-				exportAdded(referenced, referencer);
-			} else {
-				exportsCount.inc();
-			}
-		}
-	}
-
-	/**
-	 * Hook to be implemented by subclasses upon the establishment of a new
-	 * import of the <code>referenced</code> resource by the
-	 * <code>referencer</code>. This implementation does nothing; subclasses
-	 * need not call <code>super</code>.
-	 * 
-	 * @param referencer
-	 *            the referencing resource (doing the importing)
-	 * @param referenced
-	 *            the resource that it references
-	 */
-	protected void importAdded(Resource referencer, Resource referenced) {
-		// subclass hook
-	}
-
-	/**
-	 * Hook to be implemented by subclasses upon the elimination of an import of
-	 * the <code>referenced</code> resource by the <code>referencer</code>.
-	 * This implementation does nothing; subclasses need not call
-	 * <code>super</code>.
-	 * 
-	 * @param referencer
-	 *            the formerly referencing resource (doing the importing)
-	 * @param referenced
-	 *            the resource that it had referenced
-	 */
-	protected void importRemoved(Resource referencer, Resource referenced) {
-		// subclass hook
-	}
-
-	/**
-	 * Hook to be implemented by subclasses upon the establishment of a new
-	 * export of the <code>referenced</code> resource to the
-	 * <code>referencer</code>. This implementation does nothing; subclasses
-	 * need not call <code>super</code>.
-	 * 
-	 * @param referenced
-	 *            the resource being referenced (doing the exporting)
-	 * @param referencer
-	 *            the referencing resource
-	 */
-	protected void exportAdded(Resource referenced, Resource referencer) {
-		// subclass hook
-	}
-
-	/**
-	 * Hook to be implemented by subclasses upon the elimination of an export of
-	 * the <code>referenced</code> resource to the <code>referencer</code>.
-	 * This implementation does nothing; subclasses need not call
-	 * <code>super</code>.
-	 * 
-	 * @param referenced
-	 *            the resource formerly being referenced (doing the exporting)
-	 * @param referencer
-	 *            the formerly referencing resource
-	 */
-	protected void exportRemoved(Resource referenced, Resource referencer) {
-		// subclass hook
-	}
-
-	/**
-	 * Deregisters a reference updating the imports and exports maps
-	 * accordingly.
-	 * 
-	 * @param referencer
-	 *            the referencing resource
-	 * @param referenced
-	 *            the referenced resource
-	 */
-	private void deregisterReference(final Resource referencer,
-			final Resource referenced) {
-
-		if ((referencer != null) && (referenced != null)
-				&& (referencer != referenced)) {
-
-			Map importsMap = getImportsMap(referencer);
-
-			if (importsMap != null) {
-
-				Counter importsCount = (Counter) importsMap.get(referenced);
-
-				if ((importsCount != null) && importsCount.dec()) {
-
-					importsMap.remove(referenced);
-
-					importRemoved(referencer, referenced);
-
-					if (importsMap.isEmpty()) {
-						imports.remove(referencer);
-					}
-				}
-			}
-
-			Map exportsMap = getExportsMap(referenced);
-
-			if (exportsMap != null) {
-
-				Counter exportsCount = (Counter) exportsMap.get(referencer);
-
-				if ((exportsCount != null) && exportsCount.dec()) {
-
-					exportsMap.remove(referencer);
-
-					exportRemoved(referenced, referencer);
-
-					if (exportsMap.isEmpty()) {
-						exports.remove(referenced);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Cleans up a resource from the imports and exports maps.
-	 * 
-	 * @param referencer
-	 *            the referencing resource
-	 */
-	private void deregisterReferences(final Resource referencer) {
-
-		Object[] resImports = getImports(referencer).toArray();
-
-		for (int i = 0; i < resImports.length; i++) {
-
-			final Resource referenced = (Resource) resImports[i];
-
-			Map importsMap = getImportsMap(referencer);
-
-			if (importsMap != null) {
-
-				importsMap.remove(referenced);
-
-				importRemoved(referencer, referenced);
-
-				if (importsMap.isEmpty()) {
-					imports.remove(referencer);
-				}
-			}
-
-			Map exportsMap = getExportsMap(referenced);
-
-			if (exportsMap != null) {
-
-				exportsMap.remove(referencer);
-
-				exportRemoved(referenced, referencer);
-
-				if (exportsMap.isEmpty()) {
-					exports.remove(referenced);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns a Set of EObjects that reference the given EObject. If an
-	 * EReference is specified, the scope of the search is limited only to that
-	 * EReference. To include all references specify a value of null. If an
-	 * EClass type is specified, the returned Set will only include those
-	 * referencers that match the given type. To include all types specify a
-	 * value of null.
-	 * 
-	 * @param referenced
-	 *            the referenced EObject
-	 * @param reference
-	 *            the reference to find referencers on, null for any reference
-	 * @param type
-	 *            the type of the referencers, use null for any type
-	 * @return a Set of referencers
-	 */
-	public Set getInverseReferencers(EObject referenced, EReference reference,
-			EClass type) {
-		return getReferencers(getInverseReferences(referenced), reference, type);
-	}
-
-	/**
-     * Like the {@link #getInverseReferencers(EObject, EReference, EClass)} method,
-     * obtains referencing objects (optionally filtered by reference and type),
-     * except that it additionally only considers references that are
-     * {@linkplain EStructuralFeature#isChangeable() changeable} and can
-     * {@linkplain EReference#isResolveProxies() reference other resources}.
-     * 
-     * @param referenced
-     *            the referenced EObject
-     * @param reference
-     *            the reference to find referencers on, null for any reference
-     * @param type
-     *            the type of the referencers, use null for any type
-     * @return a Set of referencers on potentially cross-resource references
-     */
-    public Set getInverseReferencersCrossResource(EObject referenced, EReference reference,
-            EClass type) {
-        return getReferencers(getInverseReferencesCrossResource(referenced), reference, type);
-    }
-    
-
-	/**
-     * Like the {@link #getInverseReferences(EObject)} method,
-     * obtains settings implementing references to the specified object,
-     * except that it only considers references that are
-     * {@linkplain EStructuralFeature#isChangeable() changeable} and can
-     * {@linkplain EReference#isResolveProxies() reference other resources}.
-     * 
-     * @param eObject the referenced EObject
-     * 
-     * @return a collection of {@link EStructuralFeature.Setting}s on
-     *     potentially cross-resource references
-     */
-    public Collection getInverseReferencesCrossResource(EObject eObject) {
-        return getInverseReferencesCrossResource(eObject, !resolve());
-    }
-
-	/**
-	 * Returns a Set of EObjects that reference the given EObject through a uni
-	 * directional EReferences. If an EReference is specified, the scope of the
-	 * search is limited only to that EReference. To include all references
-	 * specify a value of null. If an EClass type is specified, the returned Set
-	 * will only include those referencers that match the given type. To include
-	 * all types specify a value of null.
-	 * 
-	 * @param referenced
-	 *            the referenced EObject
-	 * @param reference
-	 *            the reference to find referencers on, null for any reference
-	 * @param type
-	 *            the type of the referencers, use null for any type
-	 * @return a Set of referencers
-	 */
-	public Set getNonNavigableInverseReferencers(EObject referenced,
-			EReference reference, EClass type) {
-		return getReferencers(getNonNavigableInverseReferences(referenced),
-				reference, type);
-	}
-
-	/**
-	 * Extracts the EObjects from the EStructuralFeature.Setting references and
-	 * returns a filtered Set based on the given reference and type.
-	 * 
-	 * @param references
-	 *            a collection of EStructuralFeature.Setting
-	 * @param reference
-	 *            the reference to find referencers on, null for any reference
-	 * @param type
-	 *            the type of the referencers, use null for any type
-	 * @return a Set of referencers
-	 */
-	private Set getReferencers(Collection references, EReference reference,
-			EClass type) {
-		Set set = new HashSet();
-		if (!references.isEmpty()) {
-			for (Iterator iter = references.iterator(); iter.hasNext();) {
-				Setting setting = (Setting) iter.next();
-				if (reference == null
-						|| reference == setting.getEStructuralFeature()) {
-					EObject referencer = setting.getEObject();
-					if (referencer != null
-							&& (type == null || type.isInstance(referencer))) {
-						set.add(referencer);
-					}
-				}
-			}
-		}
-		return set;
-	}
-
-	/**
-	 * Searches the adapter list of the given Notifier for a
-	 * CrossReferenceAdapter. If not found, returns null.
-	 * 
-	 * @param notifier
-	 *            the notifier to search
-	 * @return the CrossReferenceAdapter if found, otherwise null
-	 */
-	public static CrossReferenceAdapter getExistingCrossReferenceAdapter(
-			Notifier notifier) {
-		if (notifier == null) {
-			return null;
-		}
-
-		List adapters = notifier.eAdapters();
-
-		for (int i = 0, size = adapters.size(); i < size; ++i) {
-			Adapter adapter = (Adapter) adapters.get(i);
-			if (adapter instanceof CrossReferenceAdapter) {
-				return (CrossReferenceAdapter) adapter;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Obtains the cross-reference adapter for the specified resource set, if
-	 * necessary creating it and attaching it.
-	 * 
-	 * @param resourceSet
-	 *            the resource set
-	 * 
-	 * @return the resourceSet's cross-reference adapter
-	 */
-	public static CrossReferenceAdapter getCrossReferenceAdapter(
-			ResourceSet resourceSet) {
-		if (resourceSet == null) {
-			return null;
-		}
-
-		CrossReferenceAdapter result = getExistingCrossReferenceAdapter(resourceSet);
-
-		if (result == null) {
-			result = new CrossReferenceAdapter();
-			resourceSet.eAdapters().add(result);
-		}
-
-		return result;
-	}
-
-	/**
-	 * A mutable integer used to count number of object-level references between
-	 * two resources.
-	 * 
-	 * @author Christian W. Damus (cdamus)
-	 */
-	private static final class Counter {
-		private int value = 1;
-
-		Counter() {
-			super();
-		}
-
-		/**
-		 * Obtains my value.
-		 * 
-		 * @return my count
-		 */
-		int getValue() {
-			return value;
-		}
-
-		/**
-		 * Increments me.
-		 */
-		void inc() {
-			value++;
-		}
-
-		/**
-		 * Decrements me.
-		 * 
-		 * @return <code>true</code> if I am now zero; <code>false</code>,
-		 *         otherwise
-		 */
-		boolean dec() {
-			return --value <= 0;
-		}
-	}
-
-	protected boolean resolve() {
-		return this.resolve;
-	}
-
-	public Collection getInverseReferences(EObject eObject, boolean _resolve) {
-		Collection result = new ArrayList();
-
-		if (_resolve) {
-			resolveAll(eObject);
-		}
-
-		EObject eContainer = eObject.eContainer();
-		if (eContainer != null) {
-			result.add(((InternalEObject) eContainer).eSetting(eObject
-					.eContainmentFeature()));
-		}
-
-		Collection nonNavigableInverseReferences = (Collection) inverseCrossReferencer
-				.get(eObject);
-		if (nonNavigableInverseReferences != null) {
-			result.addAll(nonNavigableInverseReferences);
-		}
-
-		for (Iterator i = eObject.eClass().getEAllReferences().iterator(); i
-				.hasNext();) {
-			EReference eReference = (EReference) i.next();
-			EReference eOpposite = eReference.getEOpposite();
-			if (eOpposite != null && !eReference.isContainer()
-					&& !eReference.isContainment()
-					&& eObject.eIsSet(eReference)) {
-				if (FeatureMapUtil.isMany(eObject, eReference)) {
-					Object collection = eObject.eGet(eReference);
-					for (Iterator j = resolve() ? ((Collection) collection)
-							.iterator() : ((InternalEList) collection)
-							.basicIterator(); j.hasNext();) {
-						InternalEObject referencingEObject = (InternalEObject) j
-								.next();
-						result.add(referencingEObject.eSetting(eOpposite));
-					}
-				} else {
-					// although the reference is set, the value could be null
-					InternalEObject referencingEObject = ((InternalEObject) eObject
-							.eGet(eReference, resolve()));
-					if (referencingEObject != null) {
-						result.add(referencingEObject.eSetting(eOpposite));
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Computes the references defined by the specified EClass that are
-	 * {@linkplain EStructuralFeature#isChangeable() changeable}.
-	 * 
-	 * @param eCls an EClass
-	 * @return a list of its {@link EReference}s that are changeable
-	 */
-    private static List getCrossReferencesChangeableFeatures(EClass eCls) {
-        List features = (List) eClassToChangeableFeatures.get(eCls);
-        if (features == null) {
-            features = nullList;
-            EStructuralFeature[] crossReferenceFeatures =
-
-            ((EClassImpl.FeatureSubsetSupplier) eCls
-                .getEAllStructuralFeatures()).crossReferences();
-            if (crossReferenceFeatures != null) {
-                features = new ArrayList(crossReferenceFeatures.length);
-                for (int i = 0; i < crossReferenceFeatures.length; i++) {
-                    EStructuralFeature feature = crossReferenceFeatures[i];
-                    if (isMutable(feature))
-                        features.add(feature);
-                }
-            }
-            eClassToChangeableFeatures.put(eCls, features);
-        }
-        return features != nullList ? features
-            : null;
-    }
-
-    /**
-     * Queries whether a feature is mutable.  A feature is considered
-     * mutable if and only if it is changeable and it is either not derived
-     * or it is a member of a feature map (though not itself a feature map).
-     * 
-     * @param feature the feature to test
-     * 
-     * @return <code>true</code> if the reference is mutable;
-     *     <code>false</code>, otherwise
-     */
-    static boolean isMutable(EStructuralFeature feature) {
-        boolean result = feature.isChangeable();
-        
-        if (result) {
-            if (feature.isDerived()) {
-                // check whether it is a feature-map member that is not, itself,
-                //    a feature map
-                EStructuralFeature group = ExtendedMetaData.INSTANCE.getGroup(feature);
-                
-                result = (group != null) && !FeatureMapUtil.isFeatureMap(feature);
-            }
-        }
-        
-        return result;
-    }
-
-	/**
-	 * An iterator over the references defined by the specified EObject that
-	 * are {@linkplain EStructuralFeature#isChangeable() changeable}.
-	 * 
-	 * @param eObj an EObject
-	 * @return an iterator over its {@link EReference}s that are changeable
-	 */
-    private EContentsEList.FeatureIterator getOptimizedCrossReferenceIterator(
-            EObject eObj) {
-        List features = getCrossReferencesChangeableFeatures(eObj.eClass());
-        if (features != null) {
-            EContentsEList list = null;
-            if (features.size() > 0) {
-                list = new ECrossReferenceEList(eObj,
-                    (EStructuralFeature[]) features
-                        .toArray(new EStructuralFeature[features.size()])) {
-                    // to get to the protected constructor
-                };
-            } else {
-                list = ECrossReferenceEList.EMPTY_CROSS_REFERENCE_ELIST;
-            }
-
-            return (EContentsEList.FeatureIterator) (resolve() ? list
-                .iterator()
-                : ((InternalEList) list).basicIterator());
-        }
-        return (EContentsEList.FeatureIterator) ECrossReferenceEList.EMPTY_CROSS_REFERENCE_ELIST
-            .iterator();
-    }
-
-	/**
-     * Like the {@link #getInverseReferences(EObject, boolean)} method,
-     * obtains settings implementing references to the specified object,
-     * except that it only considers references that are
-     * {@linkplain EStructuralFeature#isChangeable() changeable} and can
-     * {@linkplain EReference#isResolveProxies() reference other resources}.
-     * 
-     * @param eObject the referenced EObject
-     * @param resolve whether to resolve proxies or not
-     * 
-     * @return a collection of {@link EStructuralFeature.Setting}s on
-     *     potentially cross-resource references
-     */
-    public Collection getInverseReferencesCrossResource(EObject eObject, boolean resolve) {
-        Collection result = new ArrayList();
-
-        if (resolve) {
-            resolveAll(eObject);
-        }
-
-        EObject eContainer = eObject.eContainer();
-        if (eContainer != null) {
-            result.add(((InternalEObject) eContainer).eSetting(eObject
-                    .eContainmentFeature()));
-        }
-
-        Collection nonNavigableInverseReferences = (Collection) inverseCrossReferencer
-                .get(eObject);
-        if (nonNavigableInverseReferences != null) {
-            result.addAll(nonNavigableInverseReferences);
-        }
-
-        for (Iterator i = eObject.eClass().getEAllReferences().iterator(); i
-                .hasNext();) {
-            EReference eReference = (EReference) i.next();
-            EReference eOpposite = eReference.getEOpposite();
-            
-            if (eOpposite != null
-            		&& isImportExportCapable(eReference, eObject)
-            		&& eObject.eIsSet(eReference)) {
-                if (FeatureMapUtil.isMany(eObject, eReference)) {
-                    Object collection = eObject.eGet(eReference);
-                    for (Iterator j = resolve() ? ((Collection) collection)
-                            .iterator() : ((InternalEList) collection)
-                            .basicIterator(); j.hasNext();) {
-                        InternalEObject referencingEObject = (InternalEObject) j
-                                .next();
-                        result.add(referencingEObject.eSetting(eOpposite));
-                    }
-                } else {
-                    // although the reference is set, the value could be null
-                    InternalEObject referencingEObject = ((InternalEObject) eObject
-                            .eGet(eReference, resolve()));
-                    if (referencingEObject != null) {
-                        result.add(referencingEObject.eSetting(eOpposite));
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-    
-    /**
-     * Queries whether the specified reference, applied to the given owner
-     * object, is capable of establishing a resource import or export by
-     * virtue of being a mutable cross-resource reference.
-     * <p>
-     * A reference is considered to support resource imports and exports if
-     * all of the following apply:
-     * </p>
-     * <ul>
-     *   <li>the reference is not a container or containment reference.  Note
-     *       that this excludes cross-resource containment from registering
-     *       as an import/export dependency</li>
-     *   <li>the reference resolves proxies</li>
-     *   <li>the reference is changeable</li>
-     * </ul>
-     * 
-     * @param reference a reference feature
-     * @param owner an object under consideration that defines this reference.
-     *     Subclasses may need to introspect the object or its EClass to further
-     *     refine their criteria
-     * 
-     * @return <code>true</code> if this reference in the context of this
-     *     owner should be counted for resource imports and exports;
-     *     false, otherwise
-     */
-   protected boolean isImportExportCapable(EReference reference, EObject owner) {
-    	return !reference.isContainer()
-        	&& !reference.isContainment()
-        	&& reference.isResolveProxies() // can be cross-resource
-        	&& reference.isChangeable();    // not computed
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/EMFCoreUtil.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/EMFCoreUtil.java
deleted file mode 100644
index 00ca0bb..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/EMFCoreUtil.java
+++ /dev/null

@@ -1,673 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCoreDebugOptions;
-import org.eclipse.gmf.runtime.emf.core.internal.plugin.EMFCorePlugin;
-import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;
-import org.eclipse.gmf.runtime.emf.core.internal.util.Util;
-import org.eclipse.gmf.runtime.emf.core.resources.IExtendedResourceFactory;
-import org.eclipse.gmf.runtime.emf.core.resources.IResourceHelper;
-
-
-/**
- * Static utilities for working with EMF objects and resources in the GMF
- * environment.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class EMFCoreUtil {
-
-	/**
-	 * Creates an object at a given containment reference whose
-	 * <code>EClass</code> is eClass.
-	 * 
-	 * @param container
-	 *            The container of the new object.
-	 * @param reference
-	 *            The feature containing the object.
-	 * @param eClass
-	 *            The <code>EClass</code>.
-	 * @return The new <code>EObject</code>.
-	 */
-	public static EObject create(EObject container, EReference reference,
-			EClass eClass) {
-
-		EObject result = null;
-
-		IResourceHelper helper = Util.getHelper(container.eResource());
-		
-		if (helper != null) {
-
-			result = helper.create(eClass);
-
-		} else {
-			result = eClass.getEPackage().getEFactoryInstance().create(eClass);
-		}
-		
-		if (FeatureMapUtil.isMany(container,reference)) {
-			((Collection) container.eGet(reference)).add(result);
-		} else {
-			container.eSet(reference, result);
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Gets the first container with the specified EClass.
-	 * 
-	 * @param eObject
-	 *            The <code>EObject</code>.
-	 * @param eClass
-	 *            The eClass.
-	 * @return The container.
-	 */
-	public static EObject getContainer(EObject eObject, EClass eClass) {
-
-		for (EObject parent = eObject; parent != null; parent = parent
-			.eContainer())
-			if (eClass.isInstance(parent))
-				return parent;
-
-		return null;
-	}
-
-	/**
-	 * Finds the first common container of a collection of objects.
-	 * 
-	 * @param objects
-	 *            The <code>EObject</code>s.
-	 * @param desiredContainerType
-	 *            The desired <code>EClass</code> of the container.
-	 * @return The least common container.
-	 */
-	public static EObject getLeastCommonContainer(Collection objects,
-			EClass desiredContainerType) {
-
-		EObject commonContainer = null;
-
-		List prevContainers = new ArrayList();
-
-		Iterator i = objects.iterator();
-
-		while (i.hasNext()) {
-
-			EObject element = (EObject) i.next();
-			List containers = new ArrayList();
-
-			boolean found = false;
-
-			EObject container = element;
-
-			while (container != null) {
-
-				EClass containerClass = container.eClass();
-
-				if ((desiredContainerType == containerClass)
-					|| (desiredContainerType.isSuperTypeOf(containerClass))) {
-
-					containers.add(container);
-
-					if (!found) {
-
-						if ((prevContainers.isEmpty())
-							|| (commonContainer == null)) {
-							commonContainer = container;
-							found = true;
-
-						} else if ((prevContainers.contains(container))
-							&& (EcoreUtil.isAncestor(container, commonContainer))) {
-
-							commonContainer = container;
-							found = true;
-						}
-					}
-				}
-
-				container = container.eContainer();
-			}
-
-			if (!found)
-				return null;
-
-			prevContainers = containers;
-		}
-
-		return commonContainer;
-	}
-
-	/**
-	 * Uses a reverse reference map that is maintained by the MSL service to
-	 * find all referencers of a particular element. The search can be narrowed
-	 * down by passing the list of Reference features to match.
-	 * <code>features</code> can be null.
-	 * 
-	 * @param eObject
-	 *            The referenced object.
-	 * @param features
-	 *            The reference features.
-	 * @return The collection of referencers.
-	 */
-	public static Collection getReferencers(EObject eObject,
-			EReference[] features) {
-
-		CrossReferenceAdapter crossReferenceAdapter =
-				CrossReferenceAdapter.getExistingCrossReferenceAdapter(eObject);
-
-		if (crossReferenceAdapter == null) {
-			TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(
-				eObject);
-			
-			if (domain != null) {
-				crossReferenceAdapter = CrossReferenceAdapter.getCrossReferenceAdapter(
-					domain.getResourceSet());
-			}
-			
-			if (crossReferenceAdapter == null) {
-				// still null?  Give up
-				return Collections.EMPTY_LIST;
-			}
-		}
-		
-		Collection settings  = crossReferenceAdapter.getInverseReferences(eObject);
-		
-		if (settings.isEmpty() == false) {
-			ArrayList referencers = new ArrayList();
-			int count;
-			if ((features != null) && ((count = features.length) != 0)) {				
-				Iterator it = settings.iterator();
-				while (it.hasNext()) {
-					Setting setting = (Setting) it.next();
-					EStructuralFeature feature = setting
-					.getEStructuralFeature();
-					for(int i = 0; i< count;++i){
-						if (feature == features[i]) {
-							referencers.add(setting.getEObject());
-							break;
-						}						
-					}					
-				}
-			} else {
-				Iterator it = settings.iterator();
-				while (it.hasNext()) {
-					referencers.add(((Setting) it.next()).getEObject());
-				}
-			}
-			return referencers;
-		}
-		return Collections.EMPTY_LIST;
-	}
-	
-	/**
-	 * Gets the imports of a resource.  These are the resources to which this
-	 * <code>resource</code> has references.
-	 * 
-	 * @param resource a resource.
-	 * @return the imports of the resource
-	 */
-	public static Collection getImports(Resource resource) {
-		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(resource);
-		
-		if (domain != null) {
-			return CrossReferenceAdapter.getCrossReferenceAdapter(domain.getResourceSet()).getImports(resource);
-		}
-		
-		return Collections.EMPTY_SET;
-	}
-
-	/**
-	 * Gets the exports of a resource.  These are the resources that have
-	 * references to the <code>resource</code>.
-	 * 
-	 * @param resource a resource.
-	 * @return the exports of the resource
-	 */
-	public static Collection getExports(Resource resource) {
-		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(resource);
-		
-		if (domain != null) {
-			return CrossReferenceAdapter.getCrossReferenceAdapter(domain.getResourceSet()).getExports(resource);
-		}
-		
-		return Collections.EMPTY_SET;
-	}
-
-	/**
-	 * Gets the transitive closure of the imports of a resource.  This obtains
-	 * those resources that import the <code>resource</code>, the resources
-	 * that import those, etc.
-	 * 
-	 * @param resource a resource.
-	 * @return the transitive imports of the resource
-	 */
-	public static Collection getTransitiveImports(Resource resource) {
-		Collection result = new HashSet();
-		Collection unload = new HashSet();
-
-		getTransitiveImports(resource, result, unload);
-
-		for (Iterator i = unload.iterator(); i.hasNext();) {
-			((Resource) i.next()).unload();
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Helper method to recursively compute transitive imports of a resource.
-	 */
-	private static void getTransitiveImports(Resource resource, Collection imports,
-			Collection unload) {
-
-		if (!resource.isLoaded()) {
-
-			try {
-				resource.load(Collections.EMPTY_MAP);
-			} catch (Exception e) {
-				// ignore resources that fail to load.
-			}
-
-			unload.add(resource);
-		}
-
-		Collection directImports = getImports(resource);
-
-		for (Iterator i = directImports.iterator(); i.hasNext();) {
-
-			Resource directImport = (Resource) i.next();
-
-			if (!imports.contains(directImport)) {
-
-				imports.add(directImport);
-
-				getTransitiveImports(directImport, imports, unload);
-			}
-		}
-	}
-
-	/**
-	 * Gets the transitive closure of the exports of a resource.  This obtains
-	 * those resources that export the <code>resource</code>, the resources
-	 * that export those, etc.
-	 * 
-	 * @param resource a resource.
-	 * @return the transitive exports of the resource
-	 */
-	public static Collection getTransitiveExports(Resource resource) {
-		Collection result = new HashSet();
-		Collection unload = new HashSet();
-
-		getTransitiveExports(resource, result, unload);
-
-		for (Iterator i = unload.iterator(); i.hasNext();) {
-			((Resource) i.next()).unload();
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Helper method to recursively compute transitive imports of a resource.
-	 */
-	private static void getTransitiveExports(Resource resource, Collection exports,
-			Collection unload) {
-
-		if (!resource.isLoaded()) {
-
-			try {
-				resource.load(Collections.EMPTY_MAP);
-			} catch (Exception e) {
-				// ignore resources that fail to load.
-			}
-
-			unload.add(resource);
-		}
-
-		Collection directExports = getExports(resource);
-
-		for (Iterator i = directExports.iterator(); i.hasNext();) {
-
-			Resource directExport = (Resource) i.next();
-
-			if (!exports.contains(directExport)) {
-
-				exports.add(directExport);
-
-				getTransitiveExports(directExport, exports, unload);
-			}
-		}
-	}
-
-	/**
-	 * Gets the name of an object if the object has name, returns an empty
-	 * string otherwise.
-	 * 
-	 * @param eObject
-	 *            The object.
-	 * @return The object's name.
-	 */
-	public static String getName(EObject eObject) {
-
-		if (eObject.eIsProxy())
-			return getProxyName(eObject);
-
-		EAttribute nameAttribute = PackageUtil.getNameAttribute(eObject
-			.eClass());
-
-		if (nameAttribute != null) {
-
-			String name = (String) eObject.eGet(nameAttribute);
-
-			if (name != null)
-				return name;
-		}
-
-		return EMFCoreConstants.EMPTY_STRING;
-	}
-	
-	private static String getProxyName(EObject proxy) {
-
-		URI uri = EcoreUtil.getURI(proxy);
-
-		Resource.Factory factory = Resource.Factory.Registry.INSTANCE
-			.getFactory(uri);
-
-		String result = null;
-		
-		if (factory instanceof IExtendedResourceFactory) {
-			result = ((IExtendedResourceFactory) factory).getProxyName(proxy);
-		}
-		
-		if (result == null) {
-			// default algorithm
-			
-			result = EMFCoreConstants.EMPTY_STRING;
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Sets the name of an object if the object can be assigned a name.
-	 * 
-	 * @param eObject
-	 *            The object.
-	 * @param name
-	 *            The object's new name.
-	 *            
-	 * @throws IllegalArgumentException if the <code>eObject</code> does not
-	 *     have a name attribute
-	 */
-	public static void setName(EObject eObject, String name) {
-
-		EAttribute nameAttribute = PackageUtil.getNameAttribute(eObject
-			.eClass());
-
-		if (nameAttribute != null) {
-
-			eObject.eSet(nameAttribute, name);
-
-		} else {
-
-			RuntimeException e = new IllegalArgumentException(
-				"object has no name attribute"); //$NON-NLS-1$
-
-			Trace.throwing(EMFCorePlugin.getDefault(),
-				EMFCoreDebugOptions.EXCEPTIONS_THROWING, EMFCoreUtil.class,
-				"setName", e); //$NON-NLS-1$
-
-			throw e;
-		}
-	}
-
-	/**
-	 * Gets the fully qualified name of an object.
-	 * 
-	 * @param eObject
-	 *            The object.
-	 * @param formatted
-	 *            if True, unnamed parents will be listed using their meta-class
-	 *            name.
-	 * @return The object's qualified name.
-	 */
-	public static String getQualifiedName(EObject eObject, boolean formatted) {
-
-		if (eObject.eIsProxy())
-			return getProxyQualifiedName(eObject);
-
-		if (!formatted) {
-
-			EAttribute qNameAttribute = PackageUtil.getQualifiedNameAttribute(
-				eObject.eClass());
-
-			if (qNameAttribute != null) {
-
-				String qualifiedName = (String) eObject.eGet(qNameAttribute);
-
-				if (qualifiedName != null)
-					return qualifiedName;
-				else
-					return EMFCoreConstants.EMPTY_STRING;
-			}
-		}
-
-		String prefix = EMFCoreConstants.EMPTY_STRING;
-
-		EObject eContainer = eObject.eContainer();
-
-		while ((eContainer != null) && (eContainer instanceof EAnnotation))
-			eContainer = eContainer.eContainer();
-
-		if (eContainer != null)
-			prefix = getQualifiedName(eContainer, formatted);
-
-		String name = getName(eObject);
-
-		if ((formatted) && (name.equals(EMFCoreConstants.EMPTY_STRING)))
-			name = EMFCoreConstants.META_CLASS_BEGIN
-				+ PackageUtil.getLocalizedName(eObject.eClass())
-				+ EMFCoreConstants.META_CLASS_END;
-
-		return (prefix.length() == 0) ? name
-			: (prefix + ((name.equals(EMFCoreConstants.EMPTY_STRING)) ? EMFCoreConstants.EMPTY_STRING
-				: (EMFCoreConstants.QUALIFIED_NAME_SEPARATOR + name)));
-	}
-
-	private static String getProxyQualifiedName(EObject proxy) {
-
-		URI uri = EcoreUtil.getURI(proxy);
-
-		Resource.Factory factory = Resource.Factory.Registry.INSTANCE
-			.getFactory(uri);
-
-		String result = null;
-		
-		if (factory instanceof IExtendedResourceFactory) {
-			result = ((IExtendedResourceFactory) factory).getProxyQualifiedName(proxy);
-		}
-		
-		if (result == null) {
-			// default algorithm
-			
-			result = EMFCoreConstants.EMPTY_STRING;
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Gets the proxy ID by parsing the proxy URI.
-	 * 
-	 * @param proxy
-	 *            The proxy object.
-	 * @return The ID.
-	 */
-	public static String getProxyID(EObject proxy) {
-
-		if (proxy == null) {
-			return EMFCoreConstants.EMPTY_STRING;
-		}
-		
-		if (!proxy.eIsProxy() && (proxy.eResource() instanceof XMLResource)) {
-			XMLResource res = (XMLResource) proxy.eResource();
-			
-			if (res == null) {
-				return EMFCoreConstants.EMPTY_STRING;
-			} else {
-                String id =  res.getID(proxy);
-                // if the object had no ID then the best we can do is to return the URI Fragment
-                if (id ==null || id.length() ==0){
-                    return res.getURIFragment(proxy);
-                }
-            }
-		}
-		
-		URI uri = EcoreUtil.getURI(proxy);
-
-		Resource.Factory factory = Resource.Factory.Registry.INSTANCE
-			.getFactory(uri);
-
-		String result = null;
-		
-		if (factory instanceof IExtendedResourceFactory) {
-			result = ((IExtendedResourceFactory) factory).getProxyID(proxy);
-		}
-
-		if (result == null) {
-			// default implementation
-			
-			result = Util.getProxyID(proxy);
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Gets the proxy class by parsing the proxy URI.
-	 * 
-	 * @param proxy
-	 *            The proxy object.
-	 * @return The class.
-	 */
-	public static EClass getProxyClass(EObject proxy) {
-
-		if (proxy == null) {
-			return null;
-		}
-		
-		if (!proxy.eIsProxy()) {
-			return proxy.eClass();
-		}
-		
-		URI uri = EcoreUtil.getURI(proxy);
-
-		Resource.Factory factory = Resource.Factory.Registry.INSTANCE
-			.getFactory(uri);
-
-		String id = null;
-		
-		if (factory instanceof IExtendedResourceFactory) {
-			id = ((IExtendedResourceFactory) factory).getProxyClassID(proxy);
-		}
-		
-		if (id == null) {
-			// default algorithm
-			
-			id = PackageUtil.getID(proxy.eClass());
-		}
-
-		if (id != null) {
-
-			ENamedElement element = PackageUtil.getElement(id);
-
-			if ((element != null) && (element instanceof EClass))
-				return (EClass) element;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Creates a proxy of the specified type with the specified proxy URI.
-	 * 
-	 * @param classID
-	 *            The type of proxy to create.
-	 * @param uri
-	 *            The URI for the new proxy.
-	 * @return The new proxy.
-	 */
-	public static EObject createProxy(EClass eClass, URI uri) {
-		InternalEObject proxy = (InternalEObject) eClass.getEPackage()
-			.getEFactoryInstance().create(eClass);
-		proxy.eSetProxyURI(uri);
-
-		return proxy;
-	}
-
-	/**
-	 * Attempts to resolve the specified <code>proxy</code> object, returning
-	 * <code>null</code> (rather than the original proxy) if it is unresolvable.
-	 * 
-	 * @param domain
-	 *            Th editing domain.
-	 * @param proxy
-	 *            The proxy object.
-	 * @return The resolved object, or <code>null</code> if not resolved
-	 */
-	public static EObject resolve(TransactionalEditingDomain domain,
-			EObject proxy) {
-
-		if (proxy == null)
-			return null;
-
-		if (!proxy.eIsProxy())
-			return proxy;
-
-		URI uri = EcoreUtil.getURI(proxy);
-
-		Resource.Factory factory = Resource.Factory.Registry.INSTANCE
-			.getFactory(uri);
-
-		if (factory instanceof IExtendedResourceFactory) {
-			return ((IExtendedResourceFactory) factory).resolve(domain, proxy);
-		}
-		
-		// the default algorithm
-		
-		return Util.resolve(domain, proxy);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/EObjectAdapter.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/EObjectAdapter.java
deleted file mode 100644
index f5c4aee..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/EObjectAdapter.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.util;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.common.core.util.Proxy;
-
-/**
- * Wraps an {@link EObject} to adapt it to the {@link IAdaptable} Eclipse
- * platform API.  This is useful for passing <code>EObject</code>s into
- * APIs that consume adaptables.
- * <p>
- * See the {@link #getAdapter(Class)} method for the supported adaptations.
- * <b>Note</b> that this implementation does not consult the Eclipse platform's
- * adapter factory manager for registered adapters.
- * </p>
- * <p>
- * <b>Note</b> that this class is not intended to be extended
- * by clients.  Clients may instantiate it.
- * </p>
- * 
- * @author Anthony Hunter
- * 
- * @see #getAdapter(Class) 
- */
-public class EObjectAdapter extends Proxy implements IAdaptable, IProxyEObject {
-
-	public EObjectAdapter(EObject element) {
-		super(element);
-	}
-	
-	/**
-	 * Returns the wrapped {@link EObject} as the adapter when possible.
-	 * The following adaptations are supported:
-	 * <ul>
-	 *   <li>if the wrapped <code>EObject</code> conforms to the
-	 *       <code>adapter</code> type, then it is returned</li>
-	 *   <li>if this adapter, itself, conforms to the <code>adapter</code>
-	 *       type, then it is returned</li>
-	 *   <li>otherwise, there is no adapter (<code>null</code> returned)</li>
-	 * </ul>
-	 */
-	public Object getAdapter(Class adapter) {
-	    if ( adapter.isInstance(getRealObject() )) {
-	        return getRealObject();
-	    }
-	    if ( adapter.isInstance(this) ) {
-	        return this;
-	    }
-		return null;
-	}
-	
-    public final Object getProxyClassID() {
-        return PackageUtil.getID(EMFCoreUtil.getProxyClass((EObject)getRealObject()));
-    }	
-	
-    public final EObject resolve() {
-    	// there is no editing domain or resource set context available in
-    	//    which to attempt to resolve the proxy, so if it wasn't already
-    	//    resolved, we can only return null
-    	EObject eObject = (EObject) getRealObject();
-    	
-        return eObject.eIsProxy()? null : eObject;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/IProxyEObject.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/IProxyEObject.java
deleted file mode 100644
index cf2de34..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/IProxyEObject.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.util;
-
-import org.eclipse.emf.ecore.EObject;
-
-
-
-/**
- * Utility interface that provides proxy information; it is typically provided
- * by an {@linkplain org.eclipse.core.runtime.IAdaptable adapter} for some
- * instance of an EMF metaclass ({@link org.eclipse.emf.ecore.EClass}).
- * <p>
- * This interface may be implemented by clients.
- * </p>
- * 
- * @author mhanner
- */
-public interface IProxyEObject {
-
-    /**
-     * Obtains the ID (fully-qualified name) of the
-     * {@link org.eclipse.emf.ecore.EClass} of the proxy object.
-     * 
-     * @return the <code>EClass</code> ID (must not be <code>null</code>)
-     * 
-     * @see ProxyUtil#getProxyClassID(EObject)
-     */
-    Object getProxyClassID();
-    
-    /**
-     * Resolves the proxy.
-     * 
-     * @return the resolved object, or <code>null</code> if the proxy could not
-     *     be resolved
-     * 
-     * @see ProxyUtil#resolve(EObject)
-     */
-    EObject resolve();
-}

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/PackageUtil.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/PackageUtil.java
deleted file mode 100644
index 3a19770..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/PackageUtil.java
+++ /dev/null

@@ -1,328 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.core.util;
-
-import java.lang.ref.WeakReference;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.core.internal.util.MetamodelManager;
-import org.eclipse.gmf.runtime.emf.core.internal.util.Util;
-
-/**
- * Some utility functions that work at the meta-class level.
- * 
- * @author rafikj
- */
-public class PackageUtil {
-	/**
-	 * Mapping of {@link EClass} ==&gt; name {@link EAttribute}.  Use a weak
-	 * map to allow reclamation of dynamically-generated Ecore models; in order
-	 * for this to work, the keys are also weak refs.
-	 */
-	private static final Map NAME_ATTRIBUTES = new java.util.WeakHashMap();
-	
-	/**
-	 * Mapping of {@link EClass} ==&gt; qualified name {@link EAttribute}.
-	 * Use a weak map to allow reclamation of dynamically-generated Ecore
-	 * models; in order for this to work, the keys are also weak refs.
-	 */
-	private static final Map QNAME_ATTRIBUTES = new java.util.WeakHashMap();
-	
-	/**
-	 * Gets the ID of a meta-model element. The ID of a meta-model element is
-	 * the fully qualified name of the element going up to the root EPackage.
-	 * 
-	 * @param element
-	 *            The Meta-model element.
-	 * @return The ID.
-	 */
-	public static String getID(ENamedElement element) {
-		return MetamodelManager.getID(element);
-	}
-
-	/**
-	 * Gets meta-model element by ID.
-	 * 
-	 * @param id
-	 *            The element ID.
-	 * @return The meta-model element.
-	 */
-	public static ENamedElement getElement(String id) {
-		return MetamodelManager.getElement(id);
-	}
-
-	/**
-	 * Gets the localized name of a meta-model element. The name will not
-	 * contain spaces.
-	 * 
-	 * @param element
-	 *            The meta-model element.
-	 * @return The localized name of the meta-model element.
-	 */
-	public static String getLocalizedName(ENamedElement element) {
-		return MetamodelManager.getLocalName(element);
-	}
-
-	/**
-	 * Gets the localized display name of a meta-model element. Display name may
-	 * contain spaces.
-	 * <p>
-	 * NOTE: This should be used to make model changes (e.g. name an element).
-	 * When displaying strings in the UI (menus, dialogs, etc.) get the string
-	 * from one of our resource managers.
-	 * </p>
-	 * 
-	 * @param element
-	 *            The meta-model element.
-	 * @return The localized name of the meta-model element.
-	 */
-	public static String getDisplayName(ENamedElement element) {
-		return MetamodelManager.getDisplayName(element);
-	}
-
-	/**
-	 * Checks if a container <code>EClass</code> can contain another
-	 * <code>EClass</code>. The check can be recursive.
-	 * 
-	 * @param class1
-	 *            The container <code>EClass</code>.
-	 * @param class2
-	 *            The contained <code>EClass</code>.
-	 * @param recursive
-	 *            True if recursive.
-	 * @return True if an object can contain other objects of a given type.
-	 */
-	public static boolean canContain(EClass class1, EClass class2,
-			boolean recursive) {
-		return Util.canContain(class1, class2, recursive ? (new HashSet())
-			: null);
-	}
-
-	/**
-	 * Checks if a container <code>EClass</code> can contain another
-	 * <code>EClass</code> at a given containment reference. The check can be
-	 * recursive.
-	 * 
-	 * @param class1
-	 *            The container <code>EClass</code>.
-	 * @param reference
-	 *            The reference.
-	 * @param class2
-	 *            The contained <code>EClass</code>.
-	 * @param recursive
-	 *            True if recursive.
-	 * @return True if an object can contain other objects of a given type.
-	 */
-	public static boolean canContain(EClass class1, EReference reference,
-			EClass class2, boolean recursive) {
-
-		if ((reference.isContainment())
-			&& (class1.getEAllReferences().contains(reference))) {
-
-			EClass eType = (EClass) reference.getEType();
-
-			if ((eType.equals(class2)) || (eType.isSuperTypeOf(class2))) {
-
-				return true;
-			}
-		}
-
-		if (recursive) {
-
-			if (reference.isContainment()) {
-
-				EClass eType = (EClass) reference.getEType();
-
-				if (canContain(eType, class2, true))
-					return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if a container <code>EClass</code> can reference another
-	 * <code>EClass</code>.
-	 * 
-	 * @param class1
-	 *            The referencer <code>EClass</code>.
-	 * @param class2
-	 *            The referenced <code>EClass</code>.
-	 * @return True if an object can contain other objects of a given type.
-	 */
-	public static boolean canReference(EClass class1, EClass class2) {
-
-		Iterator i = class1.getEAllReferences().iterator();
-
-		while (i.hasNext()) {
-
-			EReference reference = (EReference) i.next();
-
-			if (!reference.isContainment()) {
-
-				EClass eType = (EClass) reference.getEType();
-
-				if ((eType.equals(class2)) || (eType.isSuperTypeOf(class2))) {
-
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if a container <code>EClass</code> can reference another
-	 * <code>EClass</code> at a given non-containment reference.
-	 * 
-	 * @param class1
-	 *            The referencer <code>EClass</code>.
-	 * @param reference
-	 *            The reference.
-	 * @param class2
-	 *            The referenced <code>EClass</code>.
-	 * @return True if an object can contain other objects of a given type.
-	 */
-	public static boolean canReference(EClass class1, EReference reference,
-			EClass class2) {
-
-		if ((!reference.isContainment())
-			&& (class1.getEAllReferences().contains(reference))) {
-
-			EClass eType = (EClass) reference.getEType();
-
-			if ((eType.equals(class2)) || (eType.isSuperTypeOf(class2))) {
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Finds a feature that can contain an object of type eClass.
-	 * 
-	 * @param container
-	 *            The container <code>EClass</code>.
-	 * @param eClass
-	 *            The contained <code>EClass</code>.
-	 * @return The found feature.
-	 */
-	public static EReference findFeature(EClass container, EClass eClass) {
-
-		Iterator i = container.getEAllReferences().iterator();
-
-		while (i.hasNext()) {
-
-			EReference reference = (EReference) i.next();
-
-			if (canContain(container, reference, eClass, false))
-				return reference;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets the name attribute of an <code>EClass</code>.
-	 * 
-	 * @param eClass
-	 *            The <code>EClass</code>.
-	 * @return The name attribute.
-	 */
-	public static EAttribute getNameAttribute(EClass eClass) {
-		
-		EAttribute nameAttribute = null;
-
-		// first, try to get the cached attribute
-		WeakReference ref = (WeakReference) NAME_ATTRIBUTES.get(eClass);
-		if (ref != null) {
-			
-			nameAttribute = (EAttribute) ref.get();
-		} else {
-
-			EStructuralFeature feature = eClass.getEStructuralFeature("name"); //$NON-NLS-1$
-
-			if (feature != null) {
-
-				if (feature instanceof EAttribute) {
-					EClassifier type = feature.getEType();
-
-					if (type != null) {
-
-						if (type.getInstanceClass() == String.class)
-							nameAttribute = (EAttribute) feature;
-					}
-				}
-			}
-			
-			// cache the result, whatever it is.  As long as the key (EClass)
-			//    isn't GCed, then the value (WeakRef) will remain to indicate
-			//    that we have at least cached a null
-			NAME_ATTRIBUTES.put(eClass, new WeakReference(nameAttribute));
-		}
-
-		return nameAttribute;
-	}
-
-	/**
-	 * Gets the qualified name attribute of an <code>EClass</code>.
-	 * 
-	 * @param eClass
-	 *            The <code>EClass</code>.
-	 * @return The qualified name attribute.
-	 */
-	public static EAttribute getQualifiedNameAttribute(EClass eClass) {
-
-		EAttribute nameAttribute = null;
-
-		// first, try to get the cached attribute
-		WeakReference ref = (WeakReference) QNAME_ATTRIBUTES.get(eClass);
-		if (ref != null) {
-			
-			nameAttribute = (EAttribute) ref.get();
-		} else  {
-
-			EStructuralFeature feature = eClass
-				.getEStructuralFeature("qualifiedName"); //$NON-NLS-1$
-
-			if (feature != null) {
-
-				if ((feature instanceof EAttribute)
-					&& (feature.getEType().getInstanceClass() == String.class))
-					nameAttribute = (EAttribute) feature;
-			}
-			
-			// cache the result, whatever it is.  As long as the key (EClass)
-			//    isn't GCed, then the value (WeakRef) will remain to indicate
-			//    that we have at least cached a null
-			QNAME_ATTRIBUTES.put(eClass, new WeakReference(nameAttribute));
-		}
-
-		return nameAttribute;
-	}
-
-	private PackageUtil() {
-		// private
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/package.html b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/package.html
deleted file mode 100644
index 6957a53..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/package.html
+++ /dev/null

@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Miscellaneous utility classes for working with MSL-managed resources, objects,
-and meta-models.
-
-<h2>Package Specification</h2>
-<p>
-Generic utilities for working with EMF artifacts:
-<ul>
-  <li>{@link org.eclipse.gmf.runtime.emf.core.util.EObjectUtil}
-       - for working with <code>EObject</code>s</li>
-  <li>{@link org.eclipse.gmf.runtime.emf.core.util.ProxyUtil}
-       - for working with proxy (unresolved) <code>EObject</code>s</li>
-  <li>{@link org.eclipse.gmf.runtime.emf.core.util.ResourceUtil}
-       - for working with <code>Resource</code>s</li>
-  <li>{@link org.eclipse.gmf.runtime.emf.core.util.MetaModelUtil}
-       - for introspecting the structure of meta-models</li>
-  <li>{@link org.eclipse.gmf.runtime.emf.core.util.EObjectContainmentLoadingEList} and
-      {@link org.eclipse.gmf.runtime.emf.core.util.EObjectContainmentWithInverseLoadingEList}
-       - for implementing containment references that automatically load
-         unloaded separate elements in a logical resource</li>
-</ul>
-</p>
-<p>
-This package also provides the following additional utilities:
-<ul>
-  <li>{@link org.eclipse.core.runtime.IAdaptable} support:  the
-      {@link org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter} class implements
-      an <code>IAdaptable</code> that wraps an
-      {@link org.eclipse.emf.ecore.EObject} to return it as the adapter for the
-      <code>EObject</code> class.  This is useful for passing EMF objects to
-      APIs that consume adaptables</li>
-  <li>{@link org.eclipse.gmf.runtime.emf.core.util.EObjectContainmentUtil} provides
-      a variety of facilities for analyzing with EMF containment trees and
-      <code>EClass</code> hierarchies</li>
-</ul>
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/.classpath b/org.eclipse.gmf.runtime.emf.type.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.emf.type.core/.cvsignore b/org.eclipse.gmf.runtime.emf.type.core/.cvsignore
deleted file mode 100644
index edfb53f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-doc
-org

diff --git a/org.eclipse.gmf.runtime.emf.type.core/.options b/org.eclipse.gmf.runtime.emf.type.core/.options
deleted file mode 100644
index 46d17fe..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.options
+++ /dev/null

@@ -1,14 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.emf.type.core plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.emf.type.core plug-in
-org.eclipse.gmf.runtime.emf.type.core/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting=false

diff --git a/org.eclipse.gmf.runtime.emf.type.core/.project b/org.eclipse.gmf.runtime.emf.type.core/.project
deleted file mode 100644
index 9abb4af..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.type.core</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/org.eclipse.gmf.runtime.emf.type.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.emf.type.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 3675bf5..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.emf.type.core;singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.emf.type.core.commands,
- org.eclipse.gmf.runtime.emf.type.core.edithelper,
- org.eclipse.gmf.runtime.emf.type.core.internal;x-friends:="org.eclipse.gmf.tests.runtime.emf.type.core,org.eclipse.gmf.tests",
- org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;x-friends:="org.eclipse.gmf.tests.runtime.emf.type.core",
- org.eclipse.gmf.runtime.emf.type.core.internal.impl;x-friends:="org.eclipse.gmf.tests.runtime.emf.type.core",
- org.eclipse.gmf.runtime.emf.type.core.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.emf.type.core",
- org.eclipse.gmf.runtime.emf.type.core.requests
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.emf.type.core/about.html b/org.eclipse.gmf.runtime.emf.type.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/build.properties b/org.eclipse.gmf.runtime.emf.type.core/build.properties
deleted file mode 100644
index 61f4273..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               schema/,\
-               .options,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.emf.type.core/plugin.properties b/org.eclipse.gmf.runtime.emf.type.core/plugin.properties
deleted file mode 100644
index e50f5d6..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/plugin.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF EMF Type Core
-Plugin.providerName = Eclipse.org
-
-extPoint.elementTypes = Element Types
-extPoint.elementTypeBindings = Element Type Bindings
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/plugin.xml b/org.eclipse.gmf.runtime.emf.type.core/plugin.xml
deleted file mode 100644
index 44b25e7..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/plugin.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2006  IBM Corporation and others.                 -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-   <extension-point id="elementTypes" name="%extPoint.elementTypes" schema="schema/elementTypes.exsd"/>
-   <extension-point id="elementTypeBindings" name="%extPoint.elementTypeBindings" schema="schema/elementTypeBindings.exsd"/>
-   
-   <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-         <elementTypeFactory
-               factory="org.eclipse.gmf.runtime.emf.type.core.internal.impl.DefaultElementTypeFactory"
-               kind = "org.eclipse.gmf.runtime.emf.type.core.IElementType">
-         </elementTypeFactory>
-        <elementTypeFactory
-               factory="org.eclipse.gmf.runtime.emf.type.core.internal.impl.HintedTypeFactory"
-               kind = "org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-        </elementTypeFactory>
-   </extension>
-   
-</plugin>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/schema/elementTypeBindings.exsd b/org.eclipse.gmf.runtime.emf.type.core/schema/elementTypeBindings.exsd
deleted file mode 100644
index bfbe22b..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/schema/elementTypeBindings.exsd
+++ /dev/null

@@ -1,268 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.emf.type.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.emf.type.core" id="elementTypeBindings" name="GMF Element Type Bindings"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients of the GMF extensible type registry to define &quot;client contexts&quot; that describe the objects that they are interested in editing, and to bind them to element types and advice that they wish to have applied to these objects.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="clientContext" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="binding" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="clientContext">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="id"/>
-         </appInfo>
-         <documentation>
-            &lt;p&gt;
-Definition of a client context, representing a class of
-objects that a client wishes to edit using a set of element types and advice.
-&lt;/p&gt;
-&lt;p&gt;
-A client context can declare an
-&lt;code&gt;&amp;lt;enablement&amp;gt;&lt;/code&gt; expression that matches
-model elements that are included in the context.
-Where that is not sufficient, an alternative is to define
-a matcher class using a &lt;code&gt;&amp;lt;matcher&amp;gt;&lt;/code&gt;
-element.
-&lt;/p&gt;
-         </documentation>
-      </annotation>
-      <complexType>
-         <choice>
-            <element ref="enablement"/>
-            <element ref="matcher"/>
-         </choice>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The unique ID of the client context.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="matcher">
-      <annotation>
-         <documentation>
-            This element is used to specify the class that will determine whether or not an existing model element matches this client context.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class that implements &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.IElementMatcher&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.core.type.IElementMatcher"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="binding">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="context"/>
-         </appInfo>
-         <documentation>
-            &lt;p&gt;
-Declares a binding between a client context and one or more
-element types or advice.  The context can, itself, be declared by the
-same plug-in or by a different plug-in.
-&lt;/p&gt;
-&lt;p&gt;
-The constraints to be bound may be specified by any number of nested &lt;code&gt;&amp;lt;elementType&amp;gt;&lt;/code&gt; and/or &lt;code&gt;&amp;lt;advice&amp;gt;&lt;/code&gt; elements to reference multiple element types and/or advice.
-&lt;/p&gt;
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="elementType" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="advice" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="context" type="string" use="required">
-            <annotation>
-               <documentation>
-                  References the ID of a context that is bound to one or more element types or advice.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="elementType">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="ref"/>
-         </appInfo>
-         <documentation>
-            Includes an element type or a pattern of element type IDs in a client context &lt;code&gt;&amp;lt;binding&amp;gt;&lt;/code&gt;.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="ref" type="string">
-            <annotation>
-               <documentation>
-                  References the ID of an element type to bind the client context to. This attribute may not be used in conjunection with the &lt;code&gt;pattern&lt;/code&gt; attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="pattern" type="string">
-            <annotation>
-               <documentation>
-                  The pattern of element type IDs to be bound. Patterns are regular expressions which match unique identifiers. Please see the Java documentation for java.util.regex.Pattern for further details.  This attribute may not be used in conjunection with the &lt;code&gt;ref&lt;/code&gt; attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="advice">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="ref"/>
-         </appInfo>
-         <documentation>
-            Includes an advice or a pattern of advice IDs in a client context &lt;code&gt;&amp;lt;binding&amp;gt;&lt;/code&gt;.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="ref" type="string">
-            <annotation>
-               <documentation>
-                  References the ID of an advice to bind the client context to. This attribute may not be used in conjunection with the &lt;code&gt;pattern&lt;/code&gt; attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="pattern" type="string">
-            <annotation>
-               <documentation>
-                  The pattern of advice IDs to be bound. Patterns are regular expressions which match unique identifiers. Please see the Java documentation for java.util.regex.Pattern for further details.  This attribute may not be used in conjunection with the &lt;code&gt;ref&lt;/code&gt; attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-Example of a context which only includes &lt;code&gt;EObjects&lt;/code&gt; from the logic example&apos;s editing domain:
-&lt;/p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings&quot;&gt;
-      &lt;clientContext id=&quot;org.eclipse.gmf.examples.runtime.diagram.logic&quot;&gt;
-         &lt;enablement&gt;
-            &lt;test
-               property=&quot;org.eclipse.gmf.runtime.emf.core.editingDomain&quot;
-               value=&quot;org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain&quot;/&gt;
-         &lt;/enablement&gt;
-      &lt;/clientContext&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;p&gt;
-Example of a binding of a single advice to the logic context:
-&lt;/p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings&quot;&gt;
-      &lt;binding context=&quot;org.eclipse.gmf.examples.runtime.diagram.logic&quot;/&gt;
-         &lt;advice ref=&quot;org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents&quot;/&gt;
-      &lt;/binding&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;p&gt;
-Example of binding multiple element types and advice to the logic context:
-&lt;/p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings&quot;&gt;
-      &lt;binding context=&quot;org.eclipse.gmf.examples.runtime.diagram.logic&quot;/&gt;
-         &lt;elementType pattern=&quot;logic.*&quot;/&gt;
-         &lt;advice pattern=&quot;logic.*&quot;/&gt;
-      &lt;/binding&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006  IBM Corporation and others.&lt;br&gt;
- 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 
- &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/schema/elementTypes.exsd b/org.eclipse.gmf.runtime.emf.type.core/schema/elementTypes.exsd
deleted file mode 100644
index 86f0d8c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/schema/elementTypes.exsd
+++ /dev/null

@@ -1,514 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.emf.type.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.emf.type.core" id="elementTypes" name="Element Types"/>
-      </appInfo>
-      <documentation>
-         The &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.elementTypes&lt;/code&gt; extension point is used to define application specializations of metamodel types for the following purposes:
-&lt;OL&gt;
-&lt;LI&gt;extend (but not replace) the basic metamodel editing behaviour for elements that match such  specializations, and&lt;/LI&gt;
-&lt;LI&gt; contribute icons and display names for such specializations&lt;/LI&gt;
-&lt;/OL&gt;
-&lt;P&gt;
-The element type specializations may be used for menu or tool palette items for element creation.
-&lt;P&gt;
-Editing behaviour can be extended by associated an &lt;code&gt;editHelperAdvice&lt;/code&gt; to a specialization, or
-by contributing an &lt;code&gt;adviceBinding&lt;/code&gt; that binds an &lt;code&gt;editHelperAdvice&lt;/code&gt; to an element type.  Edit helper advice is applied &apos;before&apos; and/or &apos;after&apos; the behaviour that is provided by the default metamodel editing behaviour.
-&lt;P&gt;
-Custom element types may be created by declaring an &lt;code&gt;IElementTypeFactory&lt;/code&gt; which is responsible for creating all element types declaring the same &apos;kind&apos; as the factory.  Custom parameters may be associated with element types created this way.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="metamodel" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="elementTypeFactory" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="specializationType" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The extension point name, &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.elementTypes&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The extension ID.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The extension name.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="metamodel">
-      <annotation>
-         <documentation>
-            This element is used to identify the metamodel for which a set of element types and advice bindings are defined.  All eclass and eContainmentFeature values specified in the types must be found within this metamodel.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="metamodelType" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="specializationType" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="adviceBinding" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="nsURI" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The namespace URI of the metamodel.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="elementTypeFactory">
-      <annotation>
-         <documentation>
-            This element is used to contribute a factory that will create element types declaring the same &apos;kind&apos; as the factory.  Custom parameters may be associated with element types created this way.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="factory" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class implementing the &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="kind" type="string" use="required">
-            <annotation>
-               <documentation>
-                  String identifying the kind of element that will be created by this factory.  Element types will declare the same &apos;kind&apos; string if they want to be created by this factory.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="params" type="string">
-            <annotation>
-               <documentation>
-                  Comma separated list of custom parameters supported by this element type factory. Parameter values will be read from the element type element and passed to the factory when they are created.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="metamodelType">
-      <annotation>
-         <documentation>
-            This element is used to define a new metamodel element type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="param" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The unique identifier for this metamodel element type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  The path of this metamodel element type icon, relative to this plugin location.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The I18N display name for this metamodel element type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="eclass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of an &lt;code&gt;EClass&lt;/code&gt; instance from the metamodel specified in the enclosing metamodel element.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="edithelper" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class implementing &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.edit.IEditHelper&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.core.type.IEditHelper"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="kind" type="string">
-            <annotation>
-               <documentation>
-                  The kind of element. Used to identify the &lt;code&gt;IElementTypeFactory&lt;/code&gt; that is used to instantiate the element type.  If it is not specified a default factory will be used to create the element.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="specializationType">
-      <annotation>
-         <documentation>
-            This element is used to define a new specialization element type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="specializes" minOccurs="1" maxOccurs="unbounded"/>
-            <choice>
-               <element ref="matcher"/>
-               <element ref="enablement"/>
-            </choice>
-            <element ref="param" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="eContainer" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The unique specialization edit type identifier.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  The path of this specialization element type icon, relative to this plugin location.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The I18N display name for this specialization element type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="edithelperadvice" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class that implements &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.edit.IEditHelperAdvice&lt;/code&gt;.  This attribute is used to specify the class that provides editing advice for elements of this type. Editing advice can be contributed before and/or after the default editing behaviour.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="kind" type="string">
-            <annotation>
-               <documentation>
-                  The kind of element. Used to identify the &lt;code&gt;IElementTypeFactory&lt;/code&gt; that is used to instantiate the element type.  If it is not specified a default factory will be used to create the element.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="adviceBinding">
-      <annotation>
-         <documentation>
-            This element is used to bind an &lt;code&gt;IEditHelperAdvice&lt;/code&gt; with an element type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <choice>
-               <element ref="matcher"/>
-               <element ref="enablement"/>
-            </choice>
-            <element ref="eContainer"/>
-         </sequence>
-         <attribute name="typeId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The element type identifier.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class that implements &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.edit.IEditHelperAdvice&lt;/code&gt;.  This attribute is used to specify the class that provides editing advice for elements of this type. Editing advice can be contributed before and/or after the default editing behaviour.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="inheritance" use="default" value="none">
-            <annotation>
-               <documentation>
-                  Indicates the related element types that should inherite this advice.  Does not apply to specialization types, which always inherit (all).
-
-&lt;UL&gt;
-&lt;LI&gt;&lt;b&gt;all&lt;/b&gt; - advice is inherited by all metamodel types whose EClasses are subtypes of the metamodel type to which it was applied, and to all specializations of those metamodel types.&lt;/LI&gt;
-
-&lt;LI&gt;&lt;b&gt;none&lt;/b&gt; - advice is not inherited by related metamodel types.  It is applied only to the metatmodel type and its specializations.&lt;/LI&gt;
-&lt;/UL&gt;
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="all">
-                  </enumeration>
-                  <enumeration value="none">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The unique ID of this advice binding.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="specializes">
-      <annotation>
-         <documentation>
-            This element is used to identify another element type (metamodel or specialization) that this type specializes.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Identifier of the metamodel type or specialization type that this type specializes.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="matcher">
-      <annotation>
-         <documentation>
-            This element is used to specify the class that will determine whether or not an existing model element matches this type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class that implements &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core.IElementMatcher&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.core.type.IElementMatcher"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="eContainer">
-      <annotation>
-         <documentation>
-            This element is used to describe the qualities of the container model element for which this edit helper advice is relevant.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="eContainmentFeature" minOccurs="0" maxOccurs="unbounded"/>
-            <choice>
-               <element ref="matcher"/>
-               <element ref="enablement"/>
-            </choice>
-         </sequence>
-      </complexType>
-   </element>
-
-   <element name="eContainmentFeature">
-      <annotation>
-         <documentation>
-            This element is used to specify the containment feature for model elements for which this edit helper advice is relevant.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="qname" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the containment feature qualified by its EClass name.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="param">
-      <annotation>
-         <documentation>
-            A custom parameter name and value pair.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The parameter name.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The parameter value.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         7.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;PRE&gt;
-&lt;extension point=&quot;org.eclipse.gmf.runtime.emf.type.core.elementTypes&quot;&gt;
-   
-        &lt;metamodel
-                nsURI=&quot;http://www.eclipse.org/emf/2002/Ecore&quot;&gt;
-             &lt;metamodelType
-                     id=&quot;org.eclipse.gmf.runtime.emf.type.core.eobject&quot;     
-                     icon=&quot;icons/eobject.gif&quot;
-                     name=&quot;%EObject&quot;
-                     eclass=&quot;EObject&quot;
-                     edithelper =&quot;org.eclipse.gmf.runtime.emf.type.core.EObjectEditHelper&quot;&gt; 
-             &lt;/metamodelType&gt;
- 
-             &lt;specializationType
-                     id=&quot;org.eclipse.gmf.runtime.emf.type.core.special&quot;
-                     icon=&quot;icons/special.gif&quot;
-                     name=&quot;%Special&quot;
-                     edithelperadvice=&quot;org.eclipse.gmf.runtime.emf.type.core.SpecialEditHelperAdvice&quot;&gt; 
-                 &lt;specializes id=&quot;org.eclipse.gmf.runtime.emf.type.core.eobject&quot;/&gt;
-                 &lt;matcher class=&quot;org.eclipse.gmf.runtime.emf.type.core.specialMatcher&quot;/&gt;
-             &lt;/specializationType&gt;
- 
-             &lt;specializationType
-                     id=&quot;org.eclipse.gmf.runtime.emf.type.core.special2&quot;
-                     icon=&quot;icons/special2.gif&quot;
-                     name=&quot;%Special2&quot;
-                     edithelperadvice=&quot;org.eclipse.gmf.runtime.emf.type.core.Special2EditHelperAdvice&quot;&gt;
-                 &lt;specializes id=&quot;org.eclipse.gmf.runtime.emf.type.core.eobject&quot;/&gt;
-                 &lt;eContainer&gt;
-                     &lt;enablement&gt;
-                         &lt;test property=&quot;special2&quot; value=&quot;special2Value&quot;/&gt;
-                     &lt;/enablement&gt;
-                 &lt;/eContainer&gt;
-                 &lt;enablement&gt;
-                    &lt;test property=&quot;special2&quot; value=&quot;special2Value&quot;/&gt;
-                 &lt;/enablement&gt;
-             &lt;/specializationType&gt;
- 
-             &lt;specializationType
-                     id=&quot;org.eclipse.gmf.runtime.emf.type.core.customType&quot;
-                     icon=&quot;icons/customType.gif&quot;
-                     name=&quot;%CustomType&quot;
-                     kind=&quot;org.eclipse.gmf.runtime.emf.type.core.CustomElementKind&quot;
-                     edithelperadvice=&quot;org.eclipse.gmf.runtime.emf.type.core.CustomEditHelperAdvice&quot;&gt; 
-                 &lt;specializes id=&quot;org.eclipse.gmf.runtime.emf.type.core.eobject&quot;/&gt;
-                 &lt;param 
-                         name=&quot;customParameter1&quot; 
-                         value=&quot;value1&quot;&gt;
-                 &lt;/param&gt;
-                 &lt;param 
-                         name=&quot;customParameter2&quot; 
-                         value=&quot;value2&quot;&gt;
-                 &lt;/param&gt;
-             &lt;/specializationType&gt;
-             
-             &lt;adviceBinding
-                  id=&quot;org.eclipse.gmf.runtime.emf.type.core.advisedType&quot;
-                  typeId=&quot;org.eclipse.gmf.runtime.emf.type.core.eobject&quot;
-                  class=&quot;org.eclipse.gmf.runtime.emf.type.core.advisedTypeEditHelperAdvice&quot;
-                  applyToSubtypes=&quot;false&quot;&gt; 
-                  &lt;eContainer&gt;
-                       &lt;enablement&gt;
-                            &lt;test property=&quot;advised&quot; value=&quot;advisedValue&quot;/&gt;
-                       &lt;/enablement&gt;
-                  &lt;/eContainer&gt;
-              &lt;/adviceBinding&gt; 
-        &lt;/metamodel&gt;
-        
-         &lt;elementTypeFactory
-               factory=&quot;org.eclipse.gmf.runtime.emf.type.core.CustomElementTypeFactory&quot;
-               kind = &quot;org.eclipse.gmf.runtime.emf.type.core.CustomElementKind&quot;
-               params = &quot;customParameter1, customParameter2&quot;&gt;
-         &lt;/elementTypeFactory&gt;
-    &lt;/extension&gt;
-&lt;/PRE&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         See the &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core&lt;/code&gt; package in the &lt;code&gt;org.eclipse.gmf.runtime.emf.type.core&lt;/code&gt; plug-in for the API description.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005  IBM Corporation and others.&lt;br&gt;
- 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 
- &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/AbstractElementTypeEnumerator.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/AbstractElementTypeEnumerator.java
deleted file mode 100644
index 5565ce6..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/AbstractElementTypeEnumerator.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-/**
- * Abstract superclass for types wishing to define constants that represent
- * element types contributed in the
- * <code>org.eclipse.gmf.runtime.emf.type.core.elementTypes</code> extension point.
- * <P>
- * Provides a convenience method that will access the
- * <code>ElementTypeRegistry</code> to get element types by ID.
- * 
- * @author ldamus
- */
-public abstract class AbstractElementTypeEnumerator {
-
-	/**
-	 * Gets the element type for <code>id</code> from the
-	 * <code>ElementTypeRegistry</code>.
-	 * 
-	 * @param id
-	 *            the element type identifier
-	 * @return element type for <code>id</code> from the
-	 *         <code>ElementTypeRegistry</code>, or <code>null</code> if
-	 *         there is no element type with that ID.
-	 */
-	protected static final IElementType getElementType(String id) {
-		return ElementTypeRegistry.getInstance().getType(id);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/AbstractElementTypeFactory.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/AbstractElementTypeFactory.java
deleted file mode 100644
index 2d53fff..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/AbstractElementTypeFactory.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-
-/**
- * Abstract implementation for element type factories. The methods in this
- * factory throw <code>UnsupportedOperationException</code>. Element type
- * factories can support either metamodel types or specialization types, or
- * both. If a concrete factory is asked to create a kind of element type that is
- * does not support, the exception will be thrown.
- * 
- * @author ldamus
- */
-public abstract class AbstractElementTypeFactory
-	implements IElementTypeFactory {
-
-	/**
-	 * @throws UnsupportedOperationException
-	 *             when metamodel types are not supported by this factory
-	 */
-	public IMetamodelType createMetamodelType(IMetamodelTypeDescriptor descriptor) {
-		throw new UnsupportedOperationException(
-			"Factory does not support metamodel types."); //$NON-NLS-1$
-	}
-
-	/**
-	 * @throws UnsupportedOperationException
-	 *             when specialization types are not supported by this factory
-	 */
-	public ISpecializationType createSpecializationType(
-			ISpecializationTypeDescriptor descriptor) {
-
-		throw new UnsupportedOperationException(
-			"Factory does not support specialization types."); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ClientContext.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ClientContext.java
deleted file mode 100644
index 4f2f15f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ClientContext.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
-
-/**
- * The implementation of the client context interface.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * 
- * @author ldamus
- */
-public class ClientContext implements IClientContext {
-
-	private final String id;
-
-	private final IElementMatcher matcher;
-
-	// set of String type and advice IDs that are bound to me
-	private final Set typeIdBindings = new java.util.HashSet();
-
-	// set of regex patterns that are bound to me
-	private final Set patternBindings = new java.util.HashSet();
-
-	/**
-	 * Initializes me with my ID and my element matcher.
-	 * 
-	 * @param id
-	 *            my unique identifier
-	 * @param matcher
-	 *            my element matcher
-	 */
-	public ClientContext(String id, IElementMatcher matcher) {
-		this.id = id;
-		this.matcher = matcher;
-	}
-
-	public final String getId() {
-		return id;
-	}
-
-	public final IElementMatcher getMatcher() {
-		return matcher;
-	}
-
-	public boolean includes(IEditHelperAdviceDescriptor adviceDescriptor) {
-		return includes(adviceDescriptor.getId());
-	}
-
-	public boolean includes(IElementTypeDescriptor elementTypeDescriptor) {
-		return includes(elementTypeDescriptor.getId());
-	}
-
-	public boolean includes(IElementType elementType) {
-		return includes(elementType.getId());
-	}
-
-	private boolean includes(String _id) {
-		boolean result = false;
-
-		result = typeIdBindings.contains(_id);
-
-		if (!result && !patternBindings.isEmpty()) {
-			// look for a bound pattern
-			result = hasPatternBindingFor(_id);
-
-			if (result) {
-				// cache the result for this type
-				bindId(_id);
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Determines whether any of my pattern bindings matches the
-	 * <code>toMatch</code> string.
-	 * 
-	 * @param toMatch
-	 *            the string to be matched
-	 * @return <code>true</code> if any of my pattern bindings matches the
-	 *         <code>toMatch</code> string; <code>false</code>, otherwise
-	 */
-	private boolean hasPatternBindingFor(String toMatch) {
-
-		for (Iterator iter = patternBindings.iterator(); iter.hasNext();) {
-			Pattern pattern = (Pattern) iter.next();
-
-			if (pattern.matcher(toMatch).matches()) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public void bindId(String typeId) {
-		typeIdBindings.add(typeId);
-	}
-
-	public void bindPattern(Pattern pattern) {
-		patternBindings.add(pattern);
-	}
-
-	/**
-	 * Has no children.
-	 */
-	public Collection getChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Not a multi-context.
-	 */
-	public boolean isMultiClientContext() {
-		return false;
-	}
-
-	/**
-	 * The context ID fully determines equality.
-	 */
-	public boolean equals(Object obj) {
-		return (obj instanceof ClientContext)
-				&& ((ClientContext) obj).getId().equals(getId());
-	}
-
-	/**
-	 * The context ID fully determines equality.
-	 */
-	public int hashCode() {
-		return getId().hashCode();
-	}
-
-	public String toString() {
-		return "ClientContext[" + getId() + ']'; //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ClientContextManager.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ClientContextManager.java
deleted file mode 100644
index 8c9a106..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ClientContextManager.java
+++ /dev/null

@@ -1,561 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.dynamichelpers.ExtensionTracker;
-import org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler;
-import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypeDebugOptions;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.DefaultClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.XMLClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * The context manager loads contexts from the <code>elementTypeBindings</code>
- * extension point and makes them available to the element type registry.
- * <P>
- * There is also a default client context, {@link #getDefaultClientContext()},
- * that is implicitly bound to all types and advice that otherwise have no
- * explicit binding.
- * 
- * @author ldamus
- */
-public final class ClientContextManager {
-
-	/**
-	 * Extension point name for the element type bindings extension point.
-	 */
-	public static final String ELEMENT_TYPE_BINDINGS_EXT_P_NAME = "elementTypeBindings"; //$NON-NLS-1$
-
-	private static final String E_CLIENT_CONTEXT = "clientContext"; //$NON-NLS-1$
-
-	private static final String E_BINDING = "binding"; //$NON-NLS-1$
-
-	private static final String A_CONTEXT = "context"; //$NON-NLS-1$
-
-	private static final String E_ELEMENT_TYPE = "elementType"; //$NON-NLS-1$
-
-	private static final String E_ADVICE = "advice"; //$NON-NLS-1$
-
-	private static final String A_REF = "ref"; //$NON-NLS-1$
-
-	private static final String A_PATTERN = "pattern"; //$NON-NLS-1$
-
-	private static final ClientContextManager INSTANCE = new ClientContextManager();
-
-	private final Set clientContexts = new java.util.HashSet();
-
-	private final Map clientContextMap = new java.util.HashMap();
-	
-	private ExtensionTracker extensionTracker;
-	
-	private IExtensionChangeHandler extensionListener;
-
-	/**
-	 * Not instantiable by clients.
-	 */
-	private ClientContextManager() {
-		super();
-
-		IConfigurationElement[] configs = Platform.getExtensionRegistry()
-				.getConfigurationElementsFor(EMFTypePlugin.getPluginId(),
-						ELEMENT_TYPE_BINDINGS_EXT_P_NAME);
-
-		if (EMFTypePlugin.isDynamicAware()) {
-			startExtensionTracking();
-		}
-		
-		configureElementTypeBindings(configs);
-	}
-	
-	private void startExtensionTracking() {
-		extensionListener = new IExtensionChangeHandler() {
-			
-			public void addExtension(IExtensionTracker tracker,
-					IExtension extension) {
-				configureElementTypeBindings(extension.getConfigurationElements());
-			}
-
-			public void removeExtension(IExtension extension, Object[] objects) {
-				// Extension removal not supported
-			}
-		};
-		
-		IExtensionPoint point = Platform.getExtensionRegistry()
-				.getExtensionPoint(EMFTypePlugin.getPluginId(),
-						ELEMENT_TYPE_BINDINGS_EXT_P_NAME);
-		
-		extensionTracker = new ExtensionTracker();
-		extensionTracker.registerHandler(extensionListener, ExtensionTracker
-				.createExtensionPointFilter(point));
-	}
-
-	/**
-	 * Obtains the singleton instance of this class.
-	 * 
-	 * @return the singleton context manager
-	 */
-	public static final ClientContextManager getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Gets the default client context.
-	 * 
-	 * @return the default context
-	 */
-	public static final IClientContext getDefaultClientContext() {
-		return getInstance().getClientContext(DefaultClientContext.ID);
-	}
-
-	/**
-	 * Obtains a client context by its unique identifier.
-	 * 
-	 * @param contextId
-	 *            the client context ID to look for
-	 * @return the matching context, or <code>null</code> if none is
-	 *         registered under this ID
-	 */
-	public IClientContext getClientContext(String contextId) {
-
-		if (DefaultClientContext.ID.equals(contextId)) {
-			return DefaultClientContext.getInstance();
-		}
-
-		return (IClientContext) clientContextMap.get(contextId);
-	}
-
-	/**
-	 * Obtains all of the client contexts registered in the system.
-	 * 
-	 * @return the available {@link IClientContext}s
-	 */
-	public Set getClientContexts() {
-		return clientContexts;
-	}
-
-	/**
-	 * Obtains the client contexts to which the specified object belongs.
-	 * 
-	 * @param eObject
-	 *            a model element
-	 * @return the client context to which the <code>eObject</code> belongs.
-	 *         This may be <code>null</code> if no context matches this
-	 *         element. It will be a <code>MultiClientContest</code> if more
-	 *         than one context matches the element.
-	 */
-	public IClientContext getClientContextFor(EObject eObject) {
-
-		Collection contexts = new java.util.ArrayList();
-
-		for (Iterator iter = getClientContexts().iterator(); iter.hasNext();) {
-			IClientContext next = (IClientContext) iter.next();
-			IElementMatcher matcher = next.getMatcher();
-
-			try {
-				if (matcher.matches(eObject)) {
-					contexts.add(next);
-				}
-			} catch (RuntimeException e) {
-				// client context matchers must not throw exceptions. This one
-				// will not be trusted in future validation operations. This
-				// is effected by removing it from the context manager
-				iter.remove();
-				clientContextMap.remove(next.getId());
-				// context
-
-				Trace.catching(EMFTypePlugin.getPlugin(),
-						EMFTypeDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-						"getClientContextsFor", e); //$NON-NLS-1$
-
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.CLIENT_MATCHER_FAILURE,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.client_matcherFailure_ERROR_,
-												next.getId()), e);
-			}
-		}
-
-		return getClientContext(contexts);
-	}
-
-	/**
-	 * Constructs and returns an <code>IClientContext</code> that represents
-	 * all of the <code>contexts</code>.
-	 * 
-	 * @param contexts
-	 *            the contexts
-	 * @return a multi-context that represents all of the <code>contexts</code>,
-	 *         or the single context if there is only one in
-	 *         <code>contexts</code>. If <code>contexts</code> is empty,
-	 *         returns the {@link DefaultClientContext#getInstance()}.
-	 */
-	private IClientContext getClientContext(Collection contexts) {
-
-		IClientContext result = DefaultClientContext.getInstance();
-
-		if (contexts.size() > 1) {
-			result = new MultiClientContext(contexts);
-
-		} else if (!contexts.isEmpty()) {
-			result = (IClientContext) contexts.iterator().next();
-		}
-
-		return result;
-	}
-
-	/**
-	 * Finds the {@link IClientContext} that is bound to the
-	 * <code>elementTypeDescriptor</code>. If more than one context is bound
-	 * to the <code>elementTypeDescriptor</code>, the context that is
-	 * returned will be a <code>MultiClientContext</code> representing them
-	 * all.
-	 * 
-	 * @param elementTypeDescriptor
-	 *            the element type descriptor
-	 * @return the {@link IClientContext} that is bound to the
-	 *         <code>elementTypeDescriptor</code>. May be a multi-context.
-	 */
-	public IClientContext getBinding(
-			IElementTypeDescriptor elementTypeDescriptor) {
-		Collection result = new ArrayList();
-
-		for (Iterator i = getClientContexts().iterator(); i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-
-			if (next.includes(elementTypeDescriptor)) {
-				result.add(next);
-			}
-		}
-		return getClientContext(result);
-	}
-
-	/**
-	 * Finds the {@link IClientContext}s that are bound to the
-	 * <code>elementType</code>. If there are more than one contexts bound,
-	 * returns a <code>MultiClientContext</code> representing them all.
-	 * 
-	 * @param elementType
-	 *            the element type
-	 * @return the {@link IClientContext} that is bound to the
-	 *         <code>elementType</code>. May be a multi-context.
-	 */
-	public IClientContext getBinding(IElementType elementType) {
-		Collection result = new ArrayList();
-
-		for (Iterator i = getClientContexts().iterator(); i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-
-			if (next.includes(elementType)) {
-				result.add(next);
-			}
-		}
-		return getClientContext(result);
-	}
-
-	/**
-	 * Finds the {@link IClientContext} that is bound to the <code>advice</code>.
-	 * If more than one context is bound to the <code>advice</code>, the
-	 * context that is returned will be a <code>MultiClientContext</code>
-	 * representing them all.
-	 * 
-	 * @param elementType
-	 *            the element type
-	 * @return the {@link IClientContext} that is bound to the
-	 *         <code>advice</code>. May be a multi-context.
-	 */
-	public IClientContext getBinding(IEditHelperAdviceDescriptor advice) {
-		Collection result = new ArrayList();
-
-		for (Iterator i = getClientContexts().iterator(); i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-
-			if (next.includes(advice)) {
-				result.add(next);
-			}
-		}
-		return getClientContext(result);
-	}
-
-	/**
-	 * <p>
-	 * Configures my providers from the Eclipse configuration
-	 * <code>elements</code> representing implementations of my extension
-	 * point.
-	 * </p>
-	 * <p>
-	 * <b>NOTE</b> that this method should only be called by the EMF Model
-	 * Validation Plug-in, not by any client code!
-	 * </p>
-	 * 
-	 * @param elements
-	 *            the configuration elements representing constraint binding
-	 *            extensions
-	 */
-	private synchronized void configureElementTypeBindings(IConfigurationElement[] elements) {
-		// must create all of the contexts before we process the bindings.
-		// Hence, this will loop over the elements twice
-		configureClientContexts(elements);
-		configureBindings(elements);
-	}
-
-	/**
-	 * Registers the <code>clientContext</code>. Does nothing if the context
-	 * has already been registered.
-	 * 
-	 * @param clientContext
-	 *            the client context
-	 */
-	public void registerClientContext(IClientContext clientContext) {
-
-		// prevent duplicates
-		if (clientContexts.add(clientContext)) {
-			clientContextMap.put(clientContext.getId(), clientContext);
-		}
-	}
-
-	/**
-	 * Helper method to configure the <code>&lt;clientContext&gt;</code>
-	 * occurrences amongst the <code>elements</code>.
-	 * 
-	 * @param elements
-	 *            the top-level configuration elements on the
-	 *            <code>elementTypeBindings</code> extension point
-	 */
-	private void configureClientContexts(IConfigurationElement[] elements) {
-		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement config = elements[i];
-
-			if (E_CLIENT_CONTEXT.equals(config.getName())) {
-				try {
-					ClientContext context = new XMLClientContext(config);
-
-					// prevent duplicates
-					if (clientContexts.add(context)) {
-						clientContextMap.put(context.getId(), context);
-					}
-
-				} catch (CoreException ce) {
-					// this client context will not participate in extensible
-					// type registry
-					String sourcePluginId = config.getDeclaringExtension()
-							.getContributor().getName();
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									ce.getStatus().getCode(),
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.xml_parsing_elementTypeBindings_ERROR_,
-													sourcePluginId, ce
-															.getStatus()
-															.getMessage()),
-									ce);
-
-				} catch (Exception e) {
-					// this client context will not participate in extensible
-					// type registry
-					String sourcePluginId = config.getDeclaringExtension()
-							.getContributor().getName();
-
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									EMFTypePluginStatusCodes.ERROR_PARSING_XML,
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.xml_parsing_elementTypeBindings_ERROR_,
-													sourcePluginId, e
-															.getMessage()), e);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Helper method to configure the <code>&lt;binding&gt;</code> occurrences
-	 * amongst the <code>elements</code>.
-	 * 
-	 * @param elements
-	 *            the top-level configuration elements on the
-	 *            <code>elementTypeBindings</code> extension point
-	 */
-	private void configureBindings(IConfigurationElement[] elements) {
-		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement config = elements[i];
-
-			if (E_BINDING.equals(config.getName())) {
-				String contextId = config.getAttribute(A_CONTEXT);
-
-				if (contextId == null) {
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									EMFTypePluginStatusCodes.BINDING_NO_CONTEXT,
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.xml_parsing_elementTypeBindings_ERROR_,
-													config
-															.getDeclaringExtension()
-															.getContributor()
-															.getName(),
-													EMFTypeCoreMessages.binding_noContextId_ERROR_));
-
-				} else {
-					ClientContext context = (ClientContext) getClientContext(contextId);
-
-					if (context == null) {
-						Log
-								.error(
-										EMFTypePlugin.getPlugin(),
-										EMFTypePluginStatusCodes.BINDING_NO_SUCH_CONTEXT,
-										EMFTypeCoreMessages
-												.bind(
-														EMFTypeCoreMessages.xml_parsing_elementTypeBindings_ERROR_,
-														config
-																.getDeclaringExtension()
-																.getContributor()
-																.getName(),
-														EMFTypeCoreMessages.binding_noSuchContext_ERROR_));
-
-					} else {
-						configureBindings(context, config);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Helper method to process a particular binding element for its client
-	 * <code>context</code>.
-	 * 
-	 * @param context
-	 *            a client context referenced by a binding
-	 * @param config
-	 *            a particular <code>&lt;binding&gt;</config> element
-	 */
-	private void configureBindings(ClientContext context,
-			IConfigurationElement config) {
-
-		configureBindings(context, config, E_ELEMENT_TYPE);
-		configureBindings(context, config, E_ADVICE);
-	}
-
-	/**
-	 * Helper method to process a particular binding element for its client
-	 * <code>context</code>.
-	 * 
-	 * @param context
-	 *            a client context referenced by a binding
-	 * @param config
-	 *            a particular <code>&lt;binding&gt;</config> element
-	 * @param elementName the name of the elements to process in the <code>&lt;binding&gt;</config> element
-	 */
-	private void configureBindings(ClientContext context,
-			IConfigurationElement config, String elementName) {
-
-		IConfigurationElement[] children = config.getChildren(elementName);
-
-		for (int i = 0; i < children.length; i++) {
-			String ref = children[i].getAttribute(A_REF);
-			String patternString = children[i].getAttribute(A_PATTERN);
-
-			if (ref == null && patternString == null) {
-				// must be one of ref or pattern
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.BINDING_NO_REF_OR_PATTERN,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.xml_parsing_elementTypeBindings_ERROR_,
-												config.getDeclaringExtension()
-														.getContributor()
-														.getName(),
-												EMFTypeCoreMessages
-														.bind(
-																EMFTypeCoreMessages.binding_no_ref_or_pattern_ERROR_,
-																context.getId())));
-				return;
-			}
-
-			if (ref != null && patternString != null) {
-				// can't specify both ref and pattern
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.BINDING_BOTH_REF_AND_PATTERN,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.xml_parsing_elementTypeBindings_ERROR_,
-												config.getDeclaringExtension()
-														.getContributor()
-														.getName(),
-												EMFTypeCoreMessages
-														.bind(
-																EMFTypeCoreMessages.binding_both_ref_and_pattern_ERROR_,
-																context.getId())));
-				return;
-			}
-
-			if (ref != null) {
-				context.bindId(ref);
-
-			} else {
-				try {
-					Pattern pattern = Pattern.compile(patternString);
-					context.bindPattern(pattern);
-
-				} catch (PatternSyntaxException pse) {
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									EMFTypePluginStatusCodes.PATTERN_INVALID_SYNTAX,
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.xml_parsing_elementTypeBindings_ERROR_,
-													config
-															.getDeclaringExtension()
-															.getContributor()
-															.getName(),
-													EMFTypeCoreMessages
-															.bind(
-																	EMFTypeCoreMessages.pattern_invalid_syntax_ERROR_,
-																	patternString)), pse);
-				}
-			}
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/EditHelperContext.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/EditHelperContext.java
deleted file mode 100644
index aba4e65..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/EditHelperContext.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * The concrete implementation of the context of an editing gesture. It
- * represents the <code>EObject</code> or <code>IElementType</code> that is
- * the subject of the editing action, and the <code>IClientContext</code> in
- * which the editing will be performed.
- * <P>
- * This class may be instantiated by clients.
- * 
- * @author ldamus
- */
-public class EditHelperContext implements IEditHelperContext {
-
-	private IClientContext clientContext;
-
-	private EObject eObject;
-
-	private IElementType elementType;
-
-	/**
-	 * Constructs a new context object.
-	 */
-	public EditHelperContext() {
-		super();
-	}
-
-	/**
-	 * Constructs a new context with an <code>eObject</code> and a
-	 * <code>clientContext</code> which describe the context in which an
-	 * editing gesture will be made.
-	 * 
-	 * @param eObject
-	 *            the <code>EObject</code> that is the subject of the editing
-	 *            gesture
-	 * @param clientContext
-	 *            the client context
-	 */
-	public EditHelperContext(EObject eObject, IClientContext clientContext) {
-		this();
-		this.eObject = eObject;
-		this.clientContext = clientContext;
-	}
-
-	/**
-	 * Constructs a new context with an <code>elementType</code> and a
-	 * <code>clientContext</code> which describe the context in which an
-	 * editing gesture will be made.
-	 * 
-	 * @param elementType
-	 *            the <code>IElementType</code> that is the subject of the
-	 *            editing gesture
-	 * @param clientContext
-	 *            the client context
-	 */
-	public EditHelperContext(IElementType elementType,
-			IClientContext clientContext) {
-		this();
-		this.elementType = elementType;
-		this.clientContext = clientContext;
-	}
-
-	// documentation copied from the interface
-	public IClientContext getClientContext() {
-		return clientContext;
-	}
-
-	/**
-	 * Sets the client context in which the editing gesture will be performed.
-	 * 
-	 * @param clientContext
-	 *            the client context
-	 */
-	public void setClientContext(IClientContext clientContext) {
-		this.clientContext = clientContext;
-	}
-
-	// documentation copied from the interface
-	public EObject getEObject() {
-		return eObject;
-	}
-
-	/**
-	 * Sets the <code>EObject</code> that is the subject of the editing
-	 * gesture.
-	 * 
-	 * @param eObject
-	 *            the eObject
-	 */
-	public void setEObject(EObject eObject) {
-		this.eObject = eObject;
-	}
-
-	// documentation copied from the interface
-	public IElementType getElementType() {
-		return elementType;
-	}
-
-	/**
-	 * Sets the <code>EObject</code> that is the subject of the editing
-	 * gesture.
-	 * 
-	 * @param elementType
-	 *            the element type
-	 */
-	public void setElementType(IElementType elementType) {
-		this.elementType = elementType;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementType.java
deleted file mode 100644
index 0c473d7..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementType.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.net.URL;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Abstract implementation for application element types.
- * 
- * @author ldamus
- */
-public abstract class ElementType
-	implements IElementType {
-
-	/**
-	 * The type id.
-	 */
-	private final String id;
-
-	/**
-	 * The URL for the icon.
-	 */
-	private final URL iconURL;
-
-	/**
-	 * The display name.
-	 */
-	private final String displayName;
-
-	/**
-	 * The metaclass.
-	 */
-	private final EClass eClass;
-	
-	/**
-	 * The supertypes of this element type.
-	 */
-	private IElementType[] supertypes;
-
-	/**
-	 * Constructs a new element type.
-	 * 
-	 * @param id
-	 *            the type ID
-	 * @param iconURL
-	 *            the URL for the icon, or <cOode>null</code> if none.
-	 * @param displayName
-	 *            the display name
-	 */
-	protected ElementType(String id, URL iconURL, String displayName) {
-		this(id, iconURL, displayName, null);
-	}
-
-	/**
-	 * Constructs a new element type.
-	 * 
-	 * @param id
-	 *            the type ID
-	 * @param iconURL
-	 *            the URL for the icon, or <cOode>null</code> if none.
-	 * @param displayName
-	 *            the display name
-	 * @param eClass
-	 *            the metaclass associated with the element type
-	 */
-	protected ElementType(String id, URL iconURL, String displayName,
-			EClass eClass) {
-		super();
-		this.id = id;
-		this.iconURL = iconURL;
-		this.displayName = displayName;
-		this.eClass = eClass;
-	}
-
-	/**
-	 * Gets the unique identifier.
-	 * 
-	 * @return the unique identifier.
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Gets the icon.
-	 * 
-	 * @return the icon.
-	 */
-	public URL getIconURL() {
-		return iconURL;
-	}
-
-	/**
-	 * Gets the display name.
-	 * 
-	 * @return the display name.
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * Gets the metamodel type.
-	 * 
-	 * @return the metamodel type.
-	 */
-	public EClass getEClass() {
-		return eClass;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.core.type.IElementType#getConfigureCommand()
-	 */
-	public ICommand getEditCommand(IEditCommandRequest request) {
-		return getEditHelper().getEditCommand(request);
-	}
-    
-    // documentation copied from interface
-    public boolean canEdit(IEditCommandRequest req) {
-        return getEditHelper().canEdit(req);
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.isAssignableFrom(this.getClass())) {
-			return this;
-		}
-		return null;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType#getAllSuperTypes()
-	 */
-	public IElementType[] getAllSuperTypes() {
-		return supertypes;
-	}
-	
-	protected void setAllSupertypes(IElementType[] supertypes) {
-		this.supertypes = supertypes;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementTypeAddedEvent.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementTypeAddedEvent.java
deleted file mode 100644
index 82b0e8c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementTypeAddedEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-/**
- * Notification that an element type has been added to the
- * {@link org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry}.
- * 
- * @author ldamus
- * 
- */
-public class ElementTypeAddedEvent {
-
-	/**
-	 * The ID of the element type that has been added.
-	 */
-	private String elementTypeId;
-
-	/**
-	 * Constructs a new event.
-	 * 
-	 * @param elementTypeId
-	 *            the element type ID
-	 */
-	public ElementTypeAddedEvent(String elementTypeId) {
-		this.elementTypeId = elementTypeId;
-	}
-
-	/**
-	 * Gets the ID of the element type that was added.
-	 * 
-	 * @return the element type ID
-	 */
-	public String getElementTypeId() {
-		return elementTypeId;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementTypeRegistry.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementTypeRegistry.java
deleted file mode 100644
index 43b84e4..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementTypeRegistry.java
+++ /dev/null

@@ -1,1361 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.dynamichelpers.ExtensionTracker;
-import org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler;
-import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.ElementTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.ElementTypeFactoryDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.ElementTypeXmlConfig;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.MetamodelDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.MetamodelTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.SpecializationTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.DefaultMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.SpecializationTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * The registry of application element types, contributed by the
- * <code>org.eclipse.gmf.runtime.emf.type.core.elementTypes</code> extension
- * point, or registered directly through {@link #register(IMetamodelType)} or
- * {@link #register(ISpecializationType)}.
- * 
- * @author ldamus
- */
-public class ElementTypeRegistry {
-
-	/**
-	 * The name of the element type extension point.
-	 */
-	private static final String ELEMENT_TYPES_EXT_P_NAME = "elementTypes"; //$NON-NLS-1$
-
-	/**
-	 * Empty element type array for convenience.
-	 */
-	private static final IElementType[] EMPTY_ELEMENT_TYPE_ARRAY = new IElementType[] {};
-
-	/**
-	 * My specialization type registr. Keeps track of the specializations and
-	 * advice bindings and provides methods for finding matching edit helper
-	 * advice.
-	 */
-	private final SpecializationTypeRegistry specializationTypeRegistry;
-
-	/**
-	 * Metamodel type descriptors stored by nsURI. Each key is a namespace URI
-	 * and each value is a map, whose key is an EClass name and whose value is a
-	 * collection of MetamodelTypeDescriptors.
-	 */
-	private final Map metamodelTypeDescriptorsByNsURI;
-
-	/**
-	 * All metamodel type descriptors stored by ID. Each value is an instance of
-	 * <code>MetamodelTypeDescriptor</code>.
-	 */
-	private final Map metamodelTypeDescriptorsById;
-
-	/**
-	 * ElementTypeFactories stored by kind. Each factory declares a string that
-	 * describes the kind of element that it is responsible for creating. Each
-	 * value is a single <code>ElementTypeFactory</code>.
-	 */
-	private final Map elementTypeFactoryMap;
-
-	/**
-	 * Listeners for changes to this registry.
-	 */
-	private final List elementTypeRegistryListeners;
-
-	/**
-	 * Singleton instance.
-	 */
-	private static ElementTypeRegistry INSTANCE;
-
-	private ExtensionTracker extensionTracker;
-	
-	private IExtensionChangeHandler extensionListener;
-
-	/**
-	 * Constructs a new element type registry.
-	 */
-	private ElementTypeRegistry(IConfigurationElement[] configs) {
-		super();
-
-		specializationTypeRegistry = new SpecializationTypeRegistry();
-		metamodelTypeDescriptorsByNsURI = new HashMap();
-		metamodelTypeDescriptorsById = new HashMap();
-		elementTypeFactoryMap = new HashMap();
-		elementTypeRegistryListeners = new ArrayList();
-
-		registerNullElementType();
-
-		if (EMFTypePlugin.isDynamicAware()) {
-			startExtensionTracking();
-		}
-		
-		load(configs);
-	}
-
-	private void startExtensionTracking() {
-		extensionListener = new IExtensionChangeHandler() {
-			
-			public void addExtension(IExtensionTracker tracker,
-					IExtension extension) {
-				load(extension.getConfigurationElements());
-			}
-
-			public void removeExtension(IExtension extension, Object[] objects) {
-				// Extension removal not supported
-			}
-		};
-		
-		IExtensionPoint point = Platform.getExtensionRegistry()
-				.getExtensionPoint(EMFTypePlugin.getPluginId(),
-						ELEMENT_TYPES_EXT_P_NAME);
-		
-		extensionTracker = new ExtensionTracker();
-		extensionTracker.registerHandler(extensionListener, ExtensionTracker
-				.createExtensionPointFilter(point));
-	}
-
-	/**
-	 * Gets the singleton element type registry.
-	 * 
-	 * @return the singleton element type registry
-	 */
-	public static ElementTypeRegistry getInstance() {
-
-		if (INSTANCE == null) {
-
-			IConfigurationElement[] configs = Platform.getExtensionRegistry()
-				.getConfigurationElementsFor(EMFTypePlugin.getPluginId(),
-					ELEMENT_TYPES_EXT_P_NAME);
-
-			INSTANCE = new ElementTypeRegistry(configs);
-		}
-		return INSTANCE;
-	}
-
-	/**
-	 * Gets the edit helper advice for <code>type</code> in order of most
-	 * general advice to most specific advice. This order is used so that the
-	 * more specific advice can act on or modify the more general advice.
-	 * <P>
-	 * The client context is inferred from the <code>type</code>.
-	 * 
-	 * @param type
-	 *            the element type for which to obtain editing advice
-	 * @return the array of edit helper advice descriptors
-	 */
-	public IEditHelperAdvice[] getEditHelperAdvice(IElementType type) {
-		
-		IClientContext clientContext = ClientContextManager.getInstance()
-				.getBinding(type);
-
-		return getEditHelperAdvice(type, clientContext);
-	}
-
-	/**
-	 * Gets the edit helper advice for <code>type</code> to which the
-	 * <code>clientContext</code> has been bound, in order of most general
-	 * advice to most specific advice. This order is used so that the more
-	 * specific advice can act on or modify the more general advice.
-	 * 
-	 * @param type
-	 *            the element type for which to obtain editing advice
-	 * @param clientContext
-	 *            the client context
-	 * @return the array of edit helper advice descriptors
-	 */
-	public IEditHelperAdvice[] getEditHelperAdvice(IElementType type, IClientContext clientContext) {
-		
-		IClientContext context = (clientContext == null) ? ClientContextManager
-				.getDefaultClientContext() : clientContext;
-
-		EClass eClass = type.getEClass();
-		MetamodelTypeDescriptor metamodelType = (eClass != null) ? getMetamodelTypeDescriptor(
-				eClass, context)
-				: null;
-		List result = specializationTypeRegistry.getEditHelperAdvice(type,
-				metamodelType, context);
-
-		return (IEditHelperAdvice[]) result.toArray(new IEditHelperAdvice[] {});
-	}
-	
-	/**
-	 * Gets the edit helper advice for <code>eObject</code> in order of most
-	 * general advice to most specific advice. This order is used so that the
-	 * more specific advice can act on or modify the more general advice.
-	 * 
-	 * @param eObject
-	 *            the model element for which to obtain editing advice
-	 * @param clientContext
-	 *            the client context
-	 * @return the array of edit helper advice
-	 */
-	public IEditHelperAdvice[] getEditHelperAdvice(EObject eObject,
-			IClientContext clientContext) {
-
-		Collection result;
-		MetamodelTypeDescriptor desc = getMetamodelTypeDescriptor(eObject, clientContext);
-		if (desc == null) {
-			result = specializationTypeRegistry.getEditHelperAdvice(
-					eObject,
-					DefaultMetamodelType.getDescriptorInstance(), clientContext);
-		} else {
-			result = specializationTypeRegistry.getEditHelperAdvice(eObject, desc, clientContext);
-		}
-
-		return (IEditHelperAdvice[]) result.toArray(new IEditHelperAdvice[] {});
-	}
-	
-	/**
-	 * Gets the edit helper advice for <code>eObject</code> in order of most
-	 * general advice to most specific advice. This order is used so that the
-	 * more specific advice can act on or modify the more general advice.
-	 * <P>
-	 * The client context will be inferred from the <code>eObject</code>.
-	 * 
-	 * @param eObject
-	 *            the model element for which to obtain editing advice
-	 * @return the array of edit helper advice
-	 */
-	public IEditHelperAdvice[] getEditHelperAdvice(EObject eObject) {
-	
-		IClientContext clientContext = ClientContextManager.getInstance()
-				.getClientContextFor(eObject);
-		
-		return getEditHelperAdvice(eObject, clientContext);
-	}
-
-	/**
-	 * Gets the edit helper advice registered for <code>o</code>, which can
-	 * be either an EObject or an IElementType or an
-	 * <code>IEditHelperContext</code>.
-	 * 
-	 * @param o
-	 *            the element or type
-	 * @return the edit helper advice, or <code>null</code> if none.
-	 */
-	public IEditHelperAdvice[] getEditHelperAdvice(Object o) {
-		
-		if (o instanceof EObject) {
-			return getEditHelperAdvice((EObject) o);
-
-		} else if (o instanceof IElementType) {
-			return getEditHelperAdvice((IElementType) o);
-
-		} else if (o instanceof IEditHelperContext) {
-			IEditHelperContext editHelperContext = (IEditHelperContext) o;
-			IClientContext clientContext = editHelperContext.getClientContext();
-			IElementType elementType = editHelperContext.getElementType();
-			EObject eObject = editHelperContext.getEObject();
-
-			if (clientContext != null) {
-				if (elementType != null) {
-					return getEditHelperAdvice(elementType, clientContext);
-
-				} else if (eObject != null) {
-					return getEditHelperAdvice(eObject, clientContext);
-				}
-			} else {
-				if (elementType != null) {
-					return getEditHelperAdvice(elementType);
-
-				} else if (eObject != null) {
-					return getEditHelperAdvice(eObject);
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Gets the array of types that can be contained in the structural
-	 * <code>feature</code> of <code>eContainer</code>. The result will not
-	 * include types that represent abstract EClasses.
-	 * 
-	 * @param eContainer
-	 *            the container
-	 * @param reference
-	 *            the feature
-	 * @param clientContext
-	 *            the client context
-	 * @return the array of types
-	 */
-	public IElementType[] getContainedTypes(EObject eContainer,
-			EReference reference, IClientContext clientContext) {
-		
-		Set result = new HashSet();
-
-		EClass containerEClass = eContainer.eClass();
-
-		if (reference.isContainment()
-			&& (containerEClass.getEAllReferences().contains(reference))) {
-
-			// Get the reference type (eclass) and all of its subtypes
-			EClass eType = (EClass) reference.getEType();
-			Set types = getSubtypes(containerEClass.getEPackage(), eType);
-			types.add(eType);
-
-			// Get the metamodel types for the eclasses
-			List metamodelTypeDescriptors = getMetamodelTypeDescriptors(types, clientContext);
-			
-			for (Iterator i = metamodelTypeDescriptors.iterator(); i.hasNext();) {
-
-				MetamodelTypeDescriptor nextMetamodelTypeDescriptor = (MetamodelTypeDescriptor) i
-					.next();
-				IMetamodelType nextMetamodelType = (IMetamodelType) nextMetamodelTypeDescriptor
-					.getElementType();
-
-				if (nextMetamodelType != null
-					&& !nextMetamodelType.getEClass().isAbstract()) {
-
-					// Add the metamodel type
-					result.add(nextMetamodelType);
-
-					// Add the specialization types that match the given
-					// container and reference
-					Collection specializationDescriptors = specializationTypeRegistry
-						.getMatchingSpecializations(
-							nextMetamodelTypeDescriptor, eContainer, reference, clientContext);
-
-					for (Iterator j = specializationDescriptors.iterator(); j
-						.hasNext();) {
-						ElementTypeDescriptor nextDescriptor = (ElementTypeDescriptor) j
-							.next();
-						IElementType nextElementType = nextDescriptor
-							.getElementType();
-
-						if (nextElementType != null) {
-							result.add(nextElementType);
-						}
-					}
-				}
-			}
-		}
-		return (IElementType[]) result.toArray(EMPTY_ELEMENT_TYPE_ARRAY);
-	}
-
-	/**
-	 * Gets the array of types that can be contained in the structural
-	 * <code>feature</code> of <code>eContainer</code>.  The result will 
-	 * not include types that represent abstract EClasses.
-	 * <P>
-	 * The client context will be inferred from the <code>eContainer</code>.
-	 * 
-	 * @param eContainer
-	 *            the container
-	 * @param reference
-	 *            the feature
-	 * @return the array of types
-	 */
-	public IElementType[] getContainedTypes(EObject eContainer,
-			EReference reference) {
-
-		IClientContext clientContext = ClientContextManager.getInstance()
-				.getClientContextFor(eContainer);
-		
-		return getContainedTypes(eContainer, reference, clientContext);
-	}
-
-	/**
-	 * Gets the subtypes of <code>eType</code> in the <code>pkg</code>.
-	 * 
-	 * @param pkg
-	 *            the package in which to find matching classifiers
-	 * @param eType
-	 *            the eClass for which to find subtypes
-	 * @return the matching subtypes
-	 */
-	private Set getSubtypes(EPackage pkg, final EClass eType) {
-
-		Set result = new HashSet();
-		List classifiers = pkg.getEClassifiers();
-
-		for (Iterator i = classifiers.iterator(); i.hasNext();) {
-			EClassifier nextClassifier = (EClassifier) i.next();
-
-			if (nextClassifier instanceof EClass
-				&& ((EClass) nextClassifier).getEAllSuperTypes()
-					.contains(eType)) {
-				result.add(nextClassifier);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the metamodel type for <code>eClass</code> in the client
-	 * <code>context</code>. If there is none registered against the
-	 * <code>eClass</code>, returns the metamodel type for the nearest
-	 * supertype of <code>eClass/code> that has a metamodel type.
-	 * 
-	 * @param eClass
-	 *            the metaclass
-	 * @param context the client context
-	 * @return the metamodel type for this <code>eClass</code> in the client <code>context</code>, or <code>null</code> if none can be found.
-	 */
-	private IMetamodelType getMetamodelType(EClass eClass, IClientContext context) {
-		
-		MetamodelTypeDescriptor descriptor = getMetamodelTypeDescriptor(eClass, context);
-
-		if (descriptor != null) {
-			return (IMetamodelType) descriptor.getElementType();
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the metamodel type registered for <code>eObject</code>'s EClass.
-	 * If there is none registered against the <code>eClass</code>, returns
-	 * the metamodel type for the nearest supertype of
-	 * <code>eClass/code> that has a metamodel type.
-	 * 
-	 * @param eObject
-	 *            the model element
-	 * @param clientContext the clientContext
-	 * @return the metamodel type for this <code>eObject</code>
-	 */
-	private IMetamodelType getMetamodelType(EObject eObject, IClientContext clientContext) {
-		
-		return getMetamodelType(eObject.eClass(), clientContext);
-	}
-
-	/**
-	 * Convenience method to get an element type for <code>o</code>.
-	 * <P>
-	 * If <code>o</code> is an <code>IElementType</code>, returns
-	 * <code>o</code>.
-	 * <P>
-	 * If <code>o</code> is an <code>EObject</code>, returns the metamodel
-	 * type registered for <code>o</code>'s eClass in the client context that
-	 * is bound to <code>o</code>.
-	 * <P>
-	 * If <code>o</code> is an <code>IEditHelperContext</code>, returns the
-	 * element type in <code>o</code> if specified. Else, returns the
-	 * metamodel type registered for the eClass of the EObject specified in
-	 * <code>o</code> in the client context specified in <code>o</code>. If
-	 * no client context is specified, then the client context bound to the
-	 * EObject is used.
-	 * <P>
-	 * Use {@link #getElementType(EClass, IClientContext)} to get metamodel
-	 * types registered for a specific <code>EClass</code>.
-	 * 
-	 * @param o
-	 *            the object for which to find an element type.
-	 * @return <code>o</code> itself if it is an element type, otherwise
-	 *         returns the registered metamodel type
-	 */
-	public IElementType getElementType(Object o) {
-
-		if (o instanceof EObject) {
-			return getElementType((EObject) o);
-
-		} else if (o instanceof IElementType) {
-			return (IElementType) o;
-			
-		} else if (o instanceof IEditHelperContext) {
-			IEditHelperContext editHelperContext = (IEditHelperContext) o;
-			IElementType elementType = editHelperContext.getElementType();
-			
-			if (elementType != null) {
-				return elementType;
-			}
-			
-			IClientContext clientContext = editHelperContext.getClientContext();
-			EObject eObject = editHelperContext.getEObject();
-
-			if (eObject != null) {
-				if (clientContext != null) {
-					return getElementType(eObject, clientContext);
-				} else {
-					return getElementType(eObject);
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Gets the registered element type for <code>eClass</code> that 
-	 * has no client contexts explicitly bound to it.
-	 * 
-	 * @param eClass
-	 *            the <code>EClass</code> whose element type is to be found.
-	 * @return the metamodel type registered for <code>eClass</code>
-	 */
-	public IElementType getElementType(EClass eClass) {
-
-		return getElementType(eClass, null);
-	}
-	
-	/**
-	 * Gets the registered element type for <code>eClass</code>.
-	 * 
-	 * @param eClass
-	 *            the <code>EClass</code> whose element type is to be found.
-	 * @param clientContext
-	 *            the client context
-	 * @return the metamodel type registered for <code>eClass</code>
-	 */
-	public IElementType getElementType(EClass eClass, IClientContext clientContext) {
-
-		IElementType result = getMetamodelType(eClass, clientContext);
-		if (result == null) {
-			// at least provide the default type for default editing support
-			result = DefaultMetamodelType.getInstance();
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Gets the registered element type for <code>eObject</code>.
-	 * <P>
-	 * The client context will be inferred from the <code>eObject</code>.
-	 * 
-	 * @param eObject
-	 *            the <code>EObject</code> whose element type is to be found.
-	 * @return the metamodel type registered for <code>eObject</code>'s
-	 *         <code>EClass</code>
-	 */
-	public IElementType getElementType(EObject eObject) {
-		
-		IClientContext clientContext = ClientContextManager.getInstance()
-				.getClientContextFor(eObject);
-		
-		return getElementType(eObject, clientContext);
-	}
-	
-	/**
-	 * Gets the registered element type for <code>eObject</code> in the
-	 * <code>clientContext</code>.
-	 * 
-	 * @param eObject
-	 *            the <code>EObject</code> whose element type is to be found.
-	 * @param clientContext
-	 *            the client context
-	 * @return the metamodel type registered for <code>eObject</code>'s
-	 *         <code>EClass</code>
-	 */
-	public IElementType getElementType(EObject eObject,
-			IClientContext clientContext) {
-
-		IElementType result = getMetamodelType(eObject, clientContext);
-		if (result == null) {
-			// at least provide the default type for default editing support
-			result = DefaultMetamodelType.getInstance();
-		}
-
-		return result;
-	}
-
-	/**
-	 * Gets the metamodel type descriptor for <code>eObject</code>'s EClass
-	 * in the client <code>context</code>. If there is none registered
-	 * against the <code>eClass</code> for that <code>context</code>,
-	 * returns the metamodel type for the nearest supertype of
-	 * <code>eClass</code> that has a metamodel type in that
-	 * <code>context</code>.
-	 * 
-	 * @param eObject
-	 *            the model element
-	 * @param context
-	 *            the client context
-	 * @return the metamodel type descriptor
-	 */
-	private MetamodelTypeDescriptor getMetamodelTypeDescriptor(EObject eObject,
-			IClientContext context) {
-		return getMetamodelTypeDescriptor(eObject.eClass(), context);
-	}
-
-	/**
-	 * Gets the metamodel type descriptor for <code>eClass</code> in the
-	 * client <code>context</code>. If there is none registered against the
-	 * <code>eClass</code> for the client <code>context</code>, returns the
-	 * metamodel type for the nearest supertype of <code>eClass</code> that
-	 * has a metamodel type in the client <code>context</code>.
-	 * 
-	 * @param eClass
-	 *            the model element eclass
-	 * @param context
-	 *            the client context
-	 * @return the metamodel type descriptor
-	 */
-	private MetamodelTypeDescriptor getMetamodelTypeDescriptor(EClass eClass,
-			IClientContext context) {
-
-		IClientContext clientContext = context;
-
-		if (clientContext == null) {
-			// use the default context
-			clientContext = ClientContextManager.getDefaultClientContext();
-		}
-		
-		Map metamodelTypeDescriptorsByEClass = (Map) metamodelTypeDescriptorsByNsURI
-				.get(eClass.getEPackage().getNsURI());
-		Collection descriptors = metamodelTypeDescriptorsByEClass != null ? (Collection) metamodelTypeDescriptorsByEClass
-				.get(eClass.getName())
-				: null;
-
-		if (descriptors != null) {
-			for (Iterator i = descriptors.iterator(); i.hasNext();) {
-				MetamodelTypeDescriptor descriptor = (MetamodelTypeDescriptor) i
-						.next();
-	
-				if (clientContext.includes(descriptor)) {
-					return descriptor;
-				}
-			}
-		} 
-		// Find the metamodel type for the nearest supertype.
-		List supertypes = eClass.getEAllSuperTypes();
-		for (int i = supertypes.size() - 1; i >= 0; i--) {
-			EClass nextEClass = (EClass) supertypes.get(i);
-
-			// nsURI could be different in supertypes of the eclass
-			metamodelTypeDescriptorsByEClass = (Map) metamodelTypeDescriptorsByNsURI.get(nextEClass.getEPackage().getNsURI());
-			descriptors = metamodelTypeDescriptorsByEClass != null ? (Collection) metamodelTypeDescriptorsByEClass
-					.get(nextEClass.getName())
-					: null;
-
-			if (descriptors != null) {
-				for (Iterator j = descriptors.iterator(); j.hasNext();) {
-					MetamodelTypeDescriptor descriptor = (MetamodelTypeDescriptor) j
-							.next();
-	
-					if (clientContext.includes(descriptor)) {
-						return descriptor;
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Gets all of the element types (metamodel type and specialization types)
-	 * that match <code>eObject</code> in breadth-first order (specializations
-	 * before metamodel types).
-	 * 
-	 * @param eObject
-	 *            the model element to match
-	 * @param clientContext
-	 *            the client context
-	 * @return all of the element types that match the model element
-	 */
-	public IElementType[] getAllTypesMatching(EObject eObject, IClientContext clientContext) {
-		
-		List result = new ArrayList();
-		IMetamodelType metamodelType = getMetamodelType(eObject, clientContext);
-
-		if (metamodelType != null) {
-
-			// Get the matching specializations
-			Collection specializations;
-			MetamodelTypeDescriptor desc = getMetamodelTypeDescriptor(eObject, clientContext);
-			if (desc == null) {
-				specializations = Collections.EMPTY_LIST;
-			} else {
-				specializations = specializationTypeRegistry
-					.getSpecializationDescriptorsMatching(eObject, desc, clientContext);
-			}
-
-			for (Iterator i = specializations.iterator(); i.hasNext();) {
-				SpecializationTypeDescriptor next = (SpecializationTypeDescriptor) i
-					.next();
-				IElementType elementType = next.getElementType();
-				if (elementType != null) {
-					result.add(elementType);
-				}
-			}
-			// Add the metamodel type
-			result.add(metamodelType);
-
-			// Add the metamodel supertypes in reverse order
-			IElementType[] superTypes = metamodelType.getAllSuperTypes();
-
-			for (int i = superTypes.length - 1; i >= 0; i--) {
-				result.add(superTypes[i]);
-			}
-		}
-		
-		if (result.isEmpty()) {
-			// at least provide the default type for default editing behaviour
-			result.add(DefaultMetamodelType.getInstance());
-		}
-		
-		return (IElementType[]) result.toArray(EMPTY_ELEMENT_TYPE_ARRAY);
-	}
-
-	/**
-	 * Gets all of the element types (metamodel type and specialization types)
-	 * that match <code>eObject</code> in breadth-first order (specializations
-	 * before metamodel types).
-	 * <P>
-	 * The client context will be inferred from the <code>eObject</code>.
-	 * 
-	 * @param eObject
-	 *            the model element to match
-	 * @return all of the element types that match the model element
-	 */
-	public IElementType[] getAllTypesMatching(EObject eObject) {
-
-		IClientContext clientContext = ClientContextManager.getInstance()
-				.getClientContextFor(eObject);
-		
-		return getAllTypesMatching(eObject, clientContext);
-	}
-	
-	/**
-	 * Gets an array containing all specializations of the element type for
-	 * <code>id</code>, in breadth-first order.
-	 * 
-	 * @param id
-	 *            the element type ID
-	 * @return the list of all specializations of this element type
-	 */
-	public ISpecializationType[] getSpecializationsOf(String id) {
-		
-		IElementTypeDescriptor descriptor = getTypeDescriptor(id);
-		
-		if (descriptor == null) {
-			return new ISpecializationType[] {};
-		}
-		
-		IClientContext clientContext = ClientContextManager.getInstance()
-				.getBinding(descriptor);
-
-		return specializationTypeRegistry
-				.getAllSpecializationTypes(descriptor, clientContext);
-	}
-	
-	/**
-	 * Gets the metamodel types in the registry that are bound to the
-	 * <code>clientContext</code>.
-	 * 
-	 * @param clientContext
-	 *            the client context
-	 * @return the metamodel types
-	 */
-	public IMetamodelType[] getMetamodelTypes(IClientContext clientContext) {
-
-		List result = new ArrayList();
-		for (Iterator i = metamodelTypeDescriptorsById.values().iterator(); i
-				.hasNext();) {
-			MetamodelTypeDescriptor descriptor = (MetamodelTypeDescriptor) i
-					.next();
-
-			if (clientContext.includes(descriptor)) {
-				result.add(descriptor.getElementType());
-			}
-		}
-
-		return (IMetamodelType[]) result.toArray(new IMetamodelType[result.size()]);
-	}
-	
-	/**
-	 * Gets the specialization types in the registry that are bound to the
-	 * <code>clientContext</code>.
-	 * 
-	 * @param clientContext
-	 *            the client context
-	 * @return the specialization types
-	 */
-	public ISpecializationType[] getSpecializationTypes(
-			IClientContext clientContext) {
-
-		List result = new ArrayList();
-		Collection specializations = specializationTypeRegistry
-				.getSpecializationTypeDescriptors(clientContext);
-		
-		for (Iterator i = specializations.iterator(); i.hasNext();) {
-			result.add(((SpecializationTypeDescriptor) i.next())
-					.getElementType());
-		}
-
-		return (ISpecializationType[]) result.toArray(new ISpecializationType[result.size()]);
-	}
-	
-	/**
-	 * Gets the element types (both metamodel types and specialization types) in
-	 * the registry that are bound to the <code>clientContext</code>.
-	 * 
-	 * @param clientContext
-	 *            the client context
-	 * @return the element types
-	 */
-	public IElementType[] getElementTypes(IClientContext clientContext) {
-
-		IMetamodelType[] metamodelTypes = getMetamodelTypes(clientContext);
-		ISpecializationType[] specializationTypes = getSpecializationTypes(clientContext);
-
-		IElementType[] result = new IElementType[metamodelTypes.length
-				+ specializationTypes.length];
-		
-		for (int i = 0; i < metamodelTypes.length; i++) {
-			result[i] = metamodelTypes[i];
-		}
-		
-		for (int i = 0; i < specializationTypes.length; i++) {
-			result[i + metamodelTypes.length] = specializationTypes[i];
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the element type for <code>id</code>. May return
-	 * <code>null</code> if this element is not registered.
-	 * 
-	 * @param id
-	 *            the type ID
-	 * @return the registered type with this ID, or <code>null</code> if there
-	 *         is none.
-	 */
-	public IElementType getType(String id) {
-
-		ElementTypeDescriptor typeDescriptor = getTypeDescriptor(id);
-
-		if (typeDescriptor != null) {
-			return typeDescriptor.getElementType();
-		} else if (DefaultMetamodelType.ID.equals(id)) {
-			return DefaultMetamodelType.getInstance();
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the element type factory registered to create element types of kind
-	 * <code>kindName</code>.
-	 * 
-	 * @param kindName
-	 *            the element type kind name
-	 * @return the element type factory for this kind, or
-	 *         <code>null/code> if there is none
-	 */
-	public IElementTypeFactory getElementTypeFactory(String kindName) {
-		ElementTypeFactoryDescriptor descriptor = (ElementTypeFactoryDescriptor) elementTypeFactoryMap
-			.get(kindName);
-		if (descriptor != null) {
-			return descriptor.getElementTypeFactory();
-		}
-		return null;
-	}
-
-	/**
-	 * Registers <code>metamodelType</code> with this registry, if its ID is
-	 * unique in the registry. The type's EClass does not have to be unique in
-	 * the registry. Metamodel types in the registry are distinguished by the
-	 * client context that is bound to the type.
-	 * <P>
-	 * Notifies clients if the element type was added to the registry.
-	 * 
-	 * @param metamodelType
-	 *            the element type to register
-	 * @return <code>true</code> if the type was registered,
-	 *         <code>false</code> otherwise
-	 */
-	public boolean register(IMetamodelType metamodelType) {
-
-		if (metamodelType == null
-			|| getType(metamodelType.getId()) != null) {
-
-			return false;
-		}
-
-		MetamodelTypeDescriptor descriptor = new MetamodelTypeDescriptor(
-			metamodelType);
-
-		boolean result = register(descriptor);
-
-		if (result) {
-			fireElementTypeAddedEvent(new ElementTypeAddedEvent(
-				metamodelType.getId()));
-		}
-
-		return result;
-	}
-
-	/**
-	 * Registers <code>specializationType</code> with this registry, if its ID
-	 * is unique in the registry.
-	 * <P>
-	 * Notifies clients if the element type was added to the registry.
-	 * 
-	 * @param specializationType
-	 *            the element type to register
-	 * @return <code>true</code> if the type was registered,
-	 *         <code>false</code> otherwise
-	 */
-	public boolean register(ISpecializationType specializationType) {
-
-		if (specializationType == null
-			|| getType(specializationType.getId()) != null) {
-
-			return false;
-		}
-
-		boolean result = specializationTypeRegistry
-			.registerSpecializationType(specializationType);
-
-		if (result) {
-			fireElementTypeAddedEvent(new ElementTypeAddedEvent(
-				specializationType.getId()));
-		}
-
-		return result;
-	}
-
-	/**
-	 * Removes specialization types from the registry that specialize more than
-	 * one metamodel type, or do not specialize any metamodel type.
-	 * <P>
-	 * Logs an error when an invalid specialization is found.
-	 */
-	private void removeInvalidSpecializations() {
-
-		List specializationsToReject = new ArrayList();
-
-		Collection specializationTypes = specializationTypeRegistry
-			.getSpecializationTypeDescriptors();
-
-		for (Iterator i = specializationTypes.iterator(); i.hasNext();) {
-			SpecializationTypeDescriptor nextSpecialization = (SpecializationTypeDescriptor) i
-				.next();
-			MetamodelTypeDescriptor metamodelTypeDescriptor = getMetamodelTypeDescriptor(nextSpecialization);
-
-			if (metamodelTypeDescriptor == null) {
-				specializationsToReject.add(nextSpecialization);
-			}
-		}
-
-		for (Iterator i = specializationsToReject.iterator(); i.hasNext();) {
-			specializationTypeRegistry
-				.removeSpecializationType((SpecializationTypeDescriptor) i
-					.next());
-		}
-	}
-
-	/**
-	 * Loads the metamodel element <code>configElement</code>.
-	 * 
-	 * @param configElement
-	 *            the configuration element
-	 * @throws CoreException
-	 *             on any problem accessing a configuration element
-	 */
-	private void loadMetamodel(IConfigurationElement configElement)
-		throws CoreException {
-
-		MetamodelDescriptor descriptor = new MetamodelDescriptor(configElement);
-
-		IConfigurationElement[] typeConfigs = configElement.getChildren();
-
-		for (int i = 0; i < typeConfigs.length; i++) {
-			IConfigurationElement next = typeConfigs[i];
-
-			String name = next.getName();
-			if (name.equals(ElementTypeXmlConfig.E_METAMODEL_TYPE)) {
-				registerMetamodelType(next, descriptor);
-
-			} else if (name.equals(ElementTypeXmlConfig.E_SPECIALIZATION_TYPE)) {
-				registerSpecializationType(next, descriptor);
-
-			} else if (name.equals(ElementTypeXmlConfig.E_ADVICE_BINDING)) {
-				specializationTypeRegistry.registerAdviceBinding(next,
-					descriptor);
-			}
-		}
-	}
-
-	/**
-	 * Registers the metamodel element type described by
-	 * <code>configElement</code>.
-	 * 
-	 * @param configElement
-	 *            the configutation element
-	 * @param metamodelDescriptor
-	 *            the descriptor for the metamodel containing the EClass for the
-	 *            new element type
-	 * 
-	 * @throws CoreException
-	 *             on any problem accessing a configuration element
-	 */
-	private void registerMetamodelType(IConfigurationElement configElement,
-			MetamodelDescriptor metamodelDescriptor)
-		throws CoreException {
-
-		MetamodelTypeDescriptor descriptor = new MetamodelTypeDescriptor(
-			configElement, metamodelDescriptor);
-		register(descriptor);
-
-	}
-
-	/**
-	 * Registers the specialization element type described by
-	 * <code>configElement</code>.
-	 * 
-	 * @param configElement
-	 *            the configutation element
-	 * @param metamodelDescriptor
-	 *            the descriptor for the metamodel containing the EClass for the
-	 *            new element type
-	 * 
-	 * @throws CoreException
-	 *             on any problem accessing a configuration element
-	 */
-	private SpecializationTypeDescriptor registerSpecializationType(
-			IConfigurationElement configElement,
-			MetamodelDescriptor metamodelDescriptor)
-		throws CoreException {
-
-		return specializationTypeRegistry.registerSpecializationType(
-			configElement, metamodelDescriptor);
-	}
-
-	/**
-	 * Adds the metamodel <code>type</code> to this registry. Logs an error if
-	 * a metamodel type has already been registered for the same ID.
-	 * 
-	 * @param typeDescriptor
-	 *            the descriptor of the type to be added.
-	 * @return <code>true</code> if the type was added, <code>false</code>
-	 *         otherwise.
-	 */
-	private boolean register(MetamodelTypeDescriptor typeDescriptor) {
-
-		if (checkForDuplicate(typeDescriptor)) {
-			return false;
-		}
-		
-		String nsURI = typeDescriptor.getNsURI();
-		String eClassName = typeDescriptor.getEClassName();
-
-		Map metamodelTypeDescriptorsByEClass = (Map) metamodelTypeDescriptorsByNsURI
-				.get(nsURI);
-
-		if (metamodelTypeDescriptorsByEClass == null) {
-			metamodelTypeDescriptorsByEClass = new HashMap();
-			metamodelTypeDescriptorsByNsURI.put(nsURI, metamodelTypeDescriptorsByEClass);
-		}
-		
-		Collection descriptors = (Collection) metamodelTypeDescriptorsByEClass.get(eClassName);
-		
-		if (descriptors == null) {
-			descriptors = new ArrayList();
-			metamodelTypeDescriptorsByEClass.put(eClassName, descriptors);
-		}
-
-		descriptors.add(typeDescriptor);
-
-		metamodelTypeDescriptorsById
-				.put(typeDescriptor.getId(), typeDescriptor);
-
-		return true;
-	}
-
-	/**
-	 * Loads the element type factory from <code>configElement</code>.
-	 * 
-	 * @param configElement
-	 *            the configuration element
-	 * @throws CoreException
-	 *             on any problem accessing a configuration element
-	 */
-	private void loadElementTypeFactory(IConfigurationElement configElement)
-		throws CoreException {
-
-		ElementTypeFactoryDescriptor descriptor = new ElementTypeFactoryDescriptor(
-			configElement);
-		elementTypeFactoryMap.put(descriptor.getKindName(), descriptor);
-
-	}
-
-	/**
-	 * Checks to see if an element type with the same ID as
-	 * <code>typeDescriptor</code> has already been registered.
-	 * 
-	 * @param typeDescriptor
-	 * @return <code>true</code> if there is no duplicate, <code>false</code>
-	 *         otherwise.
-	 */
-	private boolean checkForDuplicate(ElementTypeDescriptor typeDescriptor) {
-
-		if (metamodelTypeDescriptorsById.containsKey(typeDescriptor.getId())) {
-			Log
-					.error(
-							EMFTypePlugin.getPlugin(),
-							EMFTypePluginStatusCodes.TYPE_NOT_INITED,
-							EMFTypeCoreMessages
-									.bind(
-											EMFTypeCoreMessages.type_not_init_WARN_,
-											typeDescriptor.getId(),
-											EMFTypeCoreMessages.type_reason_duplicate_id_WARN_));
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Gets the metamodel type descriptors that match the EClasses in
-	 * <code>eClasses</code> for the client <code>context</code>.
-	 * 
-	 * @param eClasses
-	 *            a Set of <code>EClass</code> instances
-	 * @param context
-	 *            the client context
-	 * @return a List of <code>modelType</code>s
-	 */
-	private List getMetamodelTypeDescriptors(Set eClasses,
-			IClientContext context) {
-		
-		List result = new ArrayList();
-
-		for (Iterator i = eClasses.iterator(); i.hasNext();) {
-			EClass nextType = (EClass) i.next();
-
-			MetamodelTypeDescriptor metamodelTypeDescriptor = getMetamodelTypeDescriptor(
-					nextType, context);
-
-			if (metamodelTypeDescriptor != null) {
-				result.add(metamodelTypeDescriptor);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the type descriptor for the element type with <code>id</code>
-	 * 
-	 * @param id
-	 *            the type ID
-	 * @return the type descriptor, or <code>null</code> if none is registered
-	 *         with that ID
-	 */
-	private ElementTypeDescriptor getTypeDescriptor(String id) {
-
-		ElementTypeDescriptor typeDescriptor = (ElementTypeDescriptor) metamodelTypeDescriptorsById
-			.get(id);
-
-		if (typeDescriptor == null) {
-			// Try the specialization types
-			typeDescriptor = specializationTypeRegistry
-				.getSpecializationTypeDescriptor(id);
-		}
-		return typeDescriptor;
-	}
-
-	/**
-	 * Gets the descriptor for the metamodel type that the
-	 * <code>specializationTypeDescriptor</code> specializes. There should
-	 * only be one such metamodel type.
-	 * 
-	 * @param specializationTypeDescriptor
-	 * @return descriptor for the metamodel type that the
-	 *         <code>specializationTypeDescriptor</code> specializes, or
-	 *         <code>null</code> if the doesn't specialize any metamodel type,
-	 *         or it specializes more than one metamodel type.
-	 */
-	private MetamodelTypeDescriptor getMetamodelTypeDescriptor(
-			SpecializationTypeDescriptor specializationTypeDescriptor) {
-
-		MetamodelTypeDescriptor metamodelTypeDescriptor = null;
-
-		String[] specializedTypeIds = specializationTypeDescriptor
-			.getSpecializationTypeIds();
-
-		for (int j = 0; j < specializedTypeIds.length; j++) {
-
-			ElementTypeDescriptor nextSpecializedType = getTypeDescriptor(specializedTypeIds[j]);
-
-			if (nextSpecializedType == null) {
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.SPECIALIZATION_TYPE_SPECIALIZES_INVALID_ID,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.specializationType_specializes_invalid_id_ERROR_,
-												specializationTypeDescriptor
-														.getId(),
-												specializedTypeIds[j]));
-				return null;
-			}
-			
-			MetamodelTypeDescriptor specializedMetamodelType = null;
-
-			if (nextSpecializedType instanceof MetamodelTypeDescriptor) {
-				specializedMetamodelType = (MetamodelTypeDescriptor) nextSpecializedType;
-
-			} else if (nextSpecializedType instanceof SpecializationTypeDescriptor) {
-				SpecializationTypeDescriptor nextSpecializationType = (SpecializationTypeDescriptor) nextSpecializedType;
-				specializedMetamodelType = getMetamodelTypeDescriptor(nextSpecializationType);
-			}
-
-			if (specializedMetamodelType == null) {
-				// I am specializing a type that doesn't have a metamodel
-				// type. I will be removed from the element type registry.
-				metamodelTypeDescriptor = null;
-				break;
-
-			} else if (metamodelTypeDescriptor == null) {
-				// This is the first metamodel type.
-				metamodelTypeDescriptor = specializedMetamodelType;
-
-			} else if (metamodelTypeDescriptor != specializedMetamodelType) {
-				// Found that I specialize two different metamodel types
-				metamodelTypeDescriptor = null;
-				break;
-			}
-		}
-		
-		if (metamodelTypeDescriptor == null) {
-			Log
-					.error(
-							EMFTypePlugin.getPlugin(),
-							EMFTypePluginStatusCodes.SPECIALIZATION_TYPE_SPECIALIZES_MULTIPLE_METAMODEL_TYPES,
-							EMFTypeCoreMessages
-									.bind(
-											EMFTypeCoreMessages.specializationType_specializes_multiple_metamodel_types_ERROR_,
-											specializationTypeDescriptor
-													.getId()));
-		}
-		return metamodelTypeDescriptor;
-	}
-
-	/**
-	 * Loads the element type definitions from the <code>elementTypes</code>
-	 * extension point.
-	 * 
-	 * @param configs
-	 *            the configuration elements
-	 */
-	private synchronized void load(IConfigurationElement[] configs) {
-
-		for (int i = 0; i < configs.length; i++) {
-
-			IConfigurationElement next = configs[i];
-			try {
-
-				String name = next.getName();
-				if (name.equals(ElementTypeXmlConfig.E_METAMODEL)) {
-					loadMetamodel(next);
-
-				} else if (name
-					.equals(ElementTypeXmlConfig.E_ELEMENT_TYPE_FACTORY)) {
-					loadElementTypeFactory(next);
-					
-				}  else if (name.equals(ElementTypeXmlConfig.E_SPECIALIZATION_TYPE)) {
-					registerSpecializationType(next, null);
-				} 
-
-			} catch (CoreException ce) {
-
-				String sourcePluginId = next.getDeclaringExtension()
-					.getContributor().getName();
-				Log.error(EMFTypePlugin.getPlugin(), ce.getStatus().getCode(),
-						EMFTypeCoreMessages.bind(
-								EMFTypeCoreMessages.xml_parsing_ERROR_,
-								sourcePluginId, ce.getStatus().getMessage()),
-						null);
-
-			} catch (Exception e) {
-
-				String sourcePluginId = next.getDeclaringExtension()
-					.getContributor().getName();
-
-				Log.error(EMFTypePlugin.getPlugin(),
-						EMFTypePluginStatusCodes.ERROR_PARSING_XML,
-						EMFTypeCoreMessages.bind(
-								EMFTypeCoreMessages.xml_parsing_ERROR_,
-								sourcePluginId, e.getMessage()), e);
-			}
-		}
-
-		// Remove the specializations that aren't valid.
-		removeInvalidSpecializations();
-	}
-
-	/**
-	 * Adds <code>l</code> as a listener for changes to this registry. Does
-	 * nothing if <code>l</code> is already registered as a listener.
-	 * 
-	 * @param l
-	 *            the new listener
-	 */
-	public void addElementTypeRegistryListener(IElementTypeRegistryListener l) {
-
-		if (!elementTypeRegistryListeners.contains(l)) {
-			elementTypeRegistryListeners.add(l);
-		}
-	}
-
-	/**
-	 * Removes <code>l</code> as a listener for changes to this registry. Does
-	 * nothing if <code>l</code> is not registered as a listener.
-	 * 
-	 * @param l
-	 *            the listener to remove
-	 */
-	public void removeElementTypeRegistryListener(IElementTypeRegistryListener l) {
-
-		if (elementTypeRegistryListeners.contains(l)) {
-			elementTypeRegistryListeners.remove(l);
-		}
-	}
-
-	/**
-	 * Notifies registered listeners that the element type registry has changed.
-	 * 
-	 * @param e
-	 *            the change event
-	 */
-	private void fireElementTypeAddedEvent(ElementTypeAddedEvent e) {
-
-		for (Iterator i = elementTypeRegistryListeners.iterator(); i.hasNext();) {
-			IElementTypeRegistryListener nextListener = (IElementTypeRegistryListener) i
-				.next();
-			nextListener.elementTypeAdded(e);
-		}
-	}
-	
-	private void registerNullElementType() {
-		register(NullElementType.getInstance());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IClientContext.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IClientContext.java
deleted file mode 100644
index dbff124..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IClientContext.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.util.Collection;
-import java.util.regex.Pattern;
-
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
-
-/**
- * Interface of an object that defines a context to which clients of the element
- * type registry may bind element types and advice. This effectively selects the
- * types and advice that are applicable to the model defined by a client.
- * <p>
- * This interface is not intended to be implemented outside of the element type
- * framework.
- * </p>
- * 
- * @author ldamus
- */
-public interface IClientContext {
-
-	/**
-	 * Returns the context ID defined by the client if this is not a
-	 * multi-context. It is is a mult-context, returns the multi-context ID.
-	 * 
-	 * @return my context ID
-	 */
-	String getId();
-
-	/**
-	 * Returns whether this context is a multi-context, which is a compound
-	 * context representing a group of client contexts.
-	 * <p>
-	 * 
-	 * @return <code>true</code> for a multi-context, <code>false</code>
-	 *         otherwise
-	 */
-	public boolean isMultiClientContext();
-
-	/**
-	 * Returns a list of {@link IClientContext}s contained in this
-	 * multi-context, or an empty list if this is not a multi-context.
-	 * 
-	 * @return an array of client context objects
-	 */
-	public Collection getChildren();
-
-	/**
-	 * Obtains the element matcher that determines the elements belong to me.
-	 * 
-	 * @return my selector
-	 */
-	IElementMatcher getMatcher();
-
-	/**
-	 * Binds a specific element type or advice to me.
-	 * 
-	 * @param typeId
-	 *            the ID of a element type or advice that is to be bound to me
-	 */
-	public void bindId(String typeId);
-
-	/**
-	 * Binds a pattern of element types and advice to me.
-	 * 
-	 * @param pattern
-	 *            the pattern of element type and advice IDs that are bound to
-	 *            me
-	 */
-	public void bindPattern(Pattern pattern);
-
-	/**
-	 * Queries whether I am bound to the specified
-	 * <code>elementTypeDescriptor</code>.
-	 * 
-	 * @param elementTypeDescriptor
-	 *            an element type descriptor
-	 * @return <code>true</code> if I am bound to the
-	 *         <code>elementTypeDescriptor</code>; <code>false</code>,
-	 *         otherwise
-	 */
-	boolean includes(IElementTypeDescriptor elementTypeDescriptor);
-
-	/**
-	 * Queries whether I am bound to the specified <code>elementType</code>.
-	 * 
-	 * @param elementType
-	 *            an element type
-	 * @return <code>true</code> if I am bound to the <code>elementType</code>;
-	 *         <code>false</code>, otherwise
-	 */
-	boolean includes(IElementType elementType);
-
-	/**
-	 * Queries whether I am bound to the specified <code>adviceDescriptor</code>.
-	 * 
-	 * @param advice
-	 *            an edit helper advice descriptor
-	 * @return <code>true</code> if I am bound to the <code>a</code>;
-	 *         <code>false</code>, otherwise
-	 */
-	boolean includes(IEditHelperAdviceDescriptor adviceDescriptor);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IContainerDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IContainerDescriptor.java
deleted file mode 100644
index 9f82a12..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IContainerDescriptor.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * Describes a model element container using an element matcher and containing
- * references.
- * 
- * @author ldamus
- */
-public interface IContainerDescriptor {
-
-	/**
-	 * Gets the matcher for the container. May be <code>null</code>.
-	 * <P>
-	 * This method may cause the plugin that defines the matcher class to be
-	 * loaded.
-	 * 
-	 * @return the matcher
-	 */
-	public IElementMatcher getMatcher();
-
-	/**
-	 * Gets the containment references. May be <code>null</code>.
-	 * 
-	 * @return the references
-	 */
-	public EReference[] getContainmentFeatures();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IEditHelperContext.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IEditHelperContext.java
deleted file mode 100644
index ad02f60..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IEditHelperContext.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * The context of an editing gesture. It represents the <code>EObject</code>
- * or <code>IElementType</code> that is the subject of the editing action, and
- * the <code>IClientContext</code> in which the editing will be performed.
- * <P>
- * If the <code>IElementType</code> is specified, the <code>EObject</code>
- * will be ignored in determining the context of the editing gesture.
- * <P>
- * This interface should not be implemented by clients. The
- * {@link EditHelperContext} should be instantiated instead.
- * 
- * @author ldamus
- */
-public interface IEditHelperContext {
-
-	/**
-	 * Gets the <code>EObject</code> that is the subject of the editing
-	 * action.
-	 * 
-	 * @return the subject of the editing action
-	 */
-	public abstract EObject getEObject();
-
-	/**
-	 * Gets the <code>IElementType</code> that is the subject of the editing
-	 * action.
-	 * 
-	 * @return the element type
-	 */
-	public abstract IElementType getElementType();
-
-	/**
-	 * Gets the client context in which the editing gesture will be performed.
-	 * 
-	 * @return the client context
-	 */
-	public abstract IClientContext getClientContext();
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementMatcher.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementMatcher.java
deleted file mode 100644
index e6570a5..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementMatcher.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Determines whether or not a model element matches a fixed set of criteria.
- * <P>
- * The number of conditions declared by this matcher are used to identify the
- * most precise match. A new type can specialize an existing type by adding more
- * conditions than that of the existing type.
- * 
- * @author ldamus
- */
-public interface IElementMatcher {
-
-	/**
-	 * Answers whether or not I match <code>eObject</code>.
-	 * 
-	 * @param eObject
-	 *            the model element to match
-	 * @return <code>true</code> if I match <code>eObject</code>,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean matches(EObject eObject);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementType.java
deleted file mode 100644
index f2b6fe4..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementType.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Interface used to define application-layer types that describe the kinds of
- * elements that can be displayed, created, modified and destroyed. These types
- * extend the types defined for any given metamodel, so that
- * <code>IElementType</code> s can be used to distinguish types of elements
- * that share the same metaclass.
- * <P>
- * Each element type defines how model objects that match its type are to be
- * displayed (by icon URL and display name), as well as how they are to be
- * created, modified and deleted (by edit helper and an accessor for edit
- * commands).
- * <P>
- * There are two known extensions of <code>IElementType</code>. These are
- * <code>IMetamodelType</code> and <code>ISpecializationType</code>. Each
- * metamodel type maps directly to an EClass. Each specialization type matches a
- * metamodel type with further restrictions expressed in a
- * <code>IElementMatcher</code> class.
- * <P>
- * Clients should not implement this interface directly, but should extend the
- * abstract implementation
- * {@link org.eclipse.gmf.runtime.emf.type.core.ElementType}.
- * 
- * @author ldamus
- */
-public interface IElementType
-	extends IAdaptable {
-
-	/**
-	 * Gets the unique identifier for this element type.
-	 * 
-	 * @return the unique identifier
-	 */
-	public abstract String getId();
-
-	/**
-	 * Gets the icon URL.
-	 * 
-	 * @return the icon URL
-	 */
-	public abstract URL getIconURL();
-
-	/**
-	 * Gets the display name.
-	 * 
-	 * @return the display name
-	 */
-	public abstract String getDisplayName();
-
-	/**
-	 * Gets the metaclass for this element type.
-	 * 
-	 * @return the metaclass
-	 */
-	public abstract EClass getEClass();
-
-	/**
-	 * Gets a command to edit an element of this type.
-	 * 
-	 * @param request
-	 *            the edit request
-	 * @return the edit command, or <code>null</code> if none is found. The
-	 *         command returned may not be executable, and this should be tested
-	 *         before it is executed.
-	 */
-	public abstract ICommand getEditCommand(IEditCommandRequest request);
-    
-    /**
-     * Answers whether or not the requested edit can be performed.
-     * 
-     * @param req
-     *            the edit request
-     * @return <code>true</code> if the requested edit can be performed,
-     *         <code>false</code> otherwise.
-     */
-    public boolean canEdit(IEditCommandRequest req);
-
-	/**
-	 * Gets the edit helper for this element type.
-	 * 
-	 * @return the edit helper
-	 */
-	public abstract IEditHelper getEditHelper();
-	
-	/**
-	 * Gets the element supertypes for this type.
-	 * Ordered from furthest supertype to nearest supertype.
-	 * 
-	 * @return the element supertypes
-	 */
-	public IElementType[] getAllSuperTypes();
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeDescriptor.java
deleted file mode 100644
index 2ee3aa8..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeDescriptor.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.net.URL;
-
-/**
- * Descriptor for an element type that has been defined in XML using the
- * <code>elementTypes</code> extension point.
- * 
- * @author ldamus
- */
-public interface IElementTypeDescriptor {
-
-	/**
-	 * Gets the element type identifier.
-	 * 
-	 * @return the element type identifier.
-	 */
-	public abstract String getId();
-
-	/**
-	 * Gets the element type icon URL.
-	 * 
-	 * @return the element type icon URL
-	 */
-	public abstract URL getIconURL();
-
-	/**
-	 * Gets the element type display name.
-	 * 
-	 * @return the element type display name.
-	 */
-	public abstract String getName();
-
-	/**
-	 * Gets the name of the element factory kind. Identifies the factory that
-	 * should be used to create the new element type.
-	 * 
-	 * @return the element factory kind name
-	 */
-	public abstract String getKindName();
-
-	/**
-	 * Gets the value for the parameter named <code>paramName</code>.
-	 * 
-	 * @param paramName
-	 *            the parameter name
-	 * @return the parameter value
-	 */
-	public abstract String getParamValue(String paramName);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeFactory.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeFactory.java
deleted file mode 100644
index 5f3def6..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeFactory.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-
-/**
- * Factory for custom element types, which must implement one of the
- * <code>IMetamodelType</code> or <code>ISpecializationType</code>
- * interfaces.
- * <P>
- * Custom element types can define custom parameters whose values can be
- * specified in the element type extension point.
- * <P>
- * Clients should not implement this interface directly, but should subclass
- * {@link org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeFactory}instead.
- * 
- * @author ldamus
- */
-public interface IElementTypeFactory {
-
-	/**
-	 * Creates the custom metamodel type.
-	 * 
-	 * @param descriptor
-	 *            the metamodel type descriptor
-	 * @return the custom metamodel type
-	 */
-	public abstract IMetamodelType createMetamodelType(
-			IMetamodelTypeDescriptor descriptor);
-
-	/**
-	 * Creates the custom specialization type.
-	 * 
-	 * @param descriptor
-	 *            the specialization type descriptor
-	 * @return the custom specialization type
-	 */
-	public abstract ISpecializationType createSpecializationType(
-			ISpecializationTypeDescriptor descriptor);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeRegistryListener.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeRegistryListener.java
deleted file mode 100644
index d44c77e..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IElementTypeRegistryListener.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-/**
- * Interface implemented by clients wishing to know when element types are added
- * to the element type registry.
- * 
- * @author ldamus
- */
-public interface IElementTypeRegistryListener {
-
-	/**
-	 * Notifies listeners that the new element type has been added to the element type registry.
-	 * 
-	 * @param elementTypeAddedEvent
-	 *            the event
-	 */
-	public abstract void elementTypeAdded(
-			ElementTypeAddedEvent elementTypeAddedEvent);
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IHintedType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IHintedType.java
deleted file mode 100644
index 2d5cc12..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IHintedType.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-/**
- * A type that requires a semantic hint for view creation.
- * 
- * <p>
- * This interface may be implemented by clients if the class extends the
- * abstract implementation
- * {@link org.eclipse.gmf.runtime.emf.type.core.ElementType} as
- * {@link IElementType} is not meant to be implemented by clients.
- * </p>
- * 
- * @author cmahoney
- */
-public interface IHintedType
-    extends IElementType {
-
-    /**
-     * Gets the semantic hint required for view creation.
-     * 
-     * @return the semantic hint.
-     */
-    String getSemanticHint();
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IMetamodelType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IMetamodelType.java
deleted file mode 100644
index ca28100..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IMetamodelType.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-
-/**
- * Interface used to define application-layer types that map directly to an
- * <code>EClass</code>.
- * <P>
- * Clients should not implement this interface directly, but should extend the
- * abstract implementation {@link org.eclipse.gmf.runtime.emf.type.core.MetamodelType}.
- * 
- * @author ldamus
- */
-public interface IMetamodelType
-	extends IElementType {
-
-	// No additional API.
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IMetamodelTypeDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IMetamodelTypeDescriptor.java
deleted file mode 100644
index 9b7fb8e..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/IMetamodelTypeDescriptor.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-
-/**
- * Descriptor for a metamodel element type that has been defined in XML using
- * the <code>elementTypes</code> extension point.
- * 
- * @author ldamus
- */
-public interface IMetamodelTypeDescriptor extends IElementTypeDescriptor {
-
-	/**
-	 * Gets the metaclass that this type represents.
-	 * 
-	 * @return the metaclass
-	 */
-	public abstract EClass getEClass();
-
-	/**
-	 * Gets the edit helper. May activate the plugin in which the edit helper is
-	 * defined.
-	 * 
-	 * @return the edit helper.
-	 */
-	public abstract IEditHelper getEditHelper();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ISpecializationType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ISpecializationType.java
deleted file mode 100644
index 904eaad..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ISpecializationType.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-/**
- * Interface used to define application-layer types that describe a
- * specialization of a metamodel type. The specifics of the specialization are
- * expressed in a <code>IElementMatcher</code> class and an
- * <code>IContainerDescriptor</code>.
- * <P>
- * Specializations can contribute 'before' and 'after' editing behaviour to
- * their metamodel type's default behaviour using <code>IEditHelperAdvice</code>.
- * <P>
- * Clients should not implement this interface directly, but should extend the
- * abstract implementation {@link org.eclipse.gmf.runtime.emf.type.core.SpecializationType}
- * instead.
- * 
- * @author ldamus
- */
-public interface ISpecializationType
-	extends IElementType {
-
-	/**
-	 * Gets the container descriptor.
-	 * 
-	 * @return the container descriptor.
-	 */
-	public abstract IContainerDescriptor getEContainerDescriptor();
-
-	/**
-	 * Gets the element matcher.
-	 * 
-	 * @return the element matcher.
-	 */
-	public abstract IElementMatcher getMatcher();
-
-	/**
-	 * Gets the element types that this type specializes.
-	 * 
-	 * @return an array of types that are specialized by this type.
-	 */
-	public abstract IElementType[] getSpecializedTypes();
-
-	/**
-	 * Gets the IDs of the specialized types.
-	 * 
-	 * @return the IDs of the specialized types
-	 */
-	public abstract String[] getSpecializedTypeIds();
-
-	/**
-	 * Answers whether or not I am a specialization of <code>type</code>.
-	 * 
-	 * @param type
-	 *            the type to be tested
-	 * @return <code>true</code> if I am a specialization of <code>type</code>,
-	 *         <code>false</code> otherwise.
-	 */
-	public abstract boolean isSpecializationOf(IElementType type);
-
-	/**
-	 * Gets my edit helper advice. The advice can return 'before' or 'after'
-	 * editing commands for editing elements of the types that I specialize.
-	 * 
-	 * @return the edit helper advice.
-	 */
-	public abstract IEditHelperAdvice getEditHelperAdvice();
-
-	/**
-	 * Gets the metamodel type that this type is a specialization of. This type
-	 * may be a direct specialization of the metamodel type, or indirect through
-	 * other specializations. It can specialize any number of other
-	 * specializations, so long as they in turn all specialize the same
-	 * metamodel type.
-	 * 
-	 * @return the metamodel type that I specialize
-	 */
-	public abstract IMetamodelType getMetamodelType();
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ISpecializationTypeDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ISpecializationTypeDescriptor.java
deleted file mode 100644
index 0d3116b..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ISpecializationTypeDescriptor.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-/**
- * Descriptor for a specialization element type that has been defined in XML
- * using the <code>elementTypes</code> extension point.
- * 
- * @author ldamus
- */
-public interface ISpecializationTypeDescriptor extends IElementTypeDescriptor {
-
-	/**
-	 * Gets the container descriptor.
-	 * 
-	 * @return the container descriptor
-	 */
-	public abstract IContainerDescriptor getContainerDescriptor();
-
-	/**
-	 * Gets the element types that this type specializes.
-	 * 
-	 * @return an array of types that are specialized by this type.
-	 */
-	public abstract IElementType[] getSpecializedTypes();
-
-	/**
-	 * Gets the element matcher. May cause the plugin defining the element
-	 * matcher class to be loaded.
-	 * 
-	 * @return the element matcher.
-	 */
-	public abstract IElementMatcher getMatcher();
-
-	/**
-	 * Gets my edit helper advice. The advice can return 'before' or 'after'
-	 * editing commands for editing elements of the types that I specialize.
-	 * <P>
-	 * May cause the plugin defining the edit helper advice class to be loaded.
-	 * 
-	 * @return the edit helper advice.
-	 */
-	public abstract IEditHelperAdvice getEditHelperAdvice();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/MetamodelType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/MetamodelType.java
deleted file mode 100644
index f43e6c9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/MetamodelType.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.net.URL;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.DefaultMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Represents an element type that maps directly to a metamodel element type (
- * <code>EClass</code>). There is only one metamodel type registered with the
- * {@link org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry}for a given EClass.
- * <P>
- * Provides an edit helper for editing model elements with the same
- * <code>EClass</code>.
- * 
- * @author ldamus
- */
-public class MetamodelType
-	extends ElementType
-	implements IMetamodelType {
-
-	/**
-	 * The edit helper.
-	 */
-	private IEditHelper editHelper;
-
-	/**
-	 * Constructs a new metamodel type.
-	 * 
-	 * @param id
-	 *            the id
-	 * @param iconURL
-	 *            the URL for the icon
-	 * @param displayName
-	 *            the display name
-	 * @param eClass
-	 *            the metaclass
-	 * @param editHelper
-	 *            the edit helper
-	 */
-	public MetamodelType(String id, URL iconURL, String displayName,
-			EClass eClass, IEditHelper editHelper) {
-
-		super(id, iconURL, displayName, eClass);
-		this.editHelper = editHelper;
-	}
-	
-
-	/**
-	 * Constructs a new metamodel type using values from the type descriptor.
-	 * 
-	 * @param descriptor
-	 *            the metamodel type descriptor.
-	 */
-	public MetamodelType(IMetamodelTypeDescriptor descriptor) {
-
-		this(descriptor.getId(), descriptor.getIconURL(), descriptor.getName(),
-				descriptor.getEClass(), descriptor.getEditHelper());
-
-	}
-
-	/**
-	 * Gets the edit helper. May activate the plugin in which the edit helper is
-	 * defined.
-	 * 
-	 * @return the edit helper.
-	 */
-	public IEditHelper getEditHelper() {
-		
-		if (editHelper == null) {
-			IElementType[] superTypes = getAllSuperTypes();
-			
-			if (superTypes.length > 0) {
-				editHelper = superTypes[superTypes.length - 1].getEditHelper();
-				
-			} else {
-				editHelper = DefaultMetamodelType.getInstance().getEditHelper();
-			}
-		}
-		return editHelper;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType#getCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 */
-	public ICommand getEditCommand(IEditCommandRequest request) {
-		return getEditHelper().getEditCommand(request);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType#getAllSuperTypes()
-	 */
-	public IElementType[] getAllSuperTypes() {
-
-		if (super.getAllSuperTypes() == null) {
-			
-			IClientContext context = ClientContextManager.getInstance()
-					.getBinding(this);
-			
-			LinkedHashSet result = new LinkedHashSet();
-			if (getEClass() != null) {
-				List supertypes = getEClass().getEAllSuperTypes();
-	
-				for (int i = 0; i < supertypes.size(); i++) {
-					EClass nextEClass = (EClass) supertypes.get(i);
-					IElementType nextElementType = ElementTypeRegistry
-						.getInstance().getElementType(nextEClass, context);
-	
-					if ((nextElementType != null)
-							&& (nextElementType != DefaultMetamodelType.getInstance())) {
-						
-						result.add(nextElementType);
-					}
-				}
-			}
-			setAllSupertypes((IElementType[]) result
-				.toArray(new IElementType[] {}));
-		}
-		return super.getAllSuperTypes();
-	}
-	
-	public String toString() {
-		return "MetamodelType[" + getId()+ "]"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/MultiClientContext.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/MultiClientContext.java
deleted file mode 100644
index 944bb34..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/MultiClientContext.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
-
-/**
- * Implements a multi-context, which is a compound context representing a group
- * of client contexts.
- * <P>
- * It's matcher matches an <code>EObject</code> if all of child contexts match
- * that <code>EObject</code>.
- * <P>
- * It includes an <code>IElementType</code> or an
- * <code>IEditHelperAdviceDescriptor</code> if all of the child contexts
- * include that <code>IElementType</code> or
- * <code>IEditHelperAdviceDescriptor</code>.
- * 
- * @author ldamus
- */
-public class MultiClientContext implements IClientContext {
-
-	/**
-	 * The ID of all multi-contexts.
-	 */
-	public static final String MULTI_CLIENT_CONTEXT_ID = "multi_client_context_ID"; //$NON-NLS-1$
-
-	private final Set children;
-
-	private IElementMatcher matcher;
-
-	/**
-	 * Initializes me with my child contexts.
-	 * 
-	 * @param children
-	 *            the {@link IClientContext}s that I represent
-	 */
-	public MultiClientContext(Collection childContexts) {
-
-		children = new HashSet(childContexts.size());
-
-		// reduce any MultiClientContexts to their child contexts
-		for (Iterator i = childContexts.iterator(); i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-
-			if (next.isMultiClientContext()) {
-				Collection nested = ((MultiClientContext) next).getChildren();
-				children.addAll(nested);
-
-			} else {
-				children.add(next);
-			}
-		}
-	}
-
-	/**
-	 * I am a multi-clientContext.
-	 */
-	public boolean isMultiClientContext() {
-		return true;
-	}
-
-	/**
-	 * Adds the given context to this multi-context. If <code>context</code>
-	 * is a multi-context, adds its children instead of itself.
-	 * 
-	 * @param status
-	 *            the new child context
-	 */
-	public void add(IClientContext context) {
-		if (context.isMultiClientContext()) {
-			children.addAll(context.getChildren());
-		} else {
-			children.add(context);
-		}
-	}
-
-	public final String getId() {
-		return MULTI_CLIENT_CONTEXT_ID;
-	}
-
-	public Collection getChildren() {
-		return children;
-	}
-
-	/**
-	 * Matches an <code>EObject</code> if all of my children match that
-	 * <code>EObject</code>.
-	 */
-	public final IElementMatcher getMatcher() {
-
-		if (matcher == null) {
-			matcher = new IElementMatcher() {
-				public boolean matches(EObject eObject) {
-
-					boolean result = !getChildren().isEmpty();
-					
-					for (Iterator i = getChildren().iterator(); result && i.hasNext();) {
-						IClientContext next = (IClientContext) i.next();
-
-						if (!next.getMatcher().matches(eObject)) {
-							result = false;
-						}
-					}
-					return result;
-				}
-			};
-		}
-		return matcher;
-	}
-
-	/**
-	 * Binds the <code>typeId</code> to each of my children.
-	 */
-	public void bindId(String typeId) {
-		for (Iterator i = getChildren().iterator(); i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-			next.bindId(typeId);
-		}
-	}
-
-	/**
-	 * Binds the <code>pattern</code> to each of my children.
-	 */
-	public void bindPattern(Pattern pattern) {
-		for (Iterator i = getChildren().iterator(); i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-			next.bindPattern(pattern);
-		}
-	}
-
-	/**
-	 * Includes the <code>elementTypeDescriptor</code> if all of my child
-	 * contexts include the <code>elementTypeDescriptor</code>.
-	 */
-	public boolean includes(IElementTypeDescriptor elementTypeDescriptor) {
-
-		boolean result = !getChildren().isEmpty();
-		
-		for (Iterator i = getChildren().iterator(); result && i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-			if (!next.includes(elementTypeDescriptor)) {
-				result = false;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Includes the <code>elementType</code> if all of my child contexts
-	 * include the <code>elementType</code>.
-	 */
-	public boolean includes(IElementType elementType) {
-
-		boolean result = !getChildren().isEmpty();
-		
-		for (Iterator i = getChildren().iterator(); result && i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-			if (!next.includes(elementType)) {
-				result = false;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Includes the <code>advice</code> if all of my child contexts include
-	 * the <code>advice</code>.
-	 */
-	public boolean includes(IEditHelperAdviceDescriptor advice) {
-		
-		boolean result = !getChildren().isEmpty();
-		
-		for (Iterator i = getChildren().iterator(); result && i.hasNext();) {
-			IClientContext next = (IClientContext) i.next();
-			if (!next.includes(advice)) {
-				result = false;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * The children fully determine equality.
-	 */
-	public boolean equals(Object obj) {
-
-		if (obj instanceof MultiClientContext) {
-			return getChildren().equals(((MultiClientContext) obj).getChildren());
-		}
-		return false;
-	}
-
-	/**
-	 * The children fully determine equality.
-	 */
-	public int hashCode() {
-		return getChildren().hashCode();
-	}
-
-	public String toString() {
-		StringBuffer b = new StringBuffer();
-
-		for (Iterator i = getChildren().iterator(); i.hasNext();) {
-			b.append(((IClientContext) i.next()).getId());
-
-			if (i.hasNext()) {
-				b.append(StringStatics.COMMA);
-			}
-		}
-		return "ClientMultiContext[" + b + ']'; //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/NullElementMatcher.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/NullElementMatcher.java
deleted file mode 100644
index 358a5d7..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/NullElementMatcher.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Element matcher that matches nothing.
- * 
- * @author ldamus
- */
-public class NullElementMatcher
-	implements IElementMatcher {
-
-	/**
-	 * Always returns <code>false</code>.
-	 */
-	public boolean matches(EObject eObject) {
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/NullElementType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/NullElementType.java
deleted file mode 100644
index 9693039..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/NullElementType.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Singleton element type that has no <code>EClass</code>. Clients can
- * specialized this element type if they wish to declare types that do not have
- * a matching <code>EClass</code>.
- * 
- * @author ldamus
- */
-public class NullElementType
-	extends MetamodelType {
-
-	/**
-	 * Edit helper for the NullElementType that considers before and after
-	 * advice, only.
-	 */
-	private static class NullEditHelper
-		extends AbstractEditHelper {
-
-		protected ICommand getInsteadCommand(IEditCommandRequest req) {
-			return null;
-		}
-	}
-
-	/**
-	 * The ID.
-	 */
-	public static final String ID = "org.eclipse.gmf.runtime.emf.type.core.null"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance.
-	 */
-	private static NullElementType _instance;
-
-	/**
-	 * Gets the singleton instance.
-	 * 
-	 * @return the singleton instance
-	 */
-	public static NullElementType getInstance() {
-		if (_instance == null) {
-			_instance = new NullElementType();
-		}
-		return _instance;
-	}
-
-	/**
-	 * Private constructor.
-	 */
-	private NullElementType() {
-		super(ID, null, null, null, new NullEditHelper());
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/SpecializationType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/SpecializationType.java
deleted file mode 100644
index 77c578c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/SpecializationType.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Represents an application type that specializes other application types.
- * <P>
- * Specializations can contribute 'before' and 'after' advice to the editing
- * commands associated with the application types that they specialize.
- * 
- * @author ldamus
- */
-public class SpecializationType
-	extends ElementType
-	implements ISpecializationType {
-
-	/**
-	 * The container descriptor.
-	 */
-	private final IContainerDescriptor containerDescriptor;
-
-	/**
-	 * The element matcher.
-	 */
-	private IElementMatcher matcher;
-
-	/**
-	 * The element types that are specialized by this type.
-	 */
-	private final IElementType[] specializedTypes;
-
-	/**
-	 * The identifiers of the element types that are specialized by this type.
-	 */
-	private String[] specializedTypeIds;
-
-	/**
-	 * The edit helper advice.
-	 */
-	private final IEditHelperAdvice editHelperAdvice;
-
-	/**
-	 * The metamodel type
-	 */
-	private IMetamodelType metamodelType;
-
-	/**
-	 * Constructs a new specialization type.
-	 * 
-	 * @param id
-	 *            the type id
-	 * @param iconURL
-	 *            the URL for the icon
-	 * @param displayName
-	 *            the display name
-	 * @param elementTypes
-	 *            the element types that are specialized by this type
-	 * @param matcher
-	 *            the element matcher
-	 * @param descriptor
-	 *            the container descriptor
-	 * @param editHelperAdvice
-	 *            the edit helper advice
-	 */
-	public SpecializationType(String id, URL iconURL, String displayName,
-			IElementType[] elementTypes, IElementMatcher matcher,
-			IContainerDescriptor descriptor, IEditHelperAdvice editHelperAdvice) {
-
-		super(id, iconURL, displayName);
-
-		this.containerDescriptor = descriptor;
-		this.matcher = matcher;
-		this.specializedTypes = elementTypes;
-		this.editHelperAdvice = editHelperAdvice;
-	}
-	
-
-	/**
-	 * Constructs a new instance using values from the type descriptor.
-	 * 
-	 * @param descriptor
-	 *            the specialization type descriptor
-	 */
-	public SpecializationType(ISpecializationTypeDescriptor descriptor) {
-
-		this(descriptor.getId(), descriptor.getIconURL(), descriptor.getName(),
-				descriptor.getSpecializedTypes(), descriptor.getMatcher(),
-				descriptor.getContainerDescriptor(), descriptor
-						.getEditHelperAdvice());
-	}
-
-	/**
-	 * Gets the container descriptor.
-	 * 
-	 * @return the container descriptor.
-	 */
-	public IContainerDescriptor getEContainerDescriptor() {
-		return containerDescriptor;
-	}
-
-	/**
-	 * Gets the element matcher.
-	 * 
-	 * @return the element matcher.
-	 */
-	public IElementMatcher getMatcher() {
-		return matcher;
-	}
-
-	/**
-	 * Gets the element types that this type specializes.
-	 * 
-	 * @return an array of types that are specialized by this type.
-	 */
-	public IElementType[] getSpecializedTypes() {
-		return specializedTypes;
-	}
-
-	/**
-	 * Gets the IDs of the specialized types.
-	 * 
-	 * @return the IDs of the specialized types
-	 */
-	public String[] getSpecializedTypeIds() {
-
-		if (specializedTypeIds == null && specializedTypes != null) {
-			specializedTypeIds = new String[specializedTypes.length];
-
-			for (int i = 0; i < specializedTypes.length; i++) {
-				specializedTypeIds[i] = specializedTypes[i].getId();
-			}
-		}
-		return specializedTypeIds;
-	}
-
-	/**
-	 * Answers whether or not I am a specialization of <code>type</code>.
-	 * 
-	 * @param type
-	 *            the type to be tested
-	 * @return <code>true</code> if I am a specialization of <code>type</code>,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean isSpecializationOf(IElementType type) {
-
-        String[] ids = getSpecializedTypeIds();
-        
-		for (int i = 0; i < ids.length; i++) {
-			if (type.getId().equals(ids[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Gets my edit helper advice. The advice can return 'before' or 'after'
-	 * editing commands for editing elements of the types that I specialize.
-	 * 
-	 * @return the edit helper advice.
-	 */
-	public IEditHelperAdvice getEditHelperAdvice() {
-		return editHelperAdvice;
-	}
-
-	/**
-	 * Gets the metaclass that is specialized by this type.
-	 * 
-	 * @return the metaclass
-	 */
-	public EClass getEClass() {
-
-		return getMetamodelType().getEClass();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.ISpecializationType#getMetamodelType()
-	 */
-	public IMetamodelType getMetamodelType() {
-
-		if (metamodelType == null) {
-
-			for (int i = 0; i < getSpecializedTypes().length; i++) {
-				IElementType nextElementType = getSpecializedTypes()[i];
-
-				if (nextElementType instanceof IMetamodelType) {
-					metamodelType = (IMetamodelType) nextElementType;
-					break;
-
-				} else if (nextElementType instanceof ISpecializationType) {
-					metamodelType = ((ISpecializationType) nextElementType)
-						.getMetamodelType();
-					break;
-				}
-			}
-		}
-		return metamodelType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType#getEditHelper()
-	 */
-	public IEditHelper getEditHelper() {
-		return getMetamodelType().getEditHelper();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType#getCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 */
-	public ICommand getEditCommand(IEditCommandRequest request) {
-		return getEditHelper().getEditCommand(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType#getAllSuperTypes()
-	 */
-	public IElementType[] getAllSuperTypes() {
-
-		if (super.getAllSuperTypes() == null) {
-			List result = new ArrayList();
-	
-			// Add all the metamodel supertypes
-			IElementType[] metamodelSupertypes = getMetamodelType()
-				.getAllSuperTypes();
-			result.addAll(Arrays.asList(metamodelSupertypes));
-			
-			// Add the metamodel type
-			result.add(getMetamodelType());
-	
-			// Add all the specialization supertypes
-			result.addAll(getSpecializationSupertypes(this));
-
-			setAllSupertypes((IElementType[]) result.toArray(new IElementType[] {}));
-		}
-		return super.getAllSuperTypes();
-	}
-
-	/**
-	 * Gest the specialization supertypes of <code>specializationType</code>
-	 * 
-	 * @param specializationType
-	 *            the specialization type
-	 * @return the list of specialization supertypes
-	 */
-	private List getSpecializationSupertypes(
-			ISpecializationType specializationType) {
-
-		List result = new ArrayList();
-		IElementType[] specializationSupertypes = specializationType
-			.getSpecializedTypes();
-
-		for (int i = 0; i < specializationSupertypes.length; i++) {
-			IElementType nextType = specializationSupertypes[i];
-
-			if (nextType instanceof ISpecializationType) {
-				result
-					.addAll(getSpecializationSupertypes((ISpecializationType) nextType));
-				result.add(nextType);
-			}
-		}
-		return result;
-	}
-	
-	public String toString() {
-		return "SpecializationType[" + getId()+ "]";  //$NON-NLS-1$//$NON-NLS-2$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/ConfigureElementCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/ConfigureElementCommand.java
deleted file mode 100644
index 83dba82..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/ConfigureElementCommand.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-
-/**
- * Edit command to configure a new model element with the characteristics of its
- * element type.
- * 
- * @author ldamus
- */
-public abstract class ConfigureElementCommand
-	extends EditElementCommand {
-
-	/**
-	 * The element type.
-	 */
-	private final IElementType elementType;
-
-	/**
-	 * Constructs a new element configuration command for the
-	 * <code>request</code>.
-	 * 
-	 * @param request
-	 *            the element configuration request
-	 */
-	public ConfigureElementCommand(ConfigureRequest request) {
-
-		super(request.getLabel(), request.getElementToConfigure(), request);
-
-		this.elementType = request.getTypeToConfigure();
-	}
-
-	/**
-	 * Gets the element type.
-	 * 
-	 * @return the element type
-	 */
-	public IElementType getElementType() {
-		return elementType;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/ConfigureRelationshipCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/ConfigureRelationshipCommand.java
deleted file mode 100644
index 75f4e84..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/ConfigureRelationshipCommand.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-
-/**
- * Edit command to configure a new relationship element with the characteristics
- * of its element type.
- * 
- * @author ldamus
- */
-public abstract class ConfigureRelationshipCommand
-	extends ConfigureElementCommand {
-
-	/**
-	 * Constructs a new element configuration command for the
-	 * <code>request</code>.
-	 * 
-	 * @param request
-	 *            the element configuration request
-	 */
-	public ConfigureRelationshipCommand(ConfigureRequest request) {
-
-		super(request);
-	}
-
-	public boolean canExecute() {
-		Object source = ((ConfigureRequest) getRequest())
-			.getParameter(CreateRelationshipRequest.SOURCE);
-
-		Object target = ((ConfigureRequest) getRequest())
-			.getParameter(CreateRelationshipRequest.TARGET);
-		return source != null && target != null && super.canExecute();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/CreateElementCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/CreateElementCommand.java
deleted file mode 100644
index 7bb2787..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/CreateElementCommand.java
+++ /dev/null

@@ -1,257 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-/**
- * Command to create a new model element.
- * 
- * @author ldamus
- */
-public class CreateElementCommand extends EditElementCommand {
-
-	/**
-	 * The newly created element.
-	 */
-	private EObject newElement;
-
-	/**
-	 * The element type to be created.
-	 */
-	private final IElementType elementType;
-
-	/**
-	 * The containment feature in which the new element will be created.
-	 */
-	private EReference containmentFeature;
-
-	/**
-	 * Constructs a new element creation command for the <code>request</code>.
-	 * 
-	 * @param request
-	 *            the element creation request
-	 */
-	public CreateElementCommand(CreateElementRequest request) {
-
-		super(request.getLabel(), null, request);
-
-		elementType = request.getElementType();
-
-		containmentFeature = request.getContainmentFeature();
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        // Do the default element creation
-        newElement = doDefaultElementCreation();
-
-        // Configure the new element
-        ConfigureRequest configureRequest = createConfigureRequest();
-
-        ICommand configureCommand = elementType
-            .getEditCommand(configureRequest);
-        
-        IStatus configureStatus = null;
-        
-        if (configureCommand != null && configureCommand.canExecute()) {
-        	configureStatus = configureCommand.execute(monitor, info);
-        }
-
-        // Put the newly created element in the request so that the
-        // 'after' commands have access to it.
-        getCreateRequest().setNewElement(newElement);
-
-        return (configureStatus == null) ? 
-        		CommandResult.newOKCommandResult(newElement) : 
-        		new CommandResult(configureStatus, newElement);
-	}
-
-	/**
-	 * Creates the request to configure the new element.
-	 * 
-	 * @return the request
-	 */
-	protected ConfigureRequest createConfigureRequest() {
-
-		ConfigureRequest configureRequest = new ConfigureRequest(
-            getEditingDomain(), newElement, getElementType());
-        
-		// pass along the client context
-		configureRequest.setClientContext(getCreateRequest().getClientContext());
-		
-        configureRequest.addParameters(getRequest().getParameters());
-
-		return configureRequest;
-	}
-
-	/**
-	 * Subclasses should implement this to override the basic element creation.
-	 * 
-	 * @return the new model element that has been created
-	 */
-	protected EObject doDefaultElementCreation() {
-		EReference containment = getContainmentFeature();
-		EClass eClass = getElementType().getEClass();
-
-		if (containment != null) {
-			EObject element = getElementToEdit();
-
-			if (element != null)
-				return EMFCoreUtil.create(element, containment, eClass);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Initializes the container of the new element by asking the create to
-	 * create the container, if necessary.
-	 */
-	protected EObject getElementToEdit() {
-
-		if (super.getElementToEdit() == null) {
-			CreateElementRequest request = (CreateElementRequest) getRequest();
-			setElementToEdit(request.createContainer());
-		}
-		return super.getElementToEdit();
-	}
-
-	/**
-	 * Gets the EClass of the element to be edited.
-	 * 
-	 * @return the EClass
-	 */
-	protected EClass getEClassToEdit() {
-
-		CreateElementRequest request = (CreateElementRequest) getRequest();
-
-		Object context = request.getEditHelperContext();
-
-		if (context instanceof EObject) {
-			return ((EObject) context).eClass();
-
-		} else {
-			IElementType type = ElementTypeRegistry.getInstance()
-					.getElementType(context);
-
-			if (type != null) {
-				return type.getEClass();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the containment feature for the new element.
-	 * 
-	 * @return the containment feature
-	 */
-	protected EReference getContainmentFeature() {
-
-		if (containmentFeature == null) {
-			EClass classToEdit = getEClassToEdit();
-
-			if (classToEdit != null) {
-				IElementType type = getElementType();
-
-				if (type != null && type.getEClass() != null) {
-					containmentFeature = PackageUtil.findFeature(classToEdit,
-							type.getEClass());
-				}
-			}
-		}
-
-		return containmentFeature;
-	}
-
-	/**
-	 * Sets the containment feature for the new element.
-	 * 
-	 * @param containmentFeature
-	 *            the containment feature for the new element
-	 */
-	protected void setContainmentFeature(EReference containmentFeature) {
-		this.containmentFeature = containmentFeature;
-	}
-
-	/**
-	 * Gets the element type for the new element.
-	 * 
-	 * @return the element type
-	 */
-	protected IElementType getElementType() {
-		return elementType;
-	}
-
-	/**
-	 * Gets the create request.
-	 * 
-	 * @return the create request
-	 */
-	public CreateElementRequest getCreateRequest() {
-		return (CreateElementRequest) getRequest();
-	}
-
-	public boolean canExecute() {
-
-		if (getEClassToEdit() == null) {
-			return false;
-		}
-
-		if (getContainmentFeature() != null) {
-			EClassifier eClassifier = getContainmentFeature().getEType();
-			boolean result = true;
-
-			if (eClassifier instanceof EClass) {
-				result = ((EClass) eClassifier).isSuperTypeOf(getElementType()
-						.getEClass());
-			}
-
-			result = result
-					&& PackageUtil.canContain(getEClassToEdit(),
-							getContainmentFeature(), getElementType()
-									.getEClass(), false);
-
-			return result && super.canExecute();
-		}
-		return false;
-	}
-
-	/**
-	 * Gets the new element that was created by this command. Will be
-	 * <code>null</code> if the command has not been executed.
-	 * 
-	 * @return the new element
-	 */
-	public EObject getNewElement() {
-		return newElement;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/CreateRelationshipCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/CreateRelationshipCommand.java
deleted file mode 100644
index 4b88d7c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/CreateRelationshipCommand.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-
-/**
- * Command to create a new relationship element using the EMF action protocol.
- * <P>
- * If the containment feature is not specified in the request, the first feature
- * in the container that can contain the new kind of relationship will be used.
- * 
- * @author ldamus
- */
-public class CreateRelationshipCommand
-	extends CreateElementCommand {
-
-	/**
-	 * The relationship source.
-	 */
-	private final EObject source;
-
-	/**
-	 * The relationship target.
-	 */
-	private final EObject target;
-
-	/**
-	 * Constructs a new element creation command for the <code>request</code>.
-	 * 
-	 * @param request
-	 *            the element creation request
-	 */
-	public CreateRelationshipCommand(CreateRelationshipRequest request) {
-
-		super(request);
-
-		this.source = request.getSource();
-		this.target = request.getTarget();
-	}
-
-	/**
-	 * Gets the relationship source.
-	 * 
-	 * @return the relationship source
-	 */
-	public EObject getSource() {
-		return source;
-	}
-
-	/**
-	 * Gets the relationship target.
-	 * 
-	 * @return the relationship target
-	 */
-	public EObject getTarget() {
-		return target;
-	}
-
-	protected ConfigureRequest createConfigureRequest() {
-
-		ConfigureRequest result = super.createConfigureRequest();
-		result.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		result.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		return result;
-	}
-
-	public boolean canExecute() {
-		return getSource() != null && getTarget() != null
-			&& super.canExecute();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DeferredSetValueCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DeferredSetValueCommand.java
deleted file mode 100644
index b36c981..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DeferredSetValueCommand.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-
-/**
- * Command to set the value of a feature of a model element. The model element
- * is not known at the time of command construction. Subclasses can override
- * {@link #getElementToEdit()} to compute or find the elementToEdit.
- * 
- * @author ldamus
- */
-public class DeferredSetValueCommand extends SetValueCommand {
-
-	/**
-	 * Constructs a new command.
-	 * 
-	 * @param request
-	 *            the set value request
-	 */
-	public DeferredSetValueCommand(SetRequest request) {
-		super(request);
-	}
-
-	/**
-	 * Always executable when we can't get the elementToEdit.
-	 */
-	public boolean canExecute() {
-
-		if (getElementToEdit() == null) {
-			return true;
-		}
-		return super.canExecute();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DestroyElementCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DestroyElementCommand.java
deleted file mode 100644
index 496e4eb..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DestroyElementCommand.java
+++ /dev/null

@@ -1,209 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypeDebugOptions;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Command to create a model element using the EMF action protocol.
- * 
- * @author ldamus
- * @author Christian W. Damus (cdamus)
- */
-public class DestroyElementCommand
-	extends EditElementCommand {
-
-	/**
-	 * The element to be destroyed.
-	 */
-	private final EObject elementToDestroy;
-
-	/**
-	 * Constructs a new command to destroy a model element.
-	 * 
-	 * @param request
-	 *            the destroy element request
-	 */
-	public DestroyElementCommand(DestroyElementRequest request) {
-
-		super(request.getLabel(), request.getContainer(), request);
-		this.elementToDestroy = request.getElementToDestroy();
-	}
-	
-	/**
-	 * Convenience method for destroying the specified object by executing a
-	 * <code>DestroyElementCommand</code> on it, if it is attached to a
-	 * resource.  Detached elements cannot be destroyed.
-	 * <p>
-	 * <b>Note</b> that the command will not be executed on the operation
-	 * history.
-	 * </b>
-	 * 
-	 * @param eObject an element to destroy
-	 */
-	public static void destroy(EObject eObject) {
-
-		Resource resource = eObject.eResource();
-
-		if (resource != null) {
-			DestroyElementRequest destroy = new DestroyElementRequest(
-					TransactionUtil.getEditingDomain(resource),
-					eObject,
-					false);
-			
-			IElementType context = ElementTypeRegistry.getInstance().getElementType(
-					destroy.getEditHelperContext());
-			ICommand command = context.getEditCommand(destroy);
-		
-			if (command != null && command.canExecute()) {
-				try {
-					command.execute(new NullProgressMonitor(), null);
-				} catch (ExecutionException e) {
-					Trace.catching(EMFTypePlugin.getPlugin(),
-							EMFTypeDebugOptions.EXCEPTIONS_CATCHING,
-							DestroyElementCommand.class, "destroy(EObject)", e); //$NON-NLS-1$
-					Log.error(EMFTypePlugin.getPlugin(),
-							EMFTypePluginStatusCodes.COMMAND_FAILURE,
-							NLS.bind(EMFTypeCoreMessages.destroyCommandFailed,
-									context.getDisplayName()),
-							e);
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		EObject destructee = getElementToDestroy();
-		
-		// only destroy attached elements
-		if ((destructee != null) && (destructee.eResource() != null)) {
-			// tear down incoming references
-			tearDownIncomingReferences(destructee);
-			
-			// also tear down outgoing references, because we don't want
-			//    reverse-reference lookups to find destroyed objects
-			tearDownOutgoingReferences(destructee);
-			
-			// remove the object from its container
-			EcoreUtil.remove(destructee);
-			
-			// in case it was cross-resource-contained
-			Resource res = destructee.eResource();
-			if (res != null) {
-				res.getContents().remove(destructee);
-			}
-		}
-		
-		return CommandResult.newOKCommandResult();
-	}
-	
-	/**
-	 * Tears down references to the object that we are destroying, from all other
-	 * objects in the resource set.
-	 * 
-	 * @param destructee the object being destroyed
-	 */
-	protected void tearDownIncomingReferences(EObject destructee) {
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-			.getExistingCrossReferenceAdapter(destructee);
-		if (crossReferencer != null) {
-			Collection inverseReferences = crossReferencer
-				.getInverseReferences(destructee);
-			if (inverseReferences != null) {
-				int size = inverseReferences.size();
-				if (size > 0) {
-					Setting setting;
-					EReference eRef;
-					Setting[] settings = (Setting[]) inverseReferences
-						.toArray(new Setting[size]);
-					for (int i = 0; i < size; ++i) {
-						setting = settings[i];
-						eRef = (EReference) setting.getEStructuralFeature();
-						if (eRef.isChangeable() && (eRef.isDerived() == false)
-							&& (eRef.isContainment() == false)
-							&& (eRef.isContainer() == false)) {
-							EcoreUtil.remove(setting.getEObject(), eRef,
-								destructee);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Tears down outgoing unidirectional references from the object being
-	 * destroyed to all other elements in the resource set.  This is required
-	 * so that reverse-reference queries will not find the destroyed object.
-	 * 
-	 * @param destructee the object being destroyed
-	 */
-	protected void tearDownOutgoingReferences(EObject destructee) {
-		for (Iterator iter = destructee.eClass().getEAllReferences().iterator(); iter.hasNext();) {
-			EReference reference = (EReference) iter.next();
-			
-			// container/containment features are handled separately, and
-			//   bidirectional references were handled via incomings
-			if (reference.isChangeable() && !reference.isDerived()
-					&& !reference.isContainer() && !reference.isContainment()
-					&& (reference.getEOpposite() == null)) {
-				
-				if (destructee.eIsSet(reference)) {
-					destructee.eUnset(reference);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Gets the element to be destroyed.
-	 * @return the element to be destroyed
-	 */
-	protected EObject getElementToDestroy() {
-		return elementToDestroy;
-	}
-
-	public boolean canExecute() {
-		return (elementToDestroy != null) && (elementToDestroy.eResource() != null);
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DestroyReferenceCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DestroyReferenceCommand.java
deleted file mode 100644
index 048a479..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/DestroyReferenceCommand.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-
-/**
- * Command to destroy a reference from one element to another.
- * 
- * @author ldamus
- */
-public class DestroyReferenceCommand
-	extends EditElementCommand {
-
-	/**
-	 * The element that contains the reference.
-	 */
-	private EObject container;
-
-	/**
-	 * The feature in the <code>container</code> that contains the reference.
-	 */
-	private EReference containingFeature;
-
-	/**
-	 * The referenced object.
-	 */
-	private EObject referencedObject;
-
-	/**
-	 * Constructs a new command to destroy a model element.
-	 * 
-	 * @param request
-	 *            the destroy element requestO
-	 */
-	public DestroyReferenceCommand(DestroyReferenceRequest request) {
-
-		super(request.getLabel(), request.getContainer(), request);
-		this.container = request.getContainer();
-		this.containingFeature = request.getContainingFeature();
-		this.referencedObject = request.getReferencedObject();
-	}
-
-    protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-        throws ExecutionException {
-
-		List features = new ArrayList();
-
-		if (getContainingFeature() == null) {
-			features.addAll(getContainer().eClass().getEAllReferences());
-
-		} else {
-			features.add(getContainingFeature());
-		}
-
-		for (Iterator i = features.iterator(); i.hasNext();) {
-			EReference nextReference = (EReference) i.next();
-			if (nextReference.isChangeable() && !nextReference.isDerived()
-				&& getContainer().eIsSet(nextReference)) {
-				if (FeatureMapUtil.isMany(getContainer(), nextReference)) {
-					Collection referenceCollection = (Collection) getContainer()
-						.eGet(nextReference);
-					referenceCollection.remove(getReferencedObject());
-				} else if (getContainer().eGet(nextReference) == getReferencedObject()) {
-					getContainer().eSet(nextReference, null);
-				}
-			}
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * Gets element that contains the reference.
-	 * 
-	 * @return the element that contains the reference
-	 */
-	protected EObject getContainer() {
-		return container;
-	}
-
-	/**
-	 * Gets the feature in the <code>container</code> that contains the
-	 * reference.
-	 * 
-	 * @return the feature in the <code>container</code> that contains the
-	 *         reference.
-	 */
-	protected EReference getContainingFeature() {
-		return containingFeature;
-	}
-
-	/**
-	 * Gets the referenced object.
-	 * 
-	 * @return the referenced object.
-	 */
-	protected EObject getReferencedObject() {
-		return referencedObject;
-	}
-
-	public boolean canExecute() {
-		return getReferencedObject() != null && getContainer() != null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/EditElementCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/EditElementCommand.java
deleted file mode 100644
index 8c4274f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/EditElementCommand.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.internal.requests.RequestCacheEntries;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Abstract superclass for commands that modify model elements.
- * 
- * @author ldamus
- */
-public abstract class EditElementCommand
-	extends AbstractTransactionalCommand {
-
-	/**
-	 * The element to be modified.
-	 */
-	private EObject elementToEdit;
-
-	/**
-	 * The edit request that carries the required command parameters.
-	 */
-	private final IEditCommandRequest request;
-
-	/**
-	 * The kind of model element that can be modified by this command.
-	 */
-	private EClass eClass = null;
-
-	/**
-	 * Constructs a new command instance.
-	 * 
-	 * @param label
-	 *            the command label
-	 * @param elementToEdit
-	 *            the element to be modified
-	 * @param request
-	 *            the edt request
-	 */
-	protected EditElementCommand(String label, EObject elementToEdit,
-			IEditCommandRequest request) {
-
-		super(request.getEditingDomain(), label, getAffectedFiles(request));
-		this.elementToEdit = elementToEdit;
-		this.request = request;
-	}
-	
-    protected static List getAffectedFiles(IEditCommandRequest request) {
-		Map cacheMaps = (Map) request
-			.getParameter(RequestCacheEntries.Cache_Maps);
-		if (cacheMaps != null) {
-			return (List) cacheMaps.get(RequestCacheEntries.Affected_Files);
-		}
-
-		List result = new ArrayList();
-		List elements = request.getElementsToEdit();
-		int size;
-		if (elements != null && ((size = elements.size()) > 0)) {
-			if (size == 1) {
-				Resource resource = ((EObject) elements.get(0)).eResource();
-				if (resource != null) {
-					IFile file = WorkspaceSynchronizer.getFile(resource);
-					if (file != null) {
-						result.add(file);
-					}
-				}
-			} else {
-				Map resourcesToFileMap = new HashMap();
-				for (int i = 0; i < size; ++i) {
-					Resource resource = ((EObject) elements.get(i)).eResource();
-					if (resource != null) {
-						Object file = resourcesToFileMap.get(resource);
-						//if it is in the Map, then it is in the List already as well
-						if (file == null) {
-							file = WorkspaceSynchronizer.getFile(resource);
-							if (file != null) {
-								resourcesToFileMap.put(resource, file);
-								result.add(file);
-							}
-						}
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Checks that the element to be modified by this command is of the correct
-	 * kind.
-	 */
-	public boolean canExecute() {
-
-		if (getEClass() != null) {
-			return getEClass().isSuperTypeOf(getEClassToEdit());
-		}
-		return true;
-	}
-
-	/**
-	 * Gets the element to be modified by this command.
-	 * 
-	 * @return the element to be modified
-	 */
-	protected EObject getElementToEdit() {
-		return elementToEdit;
-	}
-	
-	protected EClass getEClassToEdit() {
-		return getElementToEdit().eClass();
-	}
-	
-	/**
-	 * Sets the element to be modified by this command.
-	 * 
-	 * @return the element to be modified
-	 */
-	protected void setElementToEdit(EObject element) {
-		this.elementToEdit = element;
-	}
-
-	/**
-	 * Gets the edit request.
-	 * 
-	 * @return the edit request
-	 */
-	protected IEditCommandRequest getRequest() {
-		return request;
-	}
-
-	/**
-	 * Gets the kind of element that can be modified by this command.
-	 * 
-	 * @return the kind of element
-	 */
-	protected EClass getEClass() {
-		return eClass;
-	}
-
-	/**
-	 * Sets the kind of element that can be modified by this command.
-	 * 
-	 * @param eClass
-	 *            the kind of element
-	 */
-	protected void setEClass(EClass eClass) {
-		this.eClass = eClass;
-	}
-
-	/**
-	 * Convenience method to check the status of <code>commandRequest</code>.
-	 * 
-	 * @param commandResult
-	 *            the command result to check
-	 * @return <code>true</code> if the result is OK, <code>false</code>
-	 *         otherwise.
-	 */
-	protected boolean isOK(CommandResult commandResult) {
-		return commandResult.getStatus().getCode() == IStatus.OK;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/GetEditContextCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/GetEditContextCommand.java
deleted file mode 100644
index cf2f457..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/GetEditContextCommand.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-
-/**
- * Command to get the edit context for a given request.
- * 
- * @author ldamus
- */
-public class GetEditContextCommand extends EditElementCommand {
-
-	/**
-	 * The edit context.
-	 */
-	private Object editContext;
-
-	/**
-	 * Constructs a new command. Automatically initializes the edit context with
-	 * that carried in the <code>request</code>.
-	 * 
-	 * @param request
-	 *            the command request
-	 */
-	public GetEditContextCommand(GetEditContextRequest request) {
-		super(request.getLabel(), null, request);
-		setEditContext(request.getEditContext());
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		return CommandResult.newOKCommandResult(getEditContext());
-	}
-
-	/**
-	 * Gets the edit context.
-	 * 
-	 * @return the edit context
-	 */
-	public Object getEditContext() {
-		return editContext;
-	}
-
-	/**
-	 * Sets the edit context.
-	 * 
-	 * @param editContext
-	 *            the edit context
-	 */
-	public void setEditContext(Object editContext) {
-		this.editContext = editContext;
-		((GetEditContextRequest) getRequest()).setEditContext(editContext);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/MoveElementsCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/MoveElementsCommand.java
deleted file mode 100644
index 7751ba5..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/MoveElementsCommand.java
+++ /dev/null

@@ -1,206 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-
-/**
- * Command to move model elements using the EMF action protocol.
- * <P>
- * If the target features are not specified in the request, and the features
- * fomerly containing the moved elements exists in the target element, they will
- * be used.
- * 
- * @author ldamus
- */
-public class MoveElementsCommand extends EditElementCommand {
-
-	/**
-	 * The map of <code>EObject</code>s to be moved. Keyed on
-	 * <code>EObject</code>. Each value is the <code>EReference</code>
-	 * feature in the target element into which the element should be moved.
-	 * <P>
-	 * If the feature is not specified for a given element, then a default
-	 * feature is found in the target.
-	 */
-	private final Map elementsToMove;
-
-	/**
-	 * The target container into which the element will be moved.
-	 */
-	private final EObject targetContainer;
-
-	/**
-	 * Constructs a new command to move a model element
-	 * 
-	 * @param request
-	 *            the move element request
-	 */
-	public MoveElementsCommand(MoveRequest request) {
-
-		super(request.getLabel(), request.getTargetContainer(), request);
-		this.elementsToMove = request.getElementsToMove();
-		this.targetContainer = request.getTargetContainer();
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		for (Iterator i = getElementsToMove().keySet().iterator(); i.hasNext();) {
-			EObject element = (EObject) i.next();
-			EReference feature = getTargetFeature(element);
-
-			if (feature != null) {
-				if (FeatureMapUtil.isMany(targetContainer, feature)) {
-					((Collection) targetContainer.eGet(feature)).add(element);
-
-				} else {
-					targetContainer.eSet(feature, element);
-				}
-			} else {
-				return CommandResult.newErrorCommandResult(EMFTypeCoreMessages.moveElementsCommand_noTargetFeature);
-			}
-		}
-
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * Gets the feature in the target element that should contain
-	 * <code>element</code> after it is moved.
-	 * <P>
-	 * Looks for the feature first in the elements map. If none is specified,
-	 * tries to use the same feature that contained the element in its old
-	 * location. If the old containment feature doesn't exist in the new target,
-	 * uses the MSL utility to find the first feature in the target that can
-	 * contain the element being moved.
-	 * 
-	 * @param element
-	 *            the element to be moved
-	 * @return the feature that will contain the element in the target
-	 */
-	protected EReference getTargetFeature(EObject element) {
-
-		EReference feature = (EReference) getElementsToMove().get(element);
-
-		if (feature == null) {
-			EReference oldContainmentFeature = element.eContainmentFeature();
-
-			if (getTargetContainer().eClass().getEAllReferences().contains(
-					oldContainmentFeature)) {
-				getElementsToMove().put(element, oldContainmentFeature);
-				feature = oldContainmentFeature;
-			}
-		}
-
-		if (feature == null) {
-			feature = PackageUtil.findFeature(getTargetContainer().eClass(),
-					element.eClass());
-			setTargetFeature(element, feature);
-		}
-
-		return feature;
-	}
-
-	/**
-	 * Gets the target container.
-	 * 
-	 * @return the target container
-	 */
-	protected EObject getTargetContainer() {
-		return targetContainer;
-	}
-
-	/**
-	 * Gets the map of elements to be moved. Each entry in the map consists of
-	 * an <code>EObject</code> key, which is the element to be moved to the
-	 * new target, and an <code>EReference</code> value, which is the feature
-	 * in the new target that should contain the moved element.
-	 * 
-	 * @return the map of elements to be moved
-	 */
-	protected Map getElementsToMove() {
-		return elementsToMove;
-	}
-
-	/**
-	 * Sets the reference feature into which an element should be moved.
-	 * 
-	 * @param element
-	 *            the element to be moved
-	 * @param targetFeature
-	 *            the target feature
-	 */
-	protected void setTargetFeature(EObject element, EReference targetFeature) {
-		getElementsToMove().put(element, targetFeature);
-	}
-
-	public boolean canExecute() {
-
-		EObject container = getTargetContainer();
-
-		if (container == null || elementsToMove == null
-				|| elementsToMove.isEmpty()) {
-			return false;
-		}
-
-		for (Iterator i = getElementsToMove().keySet().iterator(); i.hasNext();) {
-			EObject element = (EObject) i.next();
-			EReference feature = getTargetFeature(element);
-
-			if (feature == null
-					|| !container.eClass().getEAllReferences()
-							.contains(feature)) {
-				// If the target feature doesn't exist in the target container,
-				// don't allow the move.
-				return false;
-			}
-
-			// IF the element is already in the target container...
-			if (container.equals(element.eContainer())
-					&& feature == element.eContainmentFeature()) {
-				// Don't allow the reparenting
-				return false;
-			}
-
-			// IF the element is the parent of the target container...
-			if (EcoreUtil.isAncestor(element, getTargetContainer())) {
-				// Don't allow the reparenting
-				return false;
-			}
-
-			// IF the container can not contain the element...
-			if (!PackageUtil.canContain(getTargetContainer().eClass(),
-					feature, element.eClass(), false)) {
-				// Don't allow the reparenting
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/SetValueCommand.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/SetValueCommand.java
deleted file mode 100644
index 8616f7e..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/SetValueCommand.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.commands;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-
-/**
- * Command to set the value of a feature of a model element.
- * 
- * @author ldamus, mmostafa
- */
-public class SetValueCommand
-	extends EditElementCommand {
-
-	/**
-	 * The feature whose value should be set.
-	 */
-	private final EStructuralFeature feature;
-
-	/**
-	 * The new value.
-	 */
-	private final Object value;
-
-	/**
-	 * Constructs a new command to set the value of a feature of a model
-	 * element.
-	 * 
-	 * @param request
-	 *            the set value request
-	 */
-	public SetValueCommand(SetRequest request) {
-		super(request.getLabel(), request.getElementToEdit(), request);
-
-		this.feature = request.getFeature();
-		this.value = request.getValue();
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-        EObject elementToEdit = getElementToEdit();
-        boolean many = FeatureMapUtil.isMany(elementToEdit,feature);
-        if (many) {
-            Collection collection = ((Collection)elementToEdit.eGet(feature));
-            if (value instanceof List){
-                List values = (List)value;
-                collection.clear();
-                collection.addAll(values);
-            }else {
-                collection.add(value);
-            }
-        } else {
-            getElementToEdit().eSet(feature, value);
-        }
-        return CommandResult.newOKCommandResult();
-	}
-    
-    /**
-     * Checks that the feature is a modifiable feature of the element whose
-     * value will be set by this command. Also checks that the new value is of
-     * the correct type for the feature.
-     */
-    public boolean canExecute() {
-        EObject elementToEdit = getElementToEdit();
-        if (elementToEdit == null || !super.canExecute()) {
-            return false;
-        }
-        boolean many = FeatureMapUtil.isMany(elementToEdit, feature);
-        if (value == null && many) {
-            return false;
-        }
-        List allFeatures = getElementToEdit().eClass()
-            .getEAllStructuralFeatures();
-        if (allFeatures.contains(feature) && feature.isChangeable()){
-            if (!many && (value==null || feature.getEType().isInstance(value)))
-                return true;
-            else {
-                return verifyMany();
-            }
-        }
-        return false;
-    }
-    
-    private boolean verifyMany() {
-        if (value instanceof List){
-            List values = (List)value;
-            for (Iterator iter = values.iterator(); iter.hasNext();) {
-                Object element = iter.next();
-                if (!feature.getEType().isInstance(element))
-                    return false;
-            }
-            return true;
-        }
-        return feature.getEType().isInstance(value);
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/package.html
deleted file mode 100644
index 2845112..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides a set of commands that are used to edit model elements. These 
-commands are returned by element type edit helpers in the Element Type framework.</P>
-
-<P>Clients implementing their own edit helpers should subclass these commands if 
-they wish to implement custom editing behaviour.</P>
-
-@see org.eclipse.gmf.runtime.emf.type.core
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/AbstractEditHelper.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/AbstractEditHelper.java
deleted file mode 100644
index a6e249d..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/AbstractEditHelper.java
+++ /dev/null

@@ -1,880 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.edithelper;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-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.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.internal.requests.RequestCacheEntries;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-
-/**
- * Abstract edit helper implementation. Implements the default edit command
- * algorithm, which returns a composite command containing the following:
- * <OL>
- * <LI>'before' commands from matching element types and  specializations</LI>
- * <LI>'instead' command from this edit helper</LI>
- * <LI>'after' commands from matching element types and specializations</LI>
- * </OL>
- * <P>
- * The before and after commands are obtained by consulting the edit helper advice that
- * is bound to the edit helper context in the edit request. Edit helper advice can
- * be inherited from supertypes.
- * <P>
- * Clients should subclass this class when creating new edit helpers.
- * 
- * @author ldamus
- */
-public abstract class AbstractEditHelper
-	implements IEditHelper {
-	
-	/**
-	 * Map of the default containment features keyed on EClass. Each value is an
-	 * EReference.
-	 */
-	private Map defaultContainmentFeatures = new HashMap();
-    
-    /**
-     * Checks that I can get an executable edit command.
-     * <P>
-     * Subclasses should override if they have a different way to decide whether
-     * or not the edit is allowed.
-     */
-    public boolean canEdit(IEditCommandRequest req) {
-
-        // Get the matching edit helper advice
-        IEditHelperAdvice[] advice = getEditHelperAdvice(req);
-        
-        // Consult advisors to allow them to configure the request
-        configureRequest(req, advice);
-        
-        // Consult advisors to allow them approve the request
-        boolean approved = approveRequest(req, advice);
-        
-        if (!approved) {
-            return false;
-        }
-        
-        ICommand command = getEditCommand(req, advice);
-        return command != null && command.canExecute();
-    }
-
-	/**
-     * Builds and returns the edit command, which is a composite command
-     * containing the following:
-     * <OL>
-     * <LI>'before' commands from matching element type specializations</LI>
-     * <LI>'instead' command from this edit helper</LI>
-     * <LI>'after' commands from matching element type specializations</LI>
-     * </OL>
-     * <P>
-     * Verifies that the edit request is approved before constructing the edit
-     * command.
-     */
-	public ICommand getEditCommand(IEditCommandRequest req) { 
-		
-		// Get the matching edit helper advice
-		IEditHelperAdvice[] advice = getEditHelperAdvice(req);
-        
-		// Consult advisors to allow them to configure the request
-        configureRequest(req, advice);
-        
-		// Consult advisors to allow them approve the request
-        boolean approved = approveRequest(req, advice);
-        
-        if (!approved) {
-            return null;
-        }
-        
-        return getEditCommand(req, advice);
-	}
-    
-    /**
-     * Template method that implements the default edit command algorithm, which
-     * returns a composite command containing the following:
-     * <OL>
-     * <LI>'before' commands from matching element type specializations</LI>
-     * <LI>'instead' command from this edit helper</LI>
-     * <LI>'after' commands from matching element type specializations</LI>
-     * </OL>
-     */
-
-	
-    private ICommand getEditCommand(IEditCommandRequest req, IEditHelperAdvice[] advice) {
-    
-		ICompositeCommand command = createCommand(req);
-   
-        // Get 'before' commands from matching element type
-        // specializations
-        if (advice != null) {
-            for (int i = 0; i < advice.length; i++) {
-                IEditHelperAdvice nextAdvice = advice[i];
-
-                // Before commands
-                ICommand beforeAdvice = nextAdvice.getBeforeEditCommand(req);
-                
-                if (beforeAdvice != null) {
-
-                    if (!beforeAdvice.canExecute()) {
-                        // The operation is not permitted
-                        return UnexecutableCommand.INSTANCE;
-                    }
-                    command.compose(beforeAdvice);
-                }
-            }
-        }
-        
-        // Check if the parameter has been set to ignore the default edit command.
-        Object replaceParam = req
-                .getParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND);
-
-        if (replaceParam != Boolean.TRUE) {
-            // Get 'instead' command from this edit helper
-            ICommand insteadCommand = getInsteadCommand(req);
-
-            if (insteadCommand != null) {
-                
-                if (!insteadCommand.canExecute()) {
-                    // The operation is not permitted
-                	return UnexecutableCommand.INSTANCE;
-                }
-                command.compose(insteadCommand);
-            }
-        }
-        
-        // Get 'after' commands from matching element type
-        // specializations
-        if (advice != null) {
-            for (int i = 0; i < advice.length; i++) {
-                IEditHelperAdvice nextAdvice = advice[i];
-
-                // After commands
-                ICommand afterAdvice = nextAdvice.getAfterEditCommand(req);
-
-                if (afterAdvice != null) {
-                    
-                    if (!afterAdvice.canExecute()) {
-                        // The operation is not permitted
-                    	return UnexecutableCommand.INSTANCE;
-                    }
-                    command.compose(afterAdvice);
-                }
-            }
-        }
-        
-        return command.isEmpty() ? null
-            : command;
-    }
-    
-    /**
-     * Template method that consults the edit helper advice to configure the
-     * edit request.
-     * 
-     * @param req
-     *            the edit request
-     * @param advice
-     *            array of applicable edit helper advice
-     */
-    private void configureRequest(IEditCommandRequest req,
-            IEditHelperAdvice[] advice) {
-
-        if (advice != null) {
-
-            for (int i = 0; i < advice.length; i++) {
-                IEditHelperAdvice nextAdvice = advice[i];
-                nextAdvice.configureRequest(req);
-            }
-        }
-        // All advice has configured the request. Now consult this edit helper.
-        configureRequest(req);
-    }
-    
-    /**
-     * Template method that consults the edit helper advice to see whether or
-     * not they approve the request. If all advice approves the request, then
-     * {@link #approveRequest(IEditCommandRequest)} is called to determine if
-     * this edit helper approves the request.
-     * 
-     * @param req
-     *            the edit request
-     * @param advice
-     *            array of applicable edit helper advice
-     * @return <code>true</code> if the edit request is approved,
-     *         <code>false</code> otherwise. No edit command will be
-     *         constructed if the request is not approved.
-     */
-    private boolean approveRequest(IEditCommandRequest req,
-            IEditHelperAdvice[] advice) {
-
-        if (advice != null) {
-
-            for (int i = 0; i < advice.length; i++) {
-                IEditHelperAdvice nextAdvice = advice[i];
-                boolean approved = nextAdvice.approveRequest(req);
-
-                if (!approved) {
-                    // An advice doesn't approve this request
-                    return false;
-                }
-            }
-        }
-        // All advice has approved the request. Now consult this edit helper.
-        return approveRequest(req);
-    }
-   
-    /**
-     * Approves the edit gesture described in the <code>request</code>. This
-     * method will be consulted before the edit request is approved.
-     * <P>
-     * The default implementation does nothing. Subclasses should override if
-     * they wish to change the request parameters.
-     * 
-     * @param request
-     *            the edit request
-     */
-    protected void configureRequest(IEditCommandRequest request) {
-        // does nothing, by default
-    }
-    
-    /**
-     * Approves the edit gesture described in the <code>request</code>. This
-     * method will be consulted before the edit command is constructed.
-     * <P>
-     * The default implementation returns <code>true</code>. Subclasses
-     * should override if they wish to provide a different answer.
-     * 
-     * @param req
-     *            the edit request
-     * @return <code>true</code> if the edit request is approved,
-     *         <code>false</code> otherwise. No edit command will be
-     *         constructed if the request is not approved.
-     */
-    protected boolean approveRequest(IEditCommandRequest request) {
-        return true;
-    }
-	
-	/**
-	 * Gets the array of edit helper advice for this request.
-	 * 
-	 * @param req the edit request
-	 * @return the edit helper advice, or <code>null</code> if there is none
-	 */
-	protected IEditHelperAdvice[] getEditHelperAdvice(IEditCommandRequest req) {
-		IEditHelperAdvice[] advices = null;
-		Object editHelperContext = req.getEditHelperContext();
-		Map cacheMaps = (Map) req
-			.getParameter(RequestCacheEntries.Cache_Maps);
-		if (cacheMaps != null) {
-			Map contextMap = (Map) cacheMaps.get(editHelperContext);
-			if (contextMap != null) {
-				advices = (IEditHelperAdvice[]) contextMap.get(RequestCacheEntries.EditHelper_Advice);
-			}			
-		}		
-		
-		if (advices == null) {			
-			advices = ElementTypeRegistry.getInstance().getEditHelperAdvice(
-				editHelperContext);			
-		}
-		return advices;
-	}
-
-	/**
-	 * Creates a new composite command.
-	 * <P>
-	 * Subclasses may override to provide their own kind of composite command.
-	 * 
-	 * @param req the edit request
-	 * @return a new composite command
-	 */
-	protected ICompositeCommand createCommand(IEditCommandRequest req) {
-		CompositeTransactionalCommand result = new CompositeTransactionalCommand(
-			req.getEditingDomain(), req.getLabel()) {
-
-			/**
-			 * Extracts the first return value out of the collection of return
-			 * values from the superclass command result.
-			 */
-			public CommandResult getCommandResult() {
-				CommandResult _result = super.getCommandResult();
-
-				IStatus status = (_result == null) ? null : _result.getStatus();
-
-				if (status != null && status.getSeverity() == IStatus.OK) {
-					Object returnObject = null;
-
-					Object returnValue = _result.getReturnValue();
-
-					if (returnValue instanceof Collection) {
-						Collection collection = (Collection) returnValue;
-
-						if (!collection.isEmpty()) {
-							returnObject = collection.iterator().next();
-						}
-
-					} else {
-						returnObject = returnValue;
-					}
-					_result = new CommandResult(status, returnObject);
-				}
-
-				return _result;
-			};
-		};
-
-		// commands (esp. destroy) are expected to be large nested structures,
-		//   because there can be many discrete particles of advice
-		result.setTransactionNestingEnabled(false);
-		return result;
-	}
-
-	/**
-	 * Gets my command to do the work described in <code>req</code>.
-	 * <P>
-	 * Delegates to the more specific methods in this class to actually get the
-	 * command. Subclasses should override these more specific methods.
-	 * 
-	 * @param req
-	 *            the edit request
-	 * @return the command to do the requested work, or <code>null</code> if I
-	 *         don't support the requested work.
-	 */
-	protected ICommand getInsteadCommand(IEditCommandRequest req) {
-
-		if (req instanceof CreateRelationshipRequest) {
-			initializeDefaultFeature((CreateElementRequest) req);
-			return getCreateRelationshipCommand((CreateRelationshipRequest) req);
-
-		} else if (req instanceof CreateElementRequest) {
-			initializeDefaultFeature((CreateElementRequest) req);
-			return getCreateCommand((CreateElementRequest) req);
-
-		} else if (req instanceof ConfigureRequest) {
-			return getConfigureCommand((ConfigureRequest) req);
-
-		} else if (req instanceof DestroyElementRequest) {
-			return getDestroyElementCommand((DestroyElementRequest) req);
-			
-		} else if (req instanceof DestroyDependentsRequest) {
-			return getDestroyDependentsCommand((DestroyDependentsRequest) req);
-			
-		} else if (req instanceof DestroyReferenceRequest) {
-			return getDestroyReferenceCommand((DestroyReferenceRequest) req);
-
-		} else if (req instanceof DuplicateElementsRequest) {
-			return getDuplicateCommand((DuplicateElementsRequest) req);
-
-		} else if (req instanceof GetEditContextRequest) {
-			return getEditContextCommand((GetEditContextRequest) req);
-
-		} else if (req instanceof MoveRequest) {
-			return getMoveCommand((MoveRequest) req);
-
-		} else if (req instanceof ReorientReferenceRelationshipRequest) {
-			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);
-
-		} else if (req instanceof ReorientRelationshipRequest) {
-			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);
-
-		} else if (req instanceof SetRequest) {
-			return getSetCommand((SetRequest) req);
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.core.type.IEditHelper#getContainedValues(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.ecore.EReference)
-	 */
-	public List getContainedValues(EObject eContainer, EReference feature) {
-		return Arrays.asList(ElementTypeRegistry.getInstance()
-			.getContainedTypes(eContainer, feature));
-	}
-
-	/**
-	 * Gets the command to configure a new element of my kind. By default,
-	 * returns <code>null</code>. Subclasses may override to provide their
-	 * command.
-	 * 
-	 * @param req
-	 *            the configure request
-	 * @return the configure command
-	 */
-	protected ICommand getConfigureCommand(ConfigureRequest req) {
-		return null;
-	}
-
-	/**
-     * Gets the command to create a new relationship in an element of my kind.
-     * <P>
-     * Returns the {@link IdentityCommand} if the request does not have a source
-     * or a target. This ensures that the create relationship gesture is enabled
-     * until the request can be completely specified.
-     * <P>
-     * Subclasses may override to provide their own command.
-     * 
-     * @param req
-     *            the create relationship request
-     * @return the create relationship command
-     */
-	protected ICommand getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-        
-        EObject source = req.getSource();
-        EObject target = req.getTarget();
-
-        boolean noSourceOrTarget = (source == null || target == null);
-        boolean noSourceAndTarget = (source == null && target == null);
-
-        if (noSourceOrTarget && !noSourceAndTarget) {
-            // The request isn't complete yet. Return the identity command so
-            // that the create relationship gesture is enabled.
-            return IdentityCommand.INSTANCE;
-        }
-        
-		return new CreateRelationshipCommand(req);
-	}
-
-	/**
-	 * Gets the command to create a new element in an element of my kind.
-	 * Subclasses may override to provide their command.
-	 * 
-	 * @param req
-	 *            the create request
-	 * @return the create command
-	 */
-	protected ICommand getCreateCommand(CreateElementRequest req) {
-		return new CreateElementCommand(req);
-	}
-	
-	/**
-	 * Sets the default feature in <code>req</code>, if there is no
-	 * containment feature already in the request.
-	 * 
-	 * @param req
-	 *            the create request
-	 */
-	public void initializeDefaultFeature(CreateElementRequest req) {
-
-		if (req.getContainmentFeature() == null) {
-
-			// First, try to find the feature from the element type
-			ISpecializationType specializationType = (ISpecializationType) req.getElementType().getAdapter(ISpecializationType.class);
-			
-			if (specializationType != null) {
-				IContainerDescriptor containerDescriptor = specializationType.getEContainerDescriptor();
-
-				if (containerDescriptor != null) {
-					EReference[] features = containerDescriptor
-						.getContainmentFeatures();
-					
-					if (features != null) {
-
-						for (int i = 0; i < features.length; i++) {
-
-							Object editHelperContext = req
-								.getEditHelperContext();
-							EClass eClass = null;
-
-							if (editHelperContext instanceof EClass) {
-								eClass = (EClass) editHelperContext;
-								
-							} else if (editHelperContext instanceof EObject) {
-								eClass = ((EObject) editHelperContext).eClass();
-								
-							} else if (editHelperContext instanceof IElementType) {
-								eClass = ((IElementType) editHelperContext)
-									.getEClass();
-							}
-
-							if (eClass != null
-								&& eClass.getEAllReferences().contains(
-									features[i])) {
-								// Use the first feature
-								req.initializeContainmentFeature((features[i]));
-								return;
-							}
-						}
-					}
-				}
-			}
-
-			// Next, try to get a default feature
-			EClass eClass = req.getElementType().getEClass();
-			
-			if (eClass != null) {
-				req.initializeContainmentFeature(getDefaultContainmentFeature(eClass));
-			}
-		}
-	}
-	
-	/**
-	 * Gets the default feature to contain the <code>eClass</code>.
-	 * <P>
-	 * Returns <code>null</code> by default. Subclasses should override to
-	 * provide the default feature, if there is one.
-	 * 
-	 * @param eClass
-	 *            the EClass
-	 * @return the default feature
-	 */
-	protected EReference getDefaultContainmentFeature(EClass eClass) {
-		EReference result = (EReference) getDefaultContainmentFeatures().get(
-				eClass);
-
-		if (result == null) {
-			List superTypes = new ArrayList(eClass.getEAllSuperTypes());
-			Collections.reverse(superTypes);
-
-			Iterator i = superTypes.iterator();
-			
-			while (i.hasNext() && result == null) {
-				EClass nextSuperType = (EClass) i.next();
-				result = (EReference) getDefaultContainmentFeatures().get(
-						nextSuperType);
-			}
-		}
-		return result;
-	}
-	
-	protected Map getDefaultContainmentFeatures() {
-		return defaultContainmentFeatures;
-	}
-
-	/**
-	 * Gets the command to set a value of an element of my kind. By default,
-	 * returns <code>null</code>. Subclasses may override to provide their
-	 * command.
-	 * 
-	 * @param req
-	 *            the set request
-	 * @return the set command
-	 */
-	protected ICommand getSetCommand(SetRequest req) {
-		return new SetValueCommand(req);
-	}
-
-	/**
-	 * Gets the command to create or return the edit context element for the
-	 * creation of a new element of my kind (e.g., when creating a relationship,
-	 * the relationship may be owned by the source or target, or some ancestor
-	 * of one or the other, or both). By default, returns a command
-	 * that returns a <code>null</code> edit context.
-	 * Subclasses may override to provide their command.
-	 * 
-	 * @param req
-	 *            the get edit context request
-	 * @return the get edit context command
-	 */
-	protected ICommand getEditContextCommand(GetEditContextRequest req) {
-		return new GetEditContextCommand(req);
-	}
-
-	/**
-	 * Gets the command to destroy a single child of an element of my kind, and
-	 * only it. By default, returns a {@link DestroyElementCommand}. Subclasses
-	 * may override to provide their own command.
-	 * 
-	 * @param req
-	 *            the destroy request
-	 * @return a command that destroys only the element specified as the request's
-	 *    {@linkplain DestroyElementRequest#getElementToDestroy() element to destroy}
-	 */
-	protected ICommand getBasicDestroyElementCommand(DestroyElementRequest req) {
-		ICommand result = req.getBasicDestroyCommand();
-
-		if (result == null) {
-			result = new DestroyElementCommand(req);
-		} else {
-			// ensure that re-use of this request will not accidentally
-			//    propagate this command, which would destroy the wrong object
-			req.setBasicDestroyCommand(null);
-		}
-
-		return result;
-	}
-	
-	
-	
-	/**
-	 * Gets the command to destroy a single child of an element of my kind along
-	 * with its dependents (not related by containment). By default, returns a
-	 * composite that destroys the elements and zero or more dependents.
-	 * 
-	 * @param req
-	 *            the destroy request
-	 * @return a command that destroys the element specified as the request's
-	 *    {@linkplain DestroyElementRequest#getElementToDestroy() element to destroy}
-	 *    and its non-containment dependents
-	 */
-	protected ICommand getDestroyElementWithDependentsCommand(
-			DestroyElementRequest req) {
-		ICommand result = getBasicDestroyElementCommand(req);
-
-		EObject initial = (EObject) req
-			.getParameter(DestroyElementRequest.INITIAL_ELEMENT_TO_DESTROY_PARAMETER);
-
-		if (initial == null) {
-			// set the parameter to keep track of the initial element to destroy
-			req.setParameter(
-				DestroyElementRequest.INITIAL_ELEMENT_TO_DESTROY_PARAMETER, req
-					.getElementToDestroy());
-		}
-
-		//	 get elements dependent on the element we are destroying, that
-		//   must also be destroyed
-		DestroyDependentsRequest ddr = (DestroyDependentsRequest) req
-			.getParameter(DestroyElementRequest.DESTROY_DEPENDENTS_REQUEST_PARAMETER);
-		if (ddr == null) {
-			// create the destroy-dependents request that will be propagated to
-			//    destroy requests for all elements destroyed in this operation
-			ddr = new DestroyDependentsRequest(req.getEditingDomain(), req
-				.getElementToDestroy(), req.isConfirmationRequired());
-			// propagate the parameters, including the initial element to
-			//    destroy parameter
-			ddr.addParameters(req.getParameters());
-			ddr.setClientContext(req.getClientContext());
-			req
-				.setParameter(
-					DestroyElementRequest.DESTROY_DEPENDENTS_REQUEST_PARAMETER,
-					ddr);
-		} else {
-			ddr.setElementToDestroy(req.getElementToDestroy());
-		}
-
-		IElementType typeToDestroy = null;
-		Map cacheMaps = (Map) req.getParameter(RequestCacheEntries.Cache_Maps);
-		if (cacheMaps != null) {
-			Map map = (Map) cacheMaps.get(req.getElementToDestroy());
-			if (map != null) {
-				typeToDestroy = (IElementType) map
-					.get(RequestCacheEntries.Element_Type);
-			}
-		}
-
-		if (typeToDestroy == null) {
-			typeToDestroy = ElementTypeRegistry.getInstance().getElementType(
-				req.getElementToDestroy());
-		}
-
-		if (typeToDestroy != null) {
-			ICommand command = typeToDestroy.getEditCommand(ddr);
-
-			if (command != null) {
-				result = result.compose(command);
-			}
-		}
-
-		return result;
-	}
-	
-	/**
-	 * Gets the command to destroy a child of an element of my kind. By
-	 * default, returns a composite command that destroys the element specified
-	 * by the request and all of its contents.
-	 * 
-	 * @param req
-	 *            the destroy request
-	 * @return a command that destroys the element specified as the request's
-	 *    {@link DestroyElementRequest#getElementToDestroy() element to destroy}
-	 *    along with its contents and other dependents
-	 */
-	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {
-		ICommand result = null;	
-
-		ICommand destroyParent = getDestroyElementWithDependentsCommand(req);	
-		
-		EObject parent = req.getElementToDestroy();		
-		
-		IElementType parentType = null;	
-		
-		Map cacheMaps = (Map) req
-			.getParameter(RequestCacheEntries.Cache_Maps);
-		Set checkedElement = null;
-		if (cacheMaps != null) {
-			checkedElement = (Set) cacheMaps
-			.get(RequestCacheEntries.Checked_Elements);
-			checkedElement.add(parent);
-			Map parentMap = (Map) cacheMaps.get(parent);
-			parentType = (IElementType) parentMap
-				.get(RequestCacheEntries.Element_Type);			
-		} else {
-			parentType = ElementTypeRegistry.getInstance().getElementType(
-				parent);
-		}
-
-		if (parentType != null) {
-			for (Iterator iter = parent.eContents().iterator(); iter.hasNext();) {
-				EObject next = (EObject) iter.next();
-				
-				DestroyDependentsRequest ddr = (DestroyDependentsRequest) req.getParameter(
-						DestroyElementRequest.DESTROY_DEPENDENTS_REQUEST_PARAMETER);
-				
-				// if another object is already destroying this one because it
-				// is (transitively) a dependent, then don't destroy it again .
-				if ((ddr == null) || ((checkedElement != null) && checkedElement.add(next)) || (!ddr.getDependentElementsToDestroy().contains(next))) {
-					// set the element to be destroyed
-					req.setElementToDestroy(next);
-					
-					ICommand command = parentType.getEditCommand(req);
-				
-					if (command != null) {
-						if (result == null) {
-							result = command;
-						} else {
-							result = result.compose(command);
-						}
-						
-						if (!command.canExecute()) {
-							// no point in continuing if we're abandoning the works
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		//bottom-up destruction:  destroy children before parent
-		if (result == null) {
-			result = destroyParent;
-		} else {
-			result = result.compose(destroyParent);
-		}
-		
-		// restore the elementToDestroy in the original request
-		req.setElementToDestroy(parent);
-		
-		return result;
-	}
-
-	/**
-	 * Gets the command to destroy dependents of an element of my kind. By
-	 * default, returns <code>null</code>. Subclasses may override to provide
-	 * a command.
-	 * 
-	 * @param req
-	 *            the destroy dependents request
-	 * @return a command to destroy dependents, or <code>null</code>
-	 */
-	protected ICommand getDestroyDependentsCommand(DestroyDependentsRequest req) {
-		return null;
-	}
-
-	/**
-	 * Gets the command to remove a reference from an element of my kind. By
-	 * default, returns <code>null</code>. Subclasses may override to provide
-	 * their command.
-	 * 
-	 * @param req
-	 *            the destroy reference request
-	 * @return the destroy reference command
-	 */
-	protected ICommand getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return new DestroyReferenceCommand(req);
-	}
-
-	/**
-	 * Gets the command to duplicate a child in an element of my kind. By
-	 * default, returns <code>null</code>. Subclasses may override to provide
-	 * their command.
-	 * 
-	 * @param req
-	 *            the duplicate request
-	 * @return the duplicate command
-	 */
-	protected ICommand getDuplicateCommand(DuplicateElementsRequest req) {
-		return null;
-	}
-
-	/**
-	 * Gets the command to move an element into an element of my kind. By
-	 * default, returns <code>null</code>. Subclasses may override to provide
-	 * their command.
-	 * 
-	 * @param req
-	 *            the move request
-	 * @return the move command
-	 */
-	protected ICommand getMoveCommand(MoveRequest req) {
-		return new MoveElementsCommand(req);
-	}
-
-	/**
-	 * Gets the command to change the source or target of a reference in an
-	 * element of my kind. By default, returns <code>null</code>. Subclasses
-	 * may override to provide their command.
-	 * 
-	 * @param req
-	 *            the reorient reference request
-	 * @return the reorient reference command
-	 */
-	protected ICommand getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		return null;
-	}
-
-	/**
-	 * Gets the command to change the source or target of a relationship in an
-	 * element of my kind. By default, returns <code>null</code>. Subclasses
-	 * may override to provide their command.
-	 * 
-	 * @param req
-	 *            the reorient relationship request
-	 * @return the reorient relationship command
-	 */
-	protected ICommand getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/AbstractEditHelperAdvice.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/AbstractEditHelperAdvice.java
deleted file mode 100644
index c87abe1..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/AbstractEditHelperAdvice.java
+++ /dev/null

@@ -1,527 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.edithelper;
-
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypeDebugOptions;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-
-/**
- * Abstract superclass for edit helper advice classes that provide 'before' and
- * 'after' advice for modifying model elements.
- * <P>
- * Subclasses can override the implementation for only the specific methods for
- * the kinds of requests that they provide advice for. For convenience, these
- * methods all return <code>null</code> by default.
- * <P>
- * Edit helper advice can be registered against one or more element types using
- * the <code>org.eclipse.gmf.runtime.emf.type.core.elementTypes</code>
- * extension point.
- * 
- * @author ldamus
- */
-public class AbstractEditHelperAdvice implements IEditHelperAdvice {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice#getBeforeEditCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest)
-	 */
-	public ICommand getBeforeEditCommand(IEditCommandRequest request) {
-
-		if (request instanceof CreateRelationshipRequest) {
-			return getBeforeCreateRelationshipCommand((CreateRelationshipRequest) request);
-
-		} else if (request instanceof CreateElementRequest) {
-			return getBeforeCreateCommand((CreateElementRequest) request);
-
-		} else if (request instanceof ConfigureRequest) {
-			return getBeforeConfigureCommand((ConfigureRequest) request);
-
-		} else if (request instanceof DestroyElementRequest) {
-			return getBeforeDestroyElementCommand((DestroyElementRequest) request);
-
-		} else if (request instanceof DestroyDependentsRequest) {
-			return getBeforeDestroyDependentsCommand((DestroyDependentsRequest) request);
-
-		} else if (request instanceof DestroyReferenceRequest) {
-			return getBeforeDestroyReferenceCommand((DestroyReferenceRequest) request);
-
-		} else if (request instanceof DuplicateElementsRequest) {
-			return getBeforeDuplicateCommand((DuplicateElementsRequest) request);
-
-		} else if (request instanceof GetEditContextRequest) {
-			return getBeforeEditContextCommand((GetEditContextRequest) request);
-
-		} else if (request instanceof MoveRequest) {
-			return getBeforeMoveCommand((MoveRequest) request);
-
-		} else if (request instanceof ReorientReferenceRelationshipRequest) {
-			return getBeforeReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) request);
-
-		} else if (request instanceof ReorientRelationshipRequest) {
-			return getBeforeReorientRelationshipCommand((ReorientRelationshipRequest) request);
-
-		} else if (request instanceof SetRequest) {
-			return getBeforeSetCommand((SetRequest) request);
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice#getAfterEditCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest)
-	 */
-	public ICommand getAfterEditCommand(IEditCommandRequest request) {
-
-		if (request instanceof CreateRelationshipRequest) {
-			return getAfterCreateRelationshipCommand((CreateRelationshipRequest) request);
-
-		} else if (request instanceof CreateElementRequest) {
-			return getAfterCreateCommand((CreateElementRequest) request);
-
-		} else if (request instanceof ConfigureRequest) {
-			return getAfterConfigureCommand((ConfigureRequest) request);
-
-		} else if (request instanceof DestroyElementRequest) {
-			return getAfterDestroyElementCommand((DestroyElementRequest) request);
-
-		} else if (request instanceof DestroyDependentsRequest) {
-			return getAfterDestroyDependentsCommand((DestroyDependentsRequest) request);
-
-		} else if (request instanceof DestroyReferenceRequest) {
-			return getAfterDestroyReferenceCommand((DestroyReferenceRequest) request);
-
-		} else if (request instanceof DuplicateElementsRequest) {
-			return getAfterDuplicateCommand((DuplicateElementsRequest) request);
-
-		} else if (request instanceof GetEditContextRequest) {
-			return getAfterEditContextCommand((GetEditContextRequest) request);
-
-		} else if (request instanceof MoveRequest) {
-			return getAfterMoveCommand((MoveRequest) request);
-
-		} else if (request instanceof ReorientReferenceRelationshipRequest) {
-			return getAfterReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) request);
-
-		} else if (request instanceof ReorientRelationshipRequest) {
-			return getAfterReorientRelationshipCommand((ReorientRelationshipRequest) request);
-
-		} else if (request instanceof SetRequest) {
-			return getAfterSetCommand((SetRequest) request);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for creating the new relationship.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeCreateRelationshipCommand(
-			CreateRelationshipRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for creating the new relationship.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterCreateRelationshipCommand(
-			CreateRelationshipRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for creating the new element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for creating the new element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for configuring a new element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for configuring a new element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for destroying an element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeDestroyElementCommand(
-			DestroyElementRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for destroying an element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterDestroyElementCommand(
-			DestroyElementRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for destroying the dependents of an element that
-	 * is being destroyed.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeDestroyDependentsCommand(
-			DestroyDependentsRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for destroying the dependents of an element that
-	 * is being destroyed.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterDestroyDependentsCommand(
-			DestroyDependentsRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for destroying a reference.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeDestroyReferenceCommand(
-			DestroyReferenceRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for destroying an reference.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterDestroyReferenceCommand(
-			DestroyReferenceRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for duplicating an element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeDuplicateCommand(
-			DuplicateElementsRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for duplicating an element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterDuplicateCommand(DuplicateElementsRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for getting the edit context for an edit request.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeEditContextCommand(GetEditContextRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for getting the edit context for an edit request.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterEditContextCommand(GetEditContextRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for moving an element into a new container.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeMoveCommand(MoveRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for moving an element into a new container.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterMoveCommand(MoveRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for changing the source or target of a reference
-	 * relationship.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for changing the source or target of a reference
-	 * relationship.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for changing the source or target of a
-	 * relationship.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeReorientRelationshipCommand(
-			ReorientRelationshipRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for changing the source or target of a
-	 * relationship.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterReorientRelationshipCommand(
-			ReorientRelationshipRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'before' advice for setting the value of a feature in an element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute before the edit helper work is done
-	 */
-	protected ICommand getBeforeSetCommand(SetRequest request) {
-		return null;
-	}
-
-	/**
-	 * Gets my 'after' advice for setting the value of a feature in an element.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the command to execute after the edit helper work is done
-	 */
-	protected ICommand getAfterSetCommand(SetRequest request) {
-		return null;
-	}
-
-	/**
-	 * Convenience method to create a new element of kind <codeO>typeToCreate</code>
-	 * in the context of <code>container</code>.
-	 * 
-	 * @param container
-	 *            the container element
-	 * @param typeToCreate
-	 *            the kind of element to create
-	 * @return the newly created element, or <code>null</code> if it wasn't
-	 *         created
-	 */
-	protected EObject createType(EObject container, IElementType typeToCreate,
-            IProgressMonitor progressMonitor) {
-        
-        return createType(container, typeToCreate, null, progressMonitor);
-    }
-
-	/**
-	 * Convenience method to create a new element of kind <codeO>typeToCreate</code>
-	 * in the context of <code>container</code>.
-	 * 
-	 * @param container
-	 *            the container element
-	 * @param typeToCreate
-	 *            the kind of element to create
-	 * @param requestParameters
-	 *            parameters to be set in the creation request
-	 * @return the newly created element, or <code>null</code> if it wasn't
-	 *         created
-	 */
-	protected EObject createType(EObject container, IElementType typeToCreate,
-            Map requestParameters, IProgressMonitor progressMonitor) {
-
-		if (typeToCreate.getEClass().isAbstract()) {
-			return null;
-		}
-        
-        TransactionalEditingDomain editingDomain = TransactionUtil
-            .getEditingDomain(container);
-
-		CreateElementRequest request = new CreateElementRequest(editingDomain,
-				container, typeToCreate);
-
-		if (requestParameters != null) {
-			// Set the request parameters
-			request.addParameters(requestParameters);
-		}
-
-		IElementType containerElementType = ElementTypeRegistry.getInstance()
-				.getElementType(request.getEditHelperContext());
-		ICommand createTypeCommand = containerElementType
-				.getEditCommand(request);
-
-		if (createTypeCommand != null && createTypeCommand.canExecute()) {
-            
-            try {
-                createTypeCommand.execute(progressMonitor, null);
-                
-            } catch (ExecutionException e) {
-                Trace.catching(EMFTypePlugin.getPlugin(),
-                    EMFTypeDebugOptions.EXCEPTIONS_CATCHING,
-                    AbstractEditHelperAdvice.class, "createType", e); //$NON-NLS-1$
-                Log.error(EMFTypePlugin.getPlugin(),
-                    EMFTypePluginStatusCodes.COMMAND_FAILURE, e
-                        .getMessage(), e);
-                return null;
-            }
-
-            if (createTypeCommand.getCommandResult().getStatus().isOK()) {
-                return (EObject) createTypeCommand.getCommandResult()
-                    .getReturnValue();
-            }
-        }
-		return null;
-	}
-    
-    /**
-     * Does nothing by default. Subclasses should override if they want to add,
-     * modify or remove parameters in the request.
-     */
-    public void configureRequest(IEditCommandRequest request) {
-        // does nothing, by default
-    }
-    
-    /**
-     * Returns <code>true</code> by default. Subclasses should override if
-     * they want to give a different answer.
-     */
-    public boolean approveRequest(IEditCommandRequest request) {
-        return true;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/IEditHelper.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/IEditHelper.java
deleted file mode 100644
index e5f14c9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/IEditHelper.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.edithelper;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * A factory for commands that will modify elements of a specific type.
- * <P>
- * Clients should not implement this interface directly, but should subclass
- * {@link org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper}instead.
- * 
- * @author ldamus
- */
-public interface IEditHelper {
-
-    /**
-     * Answers whether or not the requested edit can be performed.
-     * 
-     * @param req
-     *            the edit request
-     * @return <code>true</code> if the requested edit can be performed,
-     *         <code>false</code> otherwise.
-     */
-    public boolean canEdit(IEditCommandRequest req);
-    
-	/**
-	 * Gets an edit command to perform the work requested in <code>req</code>.
-	 * <P>
-	 * The work should be considered unsupported by this edit helper if the
-	 * command returned is <code>null</code> or its
-	 * <code>isExecutable()</code> method returns <code>false</code>.
-	 * 
-	 * @param req
-	 *            the edit request
-	 * @return the edit command, or <code>null</code> if none could be found
-	 */
-	public ICommand getEditCommand(IEditCommandRequest req);
-
-	/**
-	 * Gets the values that can be contained in the <code>feature</code> of
-	 * <code>eContainer</code>. Such values may be element types that could
-	 * be owned by the <code>eContainer</code>, or actual model element
-	 * instances that can be referenced by the feature.
-	 * 
-	 * @param eContainer
-	 *            the container object
-	 * @param feature
-	 *            the feature of the container object
-	 * @return the possible values that can be contained in the feature
-	 */
-	public List getContainedValues(EObject eContainer, EReference feature);
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/IEditHelperAdvice.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/IEditHelperAdvice.java
deleted file mode 100644
index fcdb69e..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/IEditHelperAdvice.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.edithelper;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Provides 'before' and 'after' editing behaviour for modifying model elements.
- * <P>
- * Clients should not implement this interface directly. They should instead
- * subclass {@link org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice}and
- * override the methods for the specific requests that they provide advice for.
- * 
- * @author ldamus
- */
-public interface IEditHelperAdvice {
-
-	/**
-	 * Gets a command to be executed before the base editing behaviour.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the 'before' command, or <code>null</code> if I do not provide
-	 *         'before' behaviour.
-	 */
-	public ICommand getBeforeEditCommand(IEditCommandRequest request);
-
-	/**
-	 * Gets a command to be executed after the base editing behaviour.
-	 * 
-	 * @param request
-	 *            the request
-	 * @return the 'after' command, or <code>null</code> if I do not provide
-	 *         'after' behaviour.
-	 */
-	public ICommand getAfterEditCommand(IEditCommandRequest request);
-    
-    /**
-     * Configures the <code>request</code>. Advisors may modify the request
-     * parameters in this method. This method is consulted before the request is
-     * approved by {@link #approveRequest(IEditCommandRequest)} and before the
-     * edit command is constructed.
-     * 
-     * @param request
-     *            the edit request to be configured.
-     */
-    public void configureRequest(IEditCommandRequest request);
-    
-    /**
-     * Approves the edit gesture described in the <code>request</code>. This
-     * method will be consulted before the edit command is constructed, but
-     * after {@link #configureRequest(IEditCommandRequest)} has been called on
-     * all applicable advice.
-     * 
-     * @param request
-     *            the edit request
-     * @return <code>true</code> if the edit request is approved,
-     *         <code>false</code> otherwise. No edit command will be
-     *         constructed if the request is not approved.
-     */
-    public boolean approveRequest(IEditCommandRequest request);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/package.html
deleted file mode 100644
index fac501c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides the edit helper and edit helper advice for the Element Type framework.</P>
-
-<P>Edit helpers act as command-factories generating commands to edit a specific kind
-of model element.  Edit helper advice contributes commands 'before' or 'after' 
-the base editing commands contributed by the edit helper.</P>
-
-<P>Clients should subclass <code>org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper</code> 
-when they wish to implement custom edit helper behaviour.  Clients should 
-subclass <code>org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice</code> 
-when they wish to implement custom edit helper advice.</P>
-
-@see org.eclipse.gmf.runtime.emf.type.core
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypeDebugOptions.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypeDebugOptions.java
deleted file mode 100644
index 06383ea..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypeDebugOptions.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author ldamus
- *
- */
-public final class EMFTypeDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private EMFTypeDebugOptions() {
-		/* private constructor */
-	}
-
-	/** Debug option. */
-	public static final String DEBUG = EMFTypePlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	/** Debug option for tracing exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	
-	/** Debug option for tracing exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	/** Debug option for tracing method entering. */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	
-	/** Debug option for tracing method exiting. */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypePlugin.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypePlugin.java
deleted file mode 100644
index e0b641d..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypePlugin.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * Plug-in class for the Model Element Type framework.
- * <p>
- * This class is not intended to be used by clients.
- * 
- * @author ldamus
- */
-public class EMFTypePlugin
-	extends Plugin {
-	
-	/**
-	 * Flag indicating whether or not the <code>ElementTypeRegistry</code> and
-	 * the <code>ClientContextManager</code> should add types, contexts and
-	 * bindings declared in extensions from dynamically loaded plugins.
-	 * <P>
-	 * This feature can only be enabled when running JUnit tests.
-	 */
-	private static boolean DYNAMIC_AWARE_MODE = false;
-
-	/**
-	 * The shared instance.
-	 */
-	private static EMFTypePlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public EMFTypePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @return Returns the plugin.
-	 */
-	public static EMFTypePlugin getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getPlugin().getBundle().getSymbolicName();
-	}
-	
-	/**
-	 * <B>FOR INTERNAL USE ONLY.  CLIENTS MUST NEVER CALL THIS METHOD.</B>
-	 */
-	public static void startDynamicAwareMode() {
-		// Discourage use of this method by ensuring that it only works when
-		// JUnits are running.
-
-		String[] args = Platform.getCommandLineArgs();
-		String applicationId = null;
-
-		for (int i = 0; i < args.length - 1; i++) {
-			if (args[i].equalsIgnoreCase("-application")) { //$NON-NLS-1$
-				applicationId = args[i + 1];
-			}
-		}
-
-		if (applicationId != null
-				&& applicationId.startsWith("org.eclipse.pde.junit")) { //$NON-NLS-1$
-			DYNAMIC_AWARE_MODE = true;
-		}
-	}
-	
-	/**
-	 * <B>FOR INTERNAL USE ONLY.  CLIENTS MUST NEVER CALL THIS METHOD.</B>
-	 */
-	public static boolean isDynamicAware() {
-		return DYNAMIC_AWARE_MODE;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypePluginStatusCodes.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypePluginStatusCodes.java
deleted file mode 100644
index b90c5a9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/EMFTypePluginStatusCodes.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Status codes for errors and warnings logged by the Element Type framework.
- * <P>
- * Also includes keys into the .properties file for error and warning messages.
- * 
- * @author ldamus
- */
-public class EMFTypePluginStatusCodes {
-
-	//
-	// Integer-valued error codes
-	//
-
-    public static final int COMMAND_FAILURE = 4;
-    
-	public static final int ERROR_PARSING_XML = 10;
-
-	public static final int TYPE_NOT_INITED = 11;
-
-	public static final int ADVICE_BINDING_NOT_INITED = 12;
-
-	public static final int ELEMENT_NOT_INITED = 13;
-
-	public static final int FACTORY_NOT_INITED = 14;
-
-	public static final int METAMODEL_NOT_INITED = 15;
-	
-	public static final int CONTEXT_NOT_INITED = 16;
-
-	public static final int EDIT_HELPER_ADVICE_CLASS_NOT_FOUND = 20;
-
-	public static final int MATCHER_CLASS_NOT_FOUND = 21;
-
-	public static final int EDIT_HELPER_CLASS_NOT_FOUND = 22;
-
-	public static final int EXPRESSION_EVALUATION_FAILURE = 23;
-
-	public static final int ELEMENT_TYPE_FACTORY_CLASS_NOT_FOUND = 24;
-
-	public static final int CONTAINMENT_FEATURE_NOT_REFERENCE_FEATURE = 25;
-
-	public static final int CONTAINMENT_FEATURE_NO_SUCH_FEATURE = 26;
-
-	public static final int SPECIALIZATION_TYPE_SPECIALIZES_MULTIPLE_METAMODEL_TYPES = 27;
-
-	public static final int SPECIALIZATION_TYPE_SPECIALIZES_INVALID_ID = 28;
-	
-	public static final int CONTAINMENT_FEATURE_NO_METAMODEL = 29;
-	
-	public static final int CLIENT_CONTEXT_NOT_INITED = 50;
-	
-	public static final int BINDING_NO_CONTEXT = 60;
-	
-	public static final int BINDING_NO_SUCH_CONTEXT = 61;
-	
-	public static final int PATTERN_INVALID_SYNTAX = 62;
-	
-	public static final int BINDING_NO_REF_OR_PATTERN = 63;
-	
-	public static final int BINDING_BOTH_REF_AND_PATTERN = 64;
-	
-	public static final int CLIENT_MATCHER_FAILURE = 70;
-	
-	public static final int CLIENT_NO_MATCHER = 71;
-
-
-	/**
-	 * Cannot be instantiated by clients.
-	 */
-	private EMFTypePluginStatusCodes() {
-		// nothing to do
-	}
-
-	/**
-	 * Convenience method to construct a new CoreException indicating that an
-	 * advice binding failed to be created.
-	 * 
-	 * @param adviceId
-	 *            the advice binding ID
-	 * @param reason
-	 *            the localized reason why the advice binding was
-	 *            not initialized
-	 * @return the new CoreException
-	 */
-	public static CoreException getAdviceBindingInitException(String adviceId,
-			String reason) {
-
-		return new CoreException(new Status(IStatus.WARNING, EMFTypePlugin
-				.getPluginId(), ADVICE_BINDING_NOT_INITED, EMFTypeCoreMessages
-				.bind(EMFTypeCoreMessages.adviceBinding_not_init_WARN_,
-						adviceId, reason), null));
-	}
-
-	/**
-	 * Convenience method to construct a new CoreException indicating that an
-	 * element type failed to be created.
-	 * 
-	 * @param typeId
-	 *            the element type ID
-	 * @param reason
-	 *            the localized reason why the element type was not
-	 *            initialized
-	 * @param e
-	 *            an exception, if the failure was due to an exception
-	 * @return the new CoreException
-	 */
-	public static CoreException getTypeInitException(String typeId,
-			String reason, Exception e) {
-
-		return new CoreException(new Status(IStatus.WARNING, EMFTypePlugin
-				.getPluginId(), TYPE_NOT_INITED, EMFTypeCoreMessages.bind(
-				EMFTypeCoreMessages.type_not_init_WARN_, typeId, reason), e));
-	}
-
-	/**
-	 * Convenience method to construct a new CoreException indicating that an
-	 * element initialization failed.
-	 * 
-	 * @param elementId
-	 *            the element ID
-	 * @param reason
-	 *            the localized reason why the element was not
-	 *            initialized
-	 * @param e
-	 *            an exception, if the failure was due to an exception
-	 * @return the new CoreException
-	 */
-	public static CoreException getInitException(String elementId,
-			String reason, Exception e) {
-
-		return new CoreException(new Status(IStatus.WARNING, EMFTypePlugin
-				.getPluginId(), ELEMENT_NOT_INITED, EMFTypeCoreMessages.bind(
-				EMFTypeCoreMessages.elment_not_init_WARN_, elementId, reason),
-				e));
-	}
-
-	/**
-	 * Convenience method to construct a new CoreException indicating that an
-	 * element type factory initialization failed.
-	 * 
-	 * @param factoryName
-	 *            the factory name
-	 * @param reason
-	 *            the localized reason why the element type factory
-	 *            was not initialized
-	 * @return the new CoreException
-	 */
-	public static CoreException getFactoryInitException(String factoryName,
-			String reason) {
-
-		return new CoreException(new Status(IStatus.WARNING, EMFTypePlugin
-				.getPluginId(), FACTORY_NOT_INITED, EMFTypeCoreMessages.bind(
-				EMFTypeCoreMessages.elementTypeFactory_not_init_WARN_,
-				factoryName, reason), null));
-	}
-
-	/**
-	 * Convenience method to construct a new CoreException indicating that an
-	 * metamodel element itialization failed.
-	 * 
-	 * @param nsURI
-	 *            the namespace URI
-	 * @param reason
-	 *            the localized reason why the metamodel element
-	 *            was not initialized
-	 * @return the new CoreException
-	 */
-	public static CoreException getMetamodelInitException(String nsURI,
-			String reason) {
-
-		return new CoreException(new Status(IStatus.WARNING, EMFTypePlugin
-				.getPluginId(), METAMODEL_NOT_INITED, EMFTypeCoreMessages.bind(
-				EMFTypeCoreMessages.metamodel_not_init_WARN_, nsURI, reason),
-				null));
-	}
-
-	/**
-	 * Convenience method to construct a new CoreException indicating that an
-	 * element type factory initialization failed.
-	 * 
-	 * @param factoryName
-	 *            the factory name
-	 * @param reason
-	 *            the localized reason why the element type factory
-	 *            was not initialized
-	 * @return the new CoreException
-	 */
-	public static CoreException getContextInitException(String contextId,
-			String reason) {
-
-		return new CoreException(new Status(IStatus.WARNING, EMFTypePlugin
-				.getPluginId(), CONTEXT_NOT_INITED, EMFTypeCoreMessages.bind(
-				EMFTypeCoreMessages.clientContext_not_init_WARN_,
-				contextId, reason), null));
-	}
-}
-

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/AdviceBindingDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/AdviceBindingDescriptor.java
deleted file mode 100644
index 9a38236..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/AdviceBindingDescriptor.java
+++ /dev/null

@@ -1,290 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.XMLExpressionMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Descriptor for an advice binding. Advice can be bound to any element type.
- * 
- * @author ldamus
- */
-public class AdviceBindingDescriptor
-	implements IEditHelperAdviceDescriptor {
-
-	/**
-	 * The advice binding ID.
-	 */
-	private final String id;
-	
-	/**
-	 * The identifier of this element type.
-	 */
-	private final String typeId;
-
-	/**
-	 * Indicates the related element types that should inherite this advice.
-	 */
-	private final AdviceBindingInheritance inheritance;
-
-	/**
-	 * The matcher class name. May be <code>null</code>.
-	 */
-	private String matcherClassName;
-	
-	/**
-	 * The container element matcher. May be <code>null</code>.
-	 */
-	private IElementMatcher matcher;
-
-	/**
-	 * The container matcher configuration element.
-	 */
-	private IConfigurationElement matcherConfig;
-
-	/**
-	 * The binding configuration element.
-	 */
-	private final IConfigurationElement bindingConfig;
-
-	/**
-	 * The class name of the edit helper advice.
-	 */
-	private String editHelperAdviceName;
-	
-	/**
-	 * The edit helper advice.
-	 */
-	private IEditHelperAdvice editHelperAdvice;
-
-	/**
-	 * The container descriptor.
-	 */
-	private IContainerDescriptor containerDescriptor;
-
-	/**
-	 * Teh metamodel descriptor.
-	 */
-	private final MetamodelDescriptor metamodelDescriptor;
-
-	/**
-	 * Constructs a new container descriptor from the configuration element.
-	 * 
-	 * @param config
-	 *            the configuration element
-	 * @throws CoreException
-	 *             when the configuration element does not contain the required
-	 *             elements and attributes
-	 */
-	public AdviceBindingDescriptor(IConfigurationElement config,
-			MetamodelDescriptor metamodelDescriptor)
-		throws CoreException {
-
-		this.bindingConfig = config;
-		this.metamodelDescriptor = metamodelDescriptor;
-	
-		// ID
-		this.id = config.getAttribute(ElementTypeXmlConfig.A_ID);
-		if (id == null) {
-			throw EMFTypePluginStatusCodes.getAdviceBindingInitException(
-					StringStatics.BLANK,
-					EMFTypeCoreMessages.adviceBinding_reason_no_id_WARN_);
-		}
-		
-		// EDIT HELPER ADVICE CLASS
-		editHelperAdviceName = config
-			.getAttribute(ElementTypeXmlConfig.A_CLASS);
-		if (editHelperAdviceName == null) {
-			throw EMFTypePluginStatusCodes
-					.getAdviceBindingInitException(
-							id,
-							EMFTypeCoreMessages.adviceBinding_reason_no_edit_helper_advice_id_WARN_);
-		}
-
-		// TYPE ID
-		this.typeId = config.getAttribute(ElementTypeXmlConfig.A_TYPE_ID);
-		if (typeId == null) {
-			throw EMFTypePluginStatusCodes.getAdviceBindingInitException(id,
-					EMFTypeCoreMessages.adviceBinding_reason_no_type_id_WARN_);
-		}
-		
-		// ECONTAINER
-		IConfigurationElement[] containerConfigs = config
-			.getChildren(ElementTypeXmlConfig.E_ECONTAINER);
-
-		if (containerConfigs.length > 0) {
-			containerDescriptor = new ContainerDescriptor(containerConfigs[0],
-				metamodelDescriptor, getId());
-		}
-
-		// APPLY TO RELATED ELEMENT TYPES
-		String inheritanceString = config
-				.getAttribute(ElementTypeXmlConfig.A_INHERITANCE);
-		AdviceBindingInheritance declaredInheritance = AdviceBindingInheritance
-				.getAdviceBindingInheritance(inheritanceString);
-
-		if (declaredInheritance == null) {
-			if (inheritanceString != null) {
-				// Invalid inheritance value
-				throw EMFTypePluginStatusCodes.getAdviceBindingInitException(id,
-						EMFTypeCoreMessages.adviceBinding_reason_invalid_inheritance_WARN_);
-			}
-			// Default inheritance is NONE
-			declaredInheritance = AdviceBindingInheritance.NONE;
-		}
-		
-		this.inheritance = declaredInheritance;
-
-		// XML MATCHER EXPRESSION
-		IConfigurationElement[] enablementConfigs = config
-			.getChildren(ElementTypeXmlConfig.E_ENABLEMENT);
-
-		if (enablementConfigs.length > 0) {
-			matcher = new XMLExpressionMatcher(enablementConfigs[0], id);
-		}
-
-		// MATCHER CLASS
-		if (matcher == null) {
-			IConfigurationElement[] matcherConfigs = config
-				.getChildren(ElementTypeXmlConfig.E_MATCHER);
-
-			if (matcherConfigs.length > 0) {
-				matcherClassName = matcherConfigs[0].getAttribute(ElementTypeXmlConfig.A_CLASS);
-				
-				if (matcherClassName == null) {
-					throw EMFTypePluginStatusCodes.getInitException(id,
-							EMFTypeCoreMessages.element_reason_matcher_no_class_WARN_, null);
-				}
-				matcherConfig = matcherConfigs[0];
-				
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.impl.IEditHelperAdviceDescriptor#getTypeId()
-	 */
-	public String getTypeId() {
-		return typeId;
-	}
-	
-	/**
-	 * Returns the advice binding id.
-	 * @return the advice binding id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.impl.IEditHelperAdviceDescriptor#getMatcher()
-	 */
-	public IElementMatcher getMatcher() {
-
-		if (matcher == null && matcherClassName != null && matcherConfig != null) {
-			try {
-				matcher = (IElementMatcher) matcherConfig
-					.createExecutableExtension(ElementTypeXmlConfig.A_CLASS);
-
-			} catch (CoreException e) {
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.MATCHER_CLASS_NOT_FOUND,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.matcher_class_not_found_ERROR_,
-												matcherClassName), e);
-
-				// Don't try to recompute the matcher class if it has failed.
-				matcherClassName = null;
-			}
-		}
-		return matcher;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.impl.IEditHelperAdviceDescriptor#getEditHelperAdvice()
-	 */
-	public IEditHelperAdvice getEditHelperAdvice() {
-
-		if (editHelperAdvice == null) {
-
-			if (editHelperAdviceName != null) {
-				try {
-					editHelperAdvice = (IEditHelperAdvice) bindingConfig
-						.createExecutableExtension(ElementTypeXmlConfig.A_CLASS);
-
-				} catch (CoreException e) {
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									EMFTypePluginStatusCodes.EDIT_HELPER_ADVICE_CLASS_NOT_FOUND,
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.editHelperAdvice_class_not_found_ERROR_,
-													editHelperAdviceName), e);
-					// Don't recompute the edit helper advice after it has
-					// failed once.
-					editHelperAdviceName = null;
-				}
-			}
-		}
-		return editHelperAdvice;
-	}
-
-	/**
-	 * Gets the metamodel descriptor for this advice binding.
-	 * 
-	 * @return the metamodel descriptor
-	 */
-	public MetamodelDescriptor getMetamodelDescriptor() {
-		return metamodelDescriptor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor#getInheritance()
-	 */
-	public AdviceBindingInheritance getInheritance() {
-		return inheritance;
-	}
-	
-	/**
-	 * Gets the container descriptor.
-	 * 
-	 * @return the container descriptor
-	 */
-	public IContainerDescriptor getContainerDescriptor() {
-		return containerDescriptor;
-	}
-	
-	public String toString() {
-		return "AdviceBindingDescriptor[" + getId()+ "]";  //$NON-NLS-1$//$NON-NLS-2$
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/AdviceBindingInheritance.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/AdviceBindingInheritance.java
deleted file mode 100644
index ccb7df9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/AdviceBindingInheritance.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * Enumeration of the kinds of advice binding inheritance that can be identified
- * for <code>adviceBinding</code> elements in the <code>elementTypes</code>
- * extension point.
- * 
- * @author ldamus
- */
-public class AdviceBindingInheritance extends EnumeratedType {
-
-	/**
-	 * Version ID.
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Advice is not inherited by related metamodel types. It is applied only to
-	 * the element type and its specializations.
-	 */
-	public static final AdviceBindingInheritance NONE = new AdviceBindingInheritance(
-			"none"); //$NON-NLS-1$
-
-	/**
-	 * Advice is inherited by all metamodel types whose EClasses are subtypes of
-	 * the metamodel type to which it was applied, and to all specializations of
-	 * those metamodel types.
-	 */
-	public static final AdviceBindingInheritance ALL = new AdviceBindingInheritance(
-			"all"); //$NON-NLS-1$
-	
-	/**
-	 * Gets an enum literal by <code>name</code>.
-	 * 
-	 * @param name
-	 *            the enum literal name
-	 * @return the enum literal or <code>null</code> if none with that name is
-	 *         defined.
-	 */
-	public static final AdviceBindingInheritance getAdviceBindingInheritance(String name) {
-		
-		for (int i = 0; i < VALUES.length; i++) {
-			AdviceBindingInheritance nextValue = VALUES[i];
-			
-			if (nextValue.getName().equals(name)) {
-				return nextValue;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Automaic ordinal assignment variable.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final AdviceBindingInheritance[] VALUES = { NONE, ALL };
-
-	/**
-	 * Private constructor.
-	 * 
-	 * @param name
-	 *            the enumeration literal name
-	 */
-	private AdviceBindingInheritance(String name) {
-		super(name, nextOrdinal++);
-	}
-
-	protected List getValues() {
-		return Collections.unmodifiableList(Arrays.asList(VALUES));
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ContainerDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ContainerDescriptor.java
deleted file mode 100644
index 54975b9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ContainerDescriptor.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.XMLExpressionMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Descriptor for a model element container.
- * 
- * @author ldamus
- */
-class ContainerDescriptor
-	implements IContainerDescriptor {
-
-	/**
-	 * The matcher class name. May be <code>null</code>.
-	 */
-	private String matcherClassName;
-
-	/**
-	 * The container element matcher. May be <code>null</code>.
-	 */
-	private IElementMatcher matcher;
-
-	/**
-	 * The container matcher configuration element.
-	 */
-	private IConfigurationElement matcherConfig;
-
-	/**
-	 * The containment features. May be <code>null</code>.
-	 */
-	private EReference[] containmentFeatures;
-
-	/**
-	 * The containment feature names.
-	 */
-	private List featureNames = new ArrayList();
-
-	/**
-	 * The metamodel descriptor.
-	 */
-	private final MetamodelDescriptor metamodelDescriptor;
-
-	/**
-	 * Constructs a new container descriptor from the configuration element.
-	 * 
-	 * @param config
-	 *            the configuration element
-	 * @throws CoreException
-	 *             when the configuration element does not contain the required
-	 *             elements and attributes
-	 */
-	public ContainerDescriptor(IConfigurationElement config,
-			MetamodelDescriptor metamodelDescriptor, String id)
-		throws CoreException {
-
-		this.metamodelDescriptor = metamodelDescriptor;
-
-		// CONTAINMENT FEATURES
-		IConfigurationElement[] featureConfigs = config
-			.getChildren(ElementTypeXmlConfig.E_ECONTAINMENT_FEATURE);
-
-		if (featureConfigs.length > 0 && metamodelDescriptor == null) {
-			// Containment features can only be specified if a metamodel is
-			// specified.
-			throw EMFTypePluginStatusCodes
-					.getInitException(
-							id,
-							EMFTypeCoreMessages
-									.bind(
-											EMFTypeCoreMessages.element_reason_no_econtainmentfeature_metamodel_WARN_,
-											featureConfigs[0]), null);
-		}
-
-		for (int i = 0; i < featureConfigs.length; i++) {
-			IConfigurationElement nextFeatureConfig = featureConfigs[i];
-			String qname = nextFeatureConfig
-				.getAttribute(ElementTypeXmlConfig.A_QNAME);
-
-			if (qname == null) {
-				throw EMFTypePluginStatusCodes
-						.getInitException(
-								id,
-								EMFTypeCoreMessages.element_reason_no_econtainmentfeature_qname_WARN_,
-								null);
-			}
-			featureNames.add(qname);
-		}
-
-		// XML MATCHER EXPRESSION
-		IConfigurationElement[] enablementConfigs = config
-			.getChildren(ElementTypeXmlConfig.E_ENABLEMENT);
-
-		if (enablementConfigs.length > 0) {
-			matcher = new XMLExpressionMatcher(enablementConfigs[0], id);
-		}
-
-		// MATCHER CLASS
-		if (matcher == null) {
-			IConfigurationElement[] matcherConfigs = config
-				.getChildren(ElementTypeXmlConfig.E_MATCHER);
-
-			if (matcherConfigs.length > 0) {
-				matcherClassName = matcherConfigs[0]
-					.getAttribute(ElementTypeXmlConfig.A_CLASS);
-
-				if (matcherClassName == null) {
-					throw EMFTypePluginStatusCodes
-							.getInitException(
-									id,
-									EMFTypeCoreMessages.element_reason_matcher_no_class_WARN_,
-									null);
-				}
-				matcherConfig = matcherConfigs[0];
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor#getMatcher()
-	 */
-	public IElementMatcher getMatcher() {
-
-		if (matcher == null && matcherClassName != null
-			&& matcherConfig != null) {
-			try {
-				matcher = (IElementMatcher) matcherConfig
-					.createExecutableExtension(ElementTypeXmlConfig.A_CLASS);
-
-			} catch (CoreException e) {
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.MATCHER_CLASS_NOT_FOUND,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.matcher_class_not_found_ERROR_,
-												matcherClassName), e);
-				// Don't recompute the matcher class if it has failed once.
-				matcherClassName = null;
-			}
-		}
-		return matcher;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor#getContainmentFeatures()
-	 */
-	public EReference[] getContainmentFeatures() {
-
-		if (containmentFeatures == null && !featureNames.isEmpty()) {
-
-			List references = new ArrayList();
-			if (metamodelDescriptor != null) {
-
-				for (Iterator i = featureNames.iterator(); i.hasNext();) {
-					String nextFeatureName = (String) i.next();
-
-					EPackage ePackage = metamodelDescriptor.getEPackage();
-
-					int featureIndex = nextFeatureName
-						.lastIndexOf(StringStatics.PERIOD);
-					String classifierName = nextFeatureName.substring(0,
-						featureIndex);
-
-					EClassifier classifier = ePackage
-						.getEClassifier(classifierName);
-
-					if ((featureIndex < nextFeatureName.length() - 1)
-						&& classifier instanceof EClass) {
-
-						String featureName = nextFeatureName
-							.substring(featureIndex + 1);
-						EStructuralFeature feature = ((EClass) classifier)
-							.getEStructuralFeature(featureName);
-
-						if (feature instanceof EReference) {
-							references.add(feature);
-
-						} else {
-							Log
-									.error(
-											EMFTypePlugin.getPlugin(),
-											EMFTypePluginStatusCodes.CONTAINMENT_FEATURE_NOT_REFERENCE_FEATURE,
-											EMFTypeCoreMessages
-													.bind(
-															EMFTypeCoreMessages.eContainmentFeature_not_reference_feature_ERROR_,
-															nextFeatureName),
-											null);
-						}
-                    } else {
-						Log
-								.error(
-										EMFTypePlugin.getPlugin(),
-										EMFTypePluginStatusCodes.CONTAINMENT_FEATURE_NO_SUCH_FEATURE,
-										EMFTypeCoreMessages
-												.bind(
-														EMFTypeCoreMessages.eContainmentFeature_no_such_feature_ERROR_,
-														nextFeatureName), null);
-					}
-				}
-			}
-			containmentFeatures = (EReference[]) references
-				.toArray(new EReference[] {});
-		}
-		return containmentFeatures;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/EditHelperAdviceDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/EditHelperAdviceDescriptor.java
deleted file mode 100644
index abb63ea..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/EditHelperAdviceDescriptor.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Descriptor for edit helper advice.
- * 
- * @author ldamus
- */
-public class EditHelperAdviceDescriptor
-	implements IEditHelperAdviceDescriptor {
-
-	private final SpecializationTypeDescriptor specializationDescriptor;
-
-	/**
-	 * The edit helper advice.
-	 */
-	private IEditHelperAdvice editHelperAdvice;
-
-	/**
-	 * The class name of the edit helper advice.
-	 */
-	private String editHelperAdviceName;
-
-	/**
-	 * Constructs a new edit helper advice descriptor from the configuration element.
-	 * 
-	 * @param specialization
-	 *            the configuration element
-	 */
-	public EditHelperAdviceDescriptor(String editHelperAdviceName,
-			SpecializationTypeDescriptor specialization) {
-
-		this.editHelperAdviceName = editHelperAdviceName;
-		this.specializationDescriptor = specialization;
-	}
-	
-	/**
-	 * Constructs a new descriptor for the edit helper advice.
-	 * 
-	 * @param editHelperAdvice
-	 *            the edit helper advice
-	 * @param specialization
-	 *            the configuration element
-	 */
-	public EditHelperAdviceDescriptor(IEditHelperAdvice editHelperAdvice,
-			SpecializationTypeDescriptor specialization) {
-
-		this(editHelperAdvice.getClass().getName(), specialization);
-		this.editHelperAdvice = editHelperAdvice;
-	}
-	
-	public String getId() {
-		return specializationDescriptor.getId();
-	}
-
-	public String getTypeId() {
-		return specializationDescriptor.getId();
-	}
-
-	/**
-	 * Gets the edit helper advice class name.
-	 * 
-	 * @return the edit helper advice class name.
-	 */
-	public String getEditHelperAdviceName() {
-		return editHelperAdviceName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.impl.IEditHelperAdviceDescriptor#getEditHelperAdvice()
-	 */
-	public IEditHelperAdvice getEditHelperAdvice() {
-		if (editHelperAdvice == null) {
-
-			if (editHelperAdviceName != null) {
-				try {
-					editHelperAdvice = (IEditHelperAdvice) specializationDescriptor
-					.getConfigElement()
-						.createExecutableExtension(
-							ElementTypeXmlConfig.A_EDIT_HELPER_ADVICE);
-
-				} catch (CoreException e) {
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									EMFTypePluginStatusCodes.EDIT_HELPER_ADVICE_CLASS_NOT_FOUND,
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.editHelperAdvice_class_not_found_ERROR_,
-													editHelperAdviceName), e);
-
-					// Don't recompute the advice class if it has failed once.
-					editHelperAdviceName = null;
-				}
-			}
-		}
-		return editHelperAdvice;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.impl.IEditHelperAdviceDescriptor#getMatcher()
-	 */
-	public IElementMatcher getMatcher() {
-		return specializationDescriptor.getMatcher();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.impl.IEditHelperAdviceDescriptor#isAppliedToSubtypes()
-	 */
-	public AdviceBindingInheritance getInheritance() {
-		return AdviceBindingInheritance.ALL;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.type.core.internal.impl.IEditHelperAdviceDescriptor#getContainerDescriptor()
-	 */
-	public IContainerDescriptor getContainerDescriptor() {
-		return specializationDescriptor.getContainerDescriptor();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeDescriptor.java
deleted file mode 100644
index 7511014..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeDescriptor.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Descriptor for an element type that has been defined in XML using the
- * <code>elementTypes</code> extension point.
- * 
- * @author ldamus
- */
-public abstract class ElementTypeDescriptor implements IElementTypeDescriptor {
-
-	/**
-	 * The configuration element describing this element type.
-	 */
-	private IConfigurationElement configElement;
-
-	/**
-	 * The identifier of this element type.
-	 */
-	private final String id;
-
-	/**
-	 * The display name of this element type.
-	 */
-	private String name;
-
-	/**
-	 * The URL of the icon for this element type.
-	 */
-	private URL iconURL;
-
-	/**
-	 * The name of the element factory kind. Identifies the factory that should
-	 * be used to create the new element type.
-	 */
-	private String kindName;
-
-	/**
-	 * The map of custom parameters that may be associated with this element
-	 * type. Keyed on parameter name, each value is the string specified in the
-	 * XML parameter value attribute.
-	 */
-	private final Map params = new HashMap();
-
-	/**
-	 * Constructs a new element type descriptor for <code>elementType</code>.
-	 * 
-	 * @param element
-	 *            type the element type
-	 */
-	protected ElementTypeDescriptor(IElementType elementType) {
-		this.id = elementType.getId();
-		this.iconURL = elementType.getIconURL();
-		this.name = elementType.getDisplayName();
-	}
-	
-	/**
-	 * Constructs a new element type descriptor.
-	 * 
-	 * @param configElement
-	 *            the configuration element
-	 * @throws CoreException
-	 *             when the type ID or display name have not been correctly
-	 *             specified in the configuration element
-	 */
-	protected ElementTypeDescriptor(IConfigurationElement configElement)
-		throws CoreException {
-
-		assert configElement != null;
-
-		this.configElement = configElement;
-
-		// ID
-		this.id = configElement.getAttribute(ElementTypeXmlConfig.A_ID);
-		if (id == null) {
-			throw EMFTypePluginStatusCodes.getTypeInitException(StringStatics.BLANK,
-				EMFTypeCoreMessages.type_reason_no_id_WARN_, null);
-		}
-
-		// NAME
-		this.name = configElement.getAttribute(ElementTypeXmlConfig.A_NAME);
-
-		// ICON
-		String imageFilePath = configElement
-			.getAttribute(ElementTypeXmlConfig.A_ICON);
-		if (imageFilePath != null) {
-			String pluginId = configElement.getDeclaringExtension()
-				.getContributor().getName();
-			if (pluginId != null) {
-				this.iconURL = getUrlFromPlugin(pluginId, imageFilePath);
-			}
-		}
-
-		kindName = configElement.getAttribute(ElementTypeXmlConfig.A_KIND);
-
-		if (kindName == null || kindName.length() < 1) {
-			// use the default kind name
-			kindName = IElementType.class.getName();
-		}
-
-		IConfigurationElement[] paramConfigElements = configElement
-			.getChildren(ElementTypeXmlConfig.E_PARAM);
-
-		for (int i = 0; i < paramConfigElements.length; i++) {
-			IConfigurationElement nextParamConfig = paramConfigElements[i];
-			String paramName = nextParamConfig
-				.getAttribute(ElementTypeXmlConfig.A_NAME);
-
-			if (paramName == null) {
-				throw EMFTypePluginStatusCodes.getTypeInitException(getId(),
-					EMFTypeCoreMessages.type_reason_no_param_name_WARN_, null);
-			}
-
-			String paramValue = nextParamConfig
-				.getAttribute(ElementTypeXmlConfig.A_VALUE);
-			if (paramValue == null) {
-				throw EMFTypePluginStatusCodes.getTypeInitException(getId(),
-						EMFTypeCoreMessages.type_reason_no_param_value_WARN_, null);
-			}
-			params.put(paramName, paramValue);
-
-		}
-	}
-
-	/**
-	 * Gets the URL given image file path in a specific plugin.
-	 * 
-	 * @param pluginId
-	 *            the plugin ID
-	 * @param imageFilePath
-	 *            the image file path
-	 * @return the URL, or <code>null</code> if it can't be found
-	 */
-	private URL getUrlFromPlugin(String pluginId, String imageFilePath) {
-
-		Bundle bundle = Platform.getBundle(pluginId);
-		URL result = bundle.getEntry(imageFilePath);
-
-		if (result == null) {
-			try {
-				result = new URL(imageFilePath);
-			} catch (MalformedURLException e) {
-				result = null;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the element type identifier.
-	 * 
-	 * @return the element type identifier.
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Gets the element type icon URL.
-	 * 
-	 * @return the element type icon URL
-	 */
-	public URL getIconURL() {
-		return iconURL;
-	}
-
-	/**
-	 * Gets the element type display name.
-	 * 
-	 * @return the element type display name.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Sets the name.
-	 * 
-	 * @param name
-	 *            the new name
-	 */
-	protected void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Gets the name of the element factory kind. Identifies the factory that
-	 * should be used to create the new element type.
-	 * 
-	 * @return the element factory kind name
-	 */
-	public String getKindName() {
-		return kindName;
-	}
-
-	/**
-	 * Gets the configuration element for this element type.
-	 * 
-	 * @return the configuration element
-	 */
-	public IConfigurationElement getConfigElement() {
-		return configElement;
-	}
-
-	/**
-	 * Gets the element type for this descriptor. Will cause the element type to
-	 * be created if this is the first time it is called.
-	 * <P>
-	 * May cause plugin containng the element type factory and element type
-	 * class to be loaded.
-	 * 
-	 * @return the element type
-	 */
-	public abstract IElementType getElementType();
-
-	/**
-	 * Gets the value for the parameter named <code>paramName</code>.
-	 * 
-	 * @param paramName
-	 *            the parameter name
-	 * @return the parameter value
-	 */
-	public String getParamValue(String paramName) {
-		return (String) params.get(paramName);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeFactoryDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeFactoryDescriptor.java
deleted file mode 100644
index d89fe15..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeFactoryDescriptor.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Descriptor for an element type factory. Used to delay loading of the plugin
- * in which the factory class is defined.
- * 
- * @author ldamus
- */
-public class ElementTypeFactoryDescriptor {
-
-	/**
-	 * The configuration element.
-	 */
-	private final IConfigurationElement configElement;
-
-	/**
-	 * The element type factory.
-	 */
-	private IElementTypeFactory elementTypeFactory;
-
-	/**
-	 * The factory name.
-	 */
-	private String factoryName;
-
-	/**
-	 * The name of the element factory kind. Element types use the kind name to
-	 * declare that they should be created by this factory.
-	 */
-	private final String kindName;
-
-	/**
-	 * The custom parameters that are supported by this factory.
-	 */
-	private final List params;
-
-	/**
-	 * Creates a new element type factory descriptor.
-	 * 
-	 * @param configElement
-	 *            the configuration element.
-	 * @throws CoreException
-	 *             when the type ID or display name have not been correctly
-	 *             specified in the configuration element
-	 */
-	public ElementTypeFactoryDescriptor(IConfigurationElement configElement)
-		throws CoreException {
-
-		this.configElement = configElement;
-
-		// FACTORY NAME
-		this.factoryName = configElement
-			.getAttribute(ElementTypeXmlConfig.A_FACTORY);
-
-		if (factoryName == null) {
-			throw EMFTypePluginStatusCodes.getFactoryInitException(
-				StringStatics.BLANK,
-				EMFTypeCoreMessages.elementTypeFactory_reason_no_factory_WARN_);
-		}
-
-		// KIND NAME
-		this.kindName = configElement.getAttribute(ElementTypeXmlConfig.A_KIND);
-		if (kindName == null) {
-			throw EMFTypePluginStatusCodes.getFactoryInitException(
-				factoryName,
-				EMFTypeCoreMessages.elementTypeFactory_reason_no_kind_WARN_);
-		}
-
-		// CUSTOM PARAMETERS
-		String paramString = configElement
-			.getAttribute(ElementTypeXmlConfig.A_PARAMS);
-		params = new ArrayList();
-
-		if (paramString != null) {
-			StringTokenizer t = new StringTokenizer(paramString,
-				StringStatics.COMMA);
-
-			while (t.hasMoreTokens()) {
-				String nextParam = t.nextToken().trim();
-				params.add(nextParam);
-			}
-		}
-	}
-
-	/**
-	 * Gets the element type factory. Will cause the factory to be created if
-	 * this is the first time it is called.
-	 * <P>
-	 * May cause plugin containing the element type factory and element type
-	 * class to be loaded.
-	 * 
-	 * @return the element type factory
-	 */
-	public IElementTypeFactory getElementTypeFactory() {
-		
-		if (elementTypeFactory == null) {
-			
-			if (factoryName != null) {
-				try {
-					elementTypeFactory = (IElementTypeFactory) configElement
-						.createExecutableExtension(ElementTypeXmlConfig.A_FACTORY);
-
-				} catch (CoreException e) {
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									EMFTypePluginStatusCodes.ELEMENT_TYPE_FACTORY_CLASS_NOT_FOUND,
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.elementTypeFactory_class_not_found_ERROR_,
-													factoryName), e);
-					// Don't recompute the factory if is has failed once.
-					factoryName = null;
-				}
-			}
-		}
-		return elementTypeFactory;
-	}
-
-	/**
-	 * Gets the factory kind name.
-	 * 
-	 * @return the factory kind name
-	 */
-	public String getKindName() {
-		return kindName;
-	}
-
-	/**
-	 * Gets the list of custom parameter names.
-	 * 
-	 * @return the list of custom parameter names
-	 */
-	public List getParams() {
-		return params;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeXmlConfig.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeXmlConfig.java
deleted file mode 100644
index 972715c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/ElementTypeXmlConfig.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-/**
- * The configuration element and attribute names for the
- * <code>org.eclipse.gmf.runtime.emf.type.core.elementTypes</code> extension point.
- * 
- * @author ldamus
- */
-public class ElementTypeXmlConfig {
-
-	public static final String E_METAMODEL = "metamodel";//$NON-NLS-1$
-
-	public static final String E_METAMODEL_TYPE = "metamodelType";//$NON-NLS-1$
-
-	public static final String E_SPECIALIZATION_TYPE = "specializationType";//$NON-NLS-1$
-
-	public static final String E_ADVICE_BINDING = "adviceBinding";//$NON-NLS-1$
-
-	public static final String E_ELEMENT_TYPE_FACTORY = "elementTypeFactory";//$NON-NLS-1$
-
-	public static final String E_PARAM = "param";//$NON-NLS-1$
-
-	public static final String A_NSURI = "nsURI";//$NON-NLS-1$
-
-	public static final String A_ID = "id";//$NON-NLS-1$
-
-	public static final String A_TYPE_ID = "typeId";//$NON-NLS-1$
-
-	public static final String A_INHERITANCE = "inheritance";//$NON-NLS-1$
-
-	public static final String A_NAME = "name";//$NON-NLS-1$
-
-	public static final String A_VALUE = "value";//$NON-NLS-1$
-
-	public static final String A_ICON = "icon";//$NON-NLS-1$
-
-	public static final String A_KIND = "kind";//$NON-NLS-1$
-
-	public static final String A_FACTORY = "factory";//$NON-NLS-1$
-
-	public static final String A_PARAMS = "params";//$NON-NLS-1$
-
-	public static final String A_ECLASS = "eclass";//$NON-NLS-1$
-
-	public static final String A_EDIT_HELPER = "edithelper";//$NON-NLS-1$
-
-	public static final String A_EDIT_HELPER_ADVICE = "edithelperadvice";//$NON-NLS-1$
-
-	public static final String E_SPECIALIZES = "specializes";//$NON-NLS-1$
-
-	public static final String E_ECONTAINER = "eContainer";//$NON-NLS-1$
-
-	public static final String E_ECONTAINMENT_FEATURE = "eContainmentFeature";//$NON-NLS-1$
-
-	public static final String A_QNAME = "qname"; //$NON-NLS-1$
-
-	public static final String E_MATCHER = "matcher"; //$NON-NLS-1$
-
-	public static final String A_CLASS = "class"; //$NON-NLS-1$
-
-	public static final String E_ENABLEMENT = "enablement"; //$NON-NLS-1$
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/IEditHelperAdviceDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/IEditHelperAdviceDescriptor.java
deleted file mode 100644
index 7a4c4cf..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/IEditHelperAdviceDescriptor.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-/**
- * Descriptor for edit helper advice. Used to prevent premature loading 
- * of the plugins that define the element matcher, edit helper advice and metamodel
- * descriptor classes.
- * 
- * @author ldamus
- */
-public interface IEditHelperAdviceDescriptor {
-
-	/**
-	 * Gets the ID of this advice.
-	 * 
-	 * @return the advice ID
-	 */
-	public abstract String getId();
-	
-	/**
-	 * Gets the identifier of the element type that this advice is bound to.
-	 * 
-	 * @return the element type identifier.
-	 */
-	public abstract String getTypeId();
-
-	/**
-	 * Gets the element matcher.
-	 * <P>
-	 * May cause the plugin defining the matcher class to be loaded.
-	 * 
-	 * @return the element matcher
-	 */
-	public abstract IElementMatcher getMatcher();
-	
-	/**
-	 * Gets the container descriptor. May be <code>null</code>.
-	 * 
-	 * @return the container descriptor
-	 */
-	public IContainerDescriptor getContainerDescriptor();
-
-	/**
-	 * Gets my edit helper advice. The advice can return 'before' or 'after'
-	 * editing commands for editing elements of the types that I specialize.
-	 * <P>
-	 * May cause the plugin defining the matcher class to be loaded.
-	 * 
-	 * @return the edit helper advice.
-	 */
-	public abstract IEditHelperAdvice getEditHelperAdvice();
-
-	/**
-	 * Indicates the related element types that should inherit this advice.
-	 * 
-	 * @return the kind of inheritance
-	 */
-	public abstract AdviceBindingInheritance getInheritance();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/MetamodelDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/MetamodelDescriptor.java
deleted file mode 100644
index 1327775..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/MetamodelDescriptor.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Describes a metamodel. Loading the metamodel is delayed until access is made
- * to {{@link #getEPackage()}.
- * 
- * @author ldamus
- */
-public class MetamodelDescriptor {
-
-	/**
-	 * The metamodel package.
-	 */
-	private EPackage ePackage;
-	
-	/**
-	 * The namespace URI of the metamodel package.
-	 */
-	private final String nsURI;
-	
-	/**
-	 * Flag indicating that a metamodel could not be found with my namespace
-	 * URI.
-	 */
-	private boolean metamodelNotFound = false;
-
-	/**
-	 * Creates a new metamodel descriptor from a configuration element.
-	 * 
-	 * @param configElement
-	 *            the configuration element
-	 * @throws CoreException
-	 *             when the EPackage namespace URI is not
-	 *             specified in the configuration element
-	 */
-	public MetamodelDescriptor(IConfigurationElement configElement)
-		throws CoreException {
-
-		nsURI = configElement.getAttribute(ElementTypeXmlConfig.A_NSURI);
-		if (nsURI == null) {
-			throw EMFTypePluginStatusCodes.getMetamodelInitException(
-				StringStatics.BLANK, EMFTypeCoreMessages.metamodel_reason_no_nsURI_WARN_);
-		}
-	}
-
-	/**
-	 * Gets the metamodel package.
-	 * 
-	 * @return the metamodel package
-	 */
-	public EPackage getEPackage() {
-		
-		if (ePackage == null & !metamodelNotFound) {
-			ePackage = (getNsURI() != null) ? EPackage.Registry.INSTANCE
-					.getEPackage(getNsURI()) : null;
-
-			if (ePackage == null) {
-				metamodelNotFound = true;
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.METAMODEL_NOT_INITED,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.metamodel_not_init_WARN_,
-												nsURI,
-												EMFTypeCoreMessages.metamodel_reason_nsURI_not_found_WARN_));
-			}
-		}
-		return ePackage;
-	}
-	
-	/**
-	 * Gets the namespace URI for the metamodel.
-	 * 
-	 * @return the namespace URI
-	 */
-	public String getNsURI() {
-		return nsURI;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/MetamodelTypeDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/MetamodelTypeDescriptor.java
deleted file mode 100644
index ab16874..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/MetamodelTypeDescriptor.java
+++ /dev/null

@@ -1,250 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Descriptor for a metamodel element type that has been defined in XML using
- * the <code>elementTypes</code> extension point.
- * 
- * @author ldamus
- */
-public class MetamodelTypeDescriptor
-	extends ElementTypeDescriptor
-	implements IMetamodelTypeDescriptor {
-
-	/**
-	 * The metaclass that this type represents.
-	 */
-	private EClass eClass;
-	
-	/**
-	 * The name of the metaclass that this type represents.
-	 */
-	private String eClassName;
-
-	/**
-	 * Flag indicating that a metaclass could not be found with the specified
-	 * name.
-	 */
-	private boolean eClassNotFound = false;
-
-	/**
-	 * Describes the metamodel in which to find the metaclass.
-	 */
-	private final MetamodelDescriptor metamodelDescriptor;
-
-	/**
-	 * The edit helper.
-	 */
-	private IEditHelper editHelper;
-
-	/**
-	 * The metamodel type.
-	 */
-	private IMetamodelType metamodelType;
-
-	/**
-	 * The edit helper class name. May be <code>null</code>.
-	 */
-	private String editHelperName;
-
-	/**
-	 * Constructs a descriptor for the <code>metamodelType</code>.
-	 * 
-	 * @param metamodelType
-	 *            the metamodel type
-	 */
-	public MetamodelTypeDescriptor(IMetamodelType metamodelType) {
-
-		super(metamodelType);
-
-		this.eClass = metamodelType.getEClass();
-		this.editHelper = metamodelType.getEditHelper();
-		this.metamodelType = metamodelType;
-		this.metamodelDescriptor = null;
-	}
-	
-	/**
-	 * Create a descriptor from a config element.
-	 * 
-	 * @param configElement
-	 *            the configuration element
-	 * @throws CoreException
-	 *             when the configuration element is missing required attributes
-	 */
-	public MetamodelTypeDescriptor(IConfigurationElement configElement,
-			MetamodelDescriptor metamodelDescriptor)
-		throws CoreException {
-
-		super(configElement);
-		
-		this.metamodelDescriptor = metamodelDescriptor;
-
-		// ECLASS
-		eClassName = configElement
-			.getAttribute(ElementTypeXmlConfig.A_ECLASS);
-
-		if (eClassName == null) {
-			throw EMFTypePluginStatusCodes.getTypeInitException(getId(),
-				EMFTypeCoreMessages.type_reason_no_eclass_WARN_, null);
-		}
-
-		editHelperName = getConfigElement().getAttribute(
-			ElementTypeXmlConfig.A_EDIT_HELPER);
-	}
-
-	/**
-	 * Returns the metamodel type for this descriptor. Lazy creation of the
-	 * metamodel type to avoid premature plugin loading.
-	 * 
-	 * @return the metamodel type
-	 */
-	public IElementType getElementType() {
-
-		if (metamodelType == null) {
-
-			if (getKindName() != null && getKindName().length() > 0) {
-				IElementTypeFactory factory = ElementTypeRegistry.getInstance()
-					.getElementTypeFactory(getKindName());
-
-				if (factory != null) {
-					metamodelType = factory.createMetamodelType(this);
-				}
-			}
-		}
-		return metamodelType;
-	}
-
-	/**
-	 * Gets the <code>EClass</code> that this type represents.
-	 */
-	public EClass getEClass() {
-		if (eClass == null && !eClassNotFound && metamodelDescriptor != null) {
-			EPackage ePackage = metamodelDescriptor.getEPackage();
-			ENamedElement namedElement = ePackage.getEClassifier(getEClassName());
-
-			if (namedElement instanceof EClass) {
-				eClass = (EClass) namedElement;
-			}
-
-			if (eClass == null) {
-				eClassNotFound = true;
-				Log
-				.error(
-						EMFTypePlugin.getPlugin(),
-						EMFTypePluginStatusCodes.TYPE_NOT_INITED,
-						EMFTypeCoreMessages
-								.bind(
-										EMFTypeCoreMessages.type_not_init_WARN_,
-										getEClassName(),
-										EMFTypeCoreMessages.type_reason_eclass_not_found_WARN_));
-			}
-		}
-		return eClass;
-	}
-	
-	/**
-	 * Gets the name of the <code>EClass</code> that this type represents.
-	 * @return the name of the EClass, or <code>null</code> if this type doesn't represent an EClass.
-	 */
-	public String getEClassName() {
-		if (eClassName == null && eClass != null) {
-			eClassName = eClass.getName();
-		}
-		return eClassName;
-	}
-	
-	/**
-	 * Gets the namespace URI of the metamodel that owns the <code>EClass</code>
-	 * that I represent.
-	 * 
-	 * @return the namespace URI, or <code>null</code> if I don't have one
-	 */
-	public String getNsURI() {
-		if (metamodelDescriptor == null) {
-			if (eClass != null) {
-				return eClass.getEPackage().getNsURI();
-			}
-			return null;
-		}
-		return metamodelDescriptor.getNsURI();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IMetamodelTypeDescriptor#getEditHelper()
-	 */
-	public IEditHelper getEditHelper() {
-
-		if (editHelper == null) {
-
-			if (editHelperName != null) {
-				try {
-					editHelper = (IEditHelper) getConfigElement()
-						.createExecutableExtension(
-							ElementTypeXmlConfig.A_EDIT_HELPER);
-
-				} catch (CoreException e) {
-					Log
-							.error(
-									EMFTypePlugin.getPlugin(),
-									EMFTypePluginStatusCodes.EDIT_HELPER_CLASS_NOT_FOUND,
-									EMFTypeCoreMessages
-											.bind(
-													EMFTypeCoreMessages.editHelper_class_not_found_ERROR_,
-													editHelperName), e);
-					// Don't recompute the edit helper class after it has failed
-					// once.
-					editHelperName = null;
-				}
-			}
-		}
-		return editHelper;
-	}
-	
-	/**
-	 * Gets my name. If no name is specified, uses the name of the
-	 * <code>EClass</code> that I represent.
-	 */
-	public String getName() {
-		String name = super.getName();
-		
-		if ((name == null || name.length() < 1) && getEClass() != null) {
-			name = getEClass().getName();
-			setName(name);
-		}
-		return name;
-	}
-	
-	public String toString() {
-		return "MetamodelTypeDescriptor[" + getId()+ "]"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/SpecializationTypeDescriptor.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/SpecializationTypeDescriptor.java
deleted file mode 100644
index 32f8828..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/SpecializationTypeDescriptor.java
+++ /dev/null

@@ -1,333 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.descriptors;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.emf.type.core.ElementType;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.XMLExpressionMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Descriptor for a specialization element type that has been defined in XML
- * using the <code>elementTypes</code> extension point.
- * 
- * @author ldamus
- */
-public class SpecializationTypeDescriptor
-	extends ElementTypeDescriptor
-	implements ISpecializationTypeDescriptor {
-
-	/**
-	 * The matcher class name. May be <code>null</code>.
-	 */
-	private String matcherClassName;
-
-	/**
-	 * The container element matcher. May be <code>null</code>.
-	 */
-	private IElementMatcher matcher;
-
-	/**
-	 * The container matcher configuration element. May be <code>null</code>.
-	 */
-	private IConfigurationElement matcherConfig;
-
-	/**
-	 * The identifiers of the element types that this type specializes.
-	 */
-	private String[] specializedTypeIds;
-
-	/**
-	 * The element types that are specialized by this type.
-	 */
-	private IElementType[] specializedTypes;
-
-	/**
-	 * The container descriptor.
-	 */
-	private IContainerDescriptor containerDescriptor;
-
-	/**
-	 * The edit helper advice descriptor.
-	 */
-	private IEditHelperAdviceDescriptor editHelperAdviceDescriptor;
-	
-	/**
-	 * The edit helper advice.
-	 */
-	private IEditHelperAdvice editHelperAdvice;
-
-	/**
-	 * The specialization type.
-	 */
-	private ISpecializationType specializationType;
-
-	/**
-	 * The class name of the edit helper advice.
-	 */
-	private String editHelperAdviceName;
-
-	/**
-	 * Create a descriptor from a specialization type.
-	 * 
-	 * @param specializationType the specialization type
-	 */
-	public SpecializationTypeDescriptor(ISpecializationType specializationType) {
-
-		super(specializationType);
-
-		this.containerDescriptor = specializationType.getEContainerDescriptor();
-		this.editHelperAdvice = specializationType.getEditHelperAdvice();
-		this.editHelperAdviceDescriptor = new EditHelperAdviceDescriptor(
-			editHelperAdvice, this);
-		this.matcher = specializationType.getMatcher();
-		this.specializationType = specializationType;
-		this.specializedTypeIds = specializationType.getSpecializedTypeIds();
-		this.specializedTypes = specializationType.getSpecializedTypes();
-	}
-			
-	/**
-	 * Create a descriptor from a configuration element.
-	 * 
-	 * @param configElement
-	 *            the configuration element
-	 * @param metamodelDescriptor
-	 *            the metamodel descriptor. Attributes of the container
-	 *            descriptor are defined relative to this metmodel.
-	 */
-	public SpecializationTypeDescriptor(IConfigurationElement configElement,
-			MetamodelDescriptor metamodelDescriptor)
-		throws CoreException {
-
-		super(configElement);
-
-		editHelperAdviceName = configElement
-			.getAttribute(ElementTypeXmlConfig.A_EDIT_HELPER_ADVICE);
-
-		editHelperAdviceDescriptor = new EditHelperAdviceDescriptor(
-			editHelperAdviceName, this);
-
-		//SPECIALIZES
-		List specializes = new ArrayList();
-		IConfigurationElement[] specializesConfigs = configElement
-			.getChildren(ElementTypeXmlConfig.E_SPECIALIZES);
-
-		for (int i = 0; i < specializesConfigs.length; i++) {
-			IConfigurationElement nextSpecializesConfig = specializesConfigs[i];
-
-			String specializedId = nextSpecializesConfig
-				.getAttribute(ElementTypeXmlConfig.A_ID);
-
-			if (specializedId == null) {
-				throw EMFTypePluginStatusCodes.getTypeInitException(getId(),
-						EMFTypeCoreMessages.type_reason_no_specialized_id_WARN_, null);
-			}
-
-			specializes.add(specializedId);
-		}
-		specializedTypeIds = (String[]) specializes.toArray(new String[] {});
-
-		if (specializedTypeIds.length < 1) {
-			throw EMFTypePluginStatusCodes.getTypeInitException(getId(),
-				EMFTypeCoreMessages.type_reason_no_specialized_WARN_, null);
-		}
-
-		// ECONTAINER
-		IConfigurationElement[] containerConfigs = configElement
-			.getChildren(ElementTypeXmlConfig.E_ECONTAINER);
-
-		if (containerConfigs.length > 0) {
-			containerDescriptor = new ContainerDescriptor(containerConfigs[0],
-				metamodelDescriptor, getId());
-		}
-
-		// XML MATCHER EXPRESSION
-		IConfigurationElement[] enablementConfigs = configElement
-			.getChildren(ElementTypeXmlConfig.E_ENABLEMENT);
-
-		if (enablementConfigs.length > 0) {
-			matcher = new XMLExpressionMatcher(enablementConfigs[0], getId());
-		}
-
-		// MATCHER CLASS
-		if (matcher == null) {
-			IConfigurationElement[] matcherConfigs = configElement
-				.getChildren(ElementTypeXmlConfig.E_MATCHER);
-
-			if (matcherConfigs.length > 0) {
-				matcherClassName = matcherConfigs[0]
-					.getAttribute(ElementTypeXmlConfig.A_CLASS);
-
-				if (matcherClassName == null) {
-					throw EMFTypePluginStatusCodes
-							.getInitException(
-									getId(),
-									EMFTypeCoreMessages.element_reason_matcher_no_class_WARN_,
-									null);
-				}
-				matcherConfig = matcherConfigs[0];
-			}
-		}
-	}
-
-	/**
-	 * Returns the specialization type for this descriptor. Lazy creation of the
-	 * specialization type to avoid premature plugin loading.
-	 * 
-	 * @return the element type
-	 */
-	public IElementType getElementType() {
-
-		if (specializationType == null) {
-
-			if (getKindName() != null && getKindName().length() > 0) {
-				IElementTypeFactory factory = ElementTypeRegistry.getInstance()
-					.getElementTypeFactory(getKindName());
-
-				if (factory != null) {
-					specializationType = factory.createSpecializationType(this);
-				}
-			}
-		}
-		return specializationType;
-	}
-
-	/**
-	 * Gets the identifiers of the element types that this type specializes. May
-	 * be <code>null</code>.
-	 * 
-	 * @return the ids of the types that are specialized
-	 */
-	public String[] getSpecializationTypeIds() {
-		return specializedTypeIds;
-	}
-
-	/**
-	 * Gets the element matcher configuration element. May be <code>null</code>.
-	 * 
-	 * @return the element matcher configuration element
-	 */
-	public IConfigurationElement getMatcherConfiguration() {
-		return matcherConfig;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor#getContainerDescriptor()
-	 */
-	public IContainerDescriptor getContainerDescriptor() {
-		return containerDescriptor;
-	}
-
-	/**
-	 * Gets the edit helper advice. May be <code>null</code>.
-	 * 
-	 * @return the edit helper advice
-	 */
-	public IEditHelperAdviceDescriptor getEditHelperAdviceDescriptor() {
-		return editHelperAdviceDescriptor;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor#getSpecializedTypes()
-	 */
-	public IElementType[] getSpecializedTypes() {
-
-		if (specializedTypes == null) {
-			specializedTypes = new ElementType[specializedTypeIds.length];
-
-			for (int i = 0; i < specializedTypeIds.length; i++) {
-				specializedTypes[i] = ElementTypeRegistry.getInstance()
-					.getType(specializedTypeIds[i]);
-			}
-		}
-		return specializedTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor#getMatcher()
-	 */
-	public IElementMatcher getMatcher() {
-
-		if (matcher == null && matcherClassName != null
-			&& matcherConfig != null) {
-			try {
-				matcher = (IElementMatcher) matcherConfig
-					.createExecutableExtension(ElementTypeXmlConfig.A_CLASS);
-
-			} catch (CoreException e) {
-				Log
-						.error(
-								EMFTypePlugin.getPlugin(),
-								EMFTypePluginStatusCodes.MATCHER_CLASS_NOT_FOUND,
-								EMFTypeCoreMessages
-										.bind(
-												EMFTypeCoreMessages.matcher_class_not_found_ERROR_,
-												matcherClassName), e);
-
-				// Don't try to recompute the matcher class if it has failed.
-				matcherClassName = null;
-			}
-		}
-		return matcher;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor#getEditHelperAdvice()
-	 */
-	public IEditHelperAdvice getEditHelperAdvice() {
-
-		if (editHelperAdvice == null && getEditHelperAdviceDescriptor() != null) {
-			editHelperAdvice = getEditHelperAdviceDescriptor().getEditHelperAdvice();
-		}
-		return editHelperAdvice;
-	}
-	
-	/**
-	 * Gets the icon URL from the the first type I specialize, if I don't have an icon.
-	 */
-	public URL getIconURL() {
-
-		if ((super.getIconURL() == null) && (getSpecializedTypes().length > 0)) {
-			return getSpecializedTypes()[0].getIconURL();
-		}
-		return super.getIconURL();
-	}
-	
-	public String toString() {
-		return "SpecializationTypeDescriptor[" + getId()+ "]";  //$NON-NLS-1$//$NON-NLS-2$
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/package.html
deleted file mode 100644
index b7fb59f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/descriptors/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides a set of descriptors that are used in the implementation of the
-Element Type framework.</P>
-
-<P>The descriptors are used to delay loading of the plugins containing classes that
- are specified in the XML extension for element types. They store the 
- configuration element and only instantiate classes when asked to do so.</P>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.type.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultClientContext.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultClientContext.java
deleted file mode 100644
index 12c1371..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultClientContext.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.impl;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
-
-/**
- * The default client context which includes the types and advice specifically
- * bound to it, as well as any types and advice to which no other context has
- * been bound.
- * 
- * @author ldamus
- */
-public final class DefaultClientContext extends ClientContext {
-
-	/**
-	 * Identifier for the default client context.
-	 */
-	public static final String ID = "org.eclipse.gmf.runtime.emf.type.core.defaultContext"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance.
-	 */
-	private static IClientContext _instance;
-
-	/**
-	 * Gets the singleton instance.
-	 * 
-	 * @return the default client context
-	 */
-	public static final IClientContext getInstance() {
-		if (_instance == null) {
-			_instance = new DefaultClientContext();
-		}
-		return _instance;
-	}
-
-	/**
-	 * Private constructor for the singleton.
-	 */
-	private DefaultClientContext() {
-		super(ID, new IElementMatcher() {
-			public boolean matches(EObject eObject) {
-				return true;
-			}
-		});
-	}
-
-	/**
-	 * Includes the <code>elementTypeDescriptor</code> if it is explicitly
-	 * bound to me, or there is no other context bound to it.
-	 */
-	public boolean includes(IElementTypeDescriptor elementTypeDescriptor) {
-		boolean result = super.includes(elementTypeDescriptor);
-
-		if (!result) {
-			result = ClientContextManager.getInstance().getBinding(
-					elementTypeDescriptor) == _instance;
-		}
-		return result;
-	}
-
-	/**
-	 * Includes the <code>advice</code> if it is explicitly bound to me, or
-	 * there is no other context bound to it.
-	 */
-	public boolean includes(IEditHelperAdviceDescriptor advice) {
-		boolean result = super.includes(advice);
-
-		if (!result) {
-			result = ClientContextManager.getInstance().getBinding(advice) == _instance;
-		}
-		return result;
-	}
-
-	/**
-	 * Includes the <code>elementTyper</code> if it is explicitly bound to me,
-	 * or there is no other context bound to it.
-	 */
-	public boolean includes(IElementType elementType) {
-		boolean result = super.includes(elementType);
-
-		if (!result) {
-			result = ClientContextManager.getInstance().getBinding(elementType) == _instance;
-		}
-		return result;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultElementTypeFactory.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultElementTypeFactory.java
deleted file mode 100644
index 23f64ad..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultElementTypeFactory.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.impl;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
-
-/**
- * The default element type factory that creates <code>MetamodelType</code> s
- * and <code>SpecializationType</code>s. This is the factory that is used
- * when the 'kind' attribute is not specified in the element type's XML
- * contribution.
- * 
- * @author ldamus
- */
-public class DefaultElementTypeFactory
-	extends AbstractElementTypeFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory#createMetamodelType(org.eclipse.gmf.runtime.emf.type.core.internal.impl.MetamodelTypeDescriptor)
-	 */
-	public IMetamodelType createMetamodelType(IMetamodelTypeDescriptor descriptor) {
-		return new MetamodelType(descriptor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory#createSpecializationType(org.eclipse.gmf.runtime.emf.type.core.internal.impl.SpecializationTypeDescriptor)
-	 */
-	public ISpecializationType createSpecializationType(
-			ISpecializationTypeDescriptor descriptor) {
-
-		return new SpecializationType(descriptor);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultMetamodelType.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultMetamodelType.java
deleted file mode 100644
index 3799bde..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/DefaultMetamodelType.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.impl;
-
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.MetamodelTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * A default metamodel type for elements for which no type is registered.  This
- * ensures at least basic editing support for any {@link EObject}
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class DefaultMetamodelType
-	extends MetamodelType {
-
-	public static final String ID = "org.eclipse.gmf.runtime.emf.type.core.default"; //$NON-NLS-1$
-	
-	private static final DefaultMetamodelType INSTANCE = new DefaultMetamodelType();
-	private static final MetamodelTypeDescriptor DESCRIPTOR_INSTANCE =
-		new MetamodelTypeDescriptor(INSTANCE);
-	
-	/**
-	 * Initializes me.
-	 */
-	private DefaultMetamodelType() {
-		super(
-				ID,
-				null,
-				EMFTypeCoreMessages.defaultEditHelper_name,
-				EcorePackage.Literals.EOBJECT,
-				new DefaultEditHelper());
-	}
-	
-	/**
-	 * Obtains the singleton default metamodel type instance.
-	 * 
-	 * @return the singleton instance
-	 */
-	public static DefaultMetamodelType getInstance() {
-		return INSTANCE;
-	}
-	
-	/**
-	 * Obtains the singleton default metamodel type descriptor instance.
-	 * 
-	 * @return the singleton descriptor instance
-	 */
-	public static MetamodelTypeDescriptor getDescriptorInstance() {
-		return DESCRIPTOR_INSTANCE;
-	}
-
-	/**
-	 * Edit helper for the default element type.
-	 *
-	 * @author Christian W. Damus (cdamus)
-	 */
-	private static class DefaultEditHelper extends AbstractEditHelper {
-		DefaultEditHelper() {
-			super();
-		}
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/HintedTypeFactory.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/HintedTypeFactory.java
deleted file mode 100644
index 794db7e..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/HintedTypeFactory.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.impl;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
-
-/**
- * Factory for hinted element types, which are specializations types that have a
- * semantic hint parameter.
- * 
- * @author ldamus
- */
-public class HintedTypeFactory extends AbstractElementTypeFactory {
-
-	/**
-	 * The hinted type kind. This string is specified in the XML 'kind'
-	 * attribute of any element type that is a hinted type.
-	 */
-	public static final String HINTED_TYPE_KIND = "org.eclipse.gmf.runtime.emf.core.internal.util.IHintedType"; //$NON-NLS-1$
-
-	/**
-	 * The semantic hint parameter name.
-	 */
-	private static final String SEMANTIC_HINT_PARAM_NAME = "semanticHint"; //$NON-NLS-1$
-
-	/**
-	 * The hinted specialization type class.
-	 */
-	private static final class HintedSpecializationType extends
-			SpecializationType implements IHintedType {
-
-		/**
-		 * The semantic hint.
-		 */
-		private final String semanticHint;
-
-		/**
-		 * Constructs a new hinted type.
-		 * 
-		 * @param descriptor
-		 *            the specialization type descriptor
-		 * @param semanticHint
-		 *            the semantic hint
-		 */
-		public HintedSpecializationType(ISpecializationTypeDescriptor descriptor,
-				String semanticHint) {
-
-			super(descriptor);
-			this.semanticHint = semanticHint;
-		}
-
-		/**
-		 * Gets the semantic hint.
-		 */
-		public String getSemanticHint() {
-			return semanticHint;
-		}
-	}
-
-	/**
-	 * The hinted metamodel type class.
-	 */
-	private static final class HintedMetamodelType extends MetamodelType
-			implements IHintedType {
-
-		/**
-		 * The semantic hint.
-		 */
-		private final String semanticHint;
-
-		/**
-		 * Constructs a new hinted type.
-		 * 
-		 * @param descriptor
-		 *            the specialization type descriptor
-		 * @param semanticHint
-		 *            the semantic hint
-		 */
-		public HintedMetamodelType(IMetamodelTypeDescriptor descriptor,
-				String semanticHint) {
-
-			super(descriptor);
-			this.semanticHint = semanticHint;
-		}
-
-		/**
-		 * Gets the semantic hint.
-		 */
-		public String getSemanticHint() {
-			return semanticHint;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeFactory#createSpecializationType(org.eclipse.gmf.runtime.emf.type.core.internal.impl.SpecializationTypeDescriptor)
-	 */
-	public ISpecializationType createSpecializationType(
-			ISpecializationTypeDescriptor descriptor) {
-
-		String semanticHint = descriptor
-				.getParamValue(SEMANTIC_HINT_PARAM_NAME);
-
-		return new HintedSpecializationType(descriptor, semanticHint);
-	}
-
-	public IMetamodelType createMetamodelType(
-			IMetamodelTypeDescriptor descriptor) {
-
-		String semanticHint = descriptor
-				.getParamValue(SEMANTIC_HINT_PARAM_NAME);
-
-		return new HintedMetamodelType(descriptor, semanticHint);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/SpecializationTypeRegistry.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/SpecializationTypeRegistry.java
deleted file mode 100644
index ced0f67..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/SpecializationTypeRegistry.java
+++ /dev/null

@@ -1,935 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.AdviceBindingDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.AdviceBindingInheritance;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.ElementTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.MetamodelDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.MetamodelTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.SpecializationTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Registry of specialization types populated by the
- * <code>ElementTypeRegistry</code>. Keeps track of the specializations and
- * advice bindings and provides methods for finding matching edit helper advice.
- * <P>
- * This class is for internal use only.
- * 
- * @author ldamus
- */
-public class SpecializationTypeRegistry {
-	
-	/**
-	 * Set containing the ALL advice binding inheritance.
-	 */
-	private final static Set ALL = Collections
-			.singleton(AdviceBindingInheritance.ALL);
-
-	/**
-	 * Set containing the ALL and NONE advice binding inheritance.
-	 */
-	private final static Set ALL_NONE = new HashSet(
-			Arrays
-					.asList(new AdviceBindingInheritance[] {
-							AdviceBindingInheritance.NONE,
-							AdviceBindingInheritance.ALL }));
-
-	/**
-	 * Specialization type descriptors stored by ID. Each value is a
-	 * <code>SpecializationTypeDescriptor</code>.
-	 */
-	private final Map specializationTypeDescriptors;
-
-	/**
-	 * Specialization type descriptors stored by the ID of the type that has
-	 * been specialized. Each value is a Set of type descriptors for the types
-	 * that specialize the key type ID.
-	 */
-	private final Map specializationsForTypeId;
-
-	/**
-	 * Edit helper advice stored by target element type ID. Each value is a set
-	 * of IEditHelperAdviceDescriptors.
-	 */
-	private final Map adviceBindings;
-
-	/**
-	 * Constructs a new specialization type registry.
-	 */
-	public SpecializationTypeRegistry() {
-		super();
-
-		specializationTypeDescriptors = new HashMap();
-		specializationsForTypeId = new HashMap();
-		adviceBindings = new HashMap();
-	}
-	
-	/**
-	 * Registers <code>specializationType</code> if it has a unique ID in the
-	 * registry.
-	 * 
-	 * @param specializationType
-	 *            the element type
-	 * @return <code>true</code> if the element type was registered,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean registerSpecializationType(ISpecializationType specializationType) {
-		
-		if (specializationType == null
-			|| specializationTypeDescriptors.containsKey(specializationType
-				.getId())) {
-
-			return false;
-		}
-		
-		SpecializationTypeDescriptor descriptor = new SpecializationTypeDescriptor(
-			specializationType);
-		
-		return registerSpecializationType(descriptor);
-	}
-
-	/**
-	 * Registers the specialization element type described by
-	 * <code>configElement</code>.
-	 * 
-	 * @param configElement
-	 *            the configutation element
-	 * @param metamodelDescriptor
-	 *            the descriptor for the metamodel containing the EClass for the
-	 *            new element type
-	 * @return the new specialization type descriptor if it has been registered,
-	 *         <code>null</code> otherwise.
-	 * 
-	 * @throws CoreException
-	 *             on any problem accessing a configuration element
-	 */
-	public SpecializationTypeDescriptor registerSpecializationType(
-			IConfigurationElement configElement,
-			MetamodelDescriptor metamodelDescriptor)
-		throws CoreException {
-
-		SpecializationTypeDescriptor descriptor = new SpecializationTypeDescriptor(
-			configElement, metamodelDescriptor);
-
-		boolean wasRegistered = registerSpecializationType(descriptor);
-
-		return wasRegistered ? descriptor
-			: null;
-	}
-	
-	/**
-	 * Registers <code>descriptor</code> if it has a unique ID in the
-	 * registry.
-	 * 
-	 * @param descriptor
-	 * @return <code>true</code> if the element was registered,
-	 *         <code>false</code> otherwise.
-	 */
-	private boolean registerSpecializationType(
-			SpecializationTypeDescriptor descriptor) {
-
-		if (checkForDuplicate(descriptor)) {
-			return false;
-		}
-
-		// Put the type in the main specialization map.
-		specializationTypeDescriptors.put(descriptor.getId(), descriptor);
-
-		// Register its edit helper advice
-		IEditHelperAdviceDescriptor editHelperAdvice = descriptor
-			.getEditHelperAdviceDescriptor();
-
-		if (editHelperAdvice != null) {
-			register(editHelperAdvice);
-		}
-
-		// Put the type in the map of specialized types for a given ID
-		String[] specializedTypes = descriptor.getSpecializationTypeIds();
-		for (int i = 0; i < specializedTypes.length; i++) {
-			Set specializations = (Set) specializationsForTypeId
-				.get(specializedTypes[i]);
-
-			if (specializations == null) {
-				specializations = new HashSet();
-				specializationsForTypeId.put(specializedTypes[i],
-					specializations);
-			}
-			specializations.add(descriptor);
-		}
-		return true;
-	}
-
-	/**
-	 * Loads the edit helper advice binding described by
-	 * <code>configElement</code>.
-	 * 
-	 * @param configElement
-	 *            the configutation element
-	 * @throws CoreException
-	 *             on any problem accessing a configuration element
-	 */
-	public void registerAdviceBinding(IConfigurationElement configElement,
-			MetamodelDescriptor metamodelDescriptor)
-		throws CoreException {
-
-		IEditHelperAdviceDescriptor descriptor = new AdviceBindingDescriptor(
-			configElement, metamodelDescriptor);
-		register(descriptor);
-	}
-
-	/**
-	 * Registers the descriptor with the advice bindings for the target ID.
-	 * 
-	 * @param descriptor
-	 *            the edit helper advice descriptor
-	 */
-	private void register(IEditHelperAdviceDescriptor descriptor) {
-
-		String targetId = descriptor.getTypeId();
-		Set bindings = (Set) adviceBindings.get(targetId);
-
-		if (bindings == null) {
-			bindings = new HashSet();
-			adviceBindings.put(targetId, bindings);
-		}
-		bindings.add(descriptor);
-	}
-
-	/**
-	 * Removes the specialization type <code>specializationTypeDescriptor</code>.
-	 * 
-	 * @param specializationTypeDescriptor
-	 *            the specialization type to remove
-	 */
-	public void removeSpecializationType(
-			SpecializationTypeDescriptor specializationTypeDescriptor) {
-
-		specializationTypeDescriptors.remove(specializationTypeDescriptor.getId());
-		
-		String[] specializedTypes = specializationTypeDescriptor
-			.getSpecializationTypeIds();
-
-		for (int j = 0; j < specializedTypes.length; j++) {
-			Set specializations = (Set) specializationsForTypeId
-				.get(specializedTypes[j]);
-
-			specializations.remove(specializationTypeDescriptor);
-		}
-	}
-
-	/**
-	 * Gets a list containing the immediate specializations of <code>type</code>.
-	 * 
-	 * @param type
-	 *            the element type for which to find specializations
-	 * @param clientContext
-	 *            the client context
-	 * @return the list of all <code>SpecializationTypeDescriptor</code> s of
-	 *         <code>type</code>
-	 */
-	private List getImmediateSpecializationTypeDescriptors(
-			ElementTypeDescriptor type, IClientContext clientContext) {
-		return getSpecializationTypeDescriptors(type, false, clientContext);
-	}
-	
-	/**
-	 * Gets a list containing all specializations of <code>type</code>, in
-	 * breadth-first order.
-	 * 
-	 * @param type
-	 *            the element type
-	 * @param clientContext
-	 *            the client context
-	 * @return the array of all specializations of <code>type</code>
-	 */
-	public ISpecializationType[] getAllSpecializationTypes(
-			IElementTypeDescriptor type, IClientContext clientContext) {
-
-		List descriptors = getSpecializationTypeDescriptors(type, true, clientContext);
-		ISpecializationType[] result = new ISpecializationType[descriptors.size()];
-		int index = 0;
-		
-		for (Iterator i = descriptors.iterator(); i.hasNext(); index++) {
-			SpecializationTypeDescriptor next = (SpecializationTypeDescriptor) i.next();
-			result[index] = (ISpecializationType) next.getElementType();
-		}
-		return result;
-	}
-
-	/**
-	 * Gets a list containing all specializations of <code>type</code>, in
-	 * breadth-first order.
-	 * 
-	 * @param type
-	 *            the element type
-	 * @param clientContext
-	 *            the client context
-	 * @return the list of all specializations of <code>type</code>
-	 */
-	private List getAllSpecializationTypeDescriptors(
-			IElementTypeDescriptor type, IClientContext clientContext) {
-
-		return getSpecializationTypeDescriptors(type, true, clientContext);
-	}
-
-	/**
-	 * Gets a list containing the descriptors for specializations of
-	 * <code>type</code>, in breadth-first order. There are no duplicates in
-	 * the list.
-	 * 
-	 * @param type
-	 *            the element type
-	 * @param deep
-	 *            <code>true</code> if all specializations are to be found,
-	 *            recursively, <code>false</code> if only the immediate
-	 *            (direct) specializations are to be found.
-	 * @return the collection of <code>SpecializationTypeDescriptors</code> of
-	 *         <code>type</code>
-	 */
-	private List getSpecializationTypeDescriptors(IElementTypeDescriptor type,
-			boolean deep, IClientContext clientContext) {
-
-		LinkedHashSet result = new LinkedHashSet();
-		
-		if (type != null) {
-			// Get the immediate specializations
-			Set specializationDescriptors = (Set) specializationsForTypeId.get(type
-				.getId());
-	
-			if (specializationDescriptors != null) {
-				Set specializations = new HashSet();
-	
-				for (Iterator i = specializationDescriptors.iterator(); i.hasNext();) {
-					SpecializationTypeDescriptor nextDescriptor = (SpecializationTypeDescriptor) i
-						.next();
-	
-					if (clientContext.includes(nextDescriptor)) {
-						if (nextDescriptor != null) {
-							specializations.add(nextDescriptor);
-		
-							if (deep) {
-								// Recursively search for specializations
-								result.addAll(getSpecializationTypeDescriptors(
-									nextDescriptor, deep, clientContext));
-							}
-						}
-					}
-				}
-				// Add the immediate specializations last, so that a breadth-first
-				// order is maintained
-				result.addAll(specializations);
-			}
-		}
-		return new ArrayList(result);
-	}
-
-	/**
-	 * Gets the array of specialization types that match <code>eObject</code>,
-	 * in order of decreasing specialization.
-	 * <P>
-	 * Returns an empty list if the <code>clientContext</code> is not bound to
-	 * the <code>metamodelTypeDescriptor</code>.
-	 * 
-	 * @param eObject
-	 *            the model element for which to find specializations
-	 * @param metamodelTypeDescriptor
-	 *            the metamodel type descriptor for <code>eObject</code>
-	 * @return the list of <code>SpecializationTypeDescriptor</code> s that
-	 *         match <code>eObject</code>
-	 */
-	public List getSpecializationDescriptorsMatching(EObject eObject,
-			MetamodelTypeDescriptor metamodelTypeDescriptor, IClientContext clientContext) {
-		
-		List result = new ArrayList();
-
-		// Get all of the specializations of the metamodel type that matches the
-		// eObject
-		List specializations = getAllSpecializationTypeDescriptors(
-				metamodelTypeDescriptor, clientContext);
-
-		// Get the edit helper specialization descriptors that have matching
-		// advice
-		for (Iterator i = specializations.iterator(); i.hasNext();) {
-			SpecializationTypeDescriptor nextDescriptor = (SpecializationTypeDescriptor) i
-				.next();
-			IEditHelperAdviceDescriptor adviceDescriptor = nextDescriptor
-				.getEditHelperAdviceDescriptor();
-
-			if (adviceDescriptor != null) {
-				// See if the advice from this descriptor matches the model
-				// element
-				if (adviceMatches(eObject, adviceDescriptor)) {
-					result.add(nextDescriptor);
-				}
-			} else {
-				// No restrictions
-				result.add(nextDescriptor);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the list of specializations of <code>type</code> whose matching
-	 * criteria match the given <code>eContainer</code> and
-	 * <code>reference</code>.
-	 * <P>
-	 * Returns an empty list if the <code>clientContext</code> is not bound to
-	 * the <code>type</code>.
-	 * 
-	 * @param type
-	 *            the element type
-	 * @param eContainer
-	 *            the container
-	 * @param reference
-	 *            the reference feature.
-	 * @param clientContext
-	 *            the client context
-	 * @return the list of matching specializations
-	 */
-	public List getMatchingSpecializations(ElementTypeDescriptor type,
-			EObject eContainer, EReference reference, IClientContext clientContext) {
-		
-		List result = new ArrayList();
-
-		// Get the specializations of the element type that match the given
-		// feature of the container
-		List matchingSpecializations = getSpecializationDescriptorsMatching(
-			type, eContainer, reference, clientContext);
-
-		result.addAll(matchingSpecializations);
-
-		// Repeat for only the matching specializations
-		for (Iterator i = matchingSpecializations.iterator(); i.hasNext();) {
-			result.addAll(getMatchingSpecializations((ElementTypeDescriptor) i
-				.next(), eContainer, reference, clientContext));
-		}
-		return result;
-	}
-
-	/**
-	 * Queries whether the specified edit helper advice descriptor matches an
-	 * <code>eObject</code>.
-	 * 
-	 * @param eObject
-	 *            the model element for which to find matching advice
-	 * @param editHelperAdviceDescriptor
-	 *            an advice descriptor that may opr may not match <code>eObject</code>
-	 * @return <code>true</code> if the advice matches; <code>false</code>, otherwise
-	 */
-	private boolean adviceMatches(EObject eObject,
-			IEditHelperAdviceDescriptor editHelperAdviceDescriptor) {
-
-		EReference containmentFeature = eObject.eContainmentFeature();
-
-		IContainerDescriptor container = editHelperAdviceDescriptor
-			.getContainerDescriptor();
-
-		if (container != null) {
-			IElementMatcher containerMatcher = container.getMatcher();
-
-			if (containerMatcher != null
-				&& !containerMatcher.matches(eObject.eContainer())) {
-				return false;
-			}
-		}
-
-		EReference[] features = null;
-		if (container != null) {
-			features = container.getContainmentFeatures();
-		}
-
-		if (features == null || features.length < 1) {
-			// All features that can contain this type's EClass are valid
-			IElementMatcher matcher = editHelperAdviceDescriptor.getMatcher();
-
-			return (matcher == null) || matcher.matches(eObject);
-
-		} else {
-
-			for (int j = 0; j < features.length; j++) {
-
-				if (features[j] == containmentFeature) {
-					IElementMatcher matcher = editHelperAdviceDescriptor
-						.getMatcher();
-
-					return (matcher == null) || matcher.matches(eObject);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets the list descriptors of the specializations that match the
-	 * <code>eContainer</code> and <code>feature</code>.
-	 * 
-	 * @param eContainer
-	 *            the container to match
-	 * @param feature
-	 *            the containment feature to match
-	 * @param clientContext
-	 *            the client context
-	 * @return the list of <code>SpecializationTypeDescriptor</code> s that
-	 *         match
-	 */
-	private List getSpecializationDescriptorsMatching(
-			ElementTypeDescriptor typeDescriptor, EObject eContainer,
-			EReference feature, IClientContext clientContext) {
-
-		List result = new ArrayList();
-		Collection specializationDescriptors = getImmediateSpecializationTypeDescriptors(
-				typeDescriptor, clientContext);
-
-		for (Iterator i = specializationDescriptors.iterator(); i.hasNext();) {
-			SpecializationTypeDescriptor nextDescriptor = (SpecializationTypeDescriptor) i
-				.next();
-			
-			if (!clientContext.includes(nextDescriptor)) {
-				// descriptor isn't bound to the client context
-				continue;
-			}
-			
-			IContainerDescriptor container = nextDescriptor
-				.getContainerDescriptor();
-
-			// First, match the container
-			IElementMatcher containerMatcher = container != null ? container
-				.getMatcher()
-				: null;
-
-			if (containerMatcher != null
-				&& !containerMatcher.matches(eContainer)) {
-				continue;
-			}
-
-			// Second, match the containing feature(s)
-			EReference[] features = container != null ? container
-				.getContainmentFeatures()
-				: null;
-
-			if (features == null || features.length < 1) {
-				// All features that can contain this type's EClass are valid
-				EClass specializedType = nextDescriptor.getElementType()
-					.getEClass();
-
-				if (canContain(eContainer.eClass(), feature, specializedType)) {
-					result.add(nextDescriptor);
-					continue;
-				}
-			} else {
-				for (int j = 0; j < features.length; j++) {
-
-					if (features[j] == feature) {
-						result.add(nextDescriptor);
-						break;
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Answers whether or not <code>container</code> can contain
-	 * <code>contained</code> in its <code>reference</code> feature.
-	 * 
-	 * @param container
-	 *            the container
-	 * @param reference
-	 *            the reference feature
-	 * @param contained
-	 *            the element to be contained
-	 * @return <code>true</code> if <code>container</code> can contain
-	 *         <code>contained</code> in its <code>reference</code> feature,
-	 *         <code>false</code> otherwise.
-	 */
-	private boolean canContain(EClass container, EReference reference,
-			EClass contained) {
-
-		if ((reference.isContainment())
-			&& (container.getEAllReferences().contains(reference))) {
-
-			EClass eType = (EClass) reference.getEType();
-
-			if ((eType.equals(contained)) || (eType.isSuperTypeOf(contained))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Gets the edit helper advice bound to the <code>elementTypes</code> that
-	 * match <code>eObject</code>. The advice will be that which is bound to
-	 * the <code>clientContext</code>, and is ordered from most general
-	 * advice (inherited from metamodel supertypes) to most specific advice
-	 * (bound to specializations).
-	 * <P>
-	 * Returns an empty list if the <code>clientContext</code> is not bound to
-	 * the <code>metamodelTypeDescriptor</code>.
-	 * 
-	 * @param eObject
-	 *            the model element to match
-	 * @param metamodelTypeDescriptor
-	 *            the metamodel type descriptor for the model element
-	 * @param clientContext
-	 *            the client context
-	 * @return the collection of matching <code>IEditHelperAdvice</code>.
-	 */
-	public List getEditHelperAdvice(EObject eObject,
-			MetamodelTypeDescriptor metamodelTypeDescriptor, IClientContext clientContext) {
-
-		LinkedHashSet result = new LinkedHashSet();
-
-		// Look at advice bound to the metamodel supertypes
-		IElementType[] metamodelSupertypes = metamodelTypeDescriptor
-			.getElementType().getAllSuperTypes();
-		for (int i = 0; i < metamodelSupertypes.length; i++) {
-			IElementType nextSupertype = metamodelSupertypes[i];
-			result.addAll(getMatchingAdvice(nextSupertype.getId(), eObject,
-					ALL, clientContext));
-		}
-
-		// Add the advice bound to the metamodel type
-		result.addAll(getMatchingAdvice(metamodelTypeDescriptor.getId(),
-			eObject, ALL_NONE, clientContext));
-
-		// Get the specializations that match
-		List specializationDescriptors = getSpecializationDescriptorsMatching(
-			eObject, metamodelTypeDescriptor, clientContext);
-		Collections.reverse(specializationDescriptors);
-		for (Iterator i = specializationDescriptors.iterator(); i.hasNext();) {
-			SpecializationTypeDescriptor nextSpecialization = (SpecializationTypeDescriptor) i
-				.next();
-
-			// Look for advice bound to the matching specialization type
-			result.addAll(getMatchingAdvice(nextSpecialization.getId(),
-				eObject, ALL_NONE, clientContext));
-		}
-
-		return new ArrayList(result);
-	}
-
-	/**
-	 * Gets the edit helper advice bound to the <code>elementType</code> and
-	 * the inheritable advice bounds to its supertypes. The advice will be that
-	 * which is bound to the <code>clientContext</code>, and is ordered from
-	 * most general advice (inherited from metamodel supertypes) to most
-	 * specific advice (bound to specializations).
-	 * <P>
-	 * Returns an empty list if the <code>clientContext</code> is not bound to
-	 * the <code>elementType</code>.
-	 * 
-	 * @param elementType
-	 *            the element type whose bound edit helper advice will be
-	 *            considered
-	 * @param metamodelTypeDescriptor
-	 *            the metamodel type descriptor for the eClass
-	 * @param clientContext
-	 *            the client context
-	 * @return the collection of matching <code>IEditHelperAdvice</code>.
-	 */
-	public List getEditHelperAdvice(IElementType elementType,
-			MetamodelTypeDescriptor metamodelTypeDescriptor, IClientContext clientContext) {
-		
-		LinkedHashSet result = new LinkedHashSet();
-		
-		String metamodelTypeId = (metamodelTypeDescriptor != null) ? metamodelTypeDescriptor.getId() : null;
-
-		// Look at advice bound to the supertypes
-		IElementType[] metamodelSupertypes = elementType.getAllSuperTypes();
-		for (int i = 0; i < metamodelSupertypes.length; i++) {
-			IElementType nextSupertype = metamodelSupertypes[i];
-
-			if (nextSupertype instanceof ISpecializationType || nextSupertype.getId().equals(metamodelTypeId)) {
-				result
-						.addAll(getMatchingAdvice(nextSupertype.getId(),
-								ALL_NONE, clientContext));
-
-			} else if (nextSupertype instanceof IMetamodelType) {
-				result.addAll(getMatchingAdvice(nextSupertype.getId(), ALL, clientContext));
-			}
-		}
-
-		// Add the advice bound to the element type itself
-		result.addAll(getMatchingAdvice(elementType.getId(), ALL_NONE, clientContext));
-
-		return new ArrayList(result);
-	}
-
-	/**
-	 * Gets the edit helper advice bound to the element type with ID
-	 * <code>elementTypeId</code> that matches <code>eObject</code>.
-	 * 
-	 * @param elementTypeId
-	 *            the element type id
-	 * @param eObject
-	 *            the model element to match
-	 * @param considerApplicationToSubtypes
-	 *            <code>true</code> if only those advice bindings that apply
-	 *            to subtypes should be returned, <code>false</code>
-	 *            otherwise.
-	 * @param clientContext
-	 *            the client context
-	 * @return the list of matching <code>IEditHelperAdvice</code>
-	 */
-	private List getMatchingAdvice(String elementTypeId, EObject eObject,
-			Set adviceInheritanceToConsider, IClientContext clientContext) {
-
-		List result = new ArrayList();
-
-		for (Iterator j = getAdviceBindings(elementTypeId); j.hasNext();) {
-			IEditHelperAdviceDescriptor nextAdviceDescriptor = (IEditHelperAdviceDescriptor) j
-				.next();
-
-			if (clientContext.includes(nextAdviceDescriptor)) {
-				// Filter out any of the bound advice that doesn't match
-				if (!adviceMatches(eObject, nextAdviceDescriptor)) {
-					continue;
-				}
-				
-				if (adviceInheritanceToConsider.contains(nextAdviceDescriptor
-						.getInheritance())) {
-					
-					IEditHelperAdvice nextAdvice = nextAdviceDescriptor
-						.getEditHelperAdvice();
-	
-					if (nextAdvice != null) {
-						result.add(nextAdvice);
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the edit helper advice bound to the element type with ID
-	 * <code>elementTypeId</code> that matches <code>eObject</code>.
-	 * 
-	 * @param elementTypeId
-	 *            the element type id
-	 * @param considerApplicationToSubtypes
-	 *            <code>true</code> if only those advice bindings that apply
-	 *            to subtypes should be returned, <code>false</code>
-	 *            otherwise.
-	 * @param clientContext
-	 *            the client context
-	 * @return the list of matching <code>IEditHelperAdvice</code>
-	 */
-	private List getMatchingAdvice(String elementTypeId,
-			Set adviceInheritanceToConsider, IClientContext clientContext) {
-
-		List result = new ArrayList();
-
-		for (Iterator j = getAdviceBindings(elementTypeId); j.hasNext();) {
-			IEditHelperAdviceDescriptor nextAdviceDescriptor = (IEditHelperAdviceDescriptor) j
-				.next();
-			
-			if (clientContext.includes(nextAdviceDescriptor)) {
-
-				if (adviceInheritanceToConsider.contains(nextAdviceDescriptor
-						.getInheritance())) {
-					
-					IEditHelperAdvice nextAdvice = nextAdviceDescriptor
-						.getEditHelperAdvice();
-	
-					if (nextAdvice != null) {
-						result.add(nextAdvice);
-					}
-				}
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Obtains an iterator over the advices bound exactly to the specified element
-	 * type ID and also to patterns matching the element type ID. Advice bindings
-	 * are returned for all client contexts.  The caller should filter the list 
-	 * by context.
-	 * <p>
-	 * <b>Note</b> for now, in the interest of simplicity and performance, the
-	 * only pattern supported is <code>"*"</code> to match all element types.
-	 * </p>
-	 * 
-	 * @param elementTypeId the element type ID for which to get advice
-	 * 
-	 * @return an immutable iterator of the advice bindings (cannot
-	 *     {@linkplain Iterator#remove() remove} from it)
-	 */
-	private Iterator getAdviceBindings(String elementTypeId) {
-		class MultiIterator implements Iterator {
-			private Iterator current;
-			private Collection[] collections;
-			private int index = 0;
-			
-			MultiIterator(Collection[] collections) {
-				this.collections = collections;
-				current = nextIterator();
-			}
-			
-			public boolean hasNext() {
-				while (current != null) {
-					if (current.hasNext()) {
-						return true;
-					}
-					
-					current = nextIterator();
-				}
-				
-				return false;
-			}
-
-			public Object next() {
-				if (!hasNext()) {
-					throw new NoSuchElementException();
-				}
-				
-				return current.next();
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-			
-			private Iterator nextIterator() {
-				Iterator result = null;
-				
-				while ((result == null) && (index < collections.length)) {
-					if (collections[index] != null) {
-						result = collections[index].iterator();
-						collections[index] = null; // free memory
-					}
-					
-					index++;
-				}
-				
-				return result;
-			}
-		}
-		
-		return new MultiIterator(new Collection[] {
-				(Collection) adviceBindings.get(elementTypeId),
-				(Collection) adviceBindings.get("*") //$NON-NLS-1$
-		});
-	}
-
-	/**
-	 * Gets the specialization type for a given ID.
-	 * 
-	 * @param id
-	 *            the type ID
-	 * @return the specialization type, or <code>null</code> if there is none
-	 *         registered with this ID.
-	 */
-	public SpecializationTypeDescriptor getSpecializationTypeDescriptor(
-			String id) {
-		return (SpecializationTypeDescriptor) specializationTypeDescriptors
-			.get(id);
-	}
-
-	/**
-	 * Gets the collection of all registered specialization type descriptors.
-	 * 
-	 * @return the registered specialization type descriptors. Each element in
-	 *         the collection is a <code>SpecializationTypeDescriptor</code>.
-	 */
-	public Collection getSpecializationTypeDescriptors() {
-		return specializationTypeDescriptors.values();
-	}
-	
-	/**
-	 * Gets the collection of all registered specialization type descriptors
-	 * bound to the <code>clientContext</code>.
-	 * 
-	 * @return the registered specialization type descriptors. Each element in
-	 *         the collection is a <code>SpecializationTypeDescriptor</code>.
-	 */
-	public Collection getSpecializationTypeDescriptors(
-			IClientContext clientContext) {
-
-		Collection result = new ArrayList();
-
-		for (Iterator i = getSpecializationTypeDescriptors().iterator(); i
-				.hasNext();) {
-			
-			ISpecializationTypeDescriptor next = (ISpecializationTypeDescriptor) i
-					.next();
-
-			if (clientContext.includes(next)) {
-				result.add(next);
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Checks to see if an element type with the same ID as
-	 * <code>typeDescriptor</code> has already been registered.
-	 * 
-	 * @param typeDescriptor
-	 * @return <code>true</code> if the element type is duplicated,
-	 *         <code>false</code> otherwise.
-	 */
-	private boolean checkForDuplicate(ElementTypeDescriptor typeDescriptor) {
-		if (specializationTypeDescriptors.containsKey(typeDescriptor.getId())) {
-			Log
-					.error(
-							EMFTypePlugin.getPlugin(),
-							EMFTypePluginStatusCodes.TYPE_NOT_INITED,
-							EMFTypeCoreMessages
-									.bind(
-											EMFTypeCoreMessages.type_not_init_WARN_,
-											typeDescriptor.getId(),
-											EMFTypeCoreMessages.type_reason_duplicate_id_WARN_));
-			return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/XMLClientContext.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/XMLClientContext.java
deleted file mode 100644
index 8487a5f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/XMLClientContext.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.impl;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypeDebugOptions;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.ElementTypeXmlConfig;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * The implementation of the client context that is created using a
- * configuration element.
- * 
- * @author ldamus
- */
-public class XMLClientContext extends ClientContext {
-
-	private static final String E_ENABLEMENT = "enablement"; //$NON-NLS-1$
-
-	private static final String E_MATCHER = "matcher"; //$NON-NLS-1$
-
-	/**
-	 * Initializes me with my XML configuration.
-	 * 
-	 * @param config
-	 *            my XML configuration element
-	 * @throws CoreException
-	 *             on any problem in accessing the <code>config</code>uration
-	 *             or if anything is missing or incorrect
-	 */
-	public XMLClientContext(IConfigurationElement config) throws CoreException {
-		super(initializeId(config), initializeMatcher(config, config
-				.getAttribute(ElementTypeXmlConfig.A_ID)));
-	}
-
-	/**
-	 * Gets my ID from the specified XML <code>config</code>.
-	 * 
-	 * @param config
-	 *            my XML configuration
-	 * @return my ID (never <code>null</code>)
-	 * @throws CoreException
-	 *             if my ID is not specified
-	 */
-	private static String initializeId(IConfigurationElement config)
-			throws CoreException {
-		String result = config.getAttribute(ElementTypeXmlConfig.A_ID);
-
-		if (result == null) {
-			CoreException ce = EMFTypePluginStatusCodes
-					.getContextInitException(config.getContributor().getName(),
-							EMFTypeCoreMessages.context_no_id_ERROR_);
-
-			Trace.throwing(EMFTypePlugin.getPlugin(),
-					EMFTypeDebugOptions.EXCEPTIONS_THROWING,
-					XMLClientContext.class, "initializeId", ce); //$NON-NLS-1$
-
-			throw ce;
-		}
-
-		return result;
-	}
-
-	/**
-	 * Gets my matcher from the specified XML <code>config</code>.
-	 * 
-	 * @param config
-	 *            my XML configuration
-	 * @param id
-	 *            the client context ID
-	 * @return my matcher (never <code>null</code>)
-	 * @throws CoreException
-	 *             if my matcher is not specified or something went wrong in
-	 *             initializing it
-	 */
-	private static IElementMatcher initializeMatcher(
-			IConfigurationElement config, String id) throws CoreException {
-		IElementMatcher result = null;
-
-		IConfigurationElement[] enablement = config.getChildren(E_ENABLEMENT);
-		if (enablement.length > 0) {
-			result = initializeExpressionMatcher(enablement[0], id);
-		} else {
-			IConfigurationElement[] custom = config.getChildren(E_MATCHER);
-			if (custom.length > 0) {
-				result = initializeCustomMatcher(custom[0], id);
-			}
-		}
-
-		if (result == null) {
-			CoreException ce = EMFTypePluginStatusCodes
-					.getContextInitException(id,
-							EMFTypeCoreMessages.context_no_matcher_ERROR_);
-
-			Trace.throwing(EMFTypePlugin.getPlugin(),
-					EMFTypeDebugOptions.EXCEPTIONS_THROWING,
-					XMLClientContext.class, "initializeMatcher", ce); //$NON-NLS-1$
-
-			throw ce;
-		}
-
-		return result;
-	}
-
-	/**
-	 * Creates an expression-based matcher from the specified XML
-	 * <code>enablement</code> expression.
-	 * 
-	 * @param enablement
-	 *            my XML expression
-	 * @param id
-	 *            the client context ID
-	 * @return the matcher (never <code>null</code>)
-	 * @throws CoreException
-	 *             if something is malformed in the expression
-	 */
-	private static IElementMatcher initializeExpressionMatcher(
-			IConfigurationElement enablement, String id) throws CoreException {
-
-		return new XMLExpressionMatcher(enablement, id);
-	}
-
-	/**
-	 * Instantiates a custom matcher class specified in the XML.
-	 * 
-	 * @param config
-	 *            a matcher configuration element
-	 * @param id
-	 *            the client context ID
-	 * @return the matcher (never <code>null</code>)
-	 * @throws CoreException
-	 *             if something is malformed in the expression
-	 */
-	private static IElementMatcher initializeCustomMatcher(
-			IConfigurationElement config, String id) throws CoreException {
-		Object result = config
-				.createExecutableExtension(ElementTypeXmlConfig.A_CLASS);
-
-		if (!(result instanceof IElementMatcher)) {
-
-			CoreException ce = EMFTypePluginStatusCodes
-					.getContextInitException(
-							id,
-							EMFTypeCoreMessages.context_matcher_wrong_class_ERROR_);
-
-			Trace.throwing(EMFTypePlugin.getPlugin(),
-					EMFTypeDebugOptions.EXCEPTIONS_THROWING,
-					XMLClientContext.class, "initializeMatcher", ce); //$NON-NLS-1$
-
-			throw ce;
-		}
-
-		return (IElementMatcher) result;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/XMLExpressionMatcher.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/XMLExpressionMatcher.java
deleted file mode 100644
index b10cd7f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/XMLExpressionMatcher.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.impl;
-
-import org.eclipse.core.expressions.EvaluationContext;
-import org.eclipse.core.expressions.EvaluationResult;
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.expressions.ExpressionConverter;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Element matcher that matches model elements using an XML expression.
- * 
- * @author ldamus
- */
-public class XMLExpressionMatcher
-	implements IElementMatcher {
-	
-	/**
-	 * Variable representing the container of the element being tested.
-	 */
-	public static final String ECONTAINER_VARIABLE = "eContainer"; //$NON-NLS-1$
-	
-	/**
-	 * The element ID in which this expression is contributed.
-	 */
-	private final String id;
-	
-	/**
-	 * The XML expression.
-	 */
-	private final Expression xmlExpression;
-
-	/**
-	 * Constructs a new XML expression matcher.
-	 * 
-	 * @param config
-	 *            the expression configuration element
-	 */
-	public XMLExpressionMatcher(IConfigurationElement config, String id)
-		throws CoreException {
-		
-		this.id = id;
-
-		try {
-			xmlExpression = ExpressionConverter.getDefault().perform(config);
-
-		} catch (CoreException e) {
-			throw EMFTypePluginStatusCodes
-					.getInitException(
-							id,
-							EMFTypeCoreMessages.element_reason_invalid_enablement_expression_WARN_,
-							e);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.core.type.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean matches(EObject eObject) {
-
-		try {
-			EvaluationContext evaluationContext = new EvaluationContext(null, eObject);
-			
-			EObject container = eObject.eContainer();
-			
-			if (container != null) {
-				evaluationContext.addVariable(ECONTAINER_VARIABLE, container);
-			}
-			
-			EvaluationResult result = xmlExpression.evaluate(evaluationContext);
-			
-			if (result == EvaluationResult.TRUE) {
-				return true;
-			}
-
-		} catch (CoreException e) {
-			Log
-					.error(
-							EMFTypePlugin.getPlugin(),
-							EMFTypePluginStatusCodes.EXPRESSION_EVALUATION_FAILURE,
-							EMFTypeCoreMessages
-									.bind(
-											EMFTypeCoreMessages.expression_evaluation_failure_ERROR_,
-											id), e);
-		}
-
-		return false;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/package.html
deleted file mode 100644
index 19bdb4c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/package.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes used in the implementation of the Element Type framework.</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.type.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.java
deleted file mode 100644
index 359bc27..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.emf.type.core.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EMFTypeCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages";//$NON-NLS-1$
-
-	private EMFTypeCoreMessages() {
-		// Do not instantiate
-	}
-
-	public static String Request_Label_Create;
-	public static String Request_Label_Destroy;
-	public static String Request_Label_DestroyDependents;
-	public static String Request_Label_Duplicate;
-	public static String Request_Label_Move;
-	public static String Request_Label_ReorientSource;
-	public static String Request_Label_ReorientTarget;
-	public static String xml_parsing_ERROR_;
-	public static String xml_parsing_elementTypeBindings_ERROR_;
-	public static String type_not_init_WARN_;
-	public static String type_reason_no_id_WARN_;
-	public static String type_reason_duplicate_id_WARN_;
-	public static String type_reason_no_eclass_WARN_;
-	public static String type_reason_eclass_not_found_WARN_;
-	public static String type_reason_no_specialized_WARN_;
-	public static String type_reason_no_specialized_id_WARN_;
-	public static String type_reason_no_param_name_WARN_;
-	public static String type_reason_no_param_value_WARN_;
-	public static String adviceBinding_not_init_WARN_;
-	public static String adviceBinding_reason_no_id_WARN_;
-	public static String adviceBinding_reason_no_type_id_WARN_;
-	public static String adviceBinding_reason_no_edit_helper_advice_id_WARN_;
-	public static String adviceBinding_reason_invalid_inheritance_WARN_;
-	public static String elment_not_init_WARN_;
-	public static String element_reason_invalid_enablement_expression_WARN_;
-	public static String element_reason_no_econtainmentfeature_qname_WARN_;
-	public static String element_reason_matcher_no_class_WARN_;
-	public static String element_reason_no_econtainmentfeature_metamodel_WARN_;
-	public static String elementTypeFactory_not_init_WARN_;
-	public static String elementTypeFactory_reason_no_factory_WARN_;
-	public static String elementTypeFactory_reason_no_kind_WARN_;
-	public static String metamodel_not_init_WARN_;
-	public static String metamodel_reason_no_nsURI_WARN_;
-	public static String metamodel_reason_nsURI_not_found_WARN_;
-	public static String adviceBinding_class_not_found_ERROR_;
-	public static String editHelperAdvice_class_not_found_ERROR_;
-	public static String editHelper_class_not_found_ERROR_;
-	public static String matcher_class_not_found_ERROR_;
-	public static String expression_evaluation_failure_ERROR_;
-	public static String elementTypeFactory_class_not_found_ERROR_;
-	public static String eContainmentFeature_not_reference_feature_ERROR_;
-	public static String eContainmentFeature_no_such_feature_ERROR_;
-	public static String specializationType_specializes_multiple_metamodel_types_ERROR_;
-	public static String specializationType_specializes_invalid_id_ERROR_;
-	public static String binding_noContextId_ERROR_;
-	public static String binding_noSuchContext_ERROR_;
-	public static String pattern_invalid_syntax_ERROR_;
-	public static String binding_no_ref_or_pattern_ERROR_;
-	public static String binding_both_ref_and_pattern_ERROR_;
-	public static String client_matcherFailure_ERROR_;
-	public static String clientContext_not_init_WARN_;
-	public static String context_no_matcher_ERROR_;
-	public static String context_no_id_ERROR_;
-	public static String context_matcher_wrong_class_ERROR_;
-	public static String moveElementsCommand_noTargetFeature;
-	public static String destroyCommandFailed;
-	
-	public static String defaultEditHelper_name;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFTypeCoreMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.properties b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.properties
deleted file mode 100644
index 0a8ac8d..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.properties
+++ /dev/null

@@ -1,387 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Edit element labels - These labels appear in the undo and redo action labels
-# ==============================================================================
-Request_Label_Create=Create {0}
-Request_Label_Destroy=Delete Element
-Request_Label_DestroyDependents=Delete Dependents of Element
-Request_Label_Duplicate=Duplicate
-Request_Label_Move=Move
-Request_Label_ReorientSource=Change Relationship Source
-Request_Label_ReorientTarget=Change Relationship Target
-
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Extension point loading errors messages.
-# ==============================================================================
-
-# Indicates that a plugin's element types had loading errors.
-# args:
-#    0 - the contributing plugin ID
-#    1 - the reason why a plugin's element types could not be loaded (should
-#        be one of the error or warning messages in the type.*,
-#        adviceBinding_*, element_* or elementTypeFactory_* strings below)
-#
-xml_parsing_ERROR_= Errors occurred in parsing XML element type definitions contributed \
-by plugin "{0}": {1}
-
-# Indicates that a plugin's element type bindings had loading errors.
-# args:
-#    0 - the contributing plugin ID
-#    1 - the reason why a plugin's element type bindings could not be loaded (should
-#        be one of the error or warning messages in the clientContext_*,
-#        or binding_* strings below)
-#
-xml_parsing_elementTypeBindings_ERROR_= Errors occurred in parsing XML element type bindings contributed \
-by plugin "{0}": {1}
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Element type access error messages.
-# ==============================================================================
-
-
-# Indicates that an element type could not be initialized and is, therefore,
-#     not in the system.
-# args:
-#     0 - the ID of the element type
-#     1 - the reason for failure to initialize the element type (should be one
-#         of the type.reason.* strings, below)
-#
-type_not_init_WARN_= Error initializing element type "{0}": {1}.  It will be ignored.
-
-
-# Explanation of failure to initialize element type because no ID was specified.
-type_reason_no_id_WARN_= no ID specified
-
-
-# Explanation of failure to initialize element type because an element type with the
-#   same ID has already been registered
-type_reason_duplicate_id_WARN_= element type with same ID already exists
-
-
-# Explanation of failure to initialize metamodel type because no EClass was specified
-type_reason_no_eclass_WARN_= no eclass specified
-
-
-# Explanation of failure to initialize metamodel type because the specified EClass
-#   doesn't exist
-type_reason_eclass_not_found_WARN_= specified eclass does not exist
-
-
-# Explanation of failure to initialize specialization type because no specialized
-#   types were specified
-type_reason_no_specialized_WARN_= no specialized types
-
-
-# Explanation of failure to initialize specialization type because no ID was
-#   specified for a specialized type.
-type_reason_no_specialized_id_WARN_= no ID for specialized type
-
-
-# Explanation of failure to initialize an element type because no name was
-#   specified for a parameter.
-type_reason_no_param_name_WARN_= no parameter name specified
-
-
-# Explanation of failure to initialize an element type because no value was
-#   specified for a parameter.
-type_reason_no_param_value_WARN_= no parameter value specified
-
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Edit helper advice binding access error messages.
-# ==============================================================================
-
-
-# Indicates that an advice binding could not be initialized and is, therefore,
-#     not in the system.
-# args:
-#     0 - the ID of the advice binding
-#     1 - the reason for failure to initialize the advice binding (should be one
-#         of the adviceBinding.reason.* strings, below)
-#
-adviceBinding_not_init_WARN_= Error initializing advice binding "{0}": {1}.  It will be ignored.
-
-
-# Explanation of failure to initialize advice binding because no ID was specified.
-adviceBinding_reason_no_id_WARN_= no ID specified
-
-
-# Explanation of failure to initialize advice binding because no element type ID was specified.
-adviceBinding_reason_no_type_id_WARN_= no type ID specified
-
-# Explanation of failure to initialize advice binding because no edit helper advice class was specified.
-adviceBinding_reason_no_edit_helper_advice_id_WARN_= no edit helper advice class specified
-
-# Explanation of failure to initialize advice binding because no an invalid inheritance value was specified.
-adviceBinding_reason_invalid_inheritance_WARN_= invalid inheritance value
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Element type and edit helper advice binding access error messages.
-# ==============================================================================
-
-
-# Indicates that an element type or advice binding could not be initialized and is, therefore,
-#     not in the system.
-# args:
-#     0 - the ID of the element type or advice binding
-#     1 - the reason for failure to initialize the element type or advice binding (should be one
-#         of the element.reason.* strings, below)
-#
-elment_not_init_WARN_= Error initializing element type or advice binding "{0}": {1}.  It will be ignored.
-
-
-# Explanation of failure to initialize an element type or advice binding because the
-#   enablement could not be converted to an expression.
-element_reason_invalid_enablement_expression_WARN_= unable to convert enablement to expression
-
-
-# Explanation of failure to initialize an element type or advice binding because no feature name was
-#   specified for a containment feature.
-element_reason_no_econtainmentfeature_qname_WARN_= no containment feature qname specified
-
-# Explanation of failure to initialize an element type or advice binding because no matcher
-#   class was  specified.
-element_reason_matcher_no_class_WARN_= no matcher class specified
-
-# Explanation of failure to initialize an element type or advice binding because no metamodel was
-#   specified for a containment feature name
-# args:
-#     0 - the containment feature name
-element_reason_no_econtainmentfeature_metamodel_WARN_= no metamodel specified for the containment feature "{0}"
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Element type factory access error messages.
-# ==============================================================================
-
-
-# Indicates that an element type or advice binding could not be initialized and is, therefore,
-#     not in the system.
-# args:
-#     0 - the factory class name
-#     1 - the reason for failure to initialize the element type factory (should be one
-#         of the elementTypeFactory.reason.* strings, below)
-elementTypeFactory_not_init_WARN_= Error initializing element type factory "{0}": {1}.  It will be ignored.
-
-
-# Explanation of failure to initialize an element type factory because no factory class name was
-#   specified.
-elementTypeFactory_reason_no_factory_WARN_= no element type factory class
-
-
-# Explanation of failure to initialize an element type factory because no element type kind
-#   was specified.
-elementTypeFactory_reason_no_kind_WARN_= no element type factory kind
-
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Metamodel access error messages.
-# ==============================================================================
-
-
-# Indicates that a metamodel type could not be initialized and is, therefore,
-#     not in the system.
-# args:
-#     0 - the metamodel namespace URI
-#     1 - the reason for failure to initialize the metamodel (should be one
-#         of the metamodel.reason.* strings, below)
-metamodel_not_init_WARN_= Error initializing metamodel "{0}": {1}.  It will be ignored.
-
-
-# Explanation of failure to initialize a metamodel because no namespace URI
-#   was specified.
-metamodel_reason_no_nsURI_WARN_ = no namespace URI specified
-
-
-# Explanation of failure to initialize a metamodel because the specified namespace URI
-#   could not be found.
-metamodel_reason_nsURI_not_found_WARN_ = namespace URI not found
-
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Class initialization error messages.
-# ==============================================================================
-
-
-# Indicates that an advice binding class could not be initialized and is, therefore,
-#     removed from the system.
-# args:
-#     0 - the advice binding class name
-adviceBinding_class_not_found_ERROR_= Error initializing advice binding class "{0}".  It will be removed from the system.
-
-
-# Indicates that an edit helper advice class could not be initialized and is, therefore,
-#     removed from the system.
-# args:
-#     0 - the edit helper advice class name
-editHelperAdvice_class_not_found_ERROR_= Error initializing edit helper advice class "{0}".  It will be removed from the system.
-
-# Indicates that an edit helper class could not be initialized and is, therefore,
-#     removed from the system.
-# args:
-#     0 - the edit helper class name
-editHelper_class_not_found_ERROR_= Error initializing edit helper class "{0}".  It will be removed from the system.
-
-# Indicates that an matcher class could not be initialized and is, therefore,
-#     removed from the system.
-# args:
-#     0 - the matcher class name
-matcher_class_not_found_ERROR_= Error initializing matcher class "{0}".  It will be removed from the system.
-
-# Indicates that a matcher expression could not be evaluated.
-# args:
-#     0 - the id of the element that contributed the expression
-expression_evaluation_failure_ERROR_= Error evaluating matcher expression in "{0}".
-
-# Indicates that an element type factory class could not be initialized and is, therefore,
-#     removed from the system.
-# args:
-#     0 - the element type factory class name
-elementTypeFactory_class_not_found_ERROR_= Error initializing element type factory class "{0}".  It will be removed from the system.
-
-# Indicates that a containment feature is not a reference feature.
-# args:
-#     0 - the feature name
-eContainmentFeature_not_reference_feature_ERROR_= Error initializing containment feature "{0}" because it is not a reference feature.
-
-# Indicates that a containment feature does not exist.
-# args:
-#     0 - the feature name
-eContainmentFeature_no_such_feature_ERROR_= Error initializing containment feature "{0}" because it does not exist.
-
-# Indicates that a specialization type specializes more than one metamodel type.
-# args:
-#     0 - the ID of the specialization type
-specializationType_specializes_multiple_metamodel_types_ERROR_= Error initializing specialization type "{0}" because it specializes more than one metamodel type.
-
-# Indicates that a specialization type specializes an element type that does not exist
-# args:
-#     0 - the ID of the specialization type
-#     1 - the ID of the specializes type that does not exist
-specializationType_specializes_invalid_id_ERROR_= Error initializing specialization type "{0}" because it specializes type "{1}" which does not exist.
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-#
-# Element type binding initialization error messages.
-# ==============================================================================
-
-# Indicates that a client context could not be initialized and is, therefore,
-#     not in the system.
-# args:
-#     0 - the ID of the client context
-#     1 - the reason for failure to initialize the client context (should be one
-#         of the context_* strings, below)
-#
-clientContext_not_init_WARN_= Error initializing client context "{0}": {1}.  It will be ignored.
-
-# Indicates that a binding element does not specify the client context that 
-# it binds.
-#
-binding_noContextId_ERROR_= no context specified in binding
-
-# Indicates that a binding element binds a client context that does not exist.
-# args:
-#     0 - the ID of the client context
-#
-binding_noSuchContext_ERROR_= client context "{0}" does not exist
-
-# Indicates that a regex pattern to match element type or advice IDs has 
-# invalid syntax.
-# args:
-#     0 - the regex pattern
-#
-pattern_invalid_syntax_ERROR_= invalid syntax in pattern "{0}"
-
-# Indicates that an element type context binding is missing the reference to 
-# the element type or advice that is bound to that context, or the regex 
-# pattern that matches the element types or advice that is bound to that context.
-# args:
-#     0 - the client context identifier
-#
-binding_no_ref_or_pattern_ERROR_= binding to context "{0}" must have a ''ref'' or ''pattern'' element
-
-# Indicates that an element type context binding has both the reference to 
-# the element type or advice that is bound to that context, and the regex 
-# pattern that matches the element types or advice that is bound to that context.
-# This is not allowed.
-# args:
-#     0 - the client context identifier
-#
-binding_both_ref_and_pattern_ERROR_= binding to context "{0}" must not have both ''ref'' and ''pattern'' elements
-
-# Indicates that a <clientContext> extension in a plug-in omitted the matcher
-#   definition.
-#
-context_no_id_ERROR_= No identifier for client context. 
-
-# Indicates that a <clientContext> extension omitted the matcher definition.
-#
-context_no_matcher_ERROR_= No enablement expression or matcher class specified for client context.
-
-# Indicates that a <clientContext> extension specified a matcher that 
-# didn't implement the IElementMatcher interface.
-#
-context_matcher_wrong_class_ERROR_= Client context matcher must implement IElementMatcher interface.
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-# Indicates that a client context matcher threw an exception and the context 
-# will be removed from the context manager.
-# args:
-#     0 - the ID of the client context that failed
-#
-client_matcherFailure_ERROR_= Client context {0} failed with a run-time exception. \
-	It is disabled; its element type bindings are removed from the system.
-
-# Indicates that a command to move elements failed to executed because a suitable feature
-# could not be found in the target to contain one of the elements being moved.
-# args:
-#     0 - the element for which a feature could not be found in the target
-moveElementsCommand_noTargetFeature= Could not find a feature in the target element to contain "{0}".
-
-# Indicates that a command to destroy a child element failed to execute due to some
-# run-time exception.
-# args:
-#    0 - the localized name of the element type that failed to destroy a child
-destroyCommandFailed= Failed to execute destroy child command on element of type "{0}"
-
-# Localized display name of the default element type, for elements that otherwise
-# have no registered type.
-defaultEditHelper_name= Generic Element

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/package.html
deleted file mode 100644
index 6fc3ea4..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/package.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes to manage the string, image, font and cursor resources for 
-the org.eclipse.gmf.runtime.emf.type.core plugin.</p>
-
-<p>Messages and labels on GUI components that need to be localized (adapted 
-for a specific region or language) should be placed in the <code>messages.properties</code>
-file in this package.</p>
-
-<p>Classes in the org.eclipse.gmf.runtime.emf.type.core plugin should use the 
-{@link org.eclipse.gmf.runtime.emf.type.core.internal.l10n.ResourceManager} class to 
-access to the I18N resources that is needs.</p>
-
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.type.core.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/package.html
deleted file mode 100644
index 75164dd..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/package.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides classes to manage the org.eclipse.gmf.runtime.emf.type.core plugin.</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.type.core.* 
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/requests/RequestCacheEntries.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/requests/RequestCacheEntries.java
deleted file mode 100644
index c5879ea..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/requests/RequestCacheEntries.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.internal.requests;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-/**
- * @author Yasser Lulu
- *
- */
-public final class RequestCacheEntries {
-	
-
-	public static final String Cache_Maps = "Cache_Maps";//$NON-NLS-1$
-
-	public static final String Client_Context = "Client_Context";//$NON-NLS-1$
-
-	public static final String Element_Type = "Element_Type";//$NON-NLS-1$	
-
-	public static final String EditHelper_Advice = "EditHelper_Advice";//$NON-NLS-1$
-
-	public static final String Affected_Files = "Affected_Files";//$NON-NLS-1$
-
-	public static final String CrossRefAdapter = "CrossRefAdapter";//$NON-NLS-1$
-	
-	public static final String Checked_Elements = "Checked_Elements";//$NON-NLS-1$
-	public static final String Dependent_Elements = "Dependent_Elements";//$NON-NLS-1$
-	
-	private RequestCacheEntries() {
-		//
-	}
-
-	public static final void initializeEObjCache(EObject eObj, Map map) {
-		IClientContext clientContext = ClientContextManager.getInstance()
-			.getClientContextFor(eObj);
-		map.put(Client_Context, clientContext);
-		IElementType type = ElementTypeRegistry.getInstance().getElementType(
-			eObj, clientContext);
-		map.put(Element_Type, type);
-		IEditHelperAdvice[] advices = ElementTypeRegistry.getInstance()
-			.getEditHelperAdvice(eObj, clientContext);
-		map.put(EditHelper_Advice, advices);		
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/package.html
deleted file mode 100644
index 7a0e2de..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/package.html
+++ /dev/null

@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>This package contains the classes that define primary classes in the Element Type framework.</P>
-
-<P>{@link org.eclipse.gmf.runtime.emf.type.core.IElementType}s are used to 
-represent application types for the purpose of displaying and
-editing model elements. These types are contributed by
-extension point. A registry of such types,
-({@link org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry}) is 
-maintained, and can be used to find:
-<UL>
-<LI>The element type that best matches a given EObject, and</LI>
-<LI>The element types that
-can be contained in a given feature of a given EObject</LI> 
-</UL>
-
-<P>There are two kinds of element types, {@link org.eclipse.gmf.runtime.emf.type.core.IMetamodelType} and and
-specializations of metmodel types, {@link org.eclipse.gmf.runtime.emf.type.core.ISpecializationType}.</P>  
-
-<P>Each metamodel type defines the base icon, name
-and editing behaviour for all elements with its EClass.  Only one metamodel type can be registered for each EClass in a given metamodel. The
-registry logs an error when an attempt is made to register a new metamodel type that
-has the same EClass as a type that has already been registered. The second type
-is rejected from the registry.</P>
-
-<P>Specializations of metamodel types 
-can define a new icon and name for their type, but can only contribute 
-behaviour 'before' or 'after' the base editing behaviour. They cannot replace the base
-editing behaviour.</P>
-
-<P> Custom element types (which must be subtypes of metamodel or
-specialization types) can be contributed to the registry using
-a {@link org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory}.  Custom element types
-have arbitrary parameters specified by name and value pairs in XML.</P> 
-
-<P> The {@link org.eclipse.gmf.runtime.emf.type.core.NullElementType} can be specialized when
-an element type does not directly correspond to an EClass.  Such specializations 
-will not have any default editing behaviour. Instead, they will only have the 'before'
- and 'after' behaviour contributed by their edit helper advice.  As well, the
- ElementTypeRegistry will not find these specializations when asking for types
- and advice that match an existing EObject.  They will only be found when asking for
- types and advice that match the specialization types themselves.</P>
-
-@see org.eclipse.gmf.runtime.emf.type.core.commands
-@see org.eclipse.gmf.runtime.emf.type.core.edithelper
-@see org.eclipse.gmf.runtime.emf.type.core.requests
-
-@see <p><a href="../../../../../../extension-points/org_eclipse_gmf_runtime_emf_type_core_elementTypes.html"><tt>org.eclipse.gmf.runtime.emf.type.core.elementTypes</tt></a> extension point</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/AbstractEditCommandRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/AbstractEditCommandRequest.java
deleted file mode 100644
index 3f23e25..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/AbstractEditCommandRequest.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-
-/**
- * Abstract superclass for edit command requests.
- * 
- * @author ldamus
- */
-public abstract class AbstractEditCommandRequest
-	implements IEditCommandRequest {
-
-	/**
-	 * The edit command label. If <code>null</code>, the default command
-	 * label will be used.
-	 */
-	private String label;
-	
-	/**
-	 * My client context.
-	 */
-	private IClientContext clientContext;
-
-	/**
-	 * Arbitrary edit command parameters. Keyed on strings representing the name
-	 * of the parameter. Value is any object representing the parameter value.
-	 * <P>
-	 * Used to pass additional information from the client to the edit helpers.
-	 */
-	private Map parameters = new HashMap();
-	
-	/**
-	 * The editing domain in which I am requesting to make model changes.
-	 */
-	private TransactionalEditingDomain editingDomain;
-	
-	/**
-	 * Initializes me with the editing domain in which I am requesting to make
-	 * model changes.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 *            changes.
-	 */
-	protected AbstractEditCommandRequest(TransactionalEditingDomain editingDomain) {
-		this.editingDomain = editingDomain;
-	}
-	
-	// Documentation copied from the interface
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * Gets the edit command label. If the label has not been specified, the
-	 * default command label will be returned.
-	 */
-	public String getLabel() {
-		if (label == null) {
-			return getDefaultLabel();
-		}
-		return label;
-	}
-
-	/**
-	 * Gets the default edit command label.
-	 * 
-	 * @return the default label
-	 */
-	protected String getDefaultLabel() {
-		return StringStatics.BLANK;
-	}
-
-	/**
-	 * Sets the edit command label. Once the edit command label has been set,
-	 * the default command label will no longer be used.
-	 * 
-	 * @param label
-	 *            the new label
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Gets the value of the parameter named <code>parameterName</code>.
-	 * 
-	 * @return the parameter value, or <code>null</code> if the parameter
-	 *         value is not set.
-	 */
-	public Object getParameter(String parameterName) {
-		return parameters.get(parameterName);
-	}
-
-	/**
-	 * Sets the value of the parameter named <code>parameterName</code> to
-	 * <code>value</code>.
-	 * 
-	 * @param parameterName
-	 *            the parameter name
-	 * @param value
-	 *            the parameter value
-	 */
-	public void setParameter(String parameterName, Object value) {
-		parameters.put(parameterName, value);
-	}
-
-	/**
-	 * Adds of the parameter values in <code>newParameters</code> to this
-	 * request.
-	 * 
-	 * @param newParameters
-	 *            the parameters to add
-	 */
-	public void addParameters(Map newParameters) {
-		if (newParameters != null) {
-			parameters.putAll(newParameters);
-		}
-	}
-
-	/**
-	 * Gets the parameters associated with this request.
-	 * 
-	 * @return the map of parameter values, keyed on parameter name
-	 */
-	public Map getParameters() {
-		return parameters;
-	}
-	
-	// documentation copied from the interface
-	public void setClientContext(IClientContext clientContext) {
-		this.clientContext = clientContext;
-	}
-	
-	// documentation copied from the interface
-	public IClientContext getClientContext() {
-		return clientContext;
-	}
-    
-    /**
-     * Sets the editing domain.
-     * 
-     * @param editingDomain
-     *            the editing domain in which I am requesting to make model
-     *            changes.
-     */
-    public void setEditingDomain(TransactionalEditingDomain editingDomain) {
-        this.editingDomain = editingDomain;
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ConfigureRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ConfigureRequest.java
deleted file mode 100644
index 2dcc023..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ConfigureRequest.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Request to configure a new element with the attributes that it should have
- * according to its element type.
- * 
- * @author ldamus
- */
-public class ConfigureRequest extends AbstractEditCommandRequest {
-
-	/**
-	 * The element to be configured.
-	 */
-	private final EObject elementToConfigure;
-
-	/**
-	 * The element type that defines the attributes that the new element should
-	 * have.
-	 */
-	private final IElementType typeToConfigure;
-
-	/**
-	 * Constructs a new configure request.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param elementToConfigure
-	 *            the new element to be configured
-	 * @param typeToConfigure
-	 *            the element type defining the attributes that the new element
-	 *            should have
-	 */
-	public ConfigureRequest(TransactionalEditingDomain editingDomain,
-			EObject elementToConfigure, IElementType typeToConfigure) {
-
-		super(editingDomain);
-		this.elementToConfigure = elementToConfigure;
-		this.typeToConfigure = typeToConfigure;
-	}
-    
-    /**
-     * Constructs a new configure request. The editing domain will be derived
-     * from <code>elementToConfigure</code>.
-     * 
-     * @param elementToConfigure
-     *            the new element to be configured
-     * @param typeToConfigure
-     *            the element type defining the attributes that the new element
-     *            should have
-     */
-    public ConfigureRequest(EObject elementToConfigure,
-            IElementType typeToConfigure) {
-
-        this(TransactionUtil.getEditingDomain(elementToConfigure),
-            elementToConfigure, typeToConfigure);
-    }
-
-	/**
-	 * Gets the element to be configured
-	 * 
-	 * @return the element to be configured
-	 */
-	public EObject getElementToConfigure() {
-		return elementToConfigure;
-	}
-
-	/**
-	 * Gets the element type that defines the attributes that the element should
-	 * have
-	 * 
-	 * @return the element type
-	 */
-	public IElementType getTypeToConfigure() {
-		return typeToConfigure;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		if (getElementToConfigure() != null) {
-			return Collections.singletonList(getElementToConfigure());
-		}
-		return super.getElementsToEdit();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-	 */
-	public Object getEditHelperContext() {
-		
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return getTypeToConfigure();
-			
-		} else {
-			return new EditHelperContext(getTypeToConfigure(), context);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/CreateElementRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/CreateElementRequest.java
deleted file mode 100644
index 17ab6ff..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/CreateElementRequest.java
+++ /dev/null

@@ -1,480 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypeDebugOptions;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePluginStatusCodes;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Request to create a new model element.
- * <P>
- * If the request is not constructed with the editing domain through which to
- * create the new model element, it will be derived from the container element.
- * 
- * @author ldamus
- */
-public class CreateElementRequest extends AbstractEditCommandRequest {
-
-	/**
-	 * The container for the new model element.
-	 */
-	private EObject container;
-
-	/**
-	 * The feature in the container which will hold the new model element. Can
-	 * be <code>null</code>, in which case a default feature will be used.
-	 */
-	private EReference containmentFeature;
-
-	/**
-	 * The element type of the new model element.
-	 */
-	private final IElementType elementType;
-
-	/**
-	 * The new model element. Will be <code>null</code> until the new element
-	 * has been created. Once the new element has been created, it will be set
-	 * so that 'after' advice can further manipulate the new element.
-	 */
-	private EObject newElement;
-
-	/**
-	 * The edit context command.
-	 */
-	private ICommand editContextCommand;
-    
-    /**
-     * Flag indicating that we are in the process of making the request for the
-     * edit context. The edit context request and command will not be
-     * invalidated if the container or containment feature is set during this
-     * time.
-     */
-    private boolean requestingEditContext;
-
-	/**
-	 * The edit context request.
-	 */
-	private GetEditContextRequest editContextRequest;
-
-	/**
-	 * Creates a request to create a new model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 *            changes.
-	 * @param container
-	 *            the container for the new model element
-	 * @param elementType
-	 *            the element type of the new model element
-	 */
-	public CreateElementRequest(TransactionalEditingDomain editingDomain,
-			EObject container, IElementType elementType) {
-
-		this(editingDomain, container, elementType, null);
-	}
-    
-    /**
-     * Creates a request to create a new model element. The editing domain will
-     * be derived from the <code>container</code>.
-     * 
-     * @param container
-     *            the container for the new model element
-     * @param elementType
-     *            the element type of the new model element
-     */
-    public CreateElementRequest(EObject container, IElementType elementType) {
-        
-        this(TransactionUtil.getEditingDomain(container), container, elementType, null);
-    }
-    
-	/**
-     * Creates a request to create a new model element. The editing domain will
-     * be derived from the result of {@link #getContainer()}.
-     * 
-     * @param elementType
-     *            the element type of the new model element
-     */
-    public CreateElementRequest(IElementType elementType) {
-
-        this(null, null, elementType, null);
-    }
-    
-    /**
-     * Creates a request to create a new model element.
-     * 
-     * @param editingDomain
-     *            the editing domain in which I am requesting to make model
-     *            changes.
-     * @param elementType
-     *            the element type of the new model element
-     */
-    public CreateElementRequest(TransactionalEditingDomain editingDomain,
-            IElementType elementType) {
-
-        this(editingDomain, null, elementType, null);
-    }
-
-	/**
-	 * Creates a request to create a new model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 *            changes.
-	 * @param container
-	 *            the container for the new model element
-	 * @param elementType
-	 *            the element type of the new model element
-	 * @param containmentFeature
-	 *            The feature in the container which will hold the new model
-	 *            element. Can be <code>null</code>, in which case a default
-	 *            feature will be used.
-	 */
-	public CreateElementRequest(TransactionalEditingDomain editingDomain,
-			EObject container, IElementType elementType,
-			EReference containmentFeature) {
-
-		super(editingDomain);
-		this.container = container;
-		this.elementType = elementType;
-		this.containmentFeature = containmentFeature;
-	}
-    
-    /**
-     * Creates a request to create a new model element.  The editing domain will
-     * be derived from the <code>container</code>.
-     * 
-     * @param container
-     *            the container for the new model element
-     * @param elementType
-     *            the element type of the new model element
-     * @param containmentFeature
-     *            The feature in the container which will hold the new model
-     *            element. Can be <code>null</code>, in which case a default
-     *            feature will be used.
-     */
-    public CreateElementRequest(EObject container, IElementType elementType,
-            EReference containmentFeature) {
-
-        this(TransactionUtil.getEditingDomain(container), container,
-            elementType, containmentFeature);
-    }
-
-	/**
-	 * Gets the new element that has been created by this request.
-	 * 
-	 * @return the newly created element
-	 */
-	public EObject getNewElement() {
-		return newElement;
-	}
-
-	/**
-	 * Sets the element that has been created by this request.
-	 * 
-	 * @param element
-	 *            the newly created element
-	 */
-	public void setNewElement(EObject element) {
-		this.newElement = element;
-	}
-
-	/**
-	 * Gets the containment feature in which to create the new element. May be
-	 * <code>null</code>.
-	 * 
-	 * @return the containment feature or <code>null</code> if one has not
-	 *         been specified.O
-	 */
-	public EReference getContainmentFeature() {
-		return containmentFeature;
-	}
-
-	/**
-	 * Sets the containment feature in which to create the new element.
-	 * <p>
-	 * Does nothing of the feature has not changed. Othewise, invalidates the
-	 * edit helper context.
-	 * 
-	 * @param containmentFeature
-	 *            the containment feature
-	 */
-	public void setContainmentFeature(EReference containmentFeature) {
-        if (this.containmentFeature != containmentFeature) {
-            this.containmentFeature = containmentFeature;
-            invalidateEditHelperContext();
-        }
-	}
-    
-    /**
-     * Sets the containment feature in which to create the new element.
-     * <p>
-     * Does nothing of the feature has not changed. Does not invalidate the
-     * edit helper context.
-     * 
-     * @param containmentFeature
-     *            the containment feature
-     */
-    public void initializeContainmentFeature(EReference feature) {
-        if (this.containmentFeature != feature) {
-            this.containmentFeature = feature;
-        }
-    }
-
-	/**
-	 * Gets the original context in which the new element will be created. This
-	 * may not be the actual container of the new element until the
-	 * <code>createContainer</code> method is called.
-	 * 
-	 * @return the container for the new element.
-	 */
-	public EObject getContainer() {
-		return container;
-	}
-
-	/**
-	 * Sets the appropriate <code>container</code> for the new element. May
-	 * prompt the user to create the container, so this method should only be
-	 * called when the command honouring the request is executed.
-	 * <P>
-	 * Updates the value returned by the <code>getContainer</code>, if
-	 * appropriate.
-	 * 
-	 * @return the container for the new element
-	 */
-	public EObject createContainer() {
-
-		Object result = null;
-
-		ICommand contextCommand = getEditContextCommand();
-
-		if (contextCommand != null && contextCommand.canExecute()) {
-            try {
-                contextCommand.execute(new NullProgressMonitor(), null);
-
-                CommandResult commandResult = contextCommand.getCommandResult();
-
-                if (commandResult.getStatus().getCode() == IStatus.OK) {
-                    result = commandResult.getReturnValue();
-                }
-            } catch (ExecutionException e) {
-                Trace.catching(EMFTypePlugin.getPlugin(),
-                    EMFTypeDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "createContainer", e); //$NON-NLS-1$
-                Log.error(EMFTypePlugin.getPlugin(),
-                    EMFTypePluginStatusCodes.COMMAND_FAILURE, e
-                        .getLocalizedMessage(), e);
-            }
-		}
-		if (result == null || result instanceof EObject) {
-			container = (EObject) result;
-		}
-		return getContainer();
-	}
-
-	/**
-	 * Gets a command that will return the edit context for the request.
-	 * 
-	 * @return the command
-	 */
-	private ICommand getEditContextCommand() {
-
-		if (editContextCommand == null) {
-            requestingEditContext = true;
-            try {
-    			editContextCommand = getElementType().getEditCommand(
-    					getEditContextRequest());
-            } finally {
-                requestingEditContext = false;
-            }
-		}
-		return editContextCommand;
-	}
-
-	/**
-	 * Gets the edit context request.
-	 * 
-	 * @return the edit context request
-	 */
-	private GetEditContextRequest getEditContextRequest() {
-
-		if (editContextRequest == null) {
-			editContextRequest = new GetEditContextRequest(getEditingDomain(), this,
-					getElementType());
-			// Initialize the context with the container and the client context
-			editContextRequest.setEditContext(getContainer());
-			editContextRequest.setClientContext(getClientContext());
-			editContextRequest.addParameters(getParameters());
-		}
-		return editContextRequest;
-	}
-
-	/**
-	 * Sets the container for the new element.
-	 * <p>
-	 * Does nothing of the container has not changed. Othewise, invalidates the
-	 * edit helper context and containment feature.
-	 * 
-	 * @param container
-	 *            the container for the new element.
-	 */
-	public void setContainer(EObject container) {
-		if (this.container != container) {
-			this.container = container;
-            
-            if (!requestingEditContext) {
-                editContextCommand = null;
-                
-                if (editContextRequest != null) {
-                    editContextRequest.setEditContext(container);
-                }
-            }
-            invalidateContainmentFeature();
-		}
-	}
-	
-	public void setClientContext(IClientContext clientContext) {
-		super.setClientContext(clientContext);
-		
-		if (editContextRequest != null) {
-            editContextRequest.setClientContext(clientContext);
-        }
-	}
-	
-	/**
-	 * Infers the client context from {@link #getElementType()} if the context
-	 * has not be explicity set.
-	 */
-	public IClientContext getClientContext() {
-
-		IClientContext result = super.getClientContext();
-		IElementType type = getElementType();
-
-		if (result == null && type != null) {
-			result = ClientContextManager.getInstance().getBinding(type);
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the element type for the new model element.
-	 * 
-	 * @return the element type
-	 */
-	public IElementType getElementType() {
-		return elementType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		if (getContainer() != null) {
-			return Collections.singletonList(getContainer());
-		}
-		return super.getElementsToEdit();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditCommandRequest#getDefaultLabel()
-	 */
-	protected String getDefaultLabel() {
-
-		String label = MessageFormat.format(
-				EMFTypeCoreMessages.Request_Label_Create,
-				new Object[] { getElementType().getDisplayName() });
-
-		return label;
-	}
-
-	/**
-	 * Makes a request for the context of the new element from its element type.
-	 * Allows specializations and advice bindings to return the appropriate
-	 * context, if necessary.
-	 * <P>
-	 * The <code>GetContextCommand</code> will not be executed. This method
-	 * relies on the command to return the new context element type until it is
-	 * executed, at which point it can return the real context element, if a new
-	 * one needs to be created.
-	 * 
-	 * @return the edit helper context
-	 */
-	public Object getEditHelperContext() {
-		
-		// Get, but don't execute the command. Gives clients a chance to set the
-		// edit context in the request, if they need to.
-		ICommand contextCommand = getEditContextCommand();
-
-		// The request should now have the correct edit context.
-		if (contextCommand != null && contextCommand.canExecute()) {
-			return getEditContextRequest().getEditContext();
-		}
-		return null;
-	}
-
-	public void setParameter(String parameterName, Object value) {
-		super.setParameter(parameterName, value);
-	}
-
-	/**
-	 * Invalidates the cached edit context request and command.
-	 */
-	protected void invalidateEditHelperContext() {
-        if (!requestingEditContext) {
-    		editContextCommand = null;
-    		editContextRequest = null;
-        }
-	}
-
-	/**
-	 * Invalidates the cached containment feature.
-	 */
-	protected void invalidateContainmentFeature() {
-        if (!requestingEditContext) {
-            containmentFeature = null;
-        }
-	}
-    
-    public TransactionalEditingDomain getEditingDomain() {
-        TransactionalEditingDomain result = super.getEditingDomain();
-
-        EObject c = getContainer();
-        if (result == null && c != null) {
-            // get the editing domain from the container
-            result = TransactionUtil.getEditingDomain(c);
-        }
-        return result;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/CreateRelationshipRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/CreateRelationshipRequest.java
deleted file mode 100644
index 6a0f2f0..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/CreateRelationshipRequest.java
+++ /dev/null

@@ -1,301 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Request to create a new relationship element.
- * 
- * @author ldamus
- */
-public class CreateRelationshipRequest extends CreateElementRequest {
-
-	/**
-	 * The parameter name for the relationship source.
-	 */
-	public static final String SOURCE = "CreateRelationshipRequest.source"; //$NON-NLS-1$
-
-	/**
-	 * The parameter name for the relationship target.
-	 */
-	public static final String TARGET = "CreateRelationshipRequest.target"; //$NON-NLS-1$
-
-	/**
-	 * The source of the relationship.
-	 */
-	private EObject source;
-
-	/**
-	 * The target of the relationship.
-	 */
-	private EObject target;
-
-	/**
-	 * <code>true</code> if the user should be prompted to create any parts
-	 * necessary to the creation of the new relationship, <code>false</code>
-	 * otherwise.
-	 */
-	private boolean prompt;
-
-	/**
-	 * Constructs a new request to create a new relationship.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param container
-	 *            the container for the new relationship
-	 * @param source
-	 *            the source of the new relationship
-	 * @param target
-	 *            the target of the new relationship
-	 * @param elementType
-	 *            the element type of the new relationship
-	 * @param containmentFeature
-	 *            the feature that will contain the new relationship
-	 */
-	public CreateRelationshipRequest(TransactionalEditingDomain editingDomain,
-			EObject container, EObject source, EObject target,
-			IElementType elementType, EReference containmentFeature) {
-
-		super(editingDomain, container, elementType, containmentFeature);
-
-		this.source = source;
-		this.target = target;
-	}
-
-	/**
-	 * Constructs a new request to create a new relationship.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param container
-	 *            the container for the new relationship
-	 * @param source
-	 *            the source of the new relationship
-	 * @param target
-	 *            the target of the new relationship
-	 * @param elementType
-	 *            the element type of the new relationship
-	 */
-	public CreateRelationshipRequest(TransactionalEditingDomain editingDomain,
-			EObject container, EObject source, EObject target,
-			IElementType elementType) {
-
-		this(editingDomain, container, source, target, elementType, null);
-	}
-
-	/**
-	 * Constructs a new request to create a new relationship.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param source
-	 *            the source of the new relationship
-	 * @param target
-	 *            the target of the new relationship
-	 * @param elementType
-	 *            the element type of the new relationship
-	 */
-	public CreateRelationshipRequest(TransactionalEditingDomain editingDomain,
-			EObject source, EObject target, IElementType elementType) {
-
-		this(editingDomain, null, source, target, elementType, null);
-	}
-
-    /**
-     * Constructs a new request to create a new relationship. The editing domain
-     * will be derived from the result of {@link #getContainer()}.
-     * 
-     * @param source
-     *            the source of the new relationship
-     * @param target
-     *            the target of the new relationship
-     * @param elementType
-     *            the element type of the new relationship
-     */
-    public CreateRelationshipRequest(EObject source, EObject target,
-            IElementType elementType) {
-
-        this(null, null, source, target, elementType, null);
-    }
-
-	/**
-	 * Constructs a new request to create a new relationship.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param elementType
-	 *            the element type of the new relationship
-	 */
-	public CreateRelationshipRequest(TransactionalEditingDomain editingDomain,
-			IElementType elementType) {
-
-		this(editingDomain, null, null, null, elementType, null);
-	}
-
-    /**
-     * Constructs a new request to create a new relationship. The editing domain will
-     * be derived from the result of {@link #getContainer()}.
-     * 
-     * @param elementType
-     *            the element type of the new relationship
-     */
-    public CreateRelationshipRequest(
-            IElementType elementType) {
-
-        this(null, null, null, null, elementType, null);
-    }
-    
-    /**
-     * Constructs a new request to create a new relationship.  The
-     * editing domain will be derived from <code>container</code>.
-     * 
-     * @param container
-     *            the container for the new relationship
-     * @param source
-     *            the source of the new relationship
-     * @param target
-     *            the target of the new relationship
-     * @param elementType
-     *            the element type of the new relationship
-     * @param containmentFeature
-     *            the feature that will contain the new relationship
-     */
-    public CreateRelationshipRequest(EObject container, EObject source,
-            EObject target, IElementType elementType,
-            EReference containmentFeature) {
-
-        this(TransactionUtil.getEditingDomain(container), container, source,
-                target, elementType, containmentFeature);
-    }
-    
-    /**
-     * Constructs a new request to create a new relationship.  The
-     * editing domain will be derived from <code>container</code>.
-     * 
-     * @param container
-     *            the container for the new relationship
-     * @param source
-     *            the source of the new relationship
-     * @param target
-     *            the target of the new relationship
-     * @param elementType
-     *            the element type of the new relationship
-     */
-    public CreateRelationshipRequest(EObject container, EObject source,
-            EObject target, IElementType elementType) {
-
-        this(TransactionUtil.getEditingDomain(container), container, source,
-                target, elementType);
-    }
-
-	/**
-	 * Gets the source of the new relationship.
-	 * 
-	 * @return the source of the new relationship
-	 */
-	public EObject getSource() {
-		return source;
-	}
-
-	/**
-	 * Sets the relationship source.
-	 * <p>
-	 * Does nothing of the source has not changed. Othewise, invalidates the
-	 * edit helper context and containment feature.
-	 * 
-	 * @param source
-	 *            the relationship source
-	 */
-	public void setSource(EObject source) {
-
-		if (this.source != source) {
-
-			this.source = source;
-			invalidateEditHelperContext();
-
-			if (super.getContainer() == null) {
-				invalidateContainmentFeature();
-			}
-		}
-	}
-
-	/**
-	 * Gets the target of the new relationship.
-	 * 
-	 * @return the target of the new relationship
-	 */
-	public EObject getTarget() {
-		return target;
-	}
-
-	/**
-	 * Sets the relationship target.
-	 * <p>
-	 * Does nothing of the target has not changed. Otherwise, invalidates the
-	 * edit helper context.
-	 * 
-	 * @param target
-	 *            the relationship target
-	 */
-	public void setTarget(EObject target) {
-
-		if (this.target != target) {
-			this.target = target;
-			invalidateEditHelperContext();
-		}
-	}
-
-	/**
-	 * Gets the container for the new element.
-	 * 
-	 * @return the container for the new element.
-	 */
-	public EObject getContainer() {
-
-		EObject eObject = super.getContainer();
-
-		if (eObject == null) {
-			return getSource();
-		}
-		return eObject;
-	}
-
-	/**
-	 * Gets the value of the prompt flag.
-	 * 
-	 * @return <code>true</code> if the user should be prompted to create any
-	 *         parts necessary to the creation of the new relationship,
-	 *         <code>false</code> if defaults should be used.
-	 */
-	public boolean isPrompt() {
-		return prompt;
-	}
-
-	/**
-	 * Sets the value of the prompt flag.
-	 * 
-	 * @param prompt
-	 *            <code>true</code> if the user should be prompted to create
-	 *            any parts necessary to the creation of the new relationship,
-	 *            <code>false</code> if defaults should be used.
-	 */
-	public void setPrompt(boolean prompt) {
-		this.prompt = prompt;
-
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyDependentsRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyDependentsRequest.java
deleted file mode 100644
index 95cccea..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyDependentsRequest.java
+++ /dev/null

@@ -1,417 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-import org.eclipse.gmf.runtime.emf.type.core.internal.requests.RequestCacheEntries;
-
-/**
- * Request to destroy the dependents of a model element.  It is expected that
- * the request will be served primarily by advice, which can invoke the
- * {@link #getDestroyDependentCommand(EObject)} to obtain a command to destroy
- * an object dependent on the {@linkplain #getElementToDestroy() element being destroyed}
- * and have it added to the edit command.  However, an edit helper can also
- * provide an "instead" command by overriding its
- * <code>getDestroyDependentsCommand(DestroyDependentsRequest)</code> method
- * to do the same.
- * <p>
- * The destruction of dependents is an edit requested of the element being
- * destroyed, unlike the {@link DestroyElementRequest}, which is requested of
- * the <em>container</em> of the element being destroyed.
- * </p>
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class DestroyDependentsRequest extends DestroyRequest {
-	
-	/**
-	 * The element to destroy.
-	 */
-	private EObject elementToDestroy;
-	private EObject ctorElementToDestroy;
-	
-	/**
-	 * Other objects dependent on the primary object that should also be destroyed.
-	 */
-	private Set dependentElementsToDestroy;
-	private Set immutableViewOfDependents;
-	
-	/**
-	 * Constructs a new request to destroy the dependents of a model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param elementToDestroy
-	 *            the element to be destroyed
-	 * @param confirmationRequired
-	 *            <code>true</code> if the user should be prompted to confirm
-	 *            the element deletion, <code>false</code> otherwise.
-	 */
-	public DestroyDependentsRequest(TransactionalEditingDomain editingDomain,
-			EObject elementToDestroy, boolean confirmationRequired) {
-
-		super(editingDomain, confirmationRequired);		
-		this.elementToDestroy = elementToDestroy;
-		// keep it until we populate the set, beacuse someone might construct us with some element but later call
-		// setElementToDestroy(...) with a different element and the original behaviour would have added them both to the set
-		ctorElementToDestroy = elementToDestroy;
-	}	
-    
-	/**
-	 * Gets the element to be destroyed.
-	 * 
-	 * @return the element to be destroyed
-	 */
-	public final EObject getElementToDestroy() {
-		return elementToDestroy;
-	}
-
-	/**
-	 * Sets the element to be destroyed.
-	 * 
-	 * @param elementToDestroy
-	 *            the element to be destroyed
-	 */
-	public final void setElementToDestroy(EObject elementToDestroy) {
-		this.elementToDestroy = elementToDestroy;
-		if (elementToDestroy != null) {
-			internalGetDependentElementsToDestroy().add(elementToDestroy);
-		}
-	}
-
-	public EObject getContainer() {
-		if (getElementToDestroy() != null) {
-			return getElementToDestroy().eContainer();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		if (getElementToDestroy() != null) {
-			return Collections.singletonList(getElementToDestroy());
-		}
-		return super.getElementsToEdit();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditCommandRequest#getDefaultLabel()
-	 */
-	protected String getDefaultLabel() {
-		return EMFTypeCoreMessages.Request_Label_DestroyDependents;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-	 */
-	public Object getEditHelperContext() {
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return getElementToDestroy();
-		} else {
-			return new EditHelperContext(getElementToDestroy(), context);
-		}
-	}
-
-    /**
-     * Derives the editing domain from the object to be destroyed, if it hasn't
-     * already been specified.
-     */
-    public TransactionalEditingDomain getEditingDomain() {
-        TransactionalEditingDomain result = super.getEditingDomain();
-
-        if (result == null) {
-            result = TransactionUtil.getEditingDomain(getElementToDestroy());
-            if (result != null) {
-				setEditingDomain(result);
-			}
-        }
-        return result;
-    }
-
-    /**
-     * Obtains the <em>mutable</em> set of dependent elements to destroy.
-     * 
-     * @return the set of dependent elements
-     */
-    
-    protected final Set internalGetDependentElementsToDestroy() {
-		if (dependentElementsToDestroy == null) {
-			Map cacheMaps = (Map) getParameter(RequestCacheEntries.Cache_Maps);
-			if (cacheMaps != null) {
-				dependentElementsToDestroy = (Set) cacheMaps
-					.get(RequestCacheEntries.Dependent_Elements);
-			} else {
-				dependentElementsToDestroy = new HashSet();
-			}
-			
-			immutableViewOfDependents = Collections.unmodifiableSet(dependentElementsToDestroy);
-			
-			if (ctorElementToDestroy != null) {
-				dependentElementsToDestroy.add(ctorElementToDestroy);
-				populateCacheMap(null, ctorElementToDestroy);				
-			}
-
-			if (elementToDestroy != null
-				&& (elementToDestroy != ctorElementToDestroy)) {
-				dependentElementsToDestroy.add(elementToDestroy);
-				populateCacheMap(null, ctorElementToDestroy);	
-			}
-			ctorElementToDestroy = null;
-		}
-		return dependentElementsToDestroy;
-	}
-    
-    /**
-     * Obtains an immutable view of the set of dependent elements to destroy.
-     * 
-     * @return the immutable set of dependent elements
-     */
-    public final Set getDependentElementsToDestroy() {
-		if (immutableViewOfDependents == null) {
-			internalGetDependentElementsToDestroy();//this should ensure we are initialized
-		}
-		return immutableViewOfDependents;
-	}
-	
-    /**
-     * Obtains a command that destroys the specified <code>dependent</code> of
-     * the {@linkplain #getElementToDestroy() element to be destroyed}, if it
-     * is not already being destroyed by the processing of the current
-     * {@link DestroyElementRequest}.  This command can then be composed with
-     * others by the edit helper processing the <code>DestroyDependentsRequest</code>.
-     * 
-     * @param dependent an object dependent on the element being destroyed,
-     *     which must also be destroyed
-     *     
-     * @return a command to destroy the <code>dependent</code>, or
-     *     <code>null</code> if the element is already being destroyed
-     *     
-     * @throws IllegalArgumentException on an attempt to destroy the
-     *    {@linkplain #getElementToDestroy() element to be destroyed} (as a
-     *    dependent of itself)
-     * @throws NullPointerException on attempt to destroy a <code>null</code>
-     *    dependent
-     *    
-     * @see #getDestroyDependentsCommand(Collection)
-     */
-	public ICommand getDestroyDependentCommand(EObject dependent) {
-		ICommand result = null;
-
-		if (addDependentElementToDestroy(dependent)) {
-			//record the element that we are destroying, for later restoration
-			EObject elementBeingDestroyed = getElementToDestroy();
-			
-			try {
-				DestroyElementRequest destroy = new DestroyElementRequest(
-					getEditingDomain(), dependent, isConfirmationRequired());
-
-				// propagate my parameters
-				destroy.addParameters(getParameters());
-				
-				// propagate the dependents information to detect cycles
-				destroy.setParameter(
-						DestroyElementRequest.DESTROY_DEPENDENTS_REQUEST_PARAMETER,
-						this);
-				setElementToDestroy(dependent);
-				
-				Object eHelperContext = destroy.getEditHelperContext();
-				
-				IElementType context = populateCacheMap(eHelperContext, dependent);				
-
-				if (context == null) {
-					context = ElementTypeRegistry.getInstance().getElementType(
-						eHelperContext);
-				}
-
-				if (context != null) {
-					result = context.getEditCommand(destroy);
-				}
-			} finally {
-				// restore the element that we are destroying
-				setElementToDestroy(elementBeingDestroyed);
-			}
-		}
-
-		return result;
-	}
-	
-	private IElementType populateCacheMap(Object eHelperContext, EObject dependent) {
-		IElementType context = null;
-		Map cacheMaps = (Map) getParameter(RequestCacheEntries.Cache_Maps);
-		if (cacheMaps != null) {
-			//beacareful, this one here call populateCacheMap(...) if the set was null and cacheMaps exist,
-			//so before that you should instantiate the DependentElementsToDestroy set
-			Set dependents = internalGetDependentElementsToDestroy(); 
-			//May be this guy was a context-of-a-dependent, and we had populated its cache map already
-			if (cacheMaps.get(dependent) == null) {
-				Map parentMap = new HashMap();
-				cacheMaps.put(dependent, parentMap);
-				RequestCacheEntries.initializeEObjCache(dependent, parentMap);
-			}
-
-			TreeIterator it = dependent.eAllContents();
-			while (it.hasNext()) {
-				EObject eObj = (EObject) it.next();
-				dependents.add(eObj);
-				if (cacheMaps.get(eObj) == null) {
-					Map map = new HashMap();
-					cacheMaps.put(eObj, map);
-					RequestCacheEntries.initializeEObjCache(eObj, map);
-				}
-			}
-			
-			if (eHelperContext != null) {
-				Map eHelperMap = (Map) cacheMaps.get(eHelperContext);
-				if (eHelperMap == null && (eHelperContext instanceof EObject)) {
-					eHelperMap = new HashMap();
-					cacheMaps.put(eHelperContext, eHelperMap);
-					RequestCacheEntries.initializeEObjCache(
-						(EObject) eHelperContext, eHelperMap);
-				}
-
-				if (eHelperMap != null) {
-					context = (IElementType) eHelperMap
-						.get(RequestCacheEntries.Element_Type);
-				}
-			}
-		}//if (cacheMaps != null)
-
-		return context;
-	}
-	
-
-	
-	/**
-     * Obtains a command that destroys the specified <code>dependents</code> of
-     * the {@linkplain #getElementToDestroy() element to be destroyed}, if they
-     * are not already being destroyed by the processing of the current
-     * {@link DestroyElementRequest}.  This command can then be composed with
-     * others by the edit helper processing the <code>DestroyDependentsRequest</code>.
-	 * 
-	 * @param dependents dependents of the element being destroyed
-	 * 
-	 * @return a command to destroy all of the specified <code>dependents</code>,
-	 *     or <code>null</code> if they are all already being destroyed
-	 *     
-	 * @see #getDestroyDependentCommand(EObject)
-	 */
-	public ICommand getDestroyDependentsCommand(Collection dependents) {
-		ICommand result = null;
-		
-        for (Iterator i = dependents.iterator(); i.hasNext();) {
-        	result = CompositeCommand.compose(
-        			result,
-        			getDestroyDependentCommand((EObject) i.next()));
-        }
-        
-        return result;
-	}
-   
-    /**
-     * Indicates that the command that fulfils this request will also destroy
-     * the specified dependent of the
-     * {@link #getElementToDestroy() element to be destroyed}.  Note that
-     * contained elements are implicitly considered to be dependent; they need
-     * not be handled by this mechanism.
-     * <p>
-     * Advice that provides a command to destroy a dependent element
-     * <em>must</em> indicate that fact by calling this method (only after
-     * checking whether it isn't already
-     * {@link #isElementToBeDestroyed(EObject) being destroyed}, anyway).
-     * </p>
-     *  
-     * @param dependent another object to destroy, which is dependent on the
-     *     element for which we are requesting destruction
-     * 
-     * @return <code>true</code> if the <code>dependent</code> was not already
-     *     in the set of elements being destroyed; <code>false</code>, otherwise
-     * 
-     * @throws IllegalArgumentException on an attempt to add the
-     *    {@link #getElementToDestroy() element to be destroyed} as a dependent
-     *    of itself
-     * @throws NullPointerException on attempt to add a <code>null</code> object
-     *    
-     * @see #isElementToBeDestroyed(EObject)
-     * @see #getElementToDestroy()
-     * @see #getDestroyDependentCommand(EObject)
-     */
-    protected boolean addDependentElementToDestroy(EObject dependent) {
-    	if (dependent == null) {
-    		throw new NullPointerException("dependent is null"); //$NON-NLS-1$
-    	}
-    	
-    	if (dependent == getElementToDestroy()) {
-    		throw new IllegalArgumentException("dependent is the element being destroyed"); //$NON-NLS-1$
-    	}
-    	
-    	if (!isElementToBeDestroyed(dependent)) {
-    		return internalGetDependentElementsToDestroy().add(dependent);
-    	}
-    	
-    	return false;
-    }
-    
-    /**
-     * Queries whether the specified element will be destroyed as a result of
-     * the fulfillment of this request.  An element will be destroyed if it
-     * or any of its ancestors is the
-     * {@linkplain #getElementToDestroy() element to be destroyed} or one of its
-     * {@linkplain #getDependentElementsToDestroy() dependents}.
-     * 
-     * @param eObject an element
-     * 
-     * @return <code>true</code> if the command that fulfils this request
-     *     would destroy the specified element; <code>false</code> if a new
-     *     command would have to be composed with it to destroy the element
-     */
-    protected boolean isElementToBeDestroyed(EObject eObject) {
-    	boolean result = false;
-    	EObject eObj = getElementToDestroy();
-    	Set set = internalGetDependentElementsToDestroy();
-    	
-    	while (!(result || (eObject == null))) {
-			result = (eObject == eObj) || set.contains(eObject);
-			eObject = eObject.eContainer();
-		}
-    	
-    	return result;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyElementRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyElementRequest.java
deleted file mode 100644
index b2f1b40..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyElementRequest.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.DefaultMetamodelType;
-
-/**
- * Request to destroy a model element.
- * 
- * @author ldamus
- */
-public class DestroyElementRequest extends DestroyRequest {
-	
-	/**
-	 * Request parameter specifying the associated destroy-dependents request
-	 * that is propagated recursively through the processing of destroy
-	 * requests for an element, its contents, and its dependents.
-	 * <p>
-	 * The expected parameter value is an instance of type {@link DestroyDependentsRequest}. 
-	 * </p>
-	 */
-	public static final String DESTROY_DEPENDENTS_REQUEST_PARAMETER = "DestroyElementRequest.destroyDependentsRequest"; //$NON-NLS-1$
-	
-	/**
-	 * Request parameter specifying the initial element that was requested to be
-	 * destroyed.
-	 * <P>
-	 * The expected parameter value is an instance of type {@link EObject}, or
-	 * <code>null</code>.
-	 */
-	public static final String INITIAL_ELEMENT_TO_DESTROY_PARAMETER = "DestroyElementRequest.initialElementToDestroy"; //$NON-NLS-1$
-
-	/**
-	 * The element to destroy.
-	 */
-	private EObject elementToDestroy;
-	
-	/**
-	 * A command to override the basic destroy command that would be created by
-	 * default by the edit helper to perform the object destruction.
-	 */
-	private DestroyElementCommand basicDestroyCommand;
-
-	/**
-	 * Constructs a new request to destroy a model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param confirmationRequired
-	 *            <code>true</code> if the user should be prompted to confirm
-	 *            the element deletion, <code>false</code> otherwise.
-	 */
-	public DestroyElementRequest(TransactionalEditingDomain editingDomain,
-			boolean confirmationRequired) {
-
-		this(editingDomain, null, confirmationRequired);
-	}
-
-	/**
-	 * Constructs a new request to destroy a model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param elementToDestroy
-	 *            the element to be destroyed
-	 * @param confirmationRequired
-	 *            <code>true</code> if the user should be prompted to confirm
-	 *            the element deletion, <code>false</code> otherwise.
-	 */
-	public DestroyElementRequest(TransactionalEditingDomain editingDomain,
-			EObject elementToDestroy, boolean confirmationRequired) {
-
-		super(editingDomain, confirmationRequired);
-		this.elementToDestroy = elementToDestroy;
-	}
-    
-    /**
-     * Constructs a new request to destroy a model element. The editing domain will
-     * be derived from the result of {@link #getElementToDestroy()}.
-     * 
-     * @param confirmationRequired
-     *            <code>true</code> if the user should be prompted to confirm
-     *            the element deletion, <code>false</code> otherwise.
-     */
-    public DestroyElementRequest(boolean confirmationRequired) {
-
-        this(null, null, confirmationRequired);
-    }
-    
-    /**
-     * Constructs a new request to destroy a model element.
-     * 
-     * @param elementToDestroy
-     *            the element to be destroyed
-     * @param confirmationRequired
-     *            <code>true</code> if the user should be prompted to confirm
-     *            the element deletion, <code>false</code> otherwise.
-     */
-    public DestroyElementRequest(EObject elementToDestroy,
-            boolean confirmationRequired) {
-
-        this(TransactionUtil.getEditingDomain(elementToDestroy), elementToDestroy,
-                confirmationRequired);
-    }
-
-	/**
-	 * Gets the element to be destroyed.
-	 * 
-	 * @return the element to be destroyed
-	 */
-	public EObject getElementToDestroy() {
-		return elementToDestroy;
-	}
-
-	/**
-	 * Sets the element to be destroyed.
-	 * 
-	 * @param elementToDestroy
-	 *            the element to be destroyed
-	 */
-	public void setElementToDestroy(EObject elementToDestroy) {
-		this.elementToDestroy = elementToDestroy;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.DestroyRequest#getContainer()
-	 */
-	public EObject getContainer() {
-		if (getElementToDestroy() != null) {
-			return getElementToDestroy().eContainer();
-		}
-		return null;
-	}
-	
-	/**
-	 * Extends the inherited method to return the default element type when
-	 * destroying a root element of a resource.
-	 */
-	public Object getEditHelperContext() {
-		Object result = super.getEditHelperContext();
-		
-		if (result == null) {
-			EObject element = getElementToDestroy();
-			
-			if ((element != null) && (element.eResource() != null)) {
-				IClientContext context = ClientContextManager.getInstance()
-						.getClientContextFor(element);
-				result = new EditHelperContext(DefaultMetamodelType
-						.getInstance(), context);
-			}
-		}
-		
-		return result;
-	}
-
-    /**
-     * Derives the editing domain from the object to be destroyed, if it hasn't
-     * already been specified.
-     */
-    public TransactionalEditingDomain getEditingDomain() {
-        TransactionalEditingDomain result = super.getEditingDomain();
-
-        if (result == null) {
-            result = TransactionUtil.getEditingDomain(getElementToDestroy());
-            if (result != null) {
-				setEditingDomain(result);
-			}
-        }
-        return result;
-    }
-
-    /**
-	 * Assigns a command to override the basic destroy command that would be created
-	 * by default by the edit helper to perform the object destruction.  This
-	 * can be used by before advice to replace the basic destruction behaviour.
-	 * <p>
-	 * This is similar to the facility provided via the
-	 * {@link IEditCommandRequest#REPLACE_DEFAULT_COMMAND} parameter for
-	 * indicating that an advice has taken over the "instead" command, except
-	 * that this is applies only to the basic single-object destruction, whereas
-	 * the edit helper's command also performs recursion and destruction of
-	 * dependents.
-	 * </p>
-	 * 
-     * @param command the basic destroy command to use for destruction of an
-     *     element, or <code>null</code> to use the edit helper's default
-     *     implementation
-     *     
-     * @see AbstractEditHelper#getBasicDestroyElementCommand(DestroyElementRequest)
-     */
-    public void setBasicDestroyCommand(DestroyElementCommand command) {
-    	basicDestroyCommand = command;
-    }
-
-    /**
-	 * Obtains a command to override the basic destroy command that would be created
-	 * by default by the edit helper to perform the object destruction.
-	 * 
-     * @return the basic destroy command to use for destruction of an
-     *     element, or <code>null</code> to use the edit helper's default
-     *     implementation
-     * 
-     * @see #setBasicDestroyCommand(DestroyElementCommand)
-     * @see AbstractEditHelper#getBasicDestroyElementCommand(DestroyElementRequest)
-     */
-    public DestroyElementCommand getBasicDestroyCommand() {
-    	return basicDestroyCommand;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyReferenceRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyReferenceRequest.java
deleted file mode 100644
index d45c0f1..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyReferenceRequest.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-
-/**
- * Request to destroy a reference from one model element to another.
- * 
- * @author ldamus
- */
-public class DestroyReferenceRequest extends DestroyRequest {
-
-	/**
-	 * The element that contains the reference.
-	 */
-	private EObject container;
-
-	/**
-	 * The feature in the <code>container</code> that contains the reference.
-	 */
-	private EReference containingFeature;
-
-	/**
-	 * The referenced object.
-	 */
-	private EObject referencedObject;
-
-	/**
-	 * Constructs a new request to destroy a reference from one model element to
-	 * another.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param container
-	 *            the element that contains the reference
-	 * @param containingFeature
-	 *            the feature in <code>container</code> that contains the
-	 *            reference
-	 * @param referencedObject
-	 *            the referenced object
-	 * @param confirmationRequired
-	 *            <code>true</code> if the user should be prompted to confirm
-	 *            the element deletion, <code>false</code> otherwise.
-	 */
-	public DestroyReferenceRequest(TransactionalEditingDomain editingDomain,
-			EObject container, EReference containingFeature,
-			EObject referencedObject, boolean confirmationRequired) {
-
-		super(editingDomain, confirmationRequired);
-		this.container = container;
-		this.containingFeature = containingFeature;
-		this.referencedObject = referencedObject;
-	}
-    
-    /**
-     * Constructs a new request to destroy a reference from one model element to
-     * another. The editing domain is derived from the <code>container</code>.
-     * 
-     * @param container
-     *            the element that contains the reference
-     * @param containingFeature
-     *            the feature in <code>container</code> that contains the
-     *            reference
-     * @param referencedObject
-     *            the referenced object
-     * @param confirmationRequired
-     *            <code>true</code> if the user should be prompted to confirm
-     *            the element deletion, <code>false</code> otherwise.
-     */
-    public DestroyReferenceRequest(EObject container,
-            EReference containingFeature, EObject referencedObject,
-            boolean confirmationRequired) {
-
-        this(TransactionUtil.getEditingDomain(container), container,
-                containingFeature, referencedObject, confirmationRequired);
-    }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.DestroyRequest#getContainer()
-	 */
-	public EObject getContainer() {
-		return container;
-	}
-
-	/**
-	 * Sets the element that contains the reference.
-	 * 
-	 * @param container
-	 *            the element that contains the reference
-	 */
-	public void setContainer(EObject container) {
-		this.container = container;
-	}
-
-	/**
-	 * Gets the feature in the <code>container</code> that contains the
-	 * reference.
-	 * 
-	 * @return the feature in the <code>container</code> that contains the
-	 *         reference
-	 */
-	public EReference getContainingFeature() {
-		return containingFeature;
-	}
-
-	/**
-	 * Sets the feature in the <code>container</code> that contains the
-	 * reference.
-	 * 
-	 * @param containingFeature
-	 *            the feature in the <code>container</code> that contains the
-	 *            reference
-	 */
-	public void setContainingFeature(EReference containingFeature) {
-		this.containingFeature = containingFeature;
-	}
-
-	/**
-	 * Gets the referenced element.
-	 * 
-	 * @return the referenced element
-	 */
-	public EObject getReferencedObject() {
-		return referencedObject;
-	}
-
-	/**
-	 * Sets the referenced element.
-	 * 
-	 * @param referencedObject
-	 *            the referenced element
-	 */
-	public void setReferencedObject(EObject referencedObject) {
-		this.referencedObject = referencedObject;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyRequest.java
deleted file mode 100644
index de5c69f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyRequest.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Abstract superclass for reuqests to destroy a model element.
- * 
- * @author ldamus
- */
-public abstract class DestroyRequest extends AbstractEditCommandRequest {
-
-	/**
-	 * Flag to indicate whether or not confirmation is required when destoying a
-	 * model element.
-	 */
-	private boolean confirmationRequired;
-
-	/**
-	 * Constructs a new request to destroy a model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param confirmationRequired
-	 *            <code>true</code> if the user should be prompted to confirm
-	 *            the element deletion, <code>false</code> otherwise.
-	 */
-	public DestroyRequest(TransactionalEditingDomain editingDomain,
-			boolean confirmationRequired) {
-		super(editingDomain);
-		this.confirmationRequired = confirmationRequired;
-	}
-
-	/**
-	 * Answers whether or not the user should be prompted to confirm the element
-	 * deletion.
-	 * 
-	 * @return <code>true</code> if the user should be prompted to confirm the
-	 *         element deletion, <code>false</code> otherwise
-	 */
-	public boolean isConfirmationRequired() {
-		return confirmationRequired;
-	}
-
-	/**
-	 * Sets the flag that indicates whether or not confirmation of the deletion
-	 * is required.
-	 * 
-	 * @param confirmationRequired
-	 *            <code>true</code> if the user should be prompted to confirm
-	 *            the element deletion, <code>false</code> otherwise
-	 */
-	public void setConfirm(boolean confirmationRequired) {
-		this.confirmationRequired = confirmationRequired;
-	}
-
-	/**
-	 * Gets the container of the element to be destroyed.
-	 * 
-	 * @return the container of the element to be destroyed
-	 */
-	public abstract EObject getContainer();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		if (getContainer() != null) {
-			return Collections.singletonList(getContainer());
-		}
-		return super.getElementsToEdit();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditCommandRequest#getDefaultLabel()
-	 */
-	protected String getDefaultLabel() {
-		return EMFTypeCoreMessages.Request_Label_Destroy;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-	 */
-	public Object getEditHelperContext() {
-		
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return getContainer();
-		} else {
-			return new EditHelperContext(getContainer(), context);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DuplicateElementsRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DuplicateElementsRequest.java
deleted file mode 100644
index 5004319..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DuplicateElementsRequest.java
+++ /dev/null

@@ -1,292 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Request to duplicate a model element.
- * 
- * @author ldamus
- */
-public class DuplicateElementsRequest extends AbstractEditCommandRequest {
-
-	/**
-	 * The common container of all of the elements to be duplicated.
-	 */
-	private EObject commonContainer;
-
-	/**
-	 * The elements to be duplicated.
-	 */
-	private List elementsToDuplicate;
-
-	/**
-	 * This will be populated with all the elements that are duplicated after
-	 * the command executes. The key is the original element and the value is
-	 * the new duplicated element. There may be more elements duplicated than
-	 * the original list of elements passed in (e.g. contained elements) --
-	 * these will appear in this map.
-	 */
-	private Map allDuplicatedElementsMap = new HashMap();
-
-	/**
-	 * The duplicate element. Will be <code>null</code> until this request has
-	 * been answered.
-	 */
-	private EObject duplicate;
-
-	/**
-	 * Constructs a new request to duplicate a model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 */
-	public DuplicateElementsRequest(TransactionalEditingDomain editingDomain) {
-
-		this(editingDomain, null);
-	}
-
-	/**
-	 * Constructs a new request to duplicate a model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param elementToDuplicate
-	 *            the element to be duplicated
-	 */
-	public DuplicateElementsRequest(TransactionalEditingDomain editingDomain,
-			List elementsToDuplicate) {
-
-		super(editingDomain);
-		this.elementsToDuplicate = elementsToDuplicate;
-	}
-    
-    /**
-     * Constructs a new request to duplicate a model element.  The editing domain will be
-     * derived from the elements in {@link #getElementsToBeDuplicated()}.
-     * 
-     */
-    public DuplicateElementsRequest() {
-
-        this(null, null);
-    }
-    
-    /**
-     * Constructs a new request to duplicate a model element. The editing domain will be
-     * derived from the elements in {@link #getElementsToBeDuplicated()}.
-     * 
-     * @param elementToDuplicate
-     *            the element to be duplicated
-     */
-    public DuplicateElementsRequest(List elementsToDuplicate) {
-
-        this(null, elementsToDuplicate);
-    }
-
-	/**
-	 * Returns a map of all duplicated elements. This will be populated with all
-	 * the elements that are duplicated after the command executes. The key is
-	 * the original element and the value is the new duplicated element. There
-	 * may be more elements duplicated than the original list of elements passed
-	 * in (e.g. contained elements) -- these will appear in this map.
-	 * 
-	 * @return Returns the allDuplicatedElementsMap.
-	 */
-	public Map getAllDuplicatedElementsMap() {
-		return allDuplicatedElementsMap;
-	}
-
-	/**
-	 * Returns the primary elements to be duplicated.
-	 * 
-	 * @return Returns the elements to be duplicated.
-	 */
-	public List getElementsToBeDuplicated() {
-		return elementsToDuplicate;
-	}
-
-	/**
-	 * Gets the duplicate. Will return <code>null</code> until the request has
-	 * been answered.
-	 * 
-	 * @return the duplicate
-	 */
-	public EObject getDuplicate() {
-		return duplicate;
-	}
-
-	/**
-	 * Sets the duplicate.
-	 * 
-	 * @param duplicate
-	 *            the duplicate
-	 */
-	public void setAllDuplicatedElementsMap(Map duplicatedElementsMap) {
-		this.allDuplicatedElementsMap = duplicatedElementsMap;
-	}
-    
-    /**
-     * Sets the primary elements to be duplicated.
-     * 
-     * @param elements
-     *            The elements to be duplicated.
-     */
-    public void setElementsToBeDuplicated(List elements) {
-        this.elementsToDuplicate = elements;
-    }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		return elementsToDuplicate;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditCommandRequest#getDefaultLabel()
-	 */
-	protected String getDefaultLabel() {
-		return EMFTypeCoreMessages.Request_Label_Duplicate;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-	 */
-	public Object getEditHelperContext() {
-
-		if (commonContainer == null) {
-			commonContainer = getLeastCommonContainer(getElementsToBeDuplicated());
-		}
-		
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return commonContainer;
-			
-		} else {
-			return new EditHelperContext(commonContainer, context);
-		}
-	}
-
-	/**
-	 * Finds the first common container of a collection of objects, or
-	 * <code>null</code> if there is not common container.
-	 * 
-	 * @param objects
-	 *            the elements
-	 * @return the least common container that containes all of the
-	 *         <code>objects</code>, or <code>null</code> if there is no
-	 *         common container.
-	 */
-	private static EObject getLeastCommonContainer(Collection objects) {
-
-		EObject commonContainer = null;
-		List prevContainers = new ArrayList();
-
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-			EObject nextElement = (EObject) i.next();
-
-			boolean found = false;
-			List containers = new ArrayList();
-			EObject container = nextElement;
-
-			// Construct the list of containers for this next element.
-			while (container != null) {
-				containers.add(container);
-
-				if (!found) {
-
-					if ((prevContainers.isEmpty()) || (commonContainer == null)) {
-						commonContainer = container;
-						found = true;
-
-					} else if ((prevContainers.contains(container))
-							&& (contains(container, commonContainer))) {
-
-						commonContainer = container;
-						found = true;
-					}
-				}
-				container = container.eContainer();
-			}
-
-			if (!found) {
-				return null;
-			}
-			prevContainers = containers;
-		}
-		return commonContainer;
-	}
-
-	/**
-	 * Checks if a model element is contained by another element, recursively.
-	 * 
-	 * @param container
-	 *            the container element
-	 * @param eObject
-	 *            the element to be tested to see if it is contained in the
-	 *            container
-	 * @return <code>true</code> if <code>container</code> contains
-	 *         <code>eObject</code>,<code>false</code> otherwise.
-	 */
-	private static boolean contains(EObject container, EObject eObject) {
-
-		if (container == eObject) {
-			return true;
-
-		} else if ((container == null) || (eObject == null)) {
-			return false;
-
-		} else {
-			return contains(container, eObject.eContainer());
-		}
-	}
-    
-
-    /**
-     * Derives the editing domain from the elements to be duplicated, if it hasn't
-     * already been specified.
-     */
-    public TransactionalEditingDomain getEditingDomain() {
-        TransactionalEditingDomain result = super.getEditingDomain();
-
-        if (result == null) {
-            EObject eObject = (EObject) ((getElementsToBeDuplicated().size() > 0) ? getElementsToBeDuplicated()
-                .get(0)
-                : null);
-            
-            if (eObject != null) {
-                result = TransactionUtil.getEditingDomain(eObject); 
-            }
-        }
-        return result;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/GetEditContextRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/GetEditContextRequest.java
deleted file mode 100644
index 9a763b9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/GetEditContextRequest.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Request to get the context for editing a model element.
- * <P>
- * The context is used to obtain the <code>IEditHelper</code> with which to
- * perform the editing.
- * 
- * @author ldamus
- */
-public class GetEditContextRequest extends AbstractEditCommandRequest {
-
-	/**
-	 * The edit request.
-	 */
-	private final IEditCommandRequest editRequest;
-
-	/**
-	 * The edit helper context for this request.
-	 */
-	private final Object editHelperContext;
-
-	/**
-	 * The resulting edit context.
-	 */
-	private Object editContext;
-
-	/**
-	 * Constructs a new request.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param editRequest
-	 *            the edit request whose context is being requested
-	 */
-	public GetEditContextRequest(TransactionalEditingDomain editingDomain,
-			IEditCommandRequest editRequest, Object editHelperContext) {
-
-		super(editingDomain);
-		this.editRequest = editRequest;
-		this.editHelperContext = editHelperContext;
-		addParameters(editRequest.getParameters());
-	}
-    
-    /**
-     * Constructs a new request. The editing domain is derived from the
-     * <code>editRequest</code>.
-     * 
-     * @param editRequest
-     *            the edit request whose context is being requested
-     */
-    public GetEditContextRequest(IEditCommandRequest editRequest,
-            Object editHelperContext) {
-
-        this(editRequest.getEditingDomain(), editRequest, editHelperContext);
-    }
-        
-
-	/**
-	 * Gets the edit helper context for this request.
-	 */
-	public Object getEditHelperContext() {
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return editHelperContext;
-
-		} else if (editHelperContext instanceof EObject) {
-			return new EditHelperContext((EObject) editHelperContext, context);
-
-		} else if (editHelperContext instanceof IElementType) {
-			return new EditHelperContext((IElementType) editHelperContext,
-					context);
-		}
-		
-		return editHelperContext;
-	}
-
-	/**
-	 * Gets the edit command request for which the edit context is being sought.
-	 * 
-	 * @return the edit command request
-	 */
-	public IEditCommandRequest getEditCommandRequest() {
-		return editRequest;
-	}
-
-	/**
-	 * Gets the requested edit context.
-	 * 
-	 * @return the edit context
-	 */
-	public Object getEditContext() {
-		return editContext;
-	}
-
-	/**
-	 * Sets the requested edit context. Clients asked to get a command for this
-	 * request should also set the edit context if the command they will return
-	 * will create or return a different context.
-	 * 
-	 * @param editContext
-	 *            the new edit context
-	 */
-	public void setEditContext(Object editContext) {
-		this.editContext = editContext;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/IEditCommandRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/IEditCommandRequest.java
deleted file mode 100644
index a062ca2..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/IEditCommandRequest.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IEditHelperContext;
-
-
-/**
- * Request for a command to edit a model element. These requests are passed to
- * <code>IEditHelpers</code> to obtain commands that will execute the edit
- * behaviour.
- * <P>
- * Clients should not implement this interface directly, but should subclass
- * {@link org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest}instead.
- * 
- * @author ldamus
- */
-public interface IEditCommandRequest {
-
-	/**
-	 * Name of the request parameter used to indicate that the default edit
-	 * command should not be considered. Edit advice will completely replace the
-	 * default edit behaviour if the parameter value is <code>Boolean.TRUE</code>.
-	 */
-	public static String REPLACE_DEFAULT_COMMAND = "IEditCommandRequest.replaceDefaultCommand"; //$NON-NLS-1$
-
-	/**
-	 * Gets the request label.
-	 * 
-	 * @return the request label
-	 */
-	public abstract String getLabel();
-
-	/**
-	 * Gets the edit helper context for this request. The context can be an
-	 * <code>IElementType</code> or an <code>EObject</code>, or an
-	 * {@link IEditHelperContext}. It determines which edit helper should be
-	 * used to find a command to do the work in the request.
-	 * 
-	 * @return the edit helper context for this request
-	 */
-	public abstract Object getEditHelperContext();
-
-	/**
-	 * Gets the elements that will be changed when the work is done for this
-	 * request.
-	 * 
-	 * @return the elements that will be edited
-	 */
-	public abstract List getElementsToEdit();
-	
-	/**
-	 * Gets the request parameters keyed on parameter name. Each value is the
-	 * parameter value.
-	 * 
-	 * @return the request parameters
-	 */
-	public abstract Map getParameters();
-	
-	/**
-	 * Sets the request parameter named <code>name</code> to
-	 * <code>value</code>.
-	 * 
-	 * @param name
-	 *            the parameter name
-	 * @param value
-	 *            the parameter value
-	 */
-	public abstract void setParameter(String name, Object value);
-	
-	/**
-	 * Gets the value for the request parameter named <code>name</code>.
-	 * 
-	 * @param name
-	 *            the parameter name
-	 * @return the parameter value
-	 */
-	public abstract Object getParameter(String name);
-	
-	/**
-	 * Adds <code>newParameters</code> to this request.
-	 * 
-	 * @param newParameters
-	 *            the parameters to be added
-	 */
-	public abstract void addParameters(Map newParameters);
-	
-	/**
-	 * Gets the editing domain in which I am requesting to make model changes.
-	 * 
-	 * @return the editing domain
-	 */
-	public abstract TransactionalEditingDomain getEditingDomain();
-	
-	/**
-	 * Sets the client context for this request.
-	 * 
-	 * @param clientContext the client context
-	 */
-	public abstract void setClientContext(IClientContext clientContext);
-	
-	/**
-	 * Gets the client context for this request.
-	 * 
-	 * @return the client context
-	 */
-	public IClientContext getClientContext();
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/MoveRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/MoveRequest.java
deleted file mode 100644
index 0c6dac3..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/MoveRequest.java
+++ /dev/null

@@ -1,321 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Request to move a collections of model elements from one location to another.
- * The request can specify the target features that should be used to contain
- * each of the elements being moved.
- * <P>
- * If the target feature is not specified for a given element being moved, then
- * a default feature is found in the target according to the following rules:
- * <UL>
- * <LI>If the feature fomerly containing the moved element exists in the target
- * element, it will be used.</LI>
- * <LI>Otherwise, the first feature in the target that can contain the moved
- * element will be used.</LI>
- * </UL>
- * 
- * @author ldamus
- */
-public class MoveRequest
-    extends AbstractEditCommandRequest {
-
-    /**
-     * The map of <code>EObject</code>s to be moved. Keyed on
-     * <code>EObject</code>. Each value is the <code>EReference</code>
-     * feature in the target element into which the element should be moved.
-     * <P>
-     * If the feature is not specified for a given element, then a default
-     * feature is found in the target.
-     */
-    private final Map elementsToMove;
-
-    /**
-     * The new container for the element to be moved.
-     */
-    private EObject targetContainer;
-
-    /**
-     * Constructs a new request to move a model element from one container to
-     * another.
-     * 
-     * @param editingDomain
-     *            the editing domain in which I am requesting to make model
-     * @param targetContainer
-     *            the target container
-     * @param targetFeature
-     *            the target feature
-     * @param elementToMove
-     *            the element to be moved
-     */
-    public MoveRequest(TransactionalEditingDomain editingDomain,
-            EObject targetContainer, EReference targetFeature,
-            EObject elementToMove) {
-
-        super(editingDomain);
-        this.targetContainer = targetContainer;
-        this.elementsToMove = new HashMap();
-        elementsToMove.put(elementToMove, targetFeature);
-    }
-
-    /**
-     * Constructs a new request to move a model element from one container to
-     * another.
-     * 
-     * @param editingDomain
-     *            the editing domain in which I am requesting to make model
-     * @param targetContainer
-     *            the target container
-     * @param elementToMove
-     *            the element to be moved.
-     */
-    public MoveRequest(TransactionalEditingDomain editingDomain,
-            EObject targetContainer, EObject elementToMove) {
-
-        this(editingDomain, targetContainer, null, elementToMove);
-    }
-
-    /**
-     * Constructs a new request to move a collection of model element into a new
-     * container. The features in the target used to contain the moved elements
-     * will be derived as follows:
-     * <UL>
-     * <LI>If the feature fomerly containing the moved element exists in the
-     * target element, it will be used.</LI>
-     * <LI>Otherwise, the first feature in the target that can contain the
-     * moved element will be used.</LI>
-     * </UL>
-     * 
-     * @param editingDomain
-     *            the editing domain in which I am requesting to make model
-     * @param targetContainer
-     *            the target container
-     * @param elementsToMove
-     *            the list of <code>EObjects</code> to be moved.
-     */
-    public MoveRequest(TransactionalEditingDomain editingDomain,
-            EObject targetContainer, List elementsToMove) {
-
-        super(editingDomain);
-        this.targetContainer = targetContainer;
-        this.elementsToMove = new HashMap();
-
-        for (Iterator i = elementsToMove.iterator(); i.hasNext();) {
-            this.elementsToMove.put(i.next(), null);
-        }
-    }
-
-    /**
-     * Constructs a new request to move a collection of model element into
-     * specific features of a new container.
-     * 
-     * @param editingDomain
-     *            the editing domain in which I am requesting to make model
-     * @param targetContainer
-     *            the target container
-     * @param elementsToMove
-     *            the map of <code>EObjects</code> to <code>EReference</code>
-     *            features to be moved.
-     */
-    public MoveRequest(TransactionalEditingDomain editingDomain,
-            EObject targetContainer, Map elementsToMove) {
-
-        super(editingDomain);
-        this.targetContainer = targetContainer;
-        this.elementsToMove = elementsToMove;
-    }
-
-    /**
-     * Constructs a new request to move a model element from one container to
-     * another. The editing domain is derived from the
-     * <code>targetContainer</code>.
-     * 
-     * @param targetContainer
-     *            the target container
-     * @param targetFeature
-     *            the target feature
-     * @param elementToMove
-     *            the element to be moved
-     */
-    public MoveRequest(EObject targetContainer, EReference targetFeature,
-            EObject elementToMove) {
-
-        this(TransactionUtil.getEditingDomain(targetContainer),
-            targetContainer, targetFeature, elementToMove);
-    }
-
-    /**
-     * Constructs a new request to move a model element from one container to
-     * another. The editing domain is derived from the
-     * <code>targetContainer</code>.
-     * 
-     * @param targetContainer
-     *            the target container
-     * @param elementToMove
-     *            the element to be moved.
-     */
-    public MoveRequest(EObject targetContainer, EObject elementToMove) {
-
-        this(TransactionUtil.getEditingDomain(targetContainer),
-            targetContainer, null, elementToMove);
-    }
-
-    /**
-     * Constructs a new request to move a collection of model element into a new
-     * container. The features in the target used to contain the moved elements
-     * will be derived as follows:
-     * <UL>
-     * <LI>If the feature fomerly containing the moved element exists in the
-     * target element, it will be used.</LI>
-     * <LI>Otherwise, the first feature in the target that can contain the
-     * moved element will be used.</LI>
-     * </UL>
-     * <P>
-     * The editing domain is derived from the <code>targetContainer</code>.
-     * 
-     * @param targetContainer
-     *            the target container
-     * @param elementsToMove
-     *            the list of <code>EObjects</code> to be moved.
-     */
-    public MoveRequest(EObject targetContainer, List elementsToMove) {
-
-        this(TransactionUtil.getEditingDomain(targetContainer),
-            targetContainer, elementsToMove);
-    }
-
-    /**
-     * Constructs a new request to move a collection of model element into
-     * specific features of a new container. The editing domain is derived from
-     * the <code>targetContainer</code>.
-     * 
-     * @param targetContainer
-     *            the target container
-     * @param elementsToMove
-     *            the map of <code>EObjects</code> to <code>EReference</code>
-     *            features to be moved.
-     */
-    public MoveRequest(EObject targetContainer, Map elementsToMove) {
-
-        this(TransactionUtil.getEditingDomain(targetContainer),
-            targetContainer, elementsToMove);
-    }
-
-    /**
-     * Gets the map of elements to be moved. Each entry in the map consists of
-     * an <code>EObject</code> key, which is the element to be moved to the
-     * new target, and an <code>EReference</code> value, which is the feature
-     * in the new target that should contain the moved element.
-     * 
-     * @return the map of elements to be moved
-     */
-    public Map getElementsToMove() {
-        return elementsToMove;
-    }
-
-    /**
-     * Sets the container into which the element will be moved.
-     * 
-     * @param targetContainer
-     *            the target container
-     */
-    public void setTargetContainer(EObject targetContainer) {
-        this.targetContainer = targetContainer;
-    }
-
-    /**
-     * Gets the container into which the element will be moved.
-     * 
-     * @return the container into which the element will be moved
-     */
-    public EObject getTargetContainer() {
-        return targetContainer;
-    }
-
-    /**
-     * Sets the reference feature into which an element should be moved.
-     * 
-     * @param element
-     *            the element to be moved
-     * @param targetFeature
-     *            the target feature
-     */
-    public void setTargetFeature(EObject element, EReference targetFeature) {
-        getElementsToMove().put(element, targetFeature);
-    }
-
-    /**
-     * Gets the feature in the target element that should contain
-     * <code>element</code> after it is moved.
-     * 
-     * @param element
-     *            the element to be moved
-     * @return the feature that will contain the element in the target
-     */
-    public EReference getTargetFeature(EObject element) {
-        return (EReference) getElementsToMove().get(element);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-     */
-    public List getElementsToEdit() {
-
-        if (targetContainer != null) {
-            return Collections.singletonList(targetContainer);
-        }
-
-        return super.getElementsToEdit();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditCommandRequest#getDefaultLabel()
-     */
-    protected String getDefaultLabel() {
-        return EMFTypeCoreMessages.Request_Label_Move;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-     */
-    public Object getEditHelperContext() {
-    	IClientContext context = getClientContext();
-    	
-    	if (context == null) {
-    		return targetContainer;
-    	} else {
-    		return new EditHelperContext(targetContainer, context);
-    	}
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientReferenceRelationshipRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientReferenceRelationshipRequest.java
deleted file mode 100644
index 33288c7..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientReferenceRelationshipRequest.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-
-/**
- * Request to change the source or target of a reference.
- * 
- * @author ldamus
- */
-public class ReorientReferenceRelationshipRequest extends ReorientRequest {
-
-	/**
-	 * The owner of the reference.
-	 */
-	private final EObject referenceOwner;
-
-	/**
-	 * Constructs a new request to change the source or target of a reference.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param referenceOwner
-	 *            the owner of the reference
-	 * @param newRelationshipEnd
-	 *            the new source or target
-	 * @param oldRelationshipEnd
-	 *            the old source or target
-	 * @param direction
-	 *            Indicates whether or not the source of the target of the
-	 *            relationship will be changed. One of {@link #REORIENT_SOURCE}
-	 *            or {@link #REORIENT_TARGET}.
-	 */
-	public ReorientReferenceRelationshipRequest(TransactionalEditingDomain editingDomain,
-			EObject referenceOwner, EObject newRelationshipEnd,
-			EObject oldRelationshipEnd, int direction) {
-
-		super(editingDomain, direction, newRelationshipEnd, oldRelationshipEnd);
-		this.referenceOwner = referenceOwner;
-	}
-    
-    /**
-     * Constructs a new request to change the source or target of a reference. The
-     * editing domain will be derived from the <code>referenceOwner</code>.
-     * 
-     * @param referenceOwner
-     *            the owner of the reference
-     * @param newRelationshipEnd
-     *            the new source or target
-     * @param oldRelationshipEnd
-     *            the old source or target
-     * @param direction
-     *            Indicates whether or not the source of the target of the
-     *            relationship will be changed. One of {@link #REORIENT_SOURCE}
-     *            or {@link #REORIENT_TARGET}.
-     */
-    public ReorientReferenceRelationshipRequest(EObject referenceOwner,
-            EObject newRelationshipEnd, EObject oldRelationshipEnd,
-            int direction) {
-
-        this(TransactionUtil.getEditingDomain(referenceOwner), referenceOwner,
-                newRelationshipEnd, oldRelationshipEnd, direction);
-    }
-
-	/**
-	 * Get the owner of the reference.
-	 * 
-	 * @return the owner of the reference
-	 */
-	public EObject getReferenceOwner() {
-		return referenceOwner;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		return Collections.singletonList(referenceOwner);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-	 */
-	public Object getEditHelperContext() {
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return referenceOwner;
-		} else {
-			return new EditHelperContext(referenceOwner, context);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientRelationshipRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientRelationshipRequest.java
deleted file mode 100644
index e36c59f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientRelationshipRequest.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-
-/**
- * Request to change the source or target of a relationship element.
- * 
- * @author ldamus
- */
-public class ReorientRelationshipRequest extends ReorientRequest {
-
-	/**
-	 * The relationship element.
-	 */
-	private final EObject relationship;
-
-	/**
-	 * Constructs a new request to change the source or target of a relationship
-	 * element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param relationship
-	 *            the relationship element
-	 * @param newRelationshipEnd
-	 *            the new source or target
-	 * @param oldRelationshipEnd
-	 *            the old source or target
-	 * @param direction
-	 *            Indicates whether or not the source of the target of the
-	 *            relationship will be changed. One of {@link #REORIENT_SOURCE}
-	 *            or {@link #REORIENT_TARGET}.
-	 */
-	public ReorientRelationshipRequest(TransactionalEditingDomain editingDomain,
-			EObject relationship, EObject newRelationshipEnd,
-			EObject oldRelationshipEnd, int direction) {
-
-		super(editingDomain, direction, newRelationshipEnd, oldRelationshipEnd);
-		this.relationship = relationship;
-	}
-    
-    /**
-     * Constructs a new request to change the source or target of a relationship
-     * element.  The editing domain will be derived from the <code>relationship</code>.
-     * 
-     * @param relationship
-     *            the relationship element
-     * @param newRelationshipEnd
-     *            the new source or target
-     * @param oldRelationshipEnd
-     *            the old source or target
-     * @param direction
-     *            Indicates whether or not the source of the target of the
-     *            relationship will be changed. One of {@link #REORIENT_SOURCE}
-     *            or {@link #REORIENT_TARGET}.
-     */
-    public ReorientRelationshipRequest(EObject relationship,
-            EObject newRelationshipEnd, EObject oldRelationshipEnd,
-            int direction) {
-
-        this(TransactionUtil.getEditingDomain(relationship), relationship,
-                newRelationshipEnd, oldRelationshipEnd, direction);
-    }
-
-	/**
-	 * Gets the relationship element.
-	 * 
-	 * @return the relationship element
-	 */
-	public EObject getRelationship() {
-		return relationship;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		return Collections.singletonList(relationship);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-	 */
-	public Object getEditHelperContext() {
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return relationship;
-		} else {
-			return new EditHelperContext(relationship, context);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientRequest.java
deleted file mode 100644
index e227e77..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/ReorientRequest.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-
-/**
- * Abstract request for changing the source or target of a relationship.
- * 
- * @author ldamus
- */
-public abstract class ReorientRequest extends AbstractEditCommandRequest {
-
-	/**
-	 * Indicates that the source of the relationship will be changed.
-	 */
-	public final static int REORIENT_SOURCE = 1;
-
-	/**
-	 * Indicates that the target of the relationship will be changed.
-	 */
-	public final static int REORIENT_TARGET = 2;
-
-	/**
-	 * Indicates whether or not the source of the target of the relationship
-	 * will be changed. One of {@link #REORIENT_SOURCE}or
-	 * {@link #REORIENT_TARGET}.
-	 */
-	private final int direction;
-
-	/**
-	 * The new source or target.
-	 */
-	private final EObject newRelationshipEnd;
-
-	/**
-	 * The old source or target.
-	 */
-	private final EObject oldRelationshipEnd;
-
-	/**
-	 * Constructs a new request tof changing the source or target of a
-	 * relationship.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param direction
-	 *            Indicates whether or not the source of the target of the
-	 *            relationship will be changed. One of {@link #REORIENT_SOURCE}
-	 *            or {@link #REORIENT_TARGET}.
-	 * @param newRelationshipEnd
-	 *            the new source or target
-	 * @param oldRelationshipEnd
-	 *            the old source or target
-	 */
-	protected ReorientRequest(TransactionalEditingDomain editingDomain, int direction,
-			EObject newRelationshipEnd, EObject oldRelationshipEnd) {
-		super(editingDomain);
-		this.direction = direction;
-		this.newRelationshipEnd = newRelationshipEnd;
-		this.oldRelationshipEnd = oldRelationshipEnd;
-	}
-
-	/**
-	 * Gets the value that indicates whether or not the source of the target of
-	 * the relationship will be changed. One of {@link #REORIENT_SOURCE}or
-	 * {@link #REORIENT_TARGET}.
-	 * 
-	 * @return one of {@link #REORIENT_SOURCE}or {@link #REORIENT_TARGET}.
-	 */
-	public int getDirection() {
-		return direction;
-	}
-
-	/**
-	 * O Gets the new source or target.
-	 * 
-	 * @return the new source or target
-	 */
-	public EObject getNewRelationshipEnd() {
-		return newRelationshipEnd;
-	}
-
-	/**
-	 * Gets the old source or target.
-	 * 
-	 * @return the old source or target
-	 */
-	public EObject getOldRelationshipEnd() {
-		return oldRelationshipEnd;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditCommandRequest#getDefaultLabel()
-	 */
-	protected String getDefaultLabel() {
-
-		if (getDirection() == REORIENT_SOURCE) {
-			return EMFTypeCoreMessages.Request_Label_ReorientSource;
-
-		} else if (getDirection() == REORIENT_TARGET) {
-			return EMFTypeCoreMessages.Request_Label_ReorientTarget;
-		}
-		return super.getDefaultLabel();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/SetRequest.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/SetRequest.java
deleted file mode 100644
index 49d9a58..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/SetRequest.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.core.requests;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-
-/**
- * Request to set the value of a structural feature in a model element.
- * 
- * @author ldamus
- */
-public class SetRequest extends AbstractEditCommandRequest {
-
-	/**
-	 * The structural feature whose value will be set.
-	 */
-	private final EStructuralFeature feature;
-
-	/**
-	 * The owner of the structural feature.
-	 */
-	private final EObject elementToEdit;
-
-	/**
-	 * The new value of the structural feature.
-	 */
-	private final Object value;
-
-	/**
-	 * Constructs a new request to set the value of a structural feature in a
-	 * model element.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain in which I am requesting to make model
-	 * @param elementToEdit
-	 *            the owner of the structural feature
-	 * @param feature
-	 *            the structural feature whose value is to be set
-	 * @param value
-	 *            the new value
-	 */
-	public SetRequest(TransactionalEditingDomain editingDomain, EObject elementToEdit,
-			EStructuralFeature feature, Object value) {
-
-		super(editingDomain);
-		this.elementToEdit = elementToEdit;
-		this.feature = feature;
-		this.value = value;
-	}
-    
-    /**
-     * Constructs a new request to set the value of a structural feature in a
-     * model element. The editing domain will be derived from the
-     * <code>elementToEdit</code>.
-     * 
-     * @param elementToEdit
-     *            the owner of the structural feature
-     * @param feature
-     *            the structural feature whose value is to be set
-     * @param value
-     *            the new value
-     */
-    public SetRequest(EObject elementToEdit,
-            EStructuralFeature feature, Object value) {
-
-        this(TransactionUtil.getEditingDomain(elementToEdit), elementToEdit, feature, value);
-    }
-
-	/**
-	 * Gets the structural feature.
-	 * 
-	 * @return the structural feature
-	 */
-	public EStructuralFeature getFeature() {
-		return feature;
-	}
-
-	/**
-	 * Gets the new value.
-	 * 
-	 * @return the new value
-	 */
-	public Object getValue() {
-		return value;
-	}
-
-	/**
-	 * Gets the owner of the structural feature.
-	 * 
-	 * @return the owner of the structural feature
-	 */
-	public EObject getElementToEdit() {
-		return elementToEdit;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getElementsToEdit()
-	 */
-	public List getElementsToEdit() {
-		if (elementToEdit != null) {
-			return Collections.singletonList(elementToEdit);
-		}
-		
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditCommandRequest#getEditHelperContext()
-	 */
-	public Object getEditHelperContext() {
-		IClientContext context = getClientContext();
-		
-		if (context == null) {
-			return elementToEdit;
-		} else {
-			return new EditHelperContext(elementToEdit, context);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/package.html b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/package.html
deleted file mode 100644
index bb7da7c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides a set of requests that are used to ask for commands to edit model elements.
-The requests are sent to the edit helpers associated with element types, which in turn
-create the command to perform the requested edit operation.</P>
-
-@see org.eclipse.gmf.runtime.emf.type.core
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/.classpath b/org.eclipse.gmf.runtime.emf.type.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.emf.type.ui/.cvsignore b/org.eclipse.gmf.runtime.emf.type.ui/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/.project b/org.eclipse.gmf.runtime.emf.type.ui/.project
deleted file mode 100644
index eca7cbf..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.type.ui</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/org.eclipse.gmf.runtime.emf.type.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.emf.type.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9666d22..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.emf.type.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.emf.type.ui.internal.EMFTypeUIPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.emf.type.ui,
- org.eclipse.gmf.runtime.emf.type.ui.internal;x-internal:=true,
- org.eclipse.gmf.runtime.emf.type.ui.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.emf.type.ui.internal.providers;x-friends:="org.eclipse.gmf.tests.runtime.emf.type.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/about.html b/org.eclipse.gmf.runtime.emf.type.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/build.properties b/org.eclipse.gmf.runtime.emf.type.ui/build.properties
deleted file mode 100644
index 9cf9d71..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/plugin.properties b/org.eclipse.gmf.runtime.emf.type.ui/plugin.properties
deleted file mode 100644
index 94c2072..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF EMF Type UI
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/plugin.xml b/org.eclipse.gmf.runtime.emf.type.ui/plugin.xml
deleted file mode 100644
index 9110fe9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/plugin.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension id="iconProviders" 
-         name="%ext.iconProviders" 
-         point="org.eclipse.gmf.runtime.common.ui.services.iconProviders">
-      <IconProvider 
-            class="org.eclipse.gmf.runtime.emf.type.ui.internal.providers.ElementTypeIconProvider">
-         <Priority name="Lowest"/>
-      </IconProvider>
-   </extension>
-   
-</plugin>

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/ElementTypeImageDescriptor.java b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/ElementTypeImageDescriptor.java
deleted file mode 100644
index efda98d..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/ElementTypeImageDescriptor.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.ui;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Image descriptor for an <code>IElementType</code> that gets its image data
- * from the icon service.
- * 
- * @author ldamus
- */
-public class ElementTypeImageDescriptor
-	extends ImageDescriptor {
-
-	/**
-	 * The element type.
-	 */
-	private final IAdaptable elementType;
-
-	/**
-	 * Constructs a new image descriptor for <code>elementType</code>.
-	 * 
-	 * @param elementType
-	 *            the element type
-	 */
-	public ElementTypeImageDescriptor(final IElementType elementType) {
-
-		this.elementType = elementType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.resource.ImageDescriptor#getImageData()
-	 */
-	public ImageData getImageData() {
-		Image image = IconService.getInstance().getIcon(elementType);
-		if (image != null) {
-			return image.getImageData();
-		}
-		return null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/EMFTypeUIPlugin.java b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/EMFTypeUIPlugin.java
deleted file mode 100644
index 2999bc7..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/EMFTypeUIPlugin.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.runtime.emf.type.ui.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Plug-in class for the UI portion of the Model Element Type framework.
- * <p>
- * This class is not intended to be used by clients.
- * 
- * @author ldamus
- */
-public class EMFTypeUIPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The singleton instance.
-	 */
-	private static EMFTypeUIPlugin INSTANCE;
-
-	/**
-	 * Creates new plug-in runtime object.
-	 */
-	public EMFTypeUIPlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static EMFTypeUIPlugin getDefault() {
-		return INSTANCE;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/l10n/EMFTypeUIMessages.java b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/l10n/EMFTypeUIMessages.java
deleted file mode 100644
index 1a0997f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/l10n/EMFTypeUIMessages.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.emf.type.ui.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EMFTypeUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.emf.type.ui.internal.l10n.EMFTypeUIMessages";//$NON-NLS-1$
-
-	private EMFTypeUIMessages() {
-		// Do not instantiate
-	}
-
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFTypeUIMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/l10n/package.html b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/l10n/package.html
deleted file mode 100644
index 27c3c0f..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides a set of classes to manage the string, image, font and cursor resources for 
-the org.eclipse.gmf.runtime.emf.type.ui plugin.</p>
-
-<p>Messages and labels on GUI components that need to be localized (adapted 
-for a specific region or language) should be placed in the <code>messages.properties</code>
-file in this package.</p>
-
-<p>Classes in the org.eclipse.gmf.runtime.emf.type.ui plug-in should use the 
-{@link org.eclipse.gmf.runtime.emf.type.ui.internal.l10n.ResourceManager} class to 
-access to the I18N resources that is needs.</p>
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/package.html b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/package.html
deleted file mode 100644
index 0286abf..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/package.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>Provides classes to manage the org.eclipse.gmf.runtime.emf.type.ui plug-in.</p>
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/providers/ElementTypeIconProvider.java b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/providers/ElementTypeIconProvider.java
deleted file mode 100644
index ee4aebc..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/providers/ElementTypeIconProvider.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.type.ui.internal.providers;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.GetIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Default icon provider for {@link org.eclipse.gmf.runtime.emf.type.core.IElementType}s and
- * for model elements that match an {@link org.eclipse.gmf.runtime.emf.type.core.IElementType}
- * registered in the {@link org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry}.
- * 
- * @author ldamus
- */
-public class ElementTypeIconProvider
-	extends AbstractProvider
-	implements IIconProvider {
-
-	/**
-	 * My image registry keyed on element type ID. The first time a request is
-	 * made for an icon, the image descriptor for the icon is constructed using
-	 * the element type's iconURL, and added to the registry. Subsequent
-	 * retrieval of the icon will be done by direct access to the image
-	 * registry.
-	 */
-	private ImageRegistry imageRegistry;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.services.internal.icon.IIconProvider#getIcon(org.eclipse.core.runtime.IAdaptable,
-	 *      int)
-	 */
-	public Image getIcon(IAdaptable hint, int flags) {
-
-		IElementType type = getType(hint);
-
-		if (type != null) {
-			Image image = getImageRegistry().get(type.getId());
-
-			if (image == null) {
-				URL url = type.getIconURL();
-				if (url != null) {
-					ImageDescriptor descriptor = ImageDescriptor
-						.createFromURL(url);
-					getImageRegistry().put(type.getId(), descriptor);
-					image = getImageRegistry().get(type.getId());
-				}
-			}
-			return image;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-
-		if (operation instanceof GetIconOperation) {
-			IIconOperation getIconOperation = (IIconOperation) operation;
-			IAdaptable hint = getIconOperation.getHint();
-			
-			return getType(hint) != null;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets my image registry.
-	 * 
-	 * @return my image registry
-	 */
-	private ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-		}
-		return imageRegistry;
-	}
-
-	/**
-	 * Tries to get an element type from <code>hint</code>, first by adapting
-	 * to <code>IElementType</code>, the by adapting to <code>EObject</code>
-	 * and finding an element type in the {@link ElementTypeRegistry}for that
-	 * object. Arbitrarily picks the most specific matching element type in this
-	 * last case.
-	 * 
-	 * @param hint
-	 *            the icon provider hint
-	 * @return the element type, or <code>null</code> if none can be found
-	 */
-	private IElementType getType(IAdaptable hint) {
-		IElementType type = (IElementType) hint.getAdapter(IElementType.class);
-
-		if (type == null) {
-			EObject eObject = (EObject) hint.getAdapter(EObject.class);
-
-			if (eObject != null) {
-				IElementType[] types = ElementTypeRegistry.getInstance()
-					.getAllTypesMatching(eObject);
-
-				if (types.length > 0) {
-					// Pick the first match
-					type = types[0];
-				}
-			}
-		} else if (ElementTypeRegistry.getInstance().getType(type.getId()) == null) {
-			// Check that the type is in the registry
-			// TODO remove this check when UMLIconProvider is removed (when all element types are in the registry)
-			type = null;
-		}
-		return type;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/providers/package.html b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/providers/package.html
deleted file mode 100644
index 2860134..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/internal/providers/package.html
+++ /dev/null

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Contains providers for UI services that use the 
-{@link org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry}.</P> 
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/package.html b/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/package.html
deleted file mode 100644
index 3c776cd..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/src/org/eclipse/gmf/runtime/emf/type/ui/package.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<P>Provides UI-related classes that use the 
-{@link org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry}.</P> 
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/.classpath b/org.eclipse.gmf.runtime.emf.ui.properties/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.emf.ui.properties/.cvsignore b/org.eclipse.gmf.runtime.emf.ui.properties/.cvsignore
deleted file mode 100644
index edfb53f..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-doc
-org

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/.options b/org.eclipse.gmf.runtime.emf.ui.properties/.options
deleted file mode 100644
index cb26fb8..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.options
+++ /dev/null

@@ -1,14 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.emf.ui.properties plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.emf.ui.properties plug-in
-org.eclipse.gmf.runtime.emf.ui.properties/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/exiting=false

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/.project b/org.eclipse.gmf.runtime.emf.ui.properties/.project
deleted file mode 100644
index bb3c483..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.ui.properties</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/org.eclipse.gmf.runtime.emf.ui.properties/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.emf.ui.properties/META-INF/MANIFEST.MF
deleted file mode 100644
index 7c8b5fa..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.emf.ui.properties; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.emf.ui.properties.internal.EMFPropertiesPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.emf.ui.properties.actions,
- org.eclipse.gmf.runtime.emf.ui.properties.commands,
- org.eclipse.gmf.runtime.emf.ui.properties.descriptors,
- org.eclipse.gmf.runtime.emf.ui.properties.internal;x-internal:=true,
- org.eclipse.gmf.runtime.emf.ui.properties.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.emf.ui.properties.providers,
- org.eclipse.gmf.runtime.emf.ui.properties.sections,
- org.eclipse.gmf.runtime.emf.ui.properties.util
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services.properties;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.0.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/about.html b/org.eclipse.gmf.runtime.emf.ui.properties/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/build.properties b/org.eclipse.gmf.runtime.emf.ui.properties/build.properties
deleted file mode 100644
index 32f1467..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               .options,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/icons/property_page.gif b/org.eclipse.gmf.runtime.emf.ui.properties/icons/property_page.gif
deleted file mode 100644
index d11c996..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/icons/property_page.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/plugin.properties b/org.eclipse.gmf.runtime.emf.ui.properties/plugin.properties
deleted file mode 100644
index a1ddf58..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/plugin.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF EMF UI Properties Providers
-Plugin.providerName = Eclipse.org
-
-ext.propertiesProviders = GMF Generic EMF Properties Provider
-

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/plugin.xml b/org.eclipse.gmf.runtime.emf.ui.properties/plugin.xml
deleted file mode 100644
index 027191a..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/plugin.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-    	<extension
-         id="propertiesProviders"
-         name="%ext.propertiesProviders"
-         point="org.eclipse.gmf.runtime.common.ui.services.properties.propertiesProviders">
-      <PropertiesProvider
-            verifyPluginLoaded="false"
-            class="org.eclipse.gmf.runtime.emf.ui.properties.providers.GenericEMFPropertiesProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-      </PropertiesProvider>
-      </extension>
-      
-</plugin>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/actions/PropertyPageViewAction.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/actions/PropertyPageViewAction.java
deleted file mode 100644
index f3a19a6..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/actions/PropertyPageViewAction.java
+++ /dev/null

@@ -1,267 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.actions;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.dialogs.PropertiesDialog;
-import org.eclipse.gmf.runtime.common.ui.services.properties.extended.PropertyPagePropertyDescriptor;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.EMFPropertiesDebugOptions;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.EMFPropertiesPlugin;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.EMFPropertiesStatusCodes;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.l10n.EMFUIPropertiesMessages;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-import com.ibm.icu.text.Collator;
-
-/**
- * Action responsible for showing the properties page dialog when the it is
- * invoked.
- * <P>
- * This action is always enabled. If there are no property pages applicable to
- * the selection, a message dialog is shown to indicate that there are no
- * property pages.
- * 
- * @author ldamus
- */
-public class PropertyPageViewAction
-	extends Action {
-
-	/**
-	 * Constructs a new action with the default label, image and tooltip.
-	 */
-	public PropertyPageViewAction() {
-		super(EMFUIPropertiesMessages.PropertyPageViewAction_label, 
-				AbstractUIPlugin.imageDescriptorFromPlugin(EMFPropertiesPlugin.getPluginId(), "icons/property_page.gif")); //$NON-NLS-1$
-		setToolTipText(EMFUIPropertiesMessages.PropertyPageViewAction_tooltip);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		Trace.trace(EMFPropertiesPlugin.getDefault(),
-			EMFPropertiesDebugOptions.METHODS_ENTERING,
-			"PropertyPageViewActionDelegate.doRun Entering"); //$NON-NLS-1$
-		IWorkbenchPage page = EMFPropertiesPlugin.getActivePage();
-		if (page != null) {
-			final ISelection selection = page.getSelection();
-			if (selection != null && selection instanceof IStructuredSelection) {
-				TransactionalEditingDomain domain = getEditingDomain((IStructuredSelection) selection);
-
-                if (domain != null) {
-                    try {
-                        domain.runExclusive(new Runnable() {
-
-                            public void run() {
-
-                                // build the pages for the property dialog
-                                List propertyPages = getMergedPropertyPages((IStructuredSelection) selection);
-
-                                if (!propertyPages.isEmpty()) {
-                                    // sort the pages
-                                    Collections.sort(propertyPages,
-                                        new Comparator() {
-
-                                            public int compare(Object o1,
-                                                    Object o2) {
-                                                IPreferencePage p1 = (IPreferencePage) o1;
-                                                IPreferencePage p2 = (IPreferencePage) o2;
-                                                String s1 = p1.getTitle();
-                                                String s2 = p2.getTitle();
-                                                return Collator.getInstance()
-                                                    .compare(s1, s2);
-                                            }
-                                        });
-
-                                    // add the pages and invoke the property
-                                    // dialog
-                                    PropertiesDialog dialog = new PropertiesDialog(
-                                        Display.getCurrent().getActiveShell(),
-                                        new PreferenceManager());
-
-                                    for (Iterator iter = propertyPages
-                                        .iterator(); iter.hasNext();) {
-                                        dialog.getPreferenceManager()
-                                            .addToRoot(
-                                                new PreferenceNode(
-                                                    StringStatics.BLANK,
-                                                    (IPreferencePage) iter
-                                                        .next()));
-                                    }
-
-                                    dialog.create();
-                                    dialog.open();
-                                } else {
-                                    MessageDialog
-                                        .openInformation(
-                                            Display.getCurrent()
-                                                .getActiveShell(),
-                                            EMFUIPropertiesMessages.PropertyPageViewAction_NoPropertiesMessageBox_Title,
-                                            EMFUIPropertiesMessages.PropertyPageViewAction_NoPropertiesMessageBox_Message);
-                                }
-                            }
-                        });
-                    } catch (InterruptedException e) {
-                        Trace.catching(EMFPropertiesPlugin.getDefault(),
-                            EMFPropertiesDebugOptions.EXCEPTIONS_CATCHING,
-                            getClass(), "run", e); //$NON-NLS-1$
-                        Log.error(EMFPropertiesPlugin.getDefault(),
-                            EMFPropertiesStatusCodes.ACTION_FAILURE, e
-                                .getLocalizedMessage(), e);
-                    }
-                }
-            }
-        }
-		Trace.trace(EMFPropertiesPlugin.getDefault(),
-			EMFPropertiesDebugOptions.METHODS_EXITING,
-			"PropertyPageViewActionDelegate.doRun Exiting"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Gets the property pages common to the given selection
-	 * 
-	 * @param selection
-	 *            the selection
-	 * @return List the list of property pages common to the given selection
-	 */
-	private List getMergedPropertyPages(IStructuredSelection selection) {
-		// build the merged properties, common to the entire selection
-		List mergedDescriptors = computeMergedPropertyDescriptors(selection);
-
-		// build the merged pages from the merged properties
-		List mergedPages = new ArrayList();
-		if (mergedDescriptors != null) { // if there were no objects to provide
-			// us with even property sources
-			for (Iterator i = mergedDescriptors.iterator(); i.hasNext();) {
-				PropertyPagePropertyDescriptor descriptor = (PropertyPagePropertyDescriptor) i
-					.next();
-				List pages = descriptor.createPropertyPages();
-				pages.removeAll(mergedPages);
-				mergedPages.addAll(pages);
-			}
-		}
-		return mergedPages;
-	}
-
-	/**
-	 * Return the intersection of all the <code>IPropertyDescriptor</code> s
-	 * for the objects.
-	 */
-	private List computeMergedPropertyDescriptors(IStructuredSelection selection) {
-		if (selection.size() == 0)
-			return new ArrayList(0);
-
-		// get all descriptors from each object
-		Map[] propertyDescriptorMaps = new Map[selection.size()];
-
-		Iterator i = selection.iterator();
-		for (int index = 0; i.hasNext(); index++) {
-			Object object = i.next();
-			IPropertySource source = (IPropertySource) ((IAdaptable) object)
-				.getAdapter(IPropertySource.class);
-
-			if (source == null) {
-				// if one of the selected items is not a property source
-				// then we show no properties
-				return new ArrayList(0);
-			}
-			// get the property descriptors keyed by id
-			propertyDescriptorMaps[index] = computePropertyDescriptorsFor(source);
-		}
-
-		//		 intersect
-		Map intersection = propertyDescriptorMaps[0];
-		for (int p = 1; p < propertyDescriptorMaps.length; p++) {
-			// get the current ids
-			Object[] ids = intersection.keySet().toArray();
-			for (int j = 0; j < ids.length; j++) {
-				Object object = propertyDescriptorMaps[p].get(ids[j]);
-				if (object == null
-					||
-					// see if the descriptors (which have the same id) are
-					// compatible
-					!((IPropertyDescriptor) intersection.get(ids[j]))
-						.isCompatibleWith((IPropertyDescriptor) object))
-					intersection.remove(ids[j]);
-			}
-		}
-
-		return new ArrayList(intersection.values());
-	}
-
-	/**
-	 * Returns an map of property descritptors (keyed on id) for the 
-	 * given property source.
-	 *
-	 * @source a property source for which to obtain descriptors
-	 * @return a table of decriptors keyed on their id
-	 */
-	private Map computePropertyDescriptorsFor(IPropertySource source) {
-		IPropertyDescriptor[] descriptors = source.getPropertyDescriptors();
-		Map result = new HashMap(descriptors.length * 2 + 1);
-		for (int i = 0; i < descriptors.length; i++) {
-			if (descriptors[i] instanceof PropertyPagePropertyDescriptor)
-				result.put(descriptors[i].getId(), descriptors[i]);
-		}
-		return result;
-	}
-    
-    private TransactionalEditingDomain getEditingDomain(IStructuredSelection s) {
-
-        TransactionalEditingDomain result = null;
-
-        for (Iterator i = s.iterator(); i.hasNext();) {
-            Object next = i.next();
-
-            result = TransactionUtil.getEditingDomain(next);
-
-            if (result == null && next instanceof IAdaptable) {
-                EObject eObject = (EObject) ((IAdaptable) next)
-                    .getAdapter(EObject.class);
-                result = TransactionUtil.getEditingDomain(eObject);
-            }
-
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/actions/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/actions/package.html
deleted file mode 100644
index 941c37b..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/actions/package.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Actions for showing property pages and other properties-related operations.
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/RestoreDefaultPropertyValueCommand.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/RestoreDefaultPropertyValueCommand.java
deleted file mode 100644
index 95f6fc2..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/RestoreDefaultPropertyValueCommand.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * Command to restore a property value to its default value using the
- * {@link org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object)}
- * method.
- * <P>
- * This command is undoable and redoable.
- * <P>
- * @author ldamus
- */
-public class RestoreDefaultPropertyValueCommand extends AbstractTransactionalCommand {
-
-	/**
-	 * Flag to indicate that the property value was reset by this command. The
-	 * property value is not reset to its default if the property source's
-	 * <code>isPropertySet()</code> method returns <code>false</code>.
-	 */
-	private boolean valueResetOnUndo = false;
-
-	/**
-	 * The property source that owns the property to be restored to its 
-	 * default value.
-	 */
-	private final IPropertySource propertySource;
-
-	/**
-	 * The ID of the property whose default value is to be restored.
-	 */
-	private final Object propertyId;
-
-	/**
-	 * The property value which is used when this command execution is undone.
-	 */
-	private Object undoValue;
-
-	/**
-	 * Constructs a new command with the property source and the id of the
-	 * property to be reset.
-	 * 
-     * @param editingDomain the editing domain in which to make the change
-	 * @param label The label for the command. Appears in the Edit menu items.
-	 * @param affectedObjects The model operation context for the new model command.
-	 * @param propertySource The property source that owns the property
-	 * 						 whose value is to be reset.
-	 * @param propertyId The ID of the property to be reset.
-	 */
-	public RestoreDefaultPropertyValueCommand(TransactionalEditingDomain editingDomain,  
-		String label,
-		Object affectedObjects,
-		IPropertySource propertySource,
-		Object propertyId) {
-
-		super(
-            editingDomain,
-            label,
-            (affectedObjects instanceof EObject) ? getWorkspaceFiles((EObject) affectedObjects)
-                : null);
-        this.propertySource = propertySource;
-		this.propertyId = propertyId;
-	}
-
-	public boolean canRedo() {
-		return true;
-	}
-
-	public boolean canUndo() {
-		return true;
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		CommandResult result;
-		setValueResetOnUndo(getPropertySource().isPropertySet(getPropertyId()));
-
-		if (isValueResetOnUndo()) {
-			setUndoValue(getPropertySource().getPropertyValue(getPropertyId()));
-			getPropertySource().resetPropertyValue(getPropertyId());
-			result =
-				CommandResult.newOKCommandResult(
-					getPropertySource().getPropertyValue(getPropertyId()));
-
-		} else {
-			undoValue = null;
-			result = CommandResult.newOKCommandResult();
-		}
-		return result;
-	}
-
-	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-		return doExecuteWithResult(progressMonitor, info);
-	}
-
-	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-		CommandResult result;
-		if (isValueResetOnUndo()) {
-			getPropertySource().setPropertyValue(
-				getPropertyId(),
-				getUndoValue());
-			result = CommandResult.newOKCommandResult(getUndoValue());
-		} else {
-			getPropertySource().resetPropertyValue(getPropertyId());
-			result =
-                CommandResult.newOKCommandResult(
-					getPropertySource().getPropertyValue(getPropertyId()));
-		}
-		return result;
-	}
-
-	/**
-	 * Gets the flag that indicates that the property value was reset by this
-	 * command. The property value is not reset to its default if the property
-	 * source's <code>isPropertySet()</code> method returns <code>false</code>.
-	 * 
-	 * @return <code>true</code> if the property value was reset by this command,
-	 * 		   <code>false</code> otherwise.
-	 */
-	protected boolean isValueResetOnUndo() {
-		return valueResetOnUndo;
-	}
-
-	/**
-	 * Sets the flag that indicates that the property value was reset by this
-	 * command. The property value is not reset to its default if the property
-	 * source's <code>isPropertySet()</code> method returns <code>false</code>.
-	 * 
-	 * @param b <code>true</code> if the property value was reset by this command,
-	 * 		    <code>false</code> otherwise.
-	 */
-	protected void setValueResetOnUndo(boolean b) {
-		valueResetOnUndo = b;
-	}
-
-	/**
-	 * Gets the property source that owns the property to be restored to its 
-	 * default value.
-	 * 
-	 * @return the property source
-	 */
-	protected IPropertySource getPropertySource() {
-		return propertySource;
-	}
-
-	/**
-	 * Gets the ID of the property whose default value is to be restored.
-	 * 
-	 * @return the property ID
-	 */
-	protected Object getPropertyId() {
-		return propertyId;
-	}
-
-	/**
-	 * Gets the property value which is used when this command execution is 
-	 * undone.
-	 * 
-	 * @return the undo property value
-	 */
-	protected Object getUndoValue() {
-		return undoValue;
-	}
-
-	/**
-	 * Sets the property value which is used when this command execution is 
-	 * undone.
-	 * 
-	 * @param object the undo property value
-	 */
-	protected void setUndoValue(Object object) {
-		undoValue = object;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/SetModelPropertyValueCommand.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/SetModelPropertyValueCommand.java
deleted file mode 100644
index 1599e71..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/SetModelPropertyValueCommand.java
+++ /dev/null

@@ -1,201 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * Command to set a property value in the model in an undo interval. Delegates
- * the actual work of setting the property value to a
- * <code>SetPropertyValueCommand</code>.
- * 
- * @author ldamus
- */
-public class SetModelPropertyValueCommand extends AbstractTransactionalCommand {
-
-    /**
-     * Flag to indicate that the property value had never before been set, so a
-     * reset is appropriate when the command is undone.
-     */
-    private boolean valueResetOnUndo = false;
-
-    /**
-     * The property source that owns the property to be restored to its default
-     * value.
-     */
-    private final IPropertySource propertySource;
-
-    /**
-     * The ID of the property whose default value is to be restored.
-     */
-    private final Object propertyId;
-
-    /**
-     * The property value which is used when this command execution is undone.
-     */
-    private Object undoValue;
-
-    /**
-     * The new property value which will be set by this command.
-     */
-    private final Object propertyValue;
-
-    /**
-     * Constructs a new command with the property source and the id of the
-     * property to be reset.
-     * 
-     * @param editingDomain the editing domain in which to make this change
-     * @param label
-     *            The label for the command. Appears in the Edit menu items.
-     * @param affectedObjects
-     * 			  The model operation context for the new model command.
-     * @param propertySource
-     *            The property source that owns the property whose value is to
-     *            be reset.
-     * @param propertyId
-     *            The ID of the property to be reset.
-     * @param propertyValue
-     * 			  The new property value which will be set by this command.
-     */
-    public SetModelPropertyValueCommand(TransactionalEditingDomain editingDomain, String label, Object affectedObjects,
-            IPropertySource propertySource, Object propertyId,
-            Object propertyValue) {
-
-        super(
-            editingDomain,
-            label,
-            (affectedObjects instanceof EObject) ? getWorkspaceFiles((EObject) affectedObjects)
-                : null);
-
-        this.propertySource = propertySource;
-        this.propertyId = propertyId;
-        this.propertyValue = propertyValue;
-
-    }
-
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        setValueResetOnUndo(!getPropertySource().isPropertySet(getPropertyId()));
-
-        if (!isValueResetOnUndo()) {
-            setUndoValue(getPropertySource().getPropertyValue(getPropertyId()));
-        } else {
-            undoValue = null;
-        }
-        getPropertySource().setPropertyValue(getPropertyId(),
-                getPropertyValue());
-        return CommandResult.newOKCommandResult(getPropertyValue());
-    }
-
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-        
-        return doExecuteWithResult(new NullProgressMonitor(), info);
-    }
-
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-        if (isValueResetOnUndo()) {
-            getPropertySource().resetPropertyValue(getPropertyId());
-
-        } else {
-            getPropertySource().setPropertyValue(getPropertyId(),
-                    getUndoValue());
-        }
-        return CommandResult.newOKCommandResult(getPropertySource().getPropertyValue(
-                getPropertyId()));
-    }
-
-    /**
-     * Gets the flag to indicate that the property value had never before been
-     * set, so a reset is appropriate when the command is undone.
-     * 
-     * @return <code>true</code> if undoing this command should reset the
-     *         property value to its default, <code>false</code> otherwise.
-     */
-    protected boolean isValueResetOnUndo() {
-        return valueResetOnUndo;
-    }
-
-    /**
-     * Sets the flag to indicate that the property value had never before been
-     * set, so a reset is appropriate when the command is undone.
-     * 
-     * @param b
-     *            <code>true</code> if undoing this command should reset the
-     *            property value to its default, <code>false</code> otherwise.
-     */
-    protected void setValueResetOnUndo(boolean b) {
-        valueResetOnUndo = b;
-    }
-
-    /**
-     * Gets the property source that owns the property to be restored to its
-     * default value.
-     * 
-     * @return the property source
-     */
-    protected IPropertySource getPropertySource() {
-        return propertySource;
-    }
-
-    /**
-     * Gets the ID of the property whose default value is to be restored.
-     * 
-     * @return the property ID
-     */
-    protected Object getPropertyId() {
-        return propertyId;
-    }
-
-    /**
-     * Gets the property value which is used when this command execution is
-     * undone.
-     * 
-     * @return the undo property value
-     */
-    protected Object getUndoValue() {
-        return undoValue;
-    }
-
-    /**
-     * Sets the property value which is used when this command execution is
-     * undone.
-     * 
-     * @param object
-     *            the undo property value
-     */
-    protected void setUndoValue(Object object) {
-        undoValue = object;
-    }
-
-    /**
-     * Gets the property value that is set by this command.
-     * 
-     * @return the property value
-     */
-    protected Object getPropertyValue() {
-        return propertyValue;
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/package.html
deleted file mode 100644
index 8bf01d2..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/commands/package.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Reusable commands for use in implementing property editors.
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy %partners
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EMFCompositePropertySource.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EMFCompositePropertySource.java
deleted file mode 100644
index 4681837..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EMFCompositePropertySource.java
+++ /dev/null

@@ -1,260 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.descriptors;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.ui.provider.PropertySource;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource;
-
-/**
- * <code>IItemPropertySource</code> wrapper, is a linked list of composite 
- * property sources - may contain another composite property source wrapper 
- * inside. 
- * For example, a edit part will have a composite source, consisting of two - 
- * one (outer) for the shape itself and other (enclosed) - for the underlying 
- * UML element
- * 
- * @author nbalaba
- * 
- */
-public class EMFCompositePropertySource
-	extends PropertySource
-	implements ICompositePropertySource {
-
-	private ICompositePropertySource enclosed = null;
-
-	// category of the source - each descriptor inherits that
-	private String category = null;
-
-	// a local cache of the local to this source object property descriptors vs their ids
-	private Map descriptors;
-
-	// another cache - Efeatures vs descriptors - so that clients can navigate
-	// through the source using feature
-	private Map features;
-
-	/**
-	 * Constructs an instance of <code>EMFCompositePropertySource</code>
-	 * 
-	 * @param object
-	 * @param itemPropertySource
-	 */
-	protected EMFCompositePropertySource(Object object,
-		IItemPropertySource itemPropertySource) {
-		super(object, itemPropertySource);
-	}
-
-	/**
-	 * Constructs an instance of <code>EMFCompositePropertySource</code>
-	 * 
-	 * @param object
-	 * @param itemPropertySource
-	 * @param category category of the source - each descriptor inherits that
-	 */
-	public EMFCompositePropertySource(Object object,
-		IItemPropertySource itemPropertySource, String category) {
-		this(object, itemPropertySource);
-		this.category = category;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource#addPropertySource(org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource)
-	 */
-	public void addPropertySource(ICompositePropertySource source) {
-		assert this != source: "self is the same as source"; // self is not allowed - this will //$NON-NLS-1$
-		// result in stack overflows
-
-		if (this.enclosed == null)
-			enclosed = source;
-
-		else
-			enclosed.addPropertySource(source);
-
-	}
-
-	/*
-	 * Creates a cache of property descriptors confined to this property source object
-	 * without the enclosed 
-	 * @return
-	 */
-	protected Map getLocalDescriptors() {
-		if (descriptors == null) {
-			descriptors = new HashMap();
-			features = new HashMap();
-			super.getPropertyDescriptors();
-		}
-		return descriptors;
-	}
-
-	/**
-	 * This delegates to This method can cache the (local, not children)
-	 * descriptors so that their array will be modifiable (if there is a strong
-	 * requirement to do so) We can cache them (as an optimization)
-	 * {@link IItemPropertySource#getPropertyDescriptors IItemPropertySource.getPropertyDescriptors}.
-	 */
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		IPropertyDescriptor[] local = (IPropertyDescriptor[]) getLocalDescriptors()
-			.values().toArray(
-				new IPropertyDescriptor[getLocalDescriptors().size()]);
-
-		if (enclosed != null) {
-			IPropertyDescriptor[] enclosedDecriptors = enclosed
-				.getPropertyDescriptors();
-			IPropertyDescriptor[] all = new IPropertyDescriptor[local.length
-				+ enclosedDecriptors.length];
-			System.arraycopy(enclosedDecriptors, 0, all, 0,
-				enclosedDecriptors.length);
-			System.arraycopy(local, 0, all, enclosedDecriptors.length,
-				local.length);
-
-			return all;
-
-		}
-
-		return local;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue()
-	 */
-	public Object getEditableValue() {
-		Object aValue = super.getEditableValue();
-		if (aValue == null && enclosed != null)
-			return enclosed.getEditableValue();
-
-		return aValue;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.ui.provider.PropertySource#createPropertyDescriptor(org.eclipse.emf.edit.provider.IItemPropertyDescriptor)
-	 */
-	protected IPropertyDescriptor createPropertyDescriptor(
-		IItemPropertyDescriptor itemPropertyDescriptor) {
-		EMFCompositeSourcePropertyDescriptor d = (EMFCompositeSourcePropertyDescriptor) newPropertyDescriptor(itemPropertyDescriptor);
-		cacheDescriptor(d);
-		return d;
-	}
-
-	/*
-	 * Create a new property descriptor wrapper around the EMF type
-	 * @param itemPropertyDescriptor - the EMF based property descriptor
-	 * @return - property descriptor that wraps around IItemPropertyDescriptor
-	 */
-	protected IPropertyDescriptor newPropertyDescriptor(
-		IItemPropertyDescriptor itemPropertyDescriptor) {
-		return new EMFCompositeSourcePropertyDescriptor(object,
-			itemPropertyDescriptor, getCategory());
-
-	}
-
-	/*
-	 * Cache descriptor into the local cache - id vs descriptors, and features vs descriptors
-	 */
-	protected void cacheDescriptor(EMFCompositeSourcePropertyDescriptor d) {
-		if (d != null) {
-			getLocalDescriptors().put(d.getId(), d);
-			features.put(d.getFeature(), d);
-		}
-	}
-
-	/**
-	 * This delegates to
-	 * {@link IItemPropertyDescriptor#getPropertyValue IItemPropertyDescriptor.getPropertyValue}.
-	 */
-	public Object getPropertyValue(Object propertyId) {
-		EMFCompositeSourcePropertyDescriptor descriptor = (EMFCompositeSourcePropertyDescriptor) getLocalDescriptors()
-			.get(propertyId);
-		return descriptor != null ? descriptor.getPropertyValue()
-			: ((enclosed != null) ? enclosed.getPropertyValue(propertyId)
-				: null);
-	}
-
-	/**
-	 * This delegates to
-	 * {@link IItemPropertyDescriptor#isPropertySet IItemPropertyDescriptor.isPropertySet}.
-	 */
-	public boolean isPropertySet(Object propertyId) {
-		IItemPropertyDescriptor descriptor = itemPropertySource
-			.getPropertyDescriptor(object, propertyId);
-		return descriptor != null ? descriptor.isPropertySet(object)
-			: ((enclosed != null) ? enclosed.isPropertySet(propertyId)
-				: false);
-	}
-
-	/**
-	 * This delegates to
-	 * {@link IItemPropertyDescriptor#resetPropertyValue IItemPropertyDescriptor.resetPropertyValue}.
-	 */
-	public void resetPropertyValue(Object propertyId) {
-		final EMFCompositeSourcePropertyDescriptor descriptor = (EMFCompositeSourcePropertyDescriptor) getLocalDescriptors()
-			.get(propertyId);
-
-		if (descriptor != null) {
-			descriptor.resetPropertyValue();
-		} else if (enclosed != null)
-			enclosed.resetPropertyValue(propertyId);
-	}
-
-	/**
-	 * @return - the object for wich the source is provideing properties
-	 */
-	protected Object getObject() {
-		return object;
-	}
-
-	/**
-	 * This delegates to
-	 * {@link IItemPropertyDescriptor#setPropertyValue IItemPropertyDescriptor.setPropertyValue}.
-	 */
-	public void setPropertyValue(Object propertyId, final Object value) {
-
-		final EMFCompositeSourcePropertyDescriptor descriptor = (EMFCompositeSourcePropertyDescriptor) getLocalDescriptors()
-			.get(propertyId);
-
-		if (descriptor != null) {
-			descriptor.setPropertyValue(value);
-		} else if (enclosed != null)
-			enclosed.setPropertyValue(propertyId, value);
-	}
-
-	/**
-	 * @return Returns the category.
-	 */
-	protected String getCategory() {
-		return category;
-	}
-
-	/**
-	 * Sets the category.
-	 * 
-	 * @param category the new category value
-	 */
-	public void setCategory(String category) {
-		this.category = category;
-		Iterator i = getLocalDescriptors().values().iterator();
-		while (i.hasNext()) {
-			EMFCompositeSourcePropertyDescriptor d = (EMFCompositeSourcePropertyDescriptor) i
-				.next();
-			d.setCategory(getCategory());
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EMFCompositeSourcePropertyDescriptor.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EMFCompositeSourcePropertyDescriptor.java
deleted file mode 100644
index 7f4f9a9..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EMFCompositeSourcePropertyDescriptor.java
+++ /dev/null

@@ -1,537 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.descriptors;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.ui.celleditor.ExtendedComboBoxCellEditor;
-import org.eclipse.emf.common.ui.celleditor.ExtendedDialogCellEditor;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.ui.celleditor.FeatureEditorDialog;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.emf.edit.ui.provider.PropertyDescriptor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.ui.services.properties.descriptors.ICompositeSourcePropertyDescriptor;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-/**
- * The descriptor that works with the <code>EMFCompositePropertySource</code>
- * object.
- * <P>
- * When the property value is set while an EMF transaction is open on the
- * editing domain, I will not execute the set command through the editing domain
- * command stack. In this case, I rely on whoever opened the EMF transaction to
- * put their operation on the operation history.
- * 
- * @author nbalaba
- */
-public class EMFCompositeSourcePropertyDescriptor extends PropertyDescriptor
-        implements ICompositeSourcePropertyDescriptor {
-
-    protected String category = null;
-
-    protected String[] filterFlags;
-
-    protected boolean readOnly = false;
-
-    protected CellEditor propertyEditor = null;
-
-    /**
-     * The object to validate the values in the cell editor, or
-     * <code>null</code> if none (the default).
-     */
-    protected ICellEditorValidator validator;
-
-    /**
-     * A convinience method to create an instance of a ILabelProvider using
-     * IItemPropertyDescriptor
-     * 
-     * @param itemPropertyDescriptor
-     * @return label provider
-     */
-    public static ILabelProvider createLabelProvider(
-            IItemPropertyDescriptor itemPropertyDescriptor) {
-        final IItemLabelProvider itemLabelProvider = itemPropertyDescriptor
-                .getLabelProvider(null);
-        return new LabelProvider() {
-            public String getText(Object object) {
-                return itemLabelProvider.getText(object);
-            }
-
-            public Image getImage(Object object) {
-                return ExtendedImageRegistry.getInstance().getImage(
-                        itemLabelProvider.getImage(object));
-            }
-        };
-    }
-
-    /**
-     * @param object
-     * @param itemPropertyDescriptor
-     */
-    public EMFCompositeSourcePropertyDescriptor(Object object,
-            IItemPropertyDescriptor itemPropertyDescriptor) {
-        super(object, itemPropertyDescriptor);
-
-        filterFlags = itemPropertyDescriptor.getFilterFlags(object);
-        filterFlags = filterFlags == null ? new String[0] : filterFlags;
-
-    }
-
-    /**
-     * Creates an instance of <code>EMFCompositeSourcePropertyDescriptor</code>.
-     * 
-     * @param object
-     * @param itemPropertyDescriptor
-     * @param category 
-     */
-    public EMFCompositeSourcePropertyDescriptor(Object object,
-            IItemPropertyDescriptor itemPropertyDescriptor, String category) {
-        this(object, itemPropertyDescriptor);
-        setCategory(category);
-    }
-
-    /**
-     * Sets the category.
-     * 
-     * @param category The category to set.
-     */
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertyDescriptor#getCategory()
-     */
-    public String getCategory() {
-
-        String aCategory = super.getCategory();
-        return aCategory == null ? this.category : aCategory;
-
-    }
-
-    /**
-     * @return Returns the filterFlags.
-     */
-    public String[] getFilterFlags() {
-        return filterFlags;
-    }
-
-    /**
-     * Add filter flag (@see IPropertySheetEntry.FILTER_ID_EXPERT)
-     * 
-     * @param flag
-     */
-    public void addFilterFlag(String flag) {
-        if (!Arrays.asList(filterFlags).contains(flag)) {
-            String[] flags = new String[filterFlags.length + 1];
-            System.arraycopy(filterFlags, 0, flags, 0, filterFlags.length);
-            flags[filterFlags.length] = flag;
-            filterFlags = flags;
-        }
-    }
-
-    /**
-     * This returns the cell editor that will be used to edit the value of this
-     * property. This default implementation determines the type of cell editor
-     * from the nature of the structural feature.
-     */
-    public CellEditor createPropertyEditor(Composite composite) {
-
-        if (isReadOnly())
-            return null;
-
-        if (getPropertyEditor() != null)
-            return getPropertyEditor();
-
-        return doCreateEditor(composite);
-    }
-
-    /*
-     * A cxell editor creation method - after the assertions. Allows subclasses
-     * override just the part where the editor actually is created, without
-     * having to repeat preliminary assertions in every subclass
-     * 
-     * @param composite @return
-     */
-    protected CellEditor doCreateEditor(Composite composite) {
-        CellEditor result = null;
-        Object genericFeature = getFeature();
-
-        if (genericFeature instanceof EReference[]) {
-            result = createComboBoxCellEditor(composite);
-        } else if (genericFeature instanceof EStructuralFeature) {
-
-            final EStructuralFeature feature = (EStructuralFeature) genericFeature;
-            final EClassifier eType = feature.getEType();
-            final List choiceOfValues = getChoiceOfValues();
-
-            if (!choiceOfValues.isEmpty()) {
-            	if (getItemDescriptor().isMany(getObject())) {
-                    boolean valid = true;
-                    for (Iterator i = choiceOfValues.iterator(); i.hasNext();) {
-                        Object choice = i.next();
-                        if (!eType.isInstance(choice)) {
-                            valid = false;
-                            break;
-                        }
-                    }
-                    if (valid) {
-                    	result = createDialogCellEditor(composite, feature, choiceOfValues);
-					}
-                }
-                if (result == null)
-                    result = createComboBoxCellEditor(composite);
-
-            } else {
-                if (eType instanceof EDataType) {
-
-                    EDataType eDataType = (EDataType) eType;
-                    if (eDataType.isSerializable()) {
-                        if (getItemDescriptor().isMany(getObject())) {
-                        	result = createDialogCellEditor(composite, feature, choiceOfValues);
-                        } else if (eDataType == EcorePackage.eINSTANCE
-                                .getEBoolean()
-                                || eDataType == EcorePackage.eINSTANCE
-                                        .getEBooleanObject()
-                                || eDataType.getInstanceClass() == EcorePackage.eINSTANCE
-                                        .getEBoolean().getInstanceClass())
-
-                        {
-                            result = createBooleanCellEditor(composite);
-                        } else {
-                            result = createDataTypeCellEditor(composite);
-                        }
-                    }
-                }
-            }
-        }
-
-        return result == null ? super.createPropertyEditor(composite) : result;
-    }
-
-    /**
-     * Returns boolean - an indicator either or not this property can be set or
-     * re-set. It was either inherited from our IItemPropertyDescriptor or set
-     * in the context of the application
-     * 
-     * @return - true if either IItemPropertyDescriptor can not set it or our
-     *         descriptor
-     */
-    public boolean isReadOnly() {
-        return (!itemPropertyDescriptor.canSetProperty(object)) || readOnly;
-    }
-
-    /**
-     * Sets the specified value to be read only.
-     * 
-     * @param value
-     *            The readOnly to set.
-     */
-    public void setReadOnly(boolean value) {
-        this.readOnly = value;
-    }
-
-    /**
-     * @see org.eclipse.ui.views.properties.IPropertyDescriptor#isCompatibleWith(IPropertyDescriptor)
-     */
-
-    public boolean isCompatibleWith(IPropertyDescriptor anotherProperty) {
-
-        if (this == anotherProperty)
-            return true;
-
-        if (!(anotherProperty instanceof EMFCompositeSourcePropertyDescriptor))
-            return false;
-
-        EMFCompositeSourcePropertyDescriptor descriptor = (EMFCompositeSourcePropertyDescriptor) anotherProperty;
-
-        if (getFeature() == descriptor.getFeature())
-            //   && isCompatibleTypes(descriptor))
-            return (getCategory().equals(descriptor.getCategory()));
-
-        return false;
-
-    }
-
-/*    private boolean isCompatibleTypes(
-            EMFCompositeSourcePropertyDescriptor descriptor) {
-        return ((EObject) getObject()).eClass().isInstance(
-                (descriptor.getObject()))
-                || ((EObject) descriptor.getObject()).eClass().isInstance(
-                        (getObject()));
-    }
-*/
-    /**
-     * Retrieve an object for which this class is a property source.
-     * 
-     * @return <code>Object</code> for which this class is a property source 
-     */
-    protected Object getObject() {
-        return object;
-    }
-
-    /**
-     * @return the item descriptor
-     */
-    public IItemPropertyDescriptor getItemDescriptor() {
-        return itemPropertyDescriptor;
-    }
-
-    /**
-     * Retrieves the feature.
-     * 
-     * @return feature
-     */
-    public Object getFeature() {
-        return itemPropertyDescriptor.getFeature(getObject());
-    }
-
-    /**
-     * @return Returns the propertyEditor.
-     */
-    protected CellEditor getPropertyEditor() {
-        return propertyEditor;
-    }
-
-    /**
-     * @param propertyEditor
-     *            The propertyEditor to set.
-     */
-    public void setPropertyEditor(CellEditor propertyEditor) {
-        this.propertyEditor = propertyEditor;
-    }
-
-    /**
-     * @return Returns the validator.
-     */
-    public ICellEditorValidator getValidator() {
-        return validator;
-    }
-
-    /**
-     * @param validator
-     *            The validator to set.
-     */
-    public void setValidator(ICellEditorValidator validator) {
-        this.validator = validator;
-    }
-
-    /*
-     * @param composite @return
-     */
-    protected CellEditor createComboBoxCellEditor(Composite composite) {
-
-        return new ExtendedComboBoxCellEditor(composite, new ArrayList(
-                getChoiceOfValues()), getLabelProvider(), true);
-
-    }
-    
-    /**
-	 * Creates a dialog cell editor for editing multivalued features.
-	 * 
-	 * @param composite
-	 *            the composite to contain the new cell editor
-	 * @param feature
-	 *            the feature being edited
-	 * @param choiceOfValues
-	 *            the possible values for that feature
-	 * @return the new cell editor
-	 */
-    protected CellEditor createDialogCellEditor(Composite composite,
-			final EStructuralFeature feature, final List choiceOfValues) {
-    	
-		return new ExtendedDialogCellEditor(composite, getEditLabelProvider()) {
-			protected Object openDialogBox(Control cellEditorWindow) {
-				FeatureEditorDialog dialog = new FeatureEditorDialog(
-						cellEditorWindow.getShell(), getLabelProvider(),
-						getObject(), feature.getEType(),
-						(List) ((IItemPropertySource) itemPropertyDescriptor
-								.getPropertyValue(object))
-								.getEditableValue(object), getDisplayName(),
-						choiceOfValues);
-				dialog.open();
-				return dialog.getResult();
-			}
-		};
-	}
-
-    /*
-	 * @param composite @return
-	 */
-    protected CellEditor createBooleanCellEditor(Composite composite) {
-        return new ExtendedComboBoxCellEditor(composite,
-                Arrays.asList(new Object[] { Boolean.FALSE,
-                          Boolean.TRUE }), getLabelProvider(), true);
-    }
-
-    /*
-     * @param composite @return
-     */
-    protected CellEditor createDataTypeCellEditor(Composite composite) {
-        Object genericFeature = itemPropertyDescriptor.getFeature(object);
-        if (genericFeature instanceof EStructuralFeature) {
-
-            EClassifier eType = ((EStructuralFeature) genericFeature)
-                    .getEType();
-            if (eType instanceof EDataType) {
-                return new EDataTypeCellEditor((EDataType) eType, composite) {
-                    protected void focusLost() {
-                        if (isActivated()) {                     
-                            deactivate();
-                        }
-                    }
-                };
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @return - value of the property stored in the EMF descriptor
-     */
-    public Object getPropertyValue() {
-
-        return getEditableValue(); //getItemDescriptor().getPropertyValue(getObject());//
-    }
-
-    /**
-     * This is a temporary method. If we want to keep the recursive properties
-     * this become getPropertyValue().
-     * 
-     * @return the editable value
-     */
-    protected Object getEditableValue() {
-        Object aValue = getItemDescriptor().getPropertyValue(getObject());
-        //		 see if we should convert the value to an editable value
-
-        IItemPropertySource itemSource = getPropertySource(aValue);
-        if (itemSource != null) {
-            aValue = itemSource.getEditableValue(aValue);
-        }
-
-        return aValue;
-    }
-
-    /**
-     * @param value
-     *            value of the property
-     */
-    public void setPropertyValue(final Object value) {
-        //if (value == null) // hack - due to the bug in EMF
-        //return;
-
-        Object oldValue = getEditableValue();
-
-        // here we get into the infinite recursive loop
-        // because of the emf edit even generation - need to stop
-        // if the new value is the same as the old one
-        if ((oldValue != null && oldValue.equals(value))
-                || (oldValue == null && value == null))
-            return;
-        
-        getItemDescriptor().setPropertyValue(getObject(), value);
-    }
-
-    /**
-     * 
-     */
-    public void resetPropertyValue() {
-
-        getItemDescriptor().resetPropertyValue(getObject());
-
-    }
-
-    /**
-     * Returns an property source for the given value.
-     * 
-     * @object an object for which to obtain a property source or
-     *         <code>null</code> if a property source is not available
-     * @return an property source for the given object
-     */
-    protected IItemPropertySource getPropertySource(Object value) {
-        if (value instanceof IItemPropertySource) {
-            return (IItemPropertySource) value;
-        }
-        
-        TransactionalEditingDomain editingDomain = TransactionUtil
-            .getEditingDomain(getObject());
-
-        if (editingDomain instanceof AdapterFactoryEditingDomain) {
-            return (IItemPropertySource) ((AdapterFactoryEditingDomain) editingDomain)
-                .getAdapterFactory().adapt(value, IItemPropertySource.class);
-        }
-        return null;
-    }
-
-    /*
-     * Override superclass behavior by returning a feature as a property id. The
-     * superclass takes ItemPropertyDescritor id as property id. The
-     * ItemPropertyDescriptor returns a display name as a property id. The
-     * Notation properties will contain Styles - which is a list of style
-     * objects. The Styles are presented as a single object with flattened
-     * properties - each style object on the list contributes to the properties
-     * of the Style. For that each property must have a unique id. This is why
-     * we need to override and return a feature - since feature objects are
-     * singletons and quaranteed to be unique.
-     * 
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.views.properties.IPropertyDescriptor#getId()
-     */
-    public Object getId() {
-        return getFeature();
-    }
-
-    /**
-     * Return choice of values for the given property.
-     * 
-     * @return list containing list of values
-     */
-    public List getChoiceOfValues() {
-        Collection types = itemPropertyDescriptor
-                .getChoiceOfValues(getObject());
-        return types == null ? new ArrayList() : new ArrayList(types);
-    }
-
-    /**
-     * Resets the property to specified value.
-     * 
-     * @param value the new property value
-     */
-    public void resetPropertyValue(Object value) {
-      getItemDescriptor().resetPropertyValue(getObject());
-        
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EObjectContainmentListPropertyValue.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EObjectContainmentListPropertyValue.java
deleted file mode 100644
index a2f51e0..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EObjectContainmentListPropertyValue.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.descriptors;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-import org.eclipse.gmf.runtime.common.ui.services.properties.PropertiesServiceAdapterFactory;
-
-/**
- * A property source object that wraps around a containment list, presenting each item on the list
- * as if it was a property. 
- * 
- * @author nbalaba
- */
-public class EObjectContainmentListPropertyValue
-	implements IPropertySource {
-
-	// properties provider to obtain properties of the objects on the list
-	protected static final PropertiesServiceAdapterFactory propertiesProvider = new PropertiesServiceAdapterFactory();
-
-	// the containment list itself
-	protected EObjectContainmentEList target; 
-
-	// local descritpors cache, where key is the property id and a value is a descritor for the property
-	protected Map descriptors;
-
-	// a label provider
-	protected ILabelProvider labelProvider;
-
-	/*
-	 * @return - a default label provider
-	 */
-	private static ILabelProvider getDefaultLabelProvider() {
-		return new LabelProvider() {
-
-			public String getText(Object anObject) {
-				return ""; //$NON-NLS-1$				
-			}
-
-			public Image getImage(Object anObject) {
-				return null;
-			}
-		};
-	}
-
-	/**
-	 *  Create an instance of the <code>EObjectContainmentListPropertyValue</code>
-	 * 
-	 * @param target - contaiment list 
-	 * @param labelProvider  - label provider 
-	 */
-	public EObjectContainmentListPropertyValue(EObjectContainmentEList target,
-			ILabelProvider labelProvider) {
-		super();
-
-		this.target = target;
-		this.descriptors = new HashMap(target.size());
-		this.labelProvider = labelProvider;
-
-		for (Iterator e = target.iterator(); e.hasNext();) {
-			EObject object = (EObject) e.next();
-			createDescriptor(object);
-		}
-
-	}
-
-	/**
-	 * Create an instance of the <code>EObjectContainmentListPropertyValue</code>
-	 * 
-	 * @param target - contaiment list 
-	 */
-	public EObjectContainmentListPropertyValue(EObjectContainmentEList target) {
-		this(target, getDefaultLabelProvider());
-	}
-
-	/**
-	 * Create and cache property descriptor for the object on the list
-	 * 
-	 * @param object - object on the containment list
-	 */
-	protected void createDescriptor(EObject object) {
-		PropertyDescriptor descriptor = new PropertyDescriptor(object, object
-			.eClass().getName());
-		descriptor.setLabelProvider(labelProvider);
-		descriptors.put(object, descriptor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue()
-	 */
-	public Object getEditableValue() {
-		return this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()
-	 */
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		List list = new ArrayList(descriptors.values());
-		IPropertyDescriptor[] propertyDescriptors = new IPropertyDescriptor[list
-			.size()];
-		System
-			.arraycopy(list.toArray(), 0, propertyDescriptors, 0, list.size());
-
-		return propertyDescriptors;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object)
-	 */
-	public Object getPropertyValue(Object id) {
-
-		return propertiesProvider.getPropertySource(id);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(java.lang.Object)
-	 */
-	public boolean isPropertySet(Object id) {
-		return descriptors.containsKey(id);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object)
-	 */
-	public void resetPropertyValue(Object id) {
-		// do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object,
-	 *      java.lang.Object)
-	 */
-	public void setPropertyValue(Object id, Object value) {
-		// do notning - this a read-only property source
-
-	}
-
-	/**
-	 * @return Returns the labelProvider.
-	 */
-	public ILabelProvider getLabelProvider() {
-		return labelProvider;
-	}
-
-	/**
-	 * @param labelProvider
-	 *            The labelProvider to set.
-	 */
-	public void setLabelProvider(ILabelProvider labelProvider) {
-		this.labelProvider = labelProvider;
-	}
-
-	/**
-	 * @return Returns the target.
-	 */
-	public EObjectContainmentEList getTarget() {
-		return target;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/package.html
deleted file mode 100644
index 761e430..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Composite property descriptors for EMF property sources.
-
-<h2>Package Specification</h2>
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesDebugOptions.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesDebugOptions.java
deleted file mode 100644
index 67e7e93..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesDebugOptions.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.internal;
-
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class EMFPropertiesDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private EMFPropertiesDebugOptions() {
-		// Private constructor.
-	}
-
-	/** Debug option. */
-	public static final String DEBUG = EMFPropertiesPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	/** Debug option used to trace exception catching. */
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	
-	/** Debug option used to trace exception throwing. */
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	/** Debug option used to trace method entering. */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	
-	/** Debug option used to trace method exiting. */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesPlugin.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesPlugin.java
deleted file mode 100644
index 791dbef..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesPlugin.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.internal;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EMFPropertiesPlugin
-	extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static EMFPropertiesPlugin INSTANCE;
-
-	/**
-	 * Creates new plug-in runtime object.
-	 */
-	public EMFPropertiesPlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static EMFPropertiesPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Returns the currently active window for the workbench (if any).
-	 * 
-	 * @return The active workbench window, or null if the currently active
-	 *         window is not a workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Returns the currently active page for the active workbench window.
-	 * 
-	 * @return The active page, or null if none
-	 */
-	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window == null) {
-			return null;
-		}
-		return window.getActivePage();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesStatusCodes.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesStatusCodes.java
deleted file mode 100644
index 78acd73..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/EMFPropertiesStatusCodes.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.internal;
-
-/**
- * A list of status codes for the EMF properties plugin
- * 
- * @author ldamus
- * 
- */
-public final class EMFPropertiesStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private EMFPropertiesStatusCodes() {
-		//static class: prevent instatiation
-	}
-
-	/**
-	 * Status code indicating that no errors occurred
-	 */
-	public static final int OK = 0;
-    
-    /**
-     * Status code indicating that an error occurred with an action.
-     */
-    public static final int ACTION_FAILURE = 3;
-
-    /**
-	 * Status code indicating that an error occurred with a command.
-	 */
-	public static final int COMMAND_FAILURE = 4;
-	
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/EMFUIPropertiesMessages.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/EMFUIPropertiesMessages.java
deleted file mode 100644
index 643d57c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/EMFUIPropertiesMessages.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.emf.ui.properties.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EMFUIPropertiesMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.emf.ui.properties.internal.l10n.EMFUIPropertiesMessages";//$NON-NLS-1$
-
-	private EMFUIPropertiesMessages() {
-		// Do not instantiate
-	}
-
-	public static String EMFCompositeSourcePropertyDescriptor_undoProperty_commandName;
-	public static String PropertyPageSelection_PropertyDialog_selectedElementsTitle;
-	public static String PropertyPageViewAction_label;
-	public static String PropertyPageViewAction_tooltip;
-	public static String PropertyPageViewAction_NoPropertiesMessageBox_Title;
-	public static String PropertyPageViewAction_NoPropertiesMessageBox_Message;
-	public static String UndoablePropertySheetEntry_commandName;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFUIPropertiesMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/EMFUIPropertiesMessages.properties b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/EMFUIPropertiesMessages.properties
deleted file mode 100644
index 483141c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/EMFUIPropertiesMessages.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# EMF property descriptor realted resource strings
-EMFCompositeSourcePropertyDescriptor_undoProperty_commandName=Change
-
-# --- Property page strings to display in the GUI ---
-PropertyPageSelection_PropertyDialog_selectedElementsTitle = Selected Elements
-PropertyPageViewAction_label = P&roperties
-PropertyPageViewAction_tooltip = Property Pages
-PropertyPageViewAction_NoPropertiesMessageBox_Title=Properties
-PropertyPageViewAction_NoPropertiesMessageBox_Message=There are no property pages for this selection.
-
-# UndoablePropertySheetEntry resource strings
-UndoablePropertySheetEntry_commandName=Change {0} Property

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/package.html
deleted file mode 100644
index 0505ec4..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/l10n/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Localization utility for strings and icons for the MSL UI Properties plug-in.
-
-<h2>Package Specification</h2>
-<p></p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.ui.properties.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/package.html
deleted file mode 100644
index ee3b3df..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/internal/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Implementation of the plug-in lifecycle, debugging options, and status codes
-for the MSL UI Properties plug-in.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.ui.properties.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/providers/GenericEMFPropertiesProvider.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/providers/GenericEMFPropertiesProvider.java
deleted file mode 100644
index 3368269..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/providers/GenericEMFPropertiesProvider.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.providers;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.properties.GetPropertySourceOperation;
-import org.eclipse.gmf.runtime.common.ui.services.properties.ICompositePropertySource;
-import org.eclipse.gmf.runtime.common.ui.services.properties.IPropertiesProvider;
-import org.eclipse.gmf.runtime.emf.ui.properties.descriptors.EMFCompositePropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-
-/**
- * Provider that provides clients with generic EMF propeties.
- * 
- * @author nbalaba
- */
-public class GenericEMFPropertiesProvider
-	extends AbstractProvider
-	implements IPropertiesProvider {
-
-	/**
-	 * 
-	 */
-	public GenericEMFPropertiesProvider() {
-		super();
-	}
-
-    /**
-	 * Adapter to the EMF layer - the factory that will return IItelPropertySource adapters
-	 * @return - the EMF based composite adapter factory that will return IItelPropertySource adapters
-	 */
-	protected AdapterFactory getAdapterFactory(Object object) {
-        TransactionalEditingDomain editingDomain = TransactionUtil
-            .getEditingDomain(object);
-
-        if (editingDomain instanceof AdapterFactoryEditingDomain) {
-            return ((AdapterFactoryEditingDomain) editingDomain)
-                .getAdapterFactory();
-        }
-        return null;
-    }
-
-	/**
-	 * This implements {@link IPropertySourceProvider}.getPropertySource to
-	 * forward the call to an object that implements
-	 * {@link org.eclipse.emf.edit.provider.IItemPropertySource}.
-	 */
-	public ICompositePropertySource getPropertySource(Object object) {
-
-		if (object instanceof ICompositePropertySource) {
-			return (ICompositePropertySource) object;
-		} else {
-            AdapterFactory adapterFactory = getAdapterFactory(object);
-            if (adapterFactory == null) {
-                return null;
-            }
-			IItemPropertySource itemPropertySource = (IItemPropertySource) (adapterFactory
-				.adapt(object, IItemPropertySource.class));
-			return itemPropertySource != null ? createPropertySource(object,
-				itemPropertySource)
-				: null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-
-		return operation instanceof GetPropertySourceOperation
-			&& (((GetPropertySourceOperation) operation).getPropertySource() == null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * Instantiates and returns property source instance appropriate for this provider
-	 * 
-	 */
-	protected ICompositePropertySource createPropertySource(Object object,
-		IItemPropertySource itemPropertySource) {
-
-		return new EMFCompositePropertySource(object, itemPropertySource, "EMF"); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/providers/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/providers/package.html
deleted file mode 100644
index 4e8b3e6..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/providers/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Defines a generic, MSL-based properties provider for EMF.  Plugs in to the
-Common UI Properties service.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@see org.eclipse.gmf.runtime.common.ui.services.properties
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/PropertySheetEntry.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/PropertySheetEntry.java
deleted file mode 100644
index 53660f0..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/PropertySheetEntry.java
+++ /dev/null

@@ -1,756 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.sections;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySheetEntry;
-import org.eclipse.ui.views.properties.IPropertySheetEntryListener;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-
-import com.ibm.icu.text.Collator;
-
-/**
- * PropertySheetEntry that will be used in the PropertySheet view
- * 
- * @author nbalaba
- *  
- */
-public class PropertySheetEntry implements IPropertySheetEntry,
-        ICellEditorListener {
-
-    /**
-     * The values we are displaying/editing. These objects repesent the value of
-     * one of the properties of the values of our parent entry. Except for the
-     * root entry where they represent the input (selected) objects.
-     */
-    protected Object[] values = new Object[0];
-
-    /**
-     * The property sources for the values we are displaying/editing.
-     */
-    private Map sources = new HashMap(0);
-
-    /**
-     * The value of this entry is defined as the the first object in its value
-     * array or, if that object is an <code>IPropertySource</code>, the value
-     * it returns when sent <code>getEditableValue</code>
-     */
-    protected Object editValue;
-
-    /** Parent of this <code>PropertySheetEntry</code> */
-    protected PropertySheetEntry parent;
-
-    private IPropertySourceProvider propertySourceProvider;
-
-    /** <code>IPropertyDescriptor</code> for thie <code>PropertySheetEntry</code> */
-    protected IPropertyDescriptor descriptor;
-
-    /** <code>CellEditor</code> associated with this <code>PropertySheetEntry</code> */
-    protected CellEditor editor;
-
-    private String errorText;
-
-    private PropertySheetEntry[] childEntries = null;
-
-    private ListenerList listeners = new ListenerList();
-
-
-    /*
-     * (non-Javadoc) ICellEditorListener interface methods
-     */
-    public void editorValueChanged(boolean oldValidState, boolean newValidState) {
-        if (!newValidState)
-            // currently not valid so show an error message
-            setErrorText(editor.getErrorMessage());
-        else
-            // currently valid
-            setErrorText(null);
-    }
-
-    /*
-     * (non-Javadoc) ICellEditorListener interface methods
-     */
-    public void cancelEditor() {
-        setErrorText(null);
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public void addPropertySheetEntryListener(
-            IPropertySheetEntryListener listener) {
-        listeners.add(listener);
-    }
-
-    /*
-     * (non-Javadoc) ICellEditorListener interface methods
-     */
-    public void applyEditorValue() {
-        if (editor == null)
-            return;
-
-        // Check if editor has a valid value
-        if (!editor.isValueValid()) {
-            setErrorText(editor.getErrorMessage());
-            return;
-        } else {
-            setErrorText(null);
-        }
-
-        // See if the value changed and if so update
-        Object newValue = editor.getValue();
-        boolean changed = false;
-        if (values.length > 1) {
-            changed = true;
-        } else if (editValue == null) {
-            if (newValue != null)
-                changed = true;
-        } else if (!editValue.equals(newValue))
-            changed = true;
-
-        // Set the editor value
-        if (changed)
-            setValue(newValue);
-    }
-
-    /**
-     * Return the sorted intersection of all the
-     * <code>IPropertyDescriptor</code>s for the objects.
-     * 
-     * @return sorted <code>List</code> of all the <code>IPropertyDescriptor</code>s for the objects 
-     */
-    protected List computeMergedPropertyDescriptors() {
-        if (values.length == 0)
-            return new ArrayList(0);
-
-        // get all descriptors from each object
-        Map[] propertyDescriptorMaps = new Map[values.length];
-        for (int i = 0; i < values.length; i++) {
-            Object object = values[i];
-            IPropertySource source = getPropertySource(object);
-            if (source == null) {
-                // if one of the selected items is not a property source
-                // then we show no properties
-                return new ArrayList(0);
-            }
-            // get the property descriptors keyed by id
-            propertyDescriptorMaps[i] = computePropertyDescriptorsFor(source);
-        }
-
-        // intersect
-        Map intersection = propertyDescriptorMaps[0];
-        for (int i = 1; i < propertyDescriptorMaps.length; i++) {
-            // get the current ids
-            Object[] ids = intersection.keySet().toArray();
-            for (int j = 0; j < ids.length; j++) {
-                Object object = propertyDescriptorMaps[i].get(ids[j]);
-                if (object == null
-                        ||
-                        // see if the descriptors (which have the same id) are
-                        // compatible
-                        !((IPropertyDescriptor) intersection.get(ids[j]))
-                                .isCompatibleWith((IPropertyDescriptor) object))
-                    intersection.remove(ids[j]);
-            }
-        }
-
-        // Sort the descriptors
-        List descriptors = new ArrayList(intersection.values());
-        Collections.sort(descriptors, new Comparator() {
-            Collator coll = Collator.getInstance(Locale.getDefault());
-
-            public int compare(Object a, Object b) {
-                IPropertyDescriptor d1, d2;
-                String dname1, dname2;
-                d1 = (IPropertyDescriptor) a;
-                dname1 = d1.getDisplayName();
-                d2 = (IPropertyDescriptor) b;
-                dname2 = d2.getDisplayName();
-                return coll.compare(dname1, dname2);
-            }
-        });
-
-        return descriptors;
-    }
-
-    /**
-     * Returns an map of property descritptors (keyed on id) for the given
-     * property source.
-     * 
-     * @param source a property source for which to obtain descriptors
-     * @return a table of decriptors keyed on their id
-     */
-    protected Map computePropertyDescriptorsFor(IPropertySource source) {
-        IPropertyDescriptor[] descriptors = source.getPropertyDescriptors();
-        Map result = new HashMap(descriptors.length * 2 + 1);
-        for (int i = 0; i < descriptors.length; i++) {
-            result.put(descriptors[i].getId(), descriptors[i]);
-        }
-        return result;
-    }
-
-    /**
-     * Create our child entries.
-     */
-    protected void createChildEntries() {
-        // get the current descriptors
-        List descriptors = computeMergedPropertyDescriptors();
-
-        // rebuild child entries using old when possible
-        childEntries = createChildEntries(descriptors.size());
-        for (int i = 0; i < descriptors.size(); i++) {
-            IPropertyDescriptor d = (IPropertyDescriptor) descriptors.get(i);
-            // create new entry
-            PropertySheetEntry entry = createChildEntry();
-            entry.setDescriptor(d);
-            entry.setParent(this);
-            entry.setPropertySourceProvider(propertySourceProvider);
-            entry.refreshValues();
-            childEntries[i] = entry;
-        }
-    }
-
-    /**
-     * Creates a list of child <code>PropertySheetEntry</code> entries.
-     * 
-     * @param size list size
-     * @return list of child <code>PropertySheerEntry</code>
-     */
-    protected PropertySheetEntry[] createChildEntries(int size) {
-        return new PropertySheetEntry[size];
-    }
-    
-    /**
-     * Create child entry for this <code>PropertySheerEntry</code>
-     * 
-     * @return child <code>PropertySheetEntry</code>
-     */
-    protected PropertySheetEntry createChildEntry() {
-        return new PropertySheetEntry();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public void dispose() {
-        if (editor != null) {
-            editor.dispose();
-            editor = null;
-        }
-        // recursive call to dispose children
-        if (childEntries != null)
-            for (int i = 0; i < childEntries.length; i++) {
-                // an error in a property source may cause refreshChildEntries
-                // to fail. Since the Workbench handles such errors we
-                // can be left in a state where a child entry is null.
-                if (childEntries[i] != null)
-                    childEntries[i].dispose();
-            }
-    }
-
-    /**
-     * The child entries of this entry have changed (children added or removed).
-     * Notify all listeners of the change.
-     */
-    private void fireChildEntriesChanged() {
-        if (listeners == null)
-            return;
-        Object[] array = listeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            IPropertySheetEntryListener listener = (IPropertySheetEntryListener) array[i];
-            listener.childEntriesChanged(this);
-        }
-    }
-
-    /**
-     * The error message of this entry has changed. Notify all listeners of the
-     * change.
-     */
-    private void fireErrorMessageChanged() {
-        if (listeners == null)
-            return;
-        Object[] array = listeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            IPropertySheetEntryListener listener = (IPropertySheetEntryListener) array[i];
-            listener.errorMessageChanged(this);
-        }
-    }
-
-    /**
-     * The values of this entry have changed. Notify all listeners of the
-     * change.
-     */
-    private void fireValueChanged() {
-        if (listeners == null)
-            return;
-        Object[] array = listeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            IPropertySheetEntryListener listener = (IPropertySheetEntryListener) array[i];
-            listener.valueChanged(this);
-        }
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public String getCategory() {
-        return descriptor.getCategory();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public IPropertySheetEntry[] getChildEntries() {
-        if (childEntries == null)
-            createChildEntries();
-        return childEntries;
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public String getDescription() {
-        return descriptor.getDescription();
-    }
-
-    /**
-     * Returns the descriptor for this entry.
-     * 
-     * @return <code>IPropertyDescriptor</code> for this entry
-     */
-    protected IPropertyDescriptor getDescriptor() {
-        return descriptor;
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public String getDisplayName() {
-        return descriptor.getDisplayName();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public CellEditor getEditor(Composite parentComposite) {
-
-        if (editor == null) {
-            editor = descriptor.createPropertyEditor(parentComposite);
-            if (editor != null) {
-                editor.addListener(this);
-            }
-        }
-        if (editor != null) {
-            editor.setValue(editValue);
-            setErrorText(editor.getErrorMessage());
-        }
-        return editor;
-    }
-
-    /**
-     * Returns the edit value for the object at the given index.
-     * 
-     * @param index
-     *            the value object index
-     * @return the edit value for the object at the given index
-     */
-    protected Object getEditValue(int index) {
-        Object value = values[index];
-        IPropertySource source = getPropertySource(value);
-        if (source != null) {
-            value = source.getEditableValue();
-        }
-        return value;
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public String getErrorText() {
-        return errorText;
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public String getFilters()[] {
-        return descriptor.getFilterFlags();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public Object getHelpContextIds() {
-        return descriptor.getHelpContextIds();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public Image getImage() {
-        ILabelProvider provider = descriptor.getLabelProvider();
-        if (provider == null)
-            return null;
-        return provider.getImage(editValue);
-    }
-
-    /**
-     * Returns an property source for the given object.
-     * 
-     * @param object an object for which to obtain a property source or
-     *         <code>null</code> if a property source is not available
-     * @return an property source for the given object
-     */
-    protected IPropertySource getPropertySource(Object object) {
-        if (sources.containsKey(object))
-            return (IPropertySource) sources.get(object);
-
-        IPropertySource result = null;
-        if (propertySourceProvider != null)
-            result = propertySourceProvider.getPropertySource(object);
-        else if (object instanceof IPropertySource)
-            result = (IPropertySource) object;
-        else if (object instanceof IAdaptable)
-            result = (IPropertySource) ((IAdaptable) object)
-                    .getAdapter(IPropertySource.class);
-
-        sources.put(object, result);
-        return result;
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public String getValueAsString() {
-        if (editValue == null)
-            return "";//$NON-NLS-1$
-        ILabelProvider provider = descriptor.getLabelProvider();
-        if (provider == null)
-            return editValue.toString();
-        return provider.getText(editValue);
-    }
-
-    /**
-     * Returns the value objects of this entry.
-     * 
-     * @return the value of objects property for this entry
-     */
-    protected Object[] getValues() {
-        return values;
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public boolean hasChildEntries() {
-    	
-    	// RATLC00534750 - prevent infinite property expansion on "Expand All".
-		// No children if this value can be found in the parent hierarchy.
-		if (detectCycle(editValue, parent)) {
-			return false;
-		}
-    	
-        if (childEntries != null && childEntries.length > 0)
-            return true;
-        else
-            // see if we could have entires if we were asked
-            return computeMergedPropertyDescriptors().size() > 0;
-    }
-    
-    /**
-	 * Detects whether or not there is a property reference cycle. If the edit
-	 * <code>value</code> can be found in the parent hierarchy, then there is
-	 * a cycle.
-	 * 
-	 * @param value
-	 *            the edit value
-	 * @param parentEntry
-	 *            the parent property sheet entry
-	 * @return <code>true</code> if a cycle is found, <code>false</code>
-	 *         otherwise.
-	 */
-	private boolean detectCycle(Object value, PropertySheetEntry parentEntry) {
-
-		if (value == null || parentEntry == null) {
-			return false;
-		}
-
-		if (value.equals(parentEntry.editValue)) {
-			return true;
-		}
-
-		return detectCycle(value, parentEntry.parent);
-	}
-
-    /**
-	 * Update our child entries. This implementation tries to reuse child
-	 * entries if possible (if the id of the new descriptor matches the
-	 * descriptor id of the old entry).
-	 */
-    private void refreshChildEntries() {
-        if (childEntries == null)
-            // no children to refresh
-            return;
-
-        // get the current descriptors
-        List descriptors = computeMergedPropertyDescriptors();
-
-        // cache old entries by their descriptor id
-        Map entryCache = new HashMap(childEntries.length * 2 + 1);
-        for (int i = 0; i < childEntries.length; i++) {
-            if (childEntries[i] != null
-                    && childEntries[i].getDescriptor() != null) {
-                    entryCache.put(childEntries[i].getDescriptor().getId(),
-                        childEntries[i]);
-                }
-        }
-
-        // create a list of entries to dispose
-        List entriesToDispose = new ArrayList(Arrays.asList(childEntries));
-
-        // rebuild child entries using old when possible
-        childEntries = new PropertySheetEntry[descriptors.size()];
-        boolean entriesChanged = descriptors.size() != entryCache.size();
-        for (int i = 0; i < descriptors.size(); i++) {
-            IPropertyDescriptor d = (IPropertyDescriptor) descriptors.get(i);
-            // see if we have an entry matching this descriptor
-            PropertySheetEntry entry = (PropertySheetEntry) entryCache.get(d
-                    .getId());
-            if (entry != null) {
-                // reuse old entry
-                entry.setDescriptor(d);
-                entriesToDispose.remove(entry);
-            } else {
-                // create new entry
-                entry = createChildEntry();
-                entry.setDescriptor(d);
-                entry.setParent(this);
-                entry.setPropertySourceProvider(propertySourceProvider);
-                entriesChanged = true;
-            }
-            entry.refreshValues();
-            childEntries[i] = entry;
-        }
-
-        if (entriesChanged)
-            fireChildEntriesChanged();
-
-        //Dispose of entries which are no longer needed
-        for (int i = 0; i < entriesToDispose.size(); i++) {
-            ((IPropertySheetEntry) entriesToDispose.get(i)).dispose();
-        }
-    }
-
-    /**
-     * Refresh the entry tree from the root down
-     */
-    void refreshFromRoot() {
-        if (parent == null)
-            refreshChildEntries();
-        else
-            parent.refreshFromRoot();
-    }
-
-    /**
-     * Update our value objects. We ask our parent for the property values based
-     * on our descriptor.
-     */
-    protected void refreshValues() {
-        // get our parent's value objects
-        Object[] valueSources = parent.getValues();
-
-        // loop through the objects getting our property value from each
-        Object[] newValues = new Object[valueSources.length];
-        for (int i = 0; i < valueSources.length; i++) {
-            IPropertySource source = parent.getPropertySource(valueSources[i]);
-            newValues[i] = source.getPropertyValue(descriptor.getId());
-        }
-
-        // set our new values
-        setValues(newValues);
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public void removePropertySheetEntryListener(
-            IPropertySheetEntryListener listener) {
-        listeners.remove(listener);
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public void resetPropertyValue() {
-        if (parent == null)
-            // root does not have a default value
-            return;
-
-        //	Use our parent's values to reset our values.
-        boolean change = false;
-        Object[] objects = parent.getValues();
-        for (int i = 0; i < objects.length; i++) {
-            IPropertySource source = getPropertySource(objects[i]);
-            if (source.isPropertySet(descriptor.getId())) {
-                source.resetPropertyValue(descriptor.getId());
-                change = true;
-            }
-        }
-        if (change)
-            refreshFromRoot();
-    }
-
-    /**
-     * Set the descriptor.
-     */
-    private void setDescriptor(IPropertyDescriptor newDescriptor) {
-        // if our descriptor is changing, we have to get rid
-        // of our current editor if there is one
-        if (descriptor != newDescriptor && editor != null) {
-            editor.dispose();
-            editor = null;
-        }
-        descriptor = newDescriptor;
-    }
-
-    /**
-     * Set the error text. This should be set to null when the current value is
-     * valid, otherwise it should be set to a error string
-     * 
-     * @param newErrorText the error tex
-     */
-    protected void setErrorText(String newErrorText) {
-        errorText = newErrorText;
-        // inform listeners
-        fireErrorMessageChanged();
-    }
-
-    /**
-     * Sets the parent of the entry.
-     */
-    private void setParent(PropertySheetEntry p) {
-        parent = p;
-    }
-
-    /**
-     * Sets a property source provider for this entry. This provider is used to
-     * obtain an <code> IPropertySource </code> for each of this entries
-     * objects. If no provider is set then a default provider is used.
-     * 
-     * @param provider the <code>IPropertySourceProvider</code>
-     */
-    public void setPropertySourceProvider(IPropertySourceProvider provider) {
-        propertySourceProvider = provider;
-    }
-
-    /**
-     * Set the value for this entry.
-     * <p>
-     * We set the given value as the value for all our value objects. We then
-     * call our parent to update the property we represent with the given value.
-     * We then trigger a model refresh.
-     * <p>
-     * 
-     * @param newValue
-     *            the new value
-     */
-    protected void setValue(Object newValue) {
-        // Set the value
-        for (int i = 0; i < values.length; i++) {
-            values[i] = newValue;
-        }
-
-        // Inform our parent
-        parent.valueChanged(this);
-
-        // Refresh the model
-        refreshFromRoot();
-    }
-
-    /**
-     * The <code>PropertySheetEntry</code> implmentation of this method
-     * declared on <code>IPropertySheetEntry</code> will obtain an editable
-     * value for the given objects and update the child entries.
-     * <p>
-     * Updating the child entries will typically call this method on the child
-     * entries and thus the entire entry tree is updated
-     * </p>
-     * 
-     * @param objects
-     *            the new values for this entry
-     */
-    public void setValues(Object[] objects) {
-        values = objects;
-        sources = new HashMap(values.length * 2 + 1);
-
-        if (values.length == 0)
-            editValue = null;
-        else {
-            // set the first value object as the entry's value
-            Object newValue = values[0];
-
-            // see if we should convert the value to an editable value
-            IPropertySource source = getPropertySource(newValue);
-            if (source != null)
-                newValue = source.getEditableValue();
-            editValue = newValue;
-        }
-
-        // update our child entries
-        refreshChildEntries();
-
-        // inform listeners that our value changed
-        fireValueChanged();
-    }
-
-    /**
-     * The value of the given child entry has changed. Therefore we must set
-     * this change into our value objects.
-     * <p>
-     * We must inform our parent so that it can update its value objects
-     * </p>
-     * <p>
-     * Subclasses may override to set the property value in some custom way.
-     * </p>
-     * 
-     * @param child entry that changed its value
-     */
-    protected void valueChanged(PropertySheetEntry child) {
-        for (int i = 0; i < values.length; i++) {
-            IPropertySource source = getPropertySource(values[i]);
-            source.setPropertyValue(child.getDescriptor().getId(), child
-                    .getEditValue(i));
-        }
-
-        // inform our parent
-        if (parent != null)
-            parent.valueChanged(this);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/UndoableModelPropertySheetEntry.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/UndoableModelPropertySheetEntry.java
deleted file mode 100644
index 61a5c7c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/UndoableModelPropertySheetEntry.java
+++ /dev/null

@@ -1,339 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.sections;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.TriggeredOperations;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.ui.properties.commands.RestoreDefaultPropertyValueCommand;
-import org.eclipse.gmf.runtime.emf.ui.properties.commands.SetModelPropertyValueCommand;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.EMFPropertiesDebugOptions;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.EMFPropertiesPlugin;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.EMFPropertiesStatusCodes;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.l10n.EMFUIPropertiesMessages;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * An property sheet entry for elements in the model. The changes to the model
- * element property are done through a model command executed by the
- * <code>CommandManager</code> so that the changes can be undone by undo
- * interval ID.
- * 
- * @author ldamus
- * @author nbalaba
- */
-public class UndoableModelPropertySheetEntry extends PropertySheetEntry {
-
-    /**
-     * The operation history used by this entry to execute property change
-     * commands. <code>Null</code> if I am not the root entry. Only the root
-     * entry keeps track of the history on behalf of all of the child
-     * entries.
-     */
-    private final IOperationHistory operationHistory;
-    
-    /**
-     * My editing domain.
-     */
-    private TransactionalEditingDomain editingDomain;
-    
-    /**
-     * Intializes me with an operation history through
-     * which property change commands will be executed, undone and redone.
-     * 
-     * @param operationHistory
-     *            my operation history
-     */
-    public UndoableModelPropertySheetEntry(IOperationHistory operationHistory) {
-        this.operationHistory = operationHistory;
-    }
-    
-    /**
-     * Sets my editing domain.
-     * 
-     * @param editingDomain
-     *            my editing domain
-     */
-    public void setEditingDomain(TransactionalEditingDomain editingDomain) {
-        this.editingDomain = editingDomain;
-    }
-    
-    /**
-     * Gets my editing domain. The root entry stores the editing domain.
-     * 
-     * @return my editing domain
-     */
-    public TransactionalEditingDomain getEditingDomain() {
-
-        UndoableModelPropertySheetEntry parentEntry = getParentEntry();
-
-        if (parentEntry == null || editingDomain != null) {
-            return editingDomain;
-        }
-
-        return parentEntry.getEditingDomain();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IPropertySheetEntry.
-     */
-    public void applyEditorValue() {
-    	if (editor == null)
-    	 	return;
-        
-    	 if (!editor.isValueValid()) {
-            setErrorText(editor.getErrorMessage());
-            return;
-        } else 
-            setErrorText(null);
-
-
-        // See if the value changed and if so update
-        
-        Object newValue = editor.getValue();
-        boolean changed = false;
-        if (values.length > 1) {
-            changed = true;
-        } else if (editValue == null) {
-            if (newValue != null)
-                changed = true;
-        } else if (!editValue.equals(newValue))
-            changed = true;
-
-        // Set the editor value
-        if (changed)
-            setValue(newValue);
-
-    }
-
-    /*
-     * (non-Javadoc) Method declared on IUndoablePropertySheetEntry.
-     */
-    public void resetPropertyValue() {
-
-        // The root entry does not have a default value
-        if (parent == null) {
-            return;
-        }
-
-        //Use our parent's values to reset our values.
-        String propertyName = getDescriptor().getDisplayName();
-        Object propertyId = getDescriptor().getId();
-        CompositeCommand cc = new CompositeCommand(propertyName);
-        RestoreDefaultPropertyValueCommand restoreCommand;
-        boolean executeCommand = false;
-        Object[] parentValues = getParentEntry().getValues();
-
-        for (int i = 0; i < parentValues.length; i++) {
-
-            IPropertySource source = getPropertySource(parentValues[i]);
-
-            if (source.isPropertySet(propertyId)) {
-                restoreCommand = new RestoreDefaultPropertyValueCommand(getEditingDomain(), 
-                        propertyName, parentValues[i], source, propertyId);
-                cc.compose(restoreCommand);
-                executeCommand = true;
-            }
-        }
-
-        if (executeCommand) {
-            /* status is ok, can edit the storage units */
-            try {
-                TriggeredOperations triggerOperation = 
-                    new TriggeredOperations(cc, getOperationHistory());
-                getOperationHistory().execute(triggerOperation, new NullProgressMonitor(), null);
-                
-            } catch (ExecutionException e) {
-                Trace.catching(EMFPropertiesPlugin.getDefault(),
-                    EMFPropertiesDebugOptions.EXCEPTIONS_CATCHING,
-                    UndoableModelPropertySheetEntry.class,
-                    "resetPropertyValue", e); //$NON-NLS-1$
-                Log.error(EMFPropertiesPlugin.getDefault(),
-                    EMFPropertiesStatusCodes.COMMAND_FAILURE, e
-                        .getLocalizedMessage(), e);
-            }
-            refreshValues();
-        }
-    }
-
-    /**
-     * Set the value for this entry.
-     * <p>
-     * We set the given value as the value for all our value objects. We then
-     * call our parent to update the property we represent with the given value.
-     * We then trigger a model refresh.
-     * <p>
-     * 
-     * @param newValue
-     *            the new value
-     */
-    protected void setValue(Object newValue) {
-
-        // Set the value
-        for (int i = 0; i < values.length; i++)
-            values[i] = newValue;
-
-        // Inform our parent
-        getParentEntry().valueChanged(
-                this,
-                getCompositeCommand(MessageFormat.format(
-                		EMFUIPropertiesMessages.UndoablePropertySheetEntry_commandName,
-                        new String[] { getDescriptor().getDisplayName() })));
-        
-        // Remember the new value so that we don't apply this same value more
-        // than once.
-        editValue = newValue;
-    }
-
-    /**
-     * The value of the given child entry has changed. Therefore we must set
-     * this change into our value objects.
-     * <p>
-     * We must inform our parent so that it can update its value objects
-     * </p>
-     * <p>
-     * Subclasses may override to set the property value in some custom way.
-     * </p>
-     * 
-     * @param child
-     *            the child entry that changed its value
-     * @param command
-     *            the command into which to compose my property chnage command
-     */
-    protected void valueChanged(UndoableModelPropertySheetEntry child,
-            ICommand command) {
-
-        String propertyName = child.getDescriptor().getDisplayName();
-
-        Object propertyId = child.getDescriptor().getId();
-
-        for (int i = 0; i < values.length; i++)
-            command.compose(getPropertyCommand(propertyName, values[i],
-                    propertyId, child.getEditValue(i)));
-
-        // inform our parent
-        if (getParentEntry() != null) {
-            getParentEntry().valueChanged(this, command);
-        } else {
-            //I am the root entry
-            try {
-                TriggeredOperations triggerOperation = 
-                    new TriggeredOperations(command, getOperationHistory());
-                getOperationHistory().execute(triggerOperation, new NullProgressMonitor(), null);
-          
-            } catch (ExecutionException e) {
-                Trace.catching(EMFPropertiesPlugin.getDefault(),
-                    EMFPropertiesDebugOptions.EXCEPTIONS_CATCHING,
-                    UndoableModelPropertySheetEntry.class,
-                    "valueChanged", e); //$NON-NLS-1$
-                Log.error(EMFPropertiesPlugin.getDefault(),
-                    EMFPropertiesStatusCodes.COMMAND_FAILURE, e
-                        .getLocalizedMessage(), e);
-            }
-        }
-    }
-    
-    /**
-     * Extracts the editing domain from the <code>objects</code> if I am the
-     * root entry.
-     */
-    public void setValues(Object[] objects) {
-        super.setValues(objects);
-
-        if (getParentEntry() == null) {
-            // I'm the root
-            for (int i = 0; i < objects.length; i++) {
-                EObject eObject = null;
-
-                if (objects[i] instanceof EObject) {
-                    eObject = (EObject) objects[i];
-
-                } else if (objects[i] instanceof IAdaptable) {
-                    eObject = (EObject) ((IAdaptable) objects[i])
-                        .getAdapter(EObject.class);
-                }
-
-                if (eObject != null) {
-                    setEditingDomain(TransactionUtil.getEditingDomain(eObject));
-                }
-            }
-        }
-    }
-    
-    /**
-     * Gets my operation history.
-     * 
-     * @return my operation history
-     */
-    protected final IOperationHistory getOperationHistory() {
-        return operationHistory;
-    }
-
-    /**
-     * Returns the parent. This can be another <code>PropertySheetEntry</code>
-     * or <code>null</code>.
-     */
-    protected UndoableModelPropertySheetEntry getParentEntry() {
-        return (UndoableModelPropertySheetEntry) parent;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.internal.views.properties.UndoablePropertySheetEntry#getPropertyCommand(java.lang.String,
-     *      org.eclipse.ui.views.properties.IPropertySource, java.lang.Object,
-     *      java.lang.Object)
-     */
-    protected ICommand getPropertyCommand(String propertyName, Object object,
-            Object propertyId, Object value) {
-
-        return new SetModelPropertyValueCommand(getEditingDomain(), propertyName, object,
-                getPropertySource(object), propertyId, value);
-    }
-
-    protected ICompositeCommand getCompositeCommand(String propertyName) {
-        return new CompositeTransactionalCommand(getEditingDomain(), propertyName);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.internal.views.properties.UndoablePropertySheetEntry#createChildEntries(int)
-     */
-    protected PropertySheetEntry[] createChildEntries(int size) {
-        return new UndoableModelPropertySheetEntry[size];
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.internal.views.properties.UndoablePropertySheetEntry#createChildEntry()
-     */
-    protected PropertySheetEntry createChildEntry() {
-        return new UndoableModelPropertySheetEntry(getOperationHistory());
-
-    }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/package.html
deleted file mode 100644
index 9f47c1c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Classes for use in defining property editors to compose sections of the
-properties view.
-
-<h2>Package Specification</h2>
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/BooleanPropertyHelper.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/BooleanPropertyHelper.java
deleted file mode 100644
index d1c76a7..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/BooleanPropertyHelper.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.util;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Helper class used by boolean-based property descriptors and cell editors. It
- * provides for conversion from/to objects used by cell editors. It also
- * provides abstract methods to set/get the actual property.
- * 
- * @author dmisic
- */
-public abstract class BooleanPropertyHelper {
-
-	/**
-	 * Integer constant representing the boolean 'false'
-	 */
-	private final static Integer INT_FALSE = new Integer(0);
-
-	/**
-	 * Integer constant representing the boolean 'true'
-	 */
-	private final static Integer INT_TRUE = new Integer(1);
-
-	/**
-	 * The element that owns the property
-	 */
-	private EObject element;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param element The element that owns the property
-	 */
-	public BooleanPropertyHelper(EObject element) {
-		super();
-		this.element = element;
-	}
-
-	/**
-	 * Checks if the provided object is compatible with the boolean based
-	 * property. This implementation requires the value to be of type Integer.
-	 * This method may be overwritten but only in conjunction with setValue().
-	 * 
-	 * @param obj Object to be checked
-	 * @return 'true' if the object is compatible
-	 */
-	public boolean isCompatible(Object obj) {
-		return (obj != null && obj instanceof Integer);
-	}
-
-	/**
-	 * Sets the value to the boolean property. If the object (value) is not
-	 * compatible, throws the IllegalArgumentException exception. This
-	 * implementation requires the value to be of type Integer. This method may
-	 * be overwritten but only in conjunction with isCompatible().
-	 * 
-	 * @param value Value to be set
-	 */
-	public void setValue(Object value) {
-		if (!isCompatible(value)) {
-			throw new IllegalArgumentException();
-		}
-
-		boolean boolValue = false;
-		if (((Integer) value).intValue() == 1) {
-			boolValue = true;
-		}
-		setBooleanValue(boolValue);
-	}
-
-	/**
-	 * Clients should overwrite to set the boolean value to the property.
-	 * 
-	 * @param value Boolean value to be set
-	 */
-	abstract protected void setBooleanValue(boolean value);
-
-	/**
-	 * Gets the Integer representation of the boolean property.
-	 * 
-	 * @return Integer representation of the boolean property
-	 */
-	public Integer getValue() {
-		if (getBooleanValue()) {
-			return INT_TRUE;
-		}
-		return INT_FALSE;
-	}
-
-	/**
-	 * Clients should overwrite to get the boolean value from the property.
-	 * 
-	 * @return Boolean value from the property
-	 */
-	abstract protected boolean getBooleanValue();
-
-	/**
-	 * @return Returns the element that owns the property.
-	 */
-	public EObject getElement() {
-		return element;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/PropertyPageSelection.java b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/PropertyPageSelection.java
deleted file mode 100644
index baa85b1..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/PropertyPageSelection.java
+++ /dev/null

@@ -1,218 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.properties.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.properties.internal.l10n.EMFUIPropertiesMessages;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IActionFilter;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * A structured selection for use in the property page dialog.  It
- * adapts to the following types
- * <P>
- * <UL>
- * <LI>IElement</LI>
- * <LI>IStructuredSelection</LI>
- * <LI>IActionFilter</LI>
- * <LI>IPropertySource</LI>
- * <LI>IWorkbenchAdapter</LI>
- * <LI>CellEditor</LI>
- * </UL>
- * <P>
- * 
- * @author ldamus
- */
-public class PropertyPageSelection
-    implements IAdaptable, IStructuredSelection {
-
-    /**
-     * My selection
-     */
-    private final IStructuredSelection selection;
-
-    /**
-     * My workbench adapter 
-     */
-    private IWorkbenchAdapter workbenchAdapter;
-
-    /**
-     * Constructs a new instance with a single selected object
-     * 
-     * @param selectedObject The selected object
-     */
-    public PropertyPageSelection(Object selectedObject) {
-        this(new ArrayList(Collections.singleton(selectedObject)));
-    }
-
-    /**
-     * Constructs a new instance with a list of selected objects.
-     * 
-     * @param selectedObjects The objects that are selected
-     */
-    public PropertyPageSelection(List selectedObjects) {
-        super();
-        selection = new StructuredSelection(selectedObjects);
-    }
-
-    /**
-     * Returns my selection
-     * 
-     * @return my selection
-     */
-    private IStructuredSelection getSelection() {
-        return selection;
-    }
-
-    /**
-     * Gets my workbench adapter. If I contain more than a
-     * single selection, the label will be "Selected Elements". If
-     * I contain a single selection, the label will be my IElement
-     * name. This label is used in the title of the <code>PropertyDialog</code>.
-     * 
-     * @return my workbench adapter
-     */
-    private IWorkbenchAdapter getWorkbenchAdapter() {
-
-        if (workbenchAdapter == null) {
-            workbenchAdapter = new IWorkbenchAdapter() {
-
-                public Object[] getChildren(Object o) {
-                    return null;
-                }
-                public ImageDescriptor getImageDescriptor(Object object) {
-                    return null;
-                }
-                public String getLabel(Object o) {
-                    if (getSelection().size() > 1) {
-                        return EMFUIPropertiesMessages.PropertyPageSelection_PropertyDialog_selectedElementsTitle;
-                    } else {
-                        EObject element =
-                            (EObject) getAdapter(EObject.class);
-                        if (element != null) {
-                            return ParserService.getInstance().getPrintString(
-                                new EObjectAdapter(element));
-                        } else {
-                            return EMFUIPropertiesMessages.PropertyPageSelection_PropertyDialog_selectedElementsTitle;
-                        }
-
-                    }
-                }
-                public Object getParent(Object o) {
-                    return null;
-                }
-            };
-        }
-
-        return workbenchAdapter;
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
-     */
-    public Object getAdapter(Class adapter) {
-
-        if (EObject.class.equals(adapter)) {
-            return ((IAdaptable) getSelection().getFirstElement()).getAdapter(
-            		EObject.class);
-
-        } else if (IStructuredSelection.class.equals(adapter)) {
-            return this;
-
-        } else if (IActionFilter.class.equals(adapter)) {
-            return ActionFilterService.getInstance();
-
-        } else if (IPropertySource.class.equals(adapter)) {
-            return ((IAdaptable) getSelection().getFirstElement()).getAdapter(
-                IPropertySource.class);
-
-        } else if (IWorkbenchAdapter.class.equals(adapter)) {
-            return getWorkbenchAdapter();
-
-        } else if (CellEditor.class.equals(adapter)) {
-            return ((IAdaptable) getSelection().getFirstElement()).getAdapter(
-                CellEditor.class);
-        }
-        return null;
-    }
-
-    /**
-     * Returns whether this selection is empty.
-     * 
-     * @return <code>true</code> if this selection is empty,
-     *   and <code>false</code> otherwise
-     */
-    public boolean isEmpty() {
-        return getSelection().isEmpty();
-    }
-
-    /**
-     * Returns the first element in this selection, or <code>null</code>
-     * if the selection is empty.
-     *
-     * @return an element, or <code>null</code> if none
-     */
-    public Object getFirstElement() {
-        return getSelection().getFirstElement();
-    }
-
-    /**
-     * Returns an iterator over the elements of this selection.
-     *
-     * @return an iterator over the selected elements
-     */
-    public Iterator iterator() {
-        return getSelection().iterator();
-    }
-
-    /**
-     * Returns the number of elements selected in this selection.
-     *
-     * @return the number of elements selected
-     */
-    public int size() {
-        return getSelection().size();
-    }
-
-    /**
-     * Returns the elements in this selection as an array.
-     *
-     * @return the selected elements as an array
-     */
-    public Object[] toArray() {
-        return getSelection().toArray();
-    }
-
-    /**
-     * Returns the elements in this selection as a <code>List</code>.
-     *
-     * @return the selected elements as a list
-     */
-    public List toList() {
-        return getSelection().toList();
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/package.html b/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/package.html
deleted file mode 100644
index f841c1c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/util/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Miscellaneous utility classes for re-use in implementing property editors,
-actions, etc.
-
-<h2>Package Specification</h2>
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/.classpath b/org.eclipse.gmf.runtime.emf.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.emf.ui/.cvsignore b/org.eclipse.gmf.runtime.emf.ui/.cvsignore
deleted file mode 100644
index edfb53f..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-doc
-org

diff --git a/org.eclipse.gmf.runtime.emf.ui/.options b/org.eclipse.gmf.runtime.emf.ui/.options
deleted file mode 100644
index ef9bfe2..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.options
+++ /dev/null

@@ -1,17 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.emf.ui plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.emf.ui plug-in
-org.eclipse.gmf.runtime.emf.ui/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.emf.ui/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.emf.ui/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting=false
-
-# Trace when model operations are executed
-org.eclipse.gmf.runtime.emf.ui/debug/model/operations=false
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/.project b/org.eclipse.gmf.runtime.emf.ui/.project
deleted file mode 100644
index bb81dca..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.ui</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.emf.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.emf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index b64e056..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.emf.ui; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.emf.ui.action,
- org.eclipse.gmf.runtime.emf.ui.dialogs,
- org.eclipse.gmf.runtime.emf.ui.internal;x-friends:="org.eclipse.gmf.runtime.diagram.ui.properties",
- org.eclipse.gmf.runtime.emf.ui.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.emf.ui.preferences,
- org.eclipse.gmf.runtime.emf.ui.providers.marker,
- org.eclipse.gmf.runtime.emf.ui.services.action,
- org.eclipse.gmf.runtime.emf.ui.services.modelingassistant,
- org.eclipse.gmf.runtime.emf.ui.services.parser
-Require-Bundle: org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.emf.ui/about.html b/org.eclipse.gmf.runtime.emf.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/build.properties b/org.eclipse.gmf.runtime.emf.ui/build.properties
deleted file mode 100644
index 1f4c93a..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2007  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               .options,\
-               META-INF/,\
-               .,\
-               about.html,\
-               icons/
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/org.eclipse.gmf.runtime.emf.ui/icons/full/lock.gif b/org.eclipse.gmf.runtime.emf.ui/icons/full/lock.gif
deleted file mode 100644
index 5660a49..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/icons/full/lock.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.emf.ui/plugin.properties b/org.eclipse.gmf.runtime.emf.ui/plugin.properties
deleted file mode 100644
index f29f125..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/plugin.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF MSL UI
-Plugin.providerName = Eclipse.org
-
-ext.actionFilterProviders = GMF MSL UI Action Filter Providers
-ext.modelingAssistantProviders = GMF MSL UI Modeling Assistant Providers
-
-Validation_Preference_Page_Name=Validation
-
-# Category for Modeling
-createWizardCategory = Modeling
-ext.modelingNewWizards = New Modeling Wizards

diff --git a/org.eclipse.gmf.runtime.emf.ui/plugin.xml b/org.eclipse.gmf.runtime.emf.ui/plugin.xml
deleted file mode 100644
index 83233b9..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/plugin.xml
+++ /dev/null

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-     <extension-point id="modelingAssistantProviders" name="%ext.modelingAssistantProviders" schema="schema/modelingAssistantProviders.exsd"/>
-
-   <extension
-         id="modelingNewWizards"
-         name="%ext.modelingNewWizards"
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%createWizardCategory"
-            id="org.eclipse.gmf.runtime.emf.ui.modeling">
-      </category>
-  </extension>
-</plugin>

diff --git a/org.eclipse.gmf.runtime.emf.ui/schema/modelingAssistantProviders.exsd b/org.eclipse.gmf.runtime.emf.ui/schema/modelingAssistantProviders.exsd
deleted file mode 100644
index 845cf49..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/schema/modelingAssistantProviders.exsd
+++ /dev/null

@@ -1,306 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.emf.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.emf.ui" id="modelingAssistantProviders" name="Modeling Assistant Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define modeling assistant providers for the modeling assistant service.  The modeling assistant service allows plug-ins to modify or contribute to the modeling assistant behavior (e.g. connector handles).
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="modelingAssistantProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point, i.e. &lt;tt&gt;org.eclipse.gmf.runtime.emf.ui.modelingAssistantProvider&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. MyModelingAssistantProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.myModelingAssistantProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="modelingAssistantProvider">
-      <annotation>
-         <documentation>
-            The modeling assistant provider description tag
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="object" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="context" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of the modeling assistant provider class
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the modeling assistant provider
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The priority of the provider. It can be one of the following values:
-&lt;Lowest, Low, Medium, High, Highest&gt;.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="object">
-      <annotation>
-         <documentation>
-            A descriptor of an object that is examined by this provider. The object descriptor can include an optional set of methods to call on the object.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique (within the context of this provider definition) identifier for the object
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface that is assignable from or adaptable to the object. The name could be followed (between paranthesis &quot;()&quot;) by the id of a plugin whose classloader is able to load that class. The finaly syntax is:
-className&lt;(plugin id)&gt;?
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="method">
-      <annotation>
-         <documentation>
-            A method to call by reflection on the object. The method has a name and a value. The value could be described by its string representation (value &amp; notValue), or as an object &quot;value&quot; or &quot;notValue&quot;. 
-
-The rules of evaluation are as follows:
-
-1- The return value string has to be in the &quot;value&quot; string set.
-2- The return value string has to be not in the &quot;notValue&quot; string set.
-3- The return value object has to be in the &quot;value&quot; object set.
-4- The return value object has to be not in the &quot;notValue&quot; object set.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="value" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="notValue" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the method followed by an optional paramter set between paranthesis &quot;()&quot;. The parameter set can contain any number of string parameters (literals). other param types are not supported. The method name could contain nested calling separated by &quot;.&quot; The general format for this method name is : &lt;func(&lt;param&lt;,param&gt;*&gt;?).&lt;&lt;func(&lt;param&lt;,param&gt;*&gt;?)&gt;*
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated (&quot;,&quot;) list of string representations of the method return value. The string representation of the value is expected to be &quot;one&quot; of those in the list. The syntax to use is the following: &lt;string&gt;&lt;,&lt;string&gt;&gt;*
-If (&quot;,&quot;) is expected to be in one of the strings, it has to be escaped by a forward slash (&quot;\&quot;). &quot;null&quot; is accepted as a string and it means (a null object).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="notValue" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated (&quot;,&quot;) list of string representations of the method return value that is not expected (the execulsion set). The string representation of the value is expected &quot;not&quot; to be &quot;one&quot; of those in the list. The syntax to use is the following: &lt;string&gt;&lt;,&lt;string&gt;&gt;*
-If (&quot;,&quot;) is expected to be in one of the strings, it has to be escaped by a forward slash (&quot;\&quot;). &quot;null&quot; is accepted as a string and it means (a null object).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="value">
-      <annotation>
-         <documentation>
-            A descriptor of an object that represents a method&apos;s returned value. The descriptor can include an optional set of methods to call on the &quot;value&quot; object.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface that is assignable from or adaptable to the &quot;value&quot; object. The name could be followed (between paranthesis &quot;()&quot;) by the id of a plugin whose classloader is able to load that class. The finaly syntax is:
-className&lt;(plugin id)&gt;?
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="notValue">
-      <annotation>
-         <documentation>
-            A descriptor of an object that represents a method&apos;s returned value that is not required. The descriptor can include an optional set of methods to call on the &quot;notValue&quot; object.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface that is assignable from or adaptable to the &quot;value&quot; object. The name could be followed (between paranthesis &quot;()&quot;) by the id of a plugin whose classloader is able to load that class. The finaly syntax is:
-className&lt;(plugin id)&gt;?
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="context">
-      <annotation>
-         <documentation>
-            The context of a modeling assistant provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="operationId" type="string">
-            <annotation>
-               <documentation>
-                  A string representation of the operation id in this context (see IModelingAssistantOperation).  If this field is omitted, the provider will be considered for all operation types.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="elements" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated list of object ids (from the provider XML definition) that are valid element context(s) for the operation id in this context description.  If this field is omitted, the provider will be considered for all element types.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Here is an example for a modeling assistant provider that provides types for all outgoing connector handle gestures on classes and interfaces.
-
-&lt;PRE&gt;
-   &lt;extension id=&quot;LogicModelingAssistantProvider&quot; name=&quot;%logic.provider.modelingassistant&quot; point=&quot;org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders&quot;&gt;
-      &lt;modelingAssistantProvider class=&quot;org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicModelingAssistantProvider&quot;&gt;
-         &lt;Priority name=&quot;Low&quot;/&gt;
-         &lt;object class=&quot;org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.ConnectionPointEditPart(org.eclipse.gmf.examples.runtime.diagram.logic)&quot; 
-         	id=&quot;CONNECTIONPOINT&quot;&gt;                        
-         &lt;/object&gt;
-         &lt;object class=&quot;org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicFlowCompartmentEditPart(org.eclipse.gmf.examples.runtime.diagram.logic)&quot; 
-         	id=&quot;LOGIC_FLOW_COMPARTMENT&quot;&gt;               
-         &lt;/object&gt;
-         &lt;object class=&quot;org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LogicShapeCompartmentEditPart(org.eclipse.gmf.examples.runtime.diagram.logic)&quot; 
-         	id=&quot;LOGIC_SHAPE_COMPARTMENT&quot;&gt;               
-         &lt;/object&gt;
-         &lt;context elements=&quot;CONNECTIONPOINT,LOGIC_FLOW_COMPARTMENT,LOGIC_SHAPE_COMPARTMENT&quot;/&gt;
-      &lt;/modelingAssistantProvider&gt;
-   &lt;/extension&gt;
-&lt;/PRE&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
- 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 
- &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/AbstractModelActionDelegate.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/AbstractModelActionDelegate.java
deleted file mode 100644
index 48f3382..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/AbstractModelActionDelegate.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.action;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionDelegate;
-import org.eclipse.gmf.runtime.common.ui.action.IActionWithProgress;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIDebugOptions;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIStatusCodes;
-
-/**
- * The abstract parent of all concrete action delegates that execute model
- * commands. Concrete subclasses must provide a definition of the
- * <code>doRun()</code> method to gather any required input and execute a
- * model command.
- * <P>
- * Subclasses that execute a command must return <code>false</code>from
- * {@link #isReadOnly()}. The superclass performs the
- * {@link #doRun(IProgressMonitor)} method in an EMF operation executed on the
- * operation history. Subclasses should set the action delegate status using
- * {@link #setStatus(IStatus)} to their command execution status.
- * <P>
- * Subclasses that only want to read from the model must return
- * <code>true</code> from {@link #isReadOnly()}.
- * 
- * @author khussey
- * @auther ldamus
- */
-public abstract class AbstractModelActionDelegate
-	extends AbstractActionDelegate {
-    
-    private IStatus status;
-    
-    /**
-     * Intializes me with the singleton editing domain.
-     */
-    protected AbstractModelActionDelegate() {
-        super();
-    }
-
-	/**
-     * Runs this model action delegate as a read action.
-     * 
-     * @see IActionWithProgress#run(IProgressMonitor)
-     */
-    public final void run(final IProgressMonitor progressMonitor) {
-
-        if (isReadOnly()) {
-            // run exclusive so that subclasses can only read from the model
-            try {
-                getEditingDomain().runExclusive(new Runnable() {
-
-                    public void run() {
-                        AbstractModelActionDelegate.super.run(progressMonitor);
-                    }
-                });
-            } catch (InterruptedException e) {
-                Trace
-                    .catching(MslUIPlugin.getDefault(),
-                        MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                        "run", e); //$NON-NLS-1$
-            }
-
-        } else {
-            // Run in a composite transactional operation so that subclasses can
-			// both read and write to the model. Commands executed by subclasses
-			// to modify the model will be appended to this composite
-			// transactional operation.
-        	
-        	Runnable runnable = new Runnable() {
-				public void run() {
-					AbstractModelActionDelegate.super
-							.run(progressMonitor);
-				}
-			};
-			
-        	WriteCommand write = new WriteCommand(getEditingDomain(),
-					getLabel(), getActionManager().getOperationHistory(),
-					runnable) {
-        		
-				public IStatus getStatus() {
-					return AbstractModelActionDelegate.this.getStatus();
-				}
-			};
-
-            execute(write, new NullProgressMonitor(), null);
-        }
-    }
-    
-    /**
-     * Gets my editing domain. Can be <code>null</code> if I don't modify
-     * model resources.
-     * 
-     * @return my editing domain.
-     */
-    protected abstract TransactionalEditingDomain getEditingDomain();
-    
-    /**
-     * Answers whether or not I am a read-only action. Returns
-     * <code>false</code> by default. Subclasses may override.
-     * 
-     * @return <code>false</code>
-     */
-    protected boolean isReadOnly() {
-        return false;
-    }
-    
-    /**
-     * Gets the status of running this action delegate.
-     * 
-     * @return my status
-     */
-    protected IStatus getStatus() {
-        if (status == null) {
-            return Status.OK_STATUS;
-        }
-        return status;
-    }
-    
-    /**
-     * Sets the action delegate status. Subclasses should set the status when they
-     * execute a command.
-     * 
-     * @param status
-     *            the new status
-     */
-    protected void setStatus(IStatus status) {
-        this.status = status;
-    }
-    
-    /**
-	 * Convenience method for subclasses to execute an undoable operation on the
-	 * action manager's operation history. Sets my status to the status of the
-	 * operation execution, and returns that status.
-	 * 
-	 * @param operation
-	 *            the operation to be executed
-	 * @param progressMonitor
-	 *            the progress monitor
-	 * @param info
-	 *            the adaptable info, may be <code>null</code>
-	 * @return the status of the operation execution.
-	 */
-	protected IStatus execute(IUndoableOperation operation,
-			IProgressMonitor progressMonitor, IAdaptable info) {
-
-		try {
-			setStatus(getActionManager().getOperationHistory().execute(
-					operation, progressMonitor, info));
-
-		} catch (ExecutionException e) {
-			setStatus(new Status(Status.ERROR, MslUIPlugin.getPluginId(),
-					MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-							.getLocalizedMessage(), e));
-			Trace
-					.catching(MslUIPlugin.getDefault(),
-							MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-							"run", e); //$NON-NLS-1$
-			Log.error(MslUIPlugin.getDefault(),
-					MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-							.getLocalizedMessage(), e);
-		}
-		return getStatus();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/AbstractModelActionHandler.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/AbstractModelActionHandler.java
deleted file mode 100644
index 494bd23..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/AbstractModelActionHandler.java
+++ /dev/null

@@ -1,199 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.action;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler;
-import org.eclipse.gmf.runtime.common.ui.action.IActionWithProgress;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIDebugOptions;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIStatusCodes;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * The abstract parent of all concrete action handlers that execute model
- * commands. Concrete subclasses must provide a definition of the
- * <code>doRun()</code> method to gather any required input and execute a model
- * command.
- * 
- * @author khussey
- * @auther ldamus
- */
-public abstract class AbstractModelActionHandler
-	extends AbstractActionHandler {
-    
-    private IStatus status;
-
-	/**
-	 * Constructs a new model action handler for the specified workbench part.
-	 * 
-	 * @param workbenchPart The workbench part to which this model action
-	 *                       handler applies.
-	 */
-	protected AbstractModelActionHandler(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-	}
-
-	/**
-	 * Constructs a new model action handler for the specified workbench page.
-	 * 
-	 * @param workbenchPage The workbench page to which this model action
-	 *                       handler applies.
-	 */
-	protected AbstractModelActionHandler(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	/**
-	 * Runs this model action handler as a read action.
-	 * 
-	 * @see IActionWithProgress#run(IProgressMonitor)
-	 */
-	public final void run(final IProgressMonitor progressMonitor) {
-        
-        if (isReadOnly()) {
-            // run exclusive so that subclasses can only read from the model
-            try {
-                getEditingDomain().runExclusive(new Runnable() {
-
-                    public void run() {
-                        AbstractModelActionHandler.super.run(progressMonitor);
-                    }
-                });
-            } catch (InterruptedException e) {
-                Trace
-                    .catching(MslUIPlugin.getDefault(),
-                        MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                        "run", e); //$NON-NLS-1$
-            }
-
-        } else {
-        	// Run in a composite transactional operation so that subclasses can
-			// both read and write to the model. Commands executed by subclasses
-			// to modify the model will be appended to this composite
-			// transactional operation.
-        	
-        	Runnable runnable = new Runnable() {
-				public void run() {
-					AbstractModelActionHandler.super
-							.run(progressMonitor);
-				}
-			};
-			
-        	WriteCommand write = new WriteCommand(getEditingDomain(),
-					getLabel(), getActionManager().getOperationHistory(),
-					runnable) {
-        		
-				public IStatus getStatus() {
-					return AbstractModelActionHandler.this.getStatus();
-				}
-			};
-			
-            execute(write, new NullProgressMonitor(), null);
-        }
-        
-	}
-    
-    /**
-     * Gets my editing domain. Can be <code>null</code> if I don't modify
-     * model resources.
-     * 
-     * @return my editing domain.
-     */
-    protected abstract TransactionalEditingDomain getEditingDomain();
-    
-    /**
-     * Answers whether or not I am a read-only action. Returns
-     * <code>false</code> by default. Subclasses may override.
-     * 
-     * @return <code>false</code>
-     */
-    protected boolean isReadOnly() {
-        return false;
-    }
-    
-    /**
-     * Gets the status of running this action delegate.
-     * 
-     * @return my status
-     */
-    protected IStatus getStatus() {
-        if (status == null) {
-            return Status.OK_STATUS;
-        }
-        return status;
-    }
-    
-    /**
-     * Sets the action delegate status. Subclasses should set the status when they
-     * execute a command.
-     * 
-     * @param status
-     *            the new status
-     */
-    protected void setStatus(IStatus status) {
-        this.status = status;
-    }
-    
-    /**
-	 * Convenience method for subclasses to execute an undoable operation on the
-	 * action manager's operation history. Sets my status to the status of the
-	 * operation execution, and returns that status.
-	 * 
-	 * @param operation
-	 *            the operation to be executed
-	 * @param progressMonitor
-	 *            the progress monitor
-	 * @param info
-	 *            the adaptable info, may be <code>null</code>
-	 * @return the status of the operation execution.
-	 */
-	protected IStatus execute(IUndoableOperation operation,
-			IProgressMonitor progressMonitor, IAdaptable info) {
-
-		try {
-			setStatus(getActionManager().getOperationHistory().execute(
-					operation, progressMonitor, info));
-
-		} catch (ExecutionException e) {
-			setStatus(new Status(Status.ERROR, MslUIPlugin.getPluginId(),
-					MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-							.getLocalizedMessage(), e));
-			Trace
-					.catching(MslUIPlugin.getDefault(),
-							MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-							"run", e); //$NON-NLS-1$
-			Log.error(MslUIPlugin.getDefault(),
-					MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-							.getLocalizedMessage(), e);
-		}
-		return getStatus();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/WriteCommand.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/WriteCommand.java
deleted file mode 100644
index 63a4621..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/WriteCommand.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.action;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.ICompositeOperation;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-
-/**
- * Command used to allow subclasses of the {@link AbstractModelActionDelegate}
- * to read and write to the model from their #doRun implementation.
- * <P>
- * This is a kind of {@link ICompositeOperation} that opens itself on the
- * operation history. It runs a {@link Runnable} supplied at the time of
- * instantiation and any operations executed through the history in that
- * runnable are considered to be part of the composite, and can be undone and
- * redone in a single step. This allows file modification validation to be done
- * on each command executed by a subclass of {@link AbstractModelActionDelegate}.
- * 
- * @author ldamus
- */
-abstract class WriteCommand extends AbstractTransactionalCommand implements
-		ICompositeOperation {
-
-	private final CompositeTransactionalCommand compositeDelegate;
-
-	private final Runnable runnable;
-
-	private final IOperationHistory history;
-
-	/**
-	 * Initializes me.
-	 * 
-	 * @param domain
-	 *            my editing domain
-	 * @param label
-	 *            my user-readable label
-	 * @param history
-	 *            the operation history
-	 * @param runnable
-	 *            the runnable to run when I execute
-	 */
-	public WriteCommand(TransactionalEditingDomain domain, String label,
-			IOperationHistory history, Runnable runnable) {
-
-		super(domain, label, null);
-		this.compositeDelegate = new CompositeTransactionalCommand(domain,
-				label);
-		this.runnable = runnable;
-		this.history = history;
-	}
-
-	/**
-	 * Opens a composite operation on the operation history and runs the
-	 * runnable.
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor progressMonitor, IAdaptable info)
-			throws ExecutionException {
-
-		if (runnable != null) {
-			history.openOperation(this, IOperationHistory.EXECUTE);
-
-			try {
-				runnable.run();
-				history.closeOperation(getStatus().isOK(), false,
-						IOperationHistory.EXECUTE);
-
-			} catch (RuntimeException e) {
-				history.closeOperation(false, false, IOperationHistory.EXECUTE);
-				throw e;
-			}
-		}
-
-		// have to compute the result because we didn't actually execute the
-		// compositeDelegate
-		return computeResult();
-	}
-
-	/**
-	 * Redoes the commands that were accumulated when the runnable was run.
-	 */
-	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-			IAdaptable info) throws ExecutionException {
-
-		compositeDelegate.redo(progressMonitor, info);
-		return compositeDelegate.getCommandResult();
-	}
-
-	/**
-	 * Undoes the commands that were accumulated when the runnable was run.
-	 */
-	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor,
-			IAdaptable info) throws ExecutionException {
-
-		compositeDelegate.undo(progressMonitor, info);
-		return compositeDelegate.getCommandResult();
-	}
-
-	/**
-	 * Adds to my {@link CompositeTransactionalCommand} delegate.
-	 */
-	public void add(IUndoableOperation operation) {
-
-		compositeDelegate.add(operation);
-		refreshContexts();
-	}
-
-	/**
-	 * Removes from my {@link CompositeTransactionalCommand} delegate.
-	 */
-	public void remove(IUndoableOperation operation) {
-		compositeDelegate.remove(operation);
-		refreshContexts();
-	}
-
-	private void refreshContexts() {
-
-		IUndoContext[] currentContexts = getContexts();
-
-		for (int i = 0; i < currentContexts.length; i++) {
-			if (!compositeDelegate.hasContext(currentContexts[i])) {
-				removeContext(currentContexts[i]);
-			}
-		}
-
-		IUndoContext[] newContexts = compositeDelegate.getContexts();
-
-		for (int i = 0; i < newContexts.length; i++) {
-			if (!hasContext(newContexts[i])) {
-				addContext(newContexts[i]);
-			}
-		}
-	}
-
-	/**
-	 * Gets the affected files from my {@link CompositeTransactionalCommand}
-	 * delegate.
-	 */
-	public List getAffectedFiles() {
-		return compositeDelegate.getAffectedFiles();
-	}
-
-	/**
-	 * Computes a command result based on the contents of my
-	 * {@link CompositeTransactionalCommand} delegate.
-	 * 
-	 * @return the command result
-	 */
-	private CommandResult computeResult() {
-
-		if (compositeDelegate.size() == 0) {
-			return null;
-
-		} else if (compositeDelegate.size() == 1) {
-			IUndoableOperation operation = (IUndoableOperation) compositeDelegate
-					.iterator().next();
-
-			if (operation instanceof ICommand) {
-				return ((ICommand) operation).getCommandResult();
-			}
-			return new CommandResult(Status.OK_STATUS);
-		}
-
-		IStatus worst = Status.OK_STATUS;
-		List statuses = new ArrayList();
-		List returnValues = new ArrayList();
-
-		for (Iterator i = compositeDelegate.iterator(); i.hasNext();) {
-			IUndoableOperation operation = (IUndoableOperation) i.next();
-
-			if (operation instanceof ICommand) {
-				ICommand command = (ICommand) operation;
-				CommandResult result = command.getCommandResult();
-
-				if (result != null) {
-					IStatus nextStatus = result.getStatus();
-
-					if (nextStatus.getSeverity() > worst.getSeverity()) {
-						worst = nextStatus;
-					}
-					statuses.add(nextStatus);
-
-					Object nextValue = result.getReturnValue();
-
-					if (nextValue != null) {
-
-						if (getClass().isInstance(command)) {
-							// unwrap the values from other composites
-							if (nextValue != null
-									&& nextValue instanceof Collection) {
-								returnValues.addAll((Collection) nextValue);
-
-							} else {
-								returnValues.add(nextValue);
-							}
-
-						} else {
-							returnValues.add(nextValue);
-						}
-					}
-				}
-			}
-		}
-
-		IStatus status = new MultiStatus(worst.getPlugin(), worst.getCode(),
-				(IStatus[]) statuses.toArray(new IStatus[statuses.size()]),
-				worst.getMessage(), null);
-
-		return new CommandResult(status, returnValues);
-	}
-	
-	public abstract IStatus getStatus();
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/package.html
deleted file mode 100644
index bbe6f33..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/action/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Extension to the Common UI action API to support actions that operate on
-MSL-managed models.  The classes in this package are meant to be extended
-by clients that wish to ensure that the proper MSL protocols are followed
-when reading model content.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/dialogs/AbstractSelectElementDialog.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/dialogs/AbstractSelectElementDialog.java
deleted file mode 100644
index 4e67f0a..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/dialogs/AbstractSelectElementDialog.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.dialogs;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A dialog which solicits the user to select model elements in an explorer like
- * tree viewer.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com </a>
- */
-public abstract class AbstractSelectElementDialog
-	extends Dialog {
-
-	/**
-	 * Constructor for the dialog.
-	 * 
-	 * @param parentShell The parent shell.
-	 */
-	public AbstractSelectElementDialog(Shell parentShell) {
-		super(parentShell);
-	}
-
-	/**
-	 * Gets the user selected elements.
-	 * 
-	 * @return List the user selected elements
-	 */
-	public abstract List getSelectedElements();
-
-	/**
-	 * Is this dialog in single or multi-select mode?
-	 * 
-	 * @return isMultiSelectable
-	 */
-	public abstract boolean isMultiSelectable();
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/dialogs/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/dialogs/package.html
deleted file mode 100644
index f44a8f8..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/dialogs/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Reusable dialogs providing support for working with MSL models, such as
-browsing for and selecting elements.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIDebugOptions.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIDebugOptions.java
deleted file mode 100644
index aaea80c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIDebugOptions.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.internal;
-
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class MslUIDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private MslUIDebugOptions() {
-		// Private constructor.
-	}
-
-	public static final String DEBUG = MslUIPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-	
-	public static final String MODEL_OPERATIONS = DEBUG + "/model/operations"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIPlugin.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIPlugin.java
deleted file mode 100644
index 1e4aaab..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIPlugin.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.internal;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The MSL UI plug-in.
- * 
- * @author khussey
- * 
- */
-public class MslUIPlugin
-	extends AbstractUIPlugin {
-
-    /**
-     * Characters in a URI that separate segments that individually may contain
-     * BiDi text.  Use with the {@link org.eclipse.osgi.util.TextProcessor} API
-     * for handling URIs in bi-directional locales.
-     * 
-     * @since 2.0
-     */
-    public static final String URI_BIDI_SEPARATORS = ":/?#@.!"; //$NON-NLS-1$
-
-	/**
-	 * This plug-in's shared instance.
-	 */
-	private static MslUIPlugin INSTANCE;
-
-	/**
-	 * Creates a new plug-in runtime object.
-	 */
-	public MslUIPlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static MslUIPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Returns the currently active window for the workbench (if any).
-	 * 
-	 * @return The active workbench window, or null if the currently active
-	 *         window is not a workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Returns the currently active page for the active workbench window.
-	 * 
-	 * @return The active page, or null if none
-	 */
-	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window == null) {
-			return null;
-		}
-		return window.getActivePage();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIStatusCodes.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIStatusCodes.java
deleted file mode 100644
index 5bb649c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/MslUIStatusCodes.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class MslUIStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private MslUIStatusCodes() {
-		// Private constructor.
-	}
-
-	public static final int OK = 0;
-
-	public static final int IGNORED_EXCEPTION_WARNING = 10;
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/EMFUIMessages.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/EMFUIMessages.java
deleted file mode 100644
index a2c4e28..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/EMFUIMessages.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.emf.ui.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EMFUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.emf.ui.internal.l10n.EMFUIMessages";//$NON-NLS-1$
-
-	private EMFUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String CreateOrSelectElementCommand_Label;
-	public static String CreateOrSelectElementCommand_PopupMenu_UnspecifiedMenuItem_Text;
-	public static String CreateOrSelectElementCommand_PopupMenu_CreateMenuItem_Text;
-	public static String CreateOrSelectElementCommand_PopupMenu_SelectExistingElementMenuItem_Text;
-	public static String CreateOrSelectElementCommand_PopupMenu_CreateWithoutBindingMenuItem_Text;
-	public static String SelectElementDialog_title;
-	public static String SelectElementDialog_selection;
-	public static String Validation_liveValidationGroupLabel;
-	public static String Validation_liveValidationDestinationPrompt;
-	public static String Validation_liveValidationDestination_dialogComboItem;
-	public static String Validation_liveValidationDestination_consoleComboItem;
-	public static String Validation_liveValidationShowConsolePrompt;
-	public static String Validation_liveValidationWarnDialogPrompt;
-	public static String Validation_error;
-	public static String Validation_warn;
-	public static String Validation_note;
-	public static String Validation_problems;
-	public static String Validation_rollback;
-	public static String Validation_liveError;
-	public static String Validation_liveWarning_part1;
-	public static String Validation_liveWarning_part2;
-	public static String Validation_liveDialogTitle;
-	public static String Validation_dontShowCheck;
-	public static String Validation_outputProviderCategory;
-	public static String PathmapsPreferencePage_availablePathVariables;
-	public static String PathmapsPreferencePage_newVariable;
-	public static String PathmapsPreferencePage_editVariable;
-    public static String PathmapsPreferencePage_removeVariable;
-	public static String PathmapsPreferencePage_incompatiblePathVariableErrorMessage;
-	public static String PathmapsPreferencePage_registeredPathVariableErrorMessage;
-	public static String PathmapsPreferencePage_mainDescription;
-    public static String PathmapsPreferencePage_promptTitle;
-    public static String PathmapsPreferencePage_updateFailed;
-    public static String PathmapsPreferencePage_variablePattern;
-    public static String PathVariableDialog_newDialogTitle;
-    public static String PathVariableDialog_editDialogTitle;
-    public static String PathVariableDialog_newTitle;
-    public static String PathVariableDialog_editTitle;
-    public static String PathVariableDialog_newMessage;
-    public static String PathVariableDialog_editMessage;
-    public static String PathVariableDialog_nameLabel;
-    public static String PathVariableDialog_locationLabel;
-    public static String PathVariableDialog_browseButton;
-    public static String PathVariableDialog_browseDialogTitle;
-    public static String PathVariableDialog_browseDialogMessage;
-    public static String PathVariableDialog_alreadyDefined_ERROR_;
-    public static String PathVariableDialog_invalidSegment_ERROR_;
-    public static String PathVariableDialog_notFolder_ERROR_;
-    public static String PathVariableDialog_noSuchFolder_ERROR_;
-    public static String PathVariableDialog_sameLocation_WARN_;
-
-    
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EMFUIMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/EMFUIMessages.properties b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/EMFUIMessages.properties
deleted file mode 100644
index 9222c5d..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/EMFUIMessages.properties
+++ /dev/null

@@ -1,109 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2007  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# MSL UI Plugin - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- Commands displayed in undo/redo text ---
-CreateOrSelectElementCommand_Label = Get Element From User
-
-# --- Modeling Assistant Popup Menus ---
-CreateOrSelectElementCommand_PopupMenu_UnspecifiedMenuItem_Text = Unspecified
-CreateOrSelectElementCommand_PopupMenu_CreateMenuItem_Text = Create {0}
-CreateOrSelectElementCommand_PopupMenu_SelectExistingElementMenuItem_Text = Select Existing Element
-CreateOrSelectElementCommand_PopupMenu_CreateWithoutBindingMenuItem_Text = Create Unspecified
-
-# --- Dialogs ---
-SelectElementDialog_title=Select Element
-SelectElementDialog_selection=Currently selected element:
-
-# 	Validation preferences page strings
-# ================================ BEGIN ==================================================
-Validation_liveValidationGroupLabel = Live validation problems
-Validation_liveValidationDestinationPrompt = Show live validation errors in:
-Validation_liveValidationDestination_dialogComboItem = Pop-up dialog
-Validation_liveValidationDestination_consoleComboItem = Console
-Validation_liveValidationShowConsolePrompt = Show console when live validation problems occur
-Validation_liveValidationWarnDialogPrompt = Include live warnings
-# ==================================== END =================================================
-
-
-#
-# Messages pertaining to reporting of problems in live validation.
-# In all cases, the {0} argument is the error message provided by the
-# validation service.
-#
-# ================================ BEGIN ==================================================
-Validation_error=\   ERROR: {0}
-Validation_warn=\   Warning: {0}
-Validation_note=\   Note: {0}
-Validation_problems=Problems encountered in updating the model.
-Validation_rollback=\   *** The change was not applied to the model. ***
-Validation_liveError=The system cannot perform the requested action because it violates the integrity of the model.
-
-# Fragmenting the following message so as to not use hard return characters (\n) in translatable strings
-Validation_liveWarning_part1=This change to the model does not violate structural integrity but may cause unexpected problems in the application.
-Validation_liveWarning_part2=Press 'Ctrl+Z' or select the 'Edit > Undo' menu to undo the change if it is a problem.
-Validation_liveDialogTitle=Model Validation
-Validation_dontShowCheck=Don't show this dialog again
-# ==================================== END =================================================
-
-# Output view category for live validation problem messages.
-Validation_outputProviderCategory=Rational Modeling
-
-#
-# Messages pertaining to the assigning pathmaps to existing eclipse path variables
-#  to be used in modeling. These messages are used in a preference page.
-#
-# ================================ BEGIN ==================================================
-PathmapsPreferencePage_mainDescription=Use the check boxes to select path variables to use in modeling artifacts.\n\
-These are a subset of the path variables in the ''<a>{0}</a>'' preferences page.
-PathmapsPreferencePage_availablePathVariables=Available path &variables:
-PathmapsPreferencePage_newVariable=&New...
-PathmapsPreferencePage_editVariable=&Edit...
-PathmapsPreferencePage_removeVariable=&Remove
-PathmapsPreferencePage_incompatiblePathVariableErrorMessage=The selected path variable(s) cannot be supported in a modeling environment.
-PathmapsPreferencePage_registeredPathVariableErrorMessage=The selected path variable(s) are defined by the system; they cannot be removed.
-PathmapsPreferencePage_promptTitle=Path Map Variables
-PathmapsPreferencePage_updateFailed=Failed to update workspace path variables.
-# Pattern for display of path variables in the preference page.  {0} is the
-#    variable name and {1} is its value (the folder location).  This pattern
-#    corresponds to the display of Path Variables in the Linked Resources
-#    preference page provided by the Eclipse Platform
-PathmapsPreferencePage_variablePattern={0} - {1}
-# ==================================== END =================================================
-
-#
-# Messages pertaining to the creation and editing of path variables
-#  to be used in modeling. These messages are used in a modal dialog launched by
-#  the preference page.
-#
-# ================================ BEGIN ==================================================
-PathVariableDialog_newDialogTitle=Create Path Variable
-PathVariableDialog_editDialogTitle=Edit Path Variable
-PathVariableDialog_newTitle=Define a new path variable
-PathVariableDialog_editTitle=Change an existing path variable
-PathVariableDialog_newMessage=Enter the name and location of a path variable.
-PathVariableDialog_editMessage=Edit the name and/or location of the path variable.
-PathVariableDialog_nameLabel=&Name:
-PathVariableDialog_locationLabel=&Folder:
-PathVariableDialog_browseButton=&Browse...
-PathVariableDialog_browseDialogTitle=Folder Selection
-PathVariableDialog_browseDialogMessage=Select a folder for the path variable location.
-PathVariableDialog_alreadyDefined_ERROR_=Path variable already defined.
-PathVariableDialog_invalidSegment_ERROR_=Path variable name is not a valid URI segment.
-PathVariableDialog_notFolder_ERROR_=Path variables for modeling must be folder locations.
-PathVariableDialog_noSuchFolder_ERROR_=Specified folder does not exist.
-PathVariableDialog_sameLocation_WARN_=Another path variable is already defined for this location.
-
-# ==================================== END =================================================

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/package.html
deleted file mode 100644
index 2909fa4..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/l10n/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Localization utility for strings and images for the MSL UI plug-in.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.ui.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/package.html
deleted file mode 100644
index 7da5f62..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/internal/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Root package of the MSL UI plug-in, defining the plug-in lifecycle class,
-logging and tracing utilities, and preference constants.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.emf.ui.*
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/NewPathVariableDialog.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/NewPathVariableDialog.java
deleted file mode 100644
index 4a01a2a..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/NewPathVariableDialog.java
+++ /dev/null

@@ -1,420 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2007 IBM Corporation and others.
- * 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:
- *   IBM - Initial API and implementation
- *
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.gmf.runtime.emf.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IPathVariableManager;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.gmf.runtime.emf.core.internal.resources.PathmapManager;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-import org.eclipse.gmf.runtime.emf.ui.internal.l10n.EMFUIMessages;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Modal dialog for manipulation of path variables for modeling pathmaps. This
- * dialog supports both creation of new path variables, using the
- * {@link #openNew(Shell)} method, and editing of existing path variables, using
- * the {@link #openEdit(Shell, String, String)} method. In either case, if the
- * user successfully closes the dialog (i.e., hits the OK button), then the name
- * and location of the variable are accessed via the {@link #getVariableName()}
- * and {@link #getVariableLocation()} methods, respectively.
- * <p>
- * Note that this dialog intentionally differs from that utilized by the Linked
- * Resources preference page because GMF's pathmaps apply more constraints to
- * path variables, in particular that:
- * </p>
- * <ul>
- * <li>a pathmap variable name must be a valid URI segment, because it is used
- * as is in <tt>pathmap://</tt> URIs</li>
- * <li>a pathmap variable must reference a folder, not a file</li>
- * </ul>
- * 
- * @author Christian W. Damus (cdamus)
- */
-class NewPathVariableDialog
-    extends TitleAreaDialog {
-
-    private String variableName;
-
-    private IPath variableLocation;
-
-    private Text nameText;
-
-    private Text locationText;
-
-    private String initialName;
-
-    private String initialLocation;
-
-    private final IPathVariableManager pathMgr;
-
-    private final String plainMsg;
-
-    private final PathmapsPreferencePage page;
-
-    /**
-     * Not instantiable by clients.
-     * 
-     * @param page
-     *            the path maps preference page that I serve
-     * @param name
-     *            the current name of the variable to be edited, or
-     *            <code>null</code> if creating a new path variable
-     * @param location
-     *            the current location of the variable to be edited, or
-     *            <code>null</code> if creating a new path variable
-     */
-    private NewPathVariableDialog(PathmapsPreferencePage page, String name,
-            String location) {
-        super(page.getShell());
-
-        this.page = page;
-
-        this.initialName = name;
-        this.initialLocation = location;
-
-        if (name != null) {
-            // edit mode
-            plainMsg = EMFUIMessages.PathVariableDialog_editMessage;
-        } else {
-            // new mode
-            plainMsg = EMFUIMessages.PathVariableDialog_newMessage;
-        }
-
-        pathMgr = ResourcesPlugin.getWorkspace().getPathVariableManager();
-    }
-
-    /**
-     * Opens the path-variable editing dialog in creation mode, to create a new
-     * path variable.
-     * 
-     * @param page
-     *            the path maps preference page that the dialog serves
-     * @return the dialog instance, from which the path variable data can be
-     *         extracted, if the user closed it with the "OK" button;
-     *         <code>null</code>, otherwise (i.e., if the user canceled)
-     */
-    public static NewPathVariableDialog openNew(PathmapsPreferencePage page) {
-        NewPathVariableDialog dlg = new NewPathVariableDialog(page, null, null);
-
-        return (dlg.open() == IDialogConstants.OK_ID) ? dlg
-            : null;
-    }
-
-    /**
-     * Opens the path-variable editing dialog in edit mode, to modify an
-     * existing path variable. Clients must account for the possibility that the
-     * returned variable name may differ from the specified <code>name</code>,
-     * because users may rename variables.
-     * 
-     * @param page
-     *            the path maps preference page that the dialog serves
-     * @return the dialog instance, from which the path variable data can be
-     *         extracted, if the user closed it with the "OK" button;
-     *         <code>null</code>, otherwise (i.e., if the user canceled)
-     */
-    public static NewPathVariableDialog openEdit(PathmapsPreferencePage page,
-            String name, String location) {
-        NewPathVariableDialog dlg = new NewPathVariableDialog(page, name,
-            location);
-
-        return (dlg.open() == IDialogConstants.OK_ID) ? dlg
-            : null;
-    }
-
-    /**
-     * Sets the dialog's window title according to whether it is in creation or
-     * edit mode.
-     */
-    protected void configureShell(Shell newShell) {
-        super.configureShell(newShell);
-
-        if (initialName != null) {
-            // edit mode
-            newShell.setText(EMFUIMessages.PathVariableDialog_editTitle);
-        } else {
-            // new mode
-            newShell.setText(EMFUIMessages.PathVariableDialog_newTitle);
-        }
-    }
-
-    protected Control createDialogArea(Composite parent) {
-        Composite result = (Composite) super.createDialogArea(parent);
-
-        initializeDialogUnits(result);
-
-        Composite composite = new Composite(result, SWT.NONE);
-        composite.setLayout(new GridLayout(3, false));
-        GridData data = null;
-        data = new GridData(GridData.FILL_BOTH);
-        data.grabExcessHorizontalSpace = true;
-        data.grabExcessHorizontalSpace = true;
-        data.horizontalIndent = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-        data.verticalIndent = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-        composite.setLayoutData(data);
-
-        Label label = new Label(composite, SWT.LEFT);
-        label.setText(EMFUIMessages.PathVariableDialog_nameLabel);
-        data = new GridData(SWT.BEGINNING);
-        label.setLayoutData(data);
-
-        nameText = new Text(composite, SWT.BORDER);
-        data = new GridData(GridData.FILL_HORIZONTAL);
-        data.grabExcessHorizontalSpace = true;
-        nameText.setLayoutData(data);
-        if (initialName != null) {
-            nameText.setText(initialName);
-        }
-
-        // blank to occupy the upper-right corner
-        new Label(composite, SWT.None);
-
-        label = new Label(composite, SWT.NONE);
-        label.setText(EMFUIMessages.PathVariableDialog_locationLabel);
-        data = new GridData(SWT.BEGINNING);
-        label.setLayoutData(data);
-
-        // force left-to-right orientation because file paths are always LTR
-        locationText = new Text(composite, SWT.BORDER  | SWT.LEFT_TO_RIGHT);
-        data = new GridData(GridData.FILL_HORIZONTAL);
-        data.grabExcessHorizontalSpace = true;
-        locationText.setLayoutData(data);
-        if (initialLocation != null) {
-            locationText.setText(initialLocation);
-        }
-
-        Button browseButton = new Button(composite, SWT.PUSH);
-        browseButton.setText(EMFUIMessages.PathVariableDialog_browseButton);
-        setButtonLayoutData(browseButton);
-
-        browseButton.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent e) {
-                DirectoryDialog dlg = new DirectoryDialog(getShell());
-                dlg.setText(EMFUIMessages.PathVariableDialog_browseDialogTitle);
-                dlg
-                    .setMessage(EMFUIMessages.PathVariableDialog_browseDialogMessage);
-
-                String folder = dlg.open();
-                if (folder != null) {
-                    locationText.setText(folder);
-                }
-            }
-        });
-
-        ModifyListener l = new ModifyListener() {
-
-            public void modifyText(ModifyEvent e) {
-                validateInputs();
-            }
-        };
-
-        nameText.addModifyListener(l);
-        locationText.addModifyListener(l);
-
-        if (initialName != null) {
-            // edit mode
-            setTitle(EMFUIMessages.PathVariableDialog_editTitle);
-            
-            // select the location field text and set focus to it
-            locationText.setSelection(0, locationText.getText().length());
-            locationText.setFocus();
-        } else {
-            // new mode
-            setTitle(EMFUIMessages.PathVariableDialog_newTitle);
-        }
-
-        setMessage(plainMsg);
-
-        return result;
-    }
-
-    /**
-     * Initially disables the OK button, because in either creation or edit
-     * mode, the user will have to input some data before it can hit OK.
-     */
-    protected void createButtonsForButtonBar(Composite parent) {
-        super.createButtonsForButtonBar(parent);
-
-        // initially, the OK button is disabled because we haven't yet any input
-        getButton(IDialogConstants.OK_ID).setEnabled(false);
-    }
-
-    /**
-     * Validates the current values of the variable name and location entry
-     * fields. A warning or error message is shown in the title area, if
-     * appropriate, and the OK button is disabled if any input is invalid.
-     * Moreover, in edit mode, the OK button is disabled if the user hasn't
-     * changed either the variable name or the location.
-     */
-    private void validateInputs() {
-        IStatus status = Status.OK_STATUS;
-        boolean isError = false;
-
-        String name = nameText.getText();
-        String location = locationText.getText();
-        boolean hasName = name.length() > 0;
-        boolean hasLocation = location.length() > 0;
-
-        if (hasName && !name.equals(initialName)) {
-            status = validateName(name);
-        }
-
-        if (!status.isOK()) {
-            isError = true;
-            setMessage(status.getMessage(), IMessageProvider.ERROR);
-        } else if (hasLocation && !location.equals(initialLocation)) {
-            status = validateLocation(new Path(location));
-            if (!status.isOK()) {
-                isError = status.getSeverity() >= IStatus.ERROR;
-
-                setMessage(status.getMessage(),
-                    isError ? IMessageProvider.ERROR
-                        : IMessageProvider.WARNING);
-            }
-        }
-
-        if (status.isOK()) {
-            setMessage(plainMsg);
-        }
-
-        if (initialName != null) {
-            // edit mode. Check that either the name or the location is changed
-            if (name.equals(initialName) && location.equals(initialLocation)) {
-                // force OK button to be disabled
-                hasName = false;
-            }
-        }
-
-        // dialog not complete if error or missing an input
-        getButton(IDialogConstants.OK_ID).setEnabled(
-            !isError && hasName && hasLocation);
-    }
-
-    /**
-     * Validates the specified variable <code>name</code>.
-     * 
-     * @param name
-     *            the variable name to validate
-     * @return the result of validation, which may be OK or may contain a
-     *         warning or error message to display in the title area
-     */
-    private IStatus validateName(String name) {
-        IStatus result;
-
-        if (pathMgr.isDefined(name) && !page.isRemoved(name)
-            || PathmapManager.isRegisteredPathVariable(name)
-            || page.isAdded(name)) {
-            result = new Status(IStatus.ERROR, MslUIPlugin.getPluginId(),
-                EMFUIMessages.PathVariableDialog_alreadyDefined_ERROR_);
-        } else if (!URI.validSegment(name)) {
-            result = new Status(IStatus.ERROR, MslUIPlugin.getPluginId(),
-                EMFUIMessages.PathVariableDialog_invalidSegment_ERROR_);
-        } else {
-            result = pathMgr.validateName(name);
-        }
-
-        return result;
-    }
-
-    /**
-     * Validates the specified variable <code>location</code>.
-     * 
-     * @param location
-     *            the variable location to validate
-     * @return the result of validation, which may be OK or may contain a
-     *         warning or error message to display in the title area
-     */
-    private IStatus validateLocation(IPath location) {
-        IStatus result;
-        File file = location.toFile();
-
-        if (file.exists() && !file.isDirectory()) {
-            result = new Status(IStatus.ERROR, MslUIPlugin.getPluginId(),
-                EMFUIMessages.PathVariableDialog_notFolder_ERROR_);
-        } else if (!file.exists()) {
-            result = new Status(IStatus.ERROR, MslUIPlugin.getPluginId(),
-                EMFUIMessages.PathVariableDialog_noSuchFolder_ERROR_);
-        } else {
-            result = pathMgr.validateValue(location);
-        }
-
-        if (result.isOK()) {
-            if (page.isLocationDefined(location)) {
-                result = new Status(IStatus.WARNING, MslUIPlugin
-                    .getPluginId(),
-                    EMFUIMessages.PathVariableDialog_sameLocation_WARN_);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Stores the variable name and location for retrieval by the client when
-     * the user succeeds in closing the dialog by pressing the OK button.
-     * 
-     * @see #getVariableName()
-     * @see #getVariableLocation()
-     */
-    protected void okPressed() {
-        variableName = nameText.getText();
-        variableLocation = new Path(locationText.getText());
-
-        super.okPressed();
-    }
-
-    /**
-     * Obtains the path variable name entered by the user.
-     * 
-     * @return the path variable name
-     */
-    String getVariableName() {
-        return variableName;
-    }
-
-    /**
-     * Obtains the path variable location entered by the user.
-     * 
-     * @return the path variable location
-     */
-    IPath getVariableLocation() {
-        return variableLocation;
-    }
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/PathmapsPreferencePage.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/PathmapsPreferencePage.java
deleted file mode 100644
index 5b34d59..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/PathmapsPreferencePage.java
+++ /dev/null

@@ -1,1110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.preferences;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IPathVariableManager;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.gmf.runtime.emf.core.internal.resources.PathmapManager;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-import org.eclipse.gmf.runtime.emf.ui.internal.l10n.EMFUIMessages;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.osgi.util.TextProcessor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-
-/**
- * Preference page for specifying the path variables that should be considered
- * for modeling.
- * <p>
- * Path variable are created on the "Linked Resources" preference page, and
- * selected for modeling using this page.
- * </p>
- * <p>
- * This class may be instantiated by clients, but is not intended to be
- * subclassed.
- * </p>
- * 
- * @author Chris McGee
- * @autor Christian W. Damus (cdamus)
- */
-public class PathmapsPreferencePage
-    extends PreferencePage
-    implements IWorkbenchPreferencePage {
-
-    private static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
-
-    private IPathVariableManager pathVariableManager = ResourcesPlugin
-        .getWorkspace().getPathVariableManager();
-
-    private ScrolledComposite pathVariablesScroll;
-
-    private CheckboxTableViewer pathVariables;
-
-    private PathVariableContentProvider pathVariablesContent;
-
-    private Button newVariable;
-
-    private Button editVariable;
-
-    private Button removeVariable;
-
-    /** Path variable changes since last time the Apply button was pressed. */
-    private Map variableChanges = new HashMap();
-
-    private Object addedToken = new Object();
-
-    private Object changedToken = new Object();
-
-    private Object removedToken = new Object();
-
-    protected void initHelp() {
-        // No context-sensitive help for now.
-    }
-
-    protected Control createContents(Composite parent) {
-        GridData gridData = null;
-        Composite composite = new Composite(parent, SWT.NONE);
-        composite.setFont(parent.getFont());
-
-        composite.setLayout(new GridLayout(2, false));
-
-        PreferenceLinkArea pathVariablesArea = new PreferenceLinkArea(
-            composite,
-            SWT.NONE,
-            "org.eclipse.ui.preferencePages.LinkedResources", //$NON-NLS-1$
-            EMFUIMessages.PathmapsPreferencePage_mainDescription,
-            (IWorkbenchPreferenceContainer) getContainer(), null);
-        gridData = new GridData(GridData.FILL_HORIZONTAL
-            | GridData.FILL_VERTICAL);
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = false;
-        gridData.horizontalSpan = 2;
-        pathVariablesArea.getControl().setLayoutData(gridData);
-
-        Label pathVariablesLabel = new Label(composite, SWT.LEFT);
-        gridData = new GridData(GridData.FILL_HORIZONTAL
-            | GridData.FILL_VERTICAL);
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = false;
-        gridData.horizontalSpan = 2;
-        gridData.verticalIndent = 20;
-        pathVariablesLabel.setLayoutData(gridData);
-        pathVariablesLabel
-            .setText(EMFUIMessages.PathmapsPreferencePage_availablePathVariables);
-
-        pathVariablesScroll = new ScrolledComposite(composite, SWT.BORDER
-            | SWT.H_SCROLL | SWT.V_SCROLL);
-        pathVariablesScroll.setExpandHorizontal(true);
-        pathVariablesScroll.setExpandVertical(true);
-        gridData = new GridData(GridData.FILL_HORIZONTAL
-            | GridData.FILL_VERTICAL);
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = true;
-        gridData.horizontalSpan = 1;
-        pathVariablesScroll.setLayoutData(gridData);
-
-        pathVariables = CheckboxTableViewer.newCheckList(pathVariablesScroll,
-            SWT.MULTI);
-        pathVariablesScroll.setContent(pathVariables.getTable());
-
-        pathVariablesContent = new PathVariableContentProvider();
-        pathVariables.setContentProvider(pathVariablesContent);
-        pathVariables.setLabelProvider(new PathVariableLabelProvider());
-        pathVariables.setComparator(new PathVariableViewerComparator());
-
-        Composite buttonComposite = new Composite(composite, SWT.NONE);
-        buttonComposite.setLayout(new GridLayout(1, false));
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.grabExcessHorizontalSpace = false;
-        gridData.grabExcessVerticalSpace = false;
-        gridData.horizontalSpan = 1;
-        gridData.verticalAlignment = GridData.BEGINNING;
-        buttonComposite.setLayoutData(gridData);
-
-        newVariable = new Button(buttonComposite, SWT.CENTER);
-        newVariable.setText(EMFUIMessages.PathmapsPreferencePage_newVariable);
-        setButtonLayoutData(newVariable);
-
-        editVariable = new Button(buttonComposite, SWT.CENTER);
-        editVariable.setText(EMFUIMessages.PathmapsPreferencePage_editVariable);
-        setButtonLayoutData(editVariable);
-
-        removeVariable = new Button(buttonComposite, SWT.CENTER);
-        removeVariable
-            .setText(EMFUIMessages.PathmapsPreferencePage_removeVariable);
-        setButtonLayoutData(removeVariable);
-
-        pathVariables
-            .addSelectionChangedListener(new ISelectionChangedListener() {
-
-                public void selectionChanged(SelectionChangedEvent event) {
-                    pathVariableSelected(event.getSelection());
-                }
-            });
-
-        pathVariables.addCheckStateListener(new ICheckStateListener() {
-
-            public void checkStateChanged(CheckStateChangedEvent event) {
-                pathVariableChecked(event, (PathVariableEntry) event
-                    .getElement());
-            }
-        });
-
-        newVariable.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent e) {
-                addPathVariable();
-            }
-        });
-
-        editVariable.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent e) {
-                editPathVariable(pathVariables.getSelection());
-            }
-        });
-
-        removeVariable.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent e) {
-                removePathVariable(pathVariables.getSelection());
-            }
-        });
-
-        initializeContents();
-
-        applyDialogFont(composite);
-
-        pathVariableSelected(pathVariables.getSelection());
-
-        return composite;
-    }
-
-    /**
-     * Responds to the user's gesture to either check or uncheck the specified
-     * <code>entry</code> in the path variables list. This may, according to
-     * the status of the path variable entry, result in the user's change being
-     * reverted (e.g., in the case of attempting to uncheck a variable
-     * registered on the extension point). This works around the inability in
-     * SWT to disable the checkbox of an item in a check-table (see <a
-     * href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=76509">bug 76509</a>
-     * for details).
-     * 
-     * @param event
-     *            the (un)check event
-     * @param entry
-     *            the path variable entry that was (un)checked
-     */
-    private void pathVariableChecked(CheckStateChangedEvent event,
-            PathVariableEntry entry) {
-        if (event.getChecked()) {
-            // validate the check
-            if (validateSelection(entry, false)) {
-                entry.setSelected(true);
-            } else {
-                event.getCheckable().setChecked(entry, false);
-            }
-        } else {
-            // validate the uncheck
-            if (validateDeselection(entry, false)) {
-                entry.setSelected(false);
-            } else {
-                event.getCheckable().setChecked(entry, true);
-            }
-        }
-    }
-
-    /**
-     * Handles the selection of zero or more path variables in the list,
-     * updating the enablement state of the "Edit..." and "Remove" buttons.
-     * 
-     * @param selection
-     *            the new path variables list selection
-     */
-    private void pathVariableSelected(ISelection selection) {
-        IStructuredSelection ssel = (IStructuredSelection) selection;
-
-        editVariable.setEnabled(validateEdit(ssel, false));
-        removeVariable.setEnabled(validateRemove(ssel, false));
-    }
-
-    /**
-     * Updates the map of pending path variable changes to indicate that the
-     * specified variable has been added by the user.
-     * 
-     * @param variableName
-     *            the name of the added variable
-     */
-    private void markAdded(String variableName) {
-        Object currentChange = variableChanges.get(variableName);
-
-        if (currentChange == removedToken) {
-            // if we previously removed this variable's value, then it will
-            // appear to be a change when we sync on apply
-            variableChanges.put(variableName, changedToken);
-        } else if (currentChange != changedToken) {
-            // shouldn't have been a "changed" if we thought we were adding
-            variableChanges.put(variableName, addedToken);
-        }
-    }
-
-    /**
-     * Queries whether the specified path variable has an add change pending, to
-     * be applied when the OK/Apply button is pressed.
-     * 
-     * @param variableName
-     *            the path variable name
-     * @return <code>true</code> if the variable has a pending change that is
-     *         an add; <code>false</code>, otherwise
-     */
-    boolean isAdded(String variableName) {
-        return variableChanges.get(variableName) == addedToken;
-    }
-
-    /**
-     * Updates the map of pending path variable changes to indicate that the
-     * specified variable has been removed by the user.
-     * 
-     * @param variableName
-     *            the name of the removed variable
-     */
-    private void markRemoved(String variableName) {
-        Object currentChange = variableChanges.get(variableName);
-
-        if (currentChange == addedToken) {
-            // it was added since the last apply? Just forget about it, then
-            variableChanges.remove(variableName);
-        } else {
-            variableChanges.put(variableName, removedToken);
-        }
-    }
-
-    /**
-     * Queries whether the specified path variable has a remove change pending,
-     * to be applied when the OK/Apply button is pressed.
-     * 
-     * @param variableName
-     *            the path variable name
-     * @return <code>true</code> if the variable has a pending change that is
-     *         a removal; <code>false</code>, otherwise
-     */
-    boolean isRemoved(String variableName) {
-        return variableChanges.get(variableName) == removedToken;
-    }
-
-    /**
-     * Updates the map of pending path variable changes to indicate that the
-     * specified variable's value has been changed by the user.
-     * 
-     * @param variableName
-     *            the name of the changed variable
-     */
-    private void markChanged(String variableName) {
-        Object currentChange = variableChanges.get(variableName);
-
-        if (currentChange == addedToken) {
-            // do nothing in this case. If it was added, changing it doesn't
-            // change the fact that it's a new variable
-        } else {
-            variableChanges.put(variableName, changedToken);
-        }
-    }
-
-    /**
-     * Queries whether the specified path variable has a change of value
-     * pending, to be applied when the OK/Apply button is pressed.
-     * 
-     * @param variableName
-     *            the path variable name
-     * @return <code>true</code> if the variable has a pending change that is
-     *         a value change; <code>false</code>, otherwise
-     */
-    boolean isChanged(String variableName) {
-        return variableChanges.get(variableName) == changedToken;
-    }
-
-    /**
-     * Queries whether the current pending path variables (not yet applied to
-     * the workspace and GMF path map manager) has a variable referencing the
-     * specified location. Note that this does not consider path variables that
-     * are pending removal or others that are currently defined in the workspace
-     * and/or GMF that are not visible.
-     * 
-     * @param location
-     *            a location
-     * @return <code>true</code> if any of the path variables showing in the
-     *         preference page has the specified location; <code>false</code>,
-     *         otherwise
-     */
-    boolean isLocationDefined(IPath location) {
-        for (Iterator iter = pathVariablesContent.entries.iterator(); iter
-            .hasNext();) {
-            if (location.equals(((PathVariableEntry) iter.next())
-                .getLocationPath())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Handles the pushing of the "New..." button, to create a new path map
-     * variable.
-     */
-    private void addPathVariable() {
-        NewPathVariableDialog dlg = NewPathVariableDialog.openNew(this);
-        if (dlg != null) {
-            String name = dlg.getVariableName();
-            IPath location = dlg.getVariableLocation();
-
-            // prepare data for synchronization on apply
-            markAdded(name);
-
-            // by default, check the variable (if the user created it in this
-            // pref page, assume that it should be used for GMF modeling)
-            PathVariableEntry entry = new PathVariableEntry(name, location);
-            entry.setSelected(true);
-            pathVariablesContent.add(entry);
-            pathVariables.setChecked(entry, true);
-
-            // select the new path variable
-            pathVariables.setSelection(new StructuredSelection(entry));
-        }
-    }
-
-    /**
-     * Handles the pushing of the "Edit..." button, to edit the path variable
-     * contained in the specified <code>selection</code>.
-     * 
-     * @param selection
-     *            the current selection in the path variables list (should
-     *            contain a single {@link PathVariableEntry})
-     */
-    private void editPathVariable(ISelection selection) {
-        PathVariableEntry entry = null;
-
-        if (selection instanceof IStructuredSelection) {
-            IStructuredSelection ssel = (IStructuredSelection) selection;
-
-            if (!ssel.isEmpty()) {
-                entry = (PathVariableEntry) ssel.getFirstElement();
-            }
-        }
-
-        if (entry != null) {
-            String oldName = entry.getName();
-            NewPathVariableDialog dlg = NewPathVariableDialog.openEdit(this,
-                oldName, entry.getLocation());
-
-            if (dlg != null) {
-                String newName = dlg.getVariableName();
-                IPath newLocation = dlg.getVariableLocation();
-                boolean nameChanged = !oldName.equals(newName);
-
-                if (nameChanged) {
-                    // changing the name is like removing the old name
-                    // and adding the new name
-
-                    // prepare data for synchronization on apply
-                    markAdded(newName);
-                    markRemoved(oldName);
-                } else {
-                    // prepare data for synchronization on apply
-                    markChanged(oldName);
-                }
-
-                entry.setName(newName);
-                entry.setLocation(newLocation);
-
-                pathVariables.update(entry,
-                    nameChanged ? new String[] {NAME_ATTRIBUTE}
-                        : null);
-            }
-        }
-    }
-
-    /**
-     * Handles the pushing of the "Remove" button, to remove the path
-     * variable(s) contained in the specified <code>selection</code>.
-     * 
-     * @param selection
-     *            the current selection in the path variables list (should
-     *            contain one or more {@link PathVariableEntry}s of which none
-     *            is registered on the extension point)
-     */
-    private void removePathVariable(ISelection selection) {
-        Iterator entries = null;
-
-        if (selection instanceof IStructuredSelection) {
-            IStructuredSelection ssel = (IStructuredSelection) selection;
-
-            if (!ssel.isEmpty()) {
-                entries = ssel.iterator();
-            }
-        }
-
-        if (entries != null) {
-            while (entries.hasNext()) {
-                PathVariableEntry entry = (PathVariableEntry) entries.next();
-                String name = entry.getName();
-
-                // prepare data for synchronization on apply
-                markRemoved(name);
-
-                pathVariablesContent.remove(entry);
-            }
-        }
-    }
-
-    /**
-     * Validates an attempt to check a previously unchecked path variable in the
-     * list, optionally showing an error explaining the reason why this is not
-     * permitted.
-     * 
-     * @param entry
-     *            a path variable that the user attempted to check
-     * @param showError
-     *            whether to show any potential error message in the title area
-     * @return whether the checking of this variable is permitted
-     */
-    private boolean validateSelection(PathVariableEntry entry, boolean showError) {
-        String name = entry.getName();
-
-        if (!PathmapManager.isCompatiblePathVariable(name)) {
-            if (showError) {
-                setMessage(
-                    EMFUIMessages.PathmapsPreferencePage_incompatiblePathVariableErrorMessage,
-                    ERROR);
-            }
-            return false;
-        }
-
-        if (PathmapManager.isRegisteredPathVariable(name)) {
-            if (showError) {
-                setMessage(
-                    EMFUIMessages.PathmapsPreferencePage_registeredPathVariableErrorMessage,
-                    ERROR);
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates an attempt to uncheck a previously checked path variable in the
-     * list, optionally showing an error explaining the reason why this is not
-     * permitted.
-     * 
-     * @param entry
-     *            a path variable that the user attempted to uncheck
-     * @param showError
-     *            whether to show any potential error message in the title area
-     * @return whether the unchecking of this variable is permitted
-     */
-    private boolean validateDeselection(PathVariableEntry entry,
-            boolean showError) {
-        if (entry.isRequired()) {
-            if (showError) {
-                setMessage(
-                    EMFUIMessages.PathmapsPreferencePage_registeredPathVariableErrorMessage,
-                    ERROR);
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Queries whether it is permitted to edit the specified
-     * <code>selection</code> of path variables. Editing is only permitted for
-     * a single selection that is not a registered path variable.
-     * 
-     * @param selection
-     *            the current selection in the path variables list
-     * @param showError
-     *            whether to show any potential error message in the title area
-     * @return whether the editing of this selection is permitted
-     */
-    private boolean validateEdit(IStructuredSelection selection,
-            boolean showError) {
-        if (selection.isEmpty() || (selection.size() > 1)) {
-            return false;
-        }
-
-        String name = ((PathVariableEntry) selection.getFirstElement())
-            .getName();
-
-        if (PathmapManager.isRegisteredPathVariable(name)) {
-            if (showError) {
-                setMessage(
-                    EMFUIMessages.PathmapsPreferencePage_registeredPathVariableErrorMessage,
-                    ERROR);
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Queries whether it is permitted to remove the specified
-     * <code>selection</code> of path variables. Removal is only permitted
-     * when the selection is not empty and does not contain any registered path
-     * variable.
-     * 
-     * @param selection
-     *            the current selection in the path variables list
-     * @param showError
-     *            whether to show any potential error message in the title area
-     * @return whether the editing of this selection is permitted
-     */
-    private boolean validateRemove(IStructuredSelection selection,
-            boolean showError) {
-        if (selection.isEmpty()) {
-            return false;
-        }
-
-        for (Iterator iter = selection.iterator(); iter.hasNext();) {
-            String name = ((PathVariableEntry) iter.next()).getName();
-
-            if (PathmapManager.isRegisteredPathVariable(name)) {
-                if (showError) {
-                    setMessage(
-                        EMFUIMessages.PathmapsPreferencePage_registeredPathVariableErrorMessage,
-                        ERROR);
-                }
-
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Loads the contents of the Path Variables list, additionally setting the
-     * check state of each variable.
-     */
-    private void initializeContents() {
-        setMessage(null);
-
-        variableChanges.clear();
-
-        Set currentVariables = PathmapManager.getPathVariableReferences();
-
-        Set allVariables = new HashSet();
-        Set checkedVariables = new HashSet();
-
-        Set pathVariableNames = new HashSet();
-        pathVariableNames.addAll(Arrays.asList(pathVariableManager
-            .getPathVariableNames()));
-        pathVariableNames.addAll(PathmapManager.getAllPathVariables());
-
-        for (Iterator iter = pathVariableNames.iterator(); iter.hasNext();) {
-            String name = (String) iter.next();
-            PathVariableEntry entry;
-
-            if (PathmapManager.isRegisteredPathVariable(name)) {
-                String value = PathmapManager.getRegisteredValue(name);
-
-                try {
-                    URI uri = URI.createURI(value);
-
-                    if (uri.isFile()) {
-                        // show the user a familiar file system path instead
-                        // of a URI
-                        value = uri.toFileString();
-                    }
-                } catch (RuntimeException e) {
-                    // the value is not a valid URI. Nothing for us to
-                    // do; that is a problem for the plug-in developer
-                    // who registered this path map. We'll show the
-                    // value as is
-                }
-
-                entry = new PathVariableEntry(name, value);
-                checkedVariables.add(entry);
-                allVariables.add(entry);
-            } else if (PathmapManager.isCompatiblePathVariable(name)) {
-
-                entry = new PathVariableEntry(name, pathVariableManager
-                    .getValue(name));
-
-                if (currentVariables.contains(entry.getName())) {
-                    checkedVariables.add(entry);
-                    entry.setSelected(true);
-                }
-
-                allVariables.add(entry);
-            }
-        }
-
-        pathVariables.setInput(allVariables);
-        pathVariables.setCheckedElements(checkedVariables.toArray());
-    }
-
-    public void init(IWorkbench workbench) {
-        // No initialization is necessary.
-    }
-
-    protected void performDefaults() {
-        initializeContents();
-        super.performDefaults();
-    }
-
-    /**
-     * Applies the current check state of every path variable to the GMF
-     * {@link PathmapManager}'s list of path variable references and saves the
-     * preference store.
-     */
-    public boolean performOk() {
-        Set currentVariables = PathmapManager.getPathVariableReferences();
-
-        try {
-            // first, process the removed workspace path variables
-            for (Iterator iter = variableChanges.keySet().iterator(); iter
-                .hasNext();) {
-                String name = (String) iter.next();
-
-                if (isRemoved(name)) {
-                    if (pathVariableManager.isDefined(name)) {
-                        pathVariableManager.setValue(name, null);
-                    }
-
-                    PathmapManager.removePathVariableReference(name);
-
-                    iter.remove(); // successfully processed this change
-                }
-            }
-
-            // next, process the current set of path variable references to
-            // add/remove them according to the user's preferences
-            Object[] variables = pathVariablesContent.getElements(null);
-            for (int i = 0; i < variables.length; i++) {
-                PathVariableEntry entry = (PathVariableEntry) variables[i];
-                String name = entry.getName();
-
-                if (isChanged(name) || isAdded(name)
-                    && !pathVariableManager.isDefined(name)) {
-                    // set the workspace path variable's new value, now
-                    pathVariableManager.setValue(name, new Path(entry
-                        .getLocation()));
-
-                    // successfully processed this change
-                    variableChanges.remove(name);
-                }
-
-                if (entry.isSelected() && !currentVariables.contains(name)) {
-                    PathmapManager.addPathVariableReference(name);
-                } else if (!entry.isSelected()
-                    && currentVariables.contains(name)) {
-                    PathmapManager.removePathVariableReference(name);
-                }
-            }
-
-            PathmapManager.updatePreferenceStore();
-
-            return true;
-        } catch (CoreException e) {
-            ErrorDialog.openError(getShell(),
-                EMFUIMessages.PathmapsPreferencePage_promptTitle,
-                EMFUIMessages.PathmapsPreferencePage_updateFailed, e
-                    .getStatus());
-            return false;
-        }
-    }
-
-    /**
-     * A content provider for the Path Variables list.
-     */
-    private static class PathVariableContentProvider
-        implements IStructuredContentProvider {
-
-        private Set entries;
-
-        private TableViewer table;
-
-        PathVariableContentProvider() {
-            entries = new HashSet();
-        }
-
-        /**
-         * Adds a path variable to the list.
-         * 
-         * @param entry
-         *            the new path variable
-         */
-        void add(PathVariableEntry entry) {
-            if (!entries.contains(entry)) {
-                entries.add(entry);
-                table.add(entry);
-            }
-        }
-
-        /**
-         * Removes a path variable from the list.
-         * 
-         * @param entry
-         *            the path variable to remove
-         */
-        void remove(PathVariableEntry entry) {
-            if (entries.contains(entry)) {
-                entries.remove(entry);
-                table.remove(entry);
-            }
-        }
-
-        public Object[] getElements(Object inputElement) {
-            return entries.toArray();
-        }
-
-        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-            entries = (Set) newInput;
-            table = (TableViewer) viewer;
-        }
-
-        public void dispose() {
-            // nothing to clean up
-        }
-    }
-
-    /**
-     * A label provider for the Path Variables list.
-     */
-    private static class PathVariableLabelProvider
-        implements ITableLabelProvider, IColorProvider {
-
-        private Image lockImage = null;
-
-        PathVariableLabelProvider() {
-            super();
-        }
-
-        /**
-         * Shows a lock icon for registered path variables.
-         */
-        public Image getColumnImage(Object element, int columnIndex) {
-            PathVariableEntry entry = (PathVariableEntry) element;
-            String name = entry.getName();
-
-            if (PathmapManager.isRegisteredPathVariable(name)) {
-                return getLockImage();
-            } else if (!isDirectory(entry.getLocation())) {
-                return MslUIPlugin.getDefault().getWorkbench()
-                    .getSharedImages()
-                    .getImage(ISharedImages.IMG_OBJS_WARN_TSK);
-            }
-
-            return null;
-        }
-
-        /**
-         * Queries whether the specified location references a directory that
-         * exists.
-         * 
-         * @param location
-         *            a location
-         * @return <code>true</code> if the location exists in the filesystem
-         *         and is a directory
-         */
-        private boolean isDirectory(String location) {
-            File file = new File(location);
-
-            return file.exists() && file.isDirectory();
-        }
-
-        /**
-         * Obtains the lazily-initialized lock image.
-         * 
-         * @return the lock image
-         */
-        private Image getLockImage() {
-            if (lockImage == null) {
-                lockImage = MslUIPlugin
-                    .imageDescriptorFromPlugin(MslUIPlugin.getPluginId(),
-                        "/icons/full/lock.gif").createImage(); //$NON-NLS-1$
-            }
-
-            return lockImage;
-        }
-
-        /**
-         * Path variables are displayed in the same way as in the Linked
-         * Resources preference page.
-         */
-        public String getColumnText(Object element, int columnIndex) {
-            if (columnIndex != 0) {
-                return null;
-            }
-
-            PathVariableEntry entry = (PathVariableEntry) element;
-
-            // use the TextProcessor's default separators for file paths
-            // if the entry is not required, because only if it is, will
-            // it possibly be a URI
-            String pathString = entry.isRequired() ? TextProcessor.process(
-                entry.getLocation(), MslUIPlugin.URI_BIDI_SEPARATORS)
-                : TextProcessor.process(entry.getLocation());
-
-            return NLS.bind(
-                EMFUIMessages.PathmapsPreferencePage_variablePattern, entry
-                    .getName(), pathString);
-        }
-
-        public void dispose() {
-            if (lockImage != null) {
-                lockImage.dispose();
-                lockImage = null;
-            }
-        }
-
-        public boolean isLabelProperty(Object element, String property) {
-            return false;
-        }
-
-        public void addListener(ILabelProviderListener listener) {
-            // not using listeners
-        }
-
-        public void removeListener(ILabelProviderListener listener) {
-            // not using listeners
-        }
-
-        public Color getBackground(Object element) {
-            return null;
-        }
-
-        public Color getForeground(Object element) {
-            return null;
-        }
-    }
-
-    /**
-     * A sorter for the Path Variables list. All registered path maps sort to
-     * the bottom of the list to keep them out of the user's way.
-     */
-    private static class PathVariableViewerComparator
-        extends ViewerComparator {
-
-        PathVariableViewerComparator() {
-            super();
-        }
-
-        /**
-         * We sort by <code>name</code>.
-         */
-        public boolean isSorterProperty(Object element, String property) {
-            return NAME_ATTRIBUTE.equals(property);
-        }
-
-        /**
-         * Registered variables are in a higher category than user variables.
-         */
-        public int category(Object element) {
-            // sort statically-registered variables to the end of the list
-            return PathmapManager
-                .isRegisteredPathVariable(((PathVariableEntry) element)
-                    .getName()) ? 1
-                : 0;
-        }
-    }
-
-    /**
-     * Data model for a path variable in the Path Variables list.
-     */
-    private static final class PathVariableEntry {
-
-        private String name;
-
-        private String location;
-
-        private IPath locationPath;
-
-        private final boolean required;
-
-        private boolean selected;
-
-        /**
-         * Initializes a user-defined path variable with the name and location
-         * path.
-         * 
-         * @param name
-         *            the variable name
-         * @param location
-         *            the location
-         */
-        PathVariableEntry(String name, IPath location) {
-            this(name, location.toPortableString(), false);
-
-            this.locationPath = location;
-        }
-
-        /**
-         * Initializes a registered path variable with the name and location
-         * derived from the URI.
-         * 
-         * @param name
-         *            the variable name
-         * @param location
-         *            the location URI
-         */
-        PathVariableEntry(String name, String location) {
-            this(name, location, true);
-        }
-
-        private PathVariableEntry(String name, String location, boolean required) {
-            this.name = name;
-            this.location = location;
-            this.required = required;
-            selected = required;
-        }
-
-        /**
-         * Queries whether this path variable is required (a registered path
-         * variable that the user cannot edit, remove, or uncheck).
-         * 
-         * @return whether I am required
-         */
-        boolean isRequired() {
-            return required;
-        }
-
-        /**
-         * Obtains the path variable name.
-         * 
-         * @return my name
-         */
-        String getName() {
-            return name;
-        }
-
-        /**
-         * Sets the path variable name, if it is editable.
-         * 
-         * @param name
-         *            the new name
-         */
-        void setName(String name) {
-            if (!isRequired()) {
-                this.name = name;
-            }
-        }
-
-        /**
-         * Obtains the path variable location.
-         * 
-         * @return my location
-         */
-        String getLocation() {
-            return location;
-        }
-
-        /**
-         * Obtains the path variable location, as an {@link IPath}.
-         * 
-         * @return my location
-         */
-        IPath getLocationPath() {
-            return locationPath;
-        }
-
-        /**
-         * Sets the path variable name, if it is editable.
-         * 
-         * @param location
-         *            the new location
-         */
-        void setLocation(IPath location) {
-            if (!isRequired()) {
-                this.locationPath = location;
-                this.location = location.toPortableString();
-            }
-        }
-
-        /**
-         * Queries whether the path variable is checked. Required (registered)
-         * path variables are always checked.
-         * 
-         * @return whether I am checked
-         */
-        boolean isSelected() {
-            return selected;
-        }
-
-        /**
-         * Sets whether the path variable is checked, if it is not registered.
-         * 
-         * @param selected
-         *            whether I am checked
-         */
-        void setSelected(boolean selected) {
-            if (!isRequired()) {
-                this.selected = selected;
-            }
-        }
-
-        /**
-         * Displays path variable's debug string.
-         */
-        public String toString() {
-            return getName() + " - " + getLocation(); //$NON-NLS-1$
-        }
-    }
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/package.html
deleted file mode 100644
index 65bd37b..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/package.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Implementation of preference pages controlling the GMF EMF UI plug-in's UI
-interaction with the user.
-
-<h2>Package Specification</h2>
-<p>
-Clients may contribute the {@link org.eclipse.gmf.runtime.emf.ui.preferences.PathmapsPreferencePage}
-for their application preferences using the <code>org.eclipse.ui.preferencePages</code> extension point.
-The {@link org.eclipse.gmf.runtime.emf.ui.preferences.PathmapsPreferencePage} allows the user to 
-specify the path variables that should be considered for modeling. Path variable are created on 
-the "Linked Resources" preference page, and selected for modeling using this page.
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/providers/marker/AbstractModelMarkerNavigationProvider.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/providers/marker/AbstractModelMarkerNavigationProvider.java
deleted file mode 100644
index 81bd4e8..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/providers/marker/AbstractModelMarkerNavigationProvider.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.providers.marker;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.marker.AbstractMarkerNavigationProvider;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIDebugOptions;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIStatusCodes;
-import org.eclipse.ui.IEditorPart;
-
-/** 
- * Abstract Model Marker Navigation Provider this abstract class provides 
- * the necessary wrapping required to perform model operations related to 
- * the navigation of markers. If the marker attributes contain model element 
- * information that needs to be resolved, the corresponding marker provider 
- * should be derived from this class.
- * <p> 
- * Derived classes should implement the getContext() and the doGotoMarker() 
- * methods. The latter method will be called within a model read operation.
- * <p>
- * @author Kevin Cornell
- */
-public abstract class AbstractModelMarkerNavigationProvider
-    extends AbstractMarkerNavigationProvider {
-
-    private TransactionalEditingDomain editingDomain;
-    
-    /**
-     * Perform the feedback for navigating to the given marker within a
-     * model read action.
-     */
-    public final void gotoMarker(
-        final IEditorPart editor,
-        final IMarker marker) {
-
-        // Must save the editor first since it will probably be used in 
-        // the logic to obtain the model operation context.
-        setEditor(editor);
-        
-        // Remember the editing domain associated with this editor
-        IEditingDomainProvider domainProvider = (IEditingDomainProvider) getEditor().getAdapter(IEditingDomainProvider.class);
-        
-        if (domainProvider != null) {
-            EditingDomain domain = domainProvider.getEditingDomain();
-            
-            if (domain instanceof TransactionalEditingDomain) {
-                editingDomain = (TransactionalEditingDomain) domain;
-            }
-        }
-        
-        if (editingDomain != null) {
-
-            // Perform the "goto" in a read operation.
-            try {
-                editingDomain.runExclusive(new Runnable() {
-    
-                    public void run() {
-                        AbstractModelMarkerNavigationProvider.super.gotoMarker(
-                            editor, marker);
-                    }
-                });
-                
-            } catch (InterruptedException e) {
-                Trace.catching(MslUIPlugin.getDefault(),
-                    MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "gotoMarker", e); //$NON-NLS-1$
-                Log.error(MslUIPlugin.getDefault(),
-                    MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                        .getLocalizedMessage(), e);
-            }
-        }
-    }
-    
-    /**
-     * Determines the EMF resource to which a marker is attached.
-     * 
-     * @param marker a marker
-     * @return the corresponding EMF resource, or <code>null</code> if either
-     *     the marker doesn't {@link IMarker#exists() exist} or its resource
-     *     cannot be loaded by EMF
-     */
-    protected Resource getResource(IMarker marker) {
-    	Resource result = null;
-    	
-    	if (marker.exists()) {
-    		// a non-existent marker cannot have a resource
-    		
-	        IPath resourcePath = marker.getResource().getLocation();
-	        
-	        if (resourcePath != null) {
-	        	// if the resource path is null, then I can't locate any objects
-	        	// referenced in this marker on that non-existent resource
-	        	 
-                ResourceSet resourceSet = editingDomain.getResourceSet();
-                URI uri = URI.createFileURI(resourcePath.toOSString());
-                result = resourceSet.getResource(uri, true);
-	        }
-    	}
-        
-        return result;
-    }
-    
-    /**
-     * Given a list of element IDs, looks up the elements, themselves, and
-     * returns them in the same order.
-     * <p>
-     * The <code>ids</code> passed to this method should follow a couple of
-     * conventions for compactness of implementation in a marker:
-     * <ul>
-     *   <li>any ID in the list that is a URI fragment (i.e., does not include
-     *       a resource URI) is assumed to be relative to the URI of the
-     *       specified <code>resource</code></li>
-     *   <li>any ID in the list that does not reference an object in the
-     *       specified <code>resource</code> must be a fully-qualified URI
-     *       (i.e., it must include a resource URI part)</li>
-     * </ul>
-     * Thus, in the majority of cases (where all referenced objects are in the
-     * resource that has the marker), the object IDs in the marker will be as
-     * compact as possible.
-     * </p>
-     * 
-     * 
-     * @param ids a list of element IDs, as described above
-     * @param resource the resource that has a marker from which the list of
-     *     IDs was extracted.  URI fragments in the <code>ids</code> list are
-     *     assumed to be relative to this resource's URI.  Must not be
-     *     <code>null</code>
-     * @return the corresponding list of {@link EObject}s, in the same order as
-     *     the <code>ids</code>, though not including any elements that could
-     *     not be located (due to stale IDs)
-     */
-    protected List getEObjects(List ids, Resource resource) {
-    	List result = new java.util.ArrayList(ids.size());
-    	
-    	URI resourceUri = resource.getURI();
-    	ResourceSet rset = resource.getResourceSet();
-    	
-    	if (rset != null) {
-    		// can't do anything if the resource is not in a resource set
-    		
-    		for (Iterator iter = ids.iterator(); iter.hasNext();) {
-    			String nextId = (String) iter.next();
-    			
-    			URI nextUri;
-    			
-    			int hashPos = nextId.indexOf('#');
-    			
-    			if (hashPos <= 0) {
-    				// the ID is a URI fragment.  Make sure not to omit the
-    				//   hash symbol in the fragment if there is one
-    				nextUri = resourceUri.appendFragment(
-    					nextId.substring(hashPos + 1));
-    			} else {
-    				// the URI is a fully-qualified one.  The Resource URI
-    				// portion will need to be decoded but the EObject fragment
-    				// portion will not, because it is decoded by MSL
-    				String resUriStr = nextId.substring(0, hashPos);
-    				String elemIdStr = nextId.substring(hashPos + 1);
-    				
-    				try {
-    					// use UTF-8 encoding for the URI, which is the
-    					//   standard encoding for XMI
-    					resUriStr = URLDecoder.decode(resUriStr, "UTF-8"); //$NON-NLS-1$
-    				} catch (UnsupportedEncodingException e) {
-    					// UTF-8 is always available in any Java platform
-    				}
-    				
-    				nextUri = URI.createURI(resUriStr).appendFragment(elemIdStr);
-    			}
-    			
-    			// load on demand because we need to select the element in an
-    			// open model in the UI
-    			try {
-    				EObject element = rset.getEObject(nextUri, true);
-    				
-    				if (element != null) {
-    					result.add(element);
-    				}
-    			} catch (WrappedException e) {
-    				// this is expected in the case of cross-reference URIs that
-    				// can no longer be resolved because of a bad resource
-    			}
-    		}
-    	}
-    	
-    	return result;
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/providers/marker/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/providers/marker/package.html
deleted file mode 100644
index 8b9ffe3..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/providers/marker/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Extension of the Common UI marker-navigation provider API that supports navigation
-to elements within MSL-managed models.  Requires clients to be able to extract
-element IDs from their marker implementation.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/action/AbstractModelActionFilterProvider.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/action/AbstractModelActionFilterProvider.java
deleted file mode 100644
index 89f1faa..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/action/AbstractModelActionFilterProvider.java
+++ /dev/null

@@ -1,223 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.action;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.AbstractActionFilterProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.TestAttributeOperation;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIDebugOptions;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIStatusCodes;
-
-/**
- * The parent of all model action filter providers. Defines behavior to wrap
- * queries on this provider in read actions.
- * 
- * @author khussey
- *
- */
-public abstract class AbstractModelActionFilterProvider
-	extends AbstractActionFilterProvider {
-
-	/**
-	 * The internal result of querying this model action filter provider.
-	 * 
-	 */
-	private boolean result = false;
-
-	/**
-	 * Constructs a new model action filter provider.
-	 * 
-	 */
-	protected AbstractModelActionFilterProvider() {
-		super();
-	}
-
-	/**
-	 * Retrieves the value of the <code>result</code> instance variable.
-	 * 
-	 * @return The value of the <code>result</code> instance variable.
-	 * 
-	 */
-	protected final boolean getResult() {
-		return result;
-	}
-
-	/**
-	 * Sets the <code>result</code> instance variable to the specified value.
-	 * 
-	 * @param result The new value for the <code>result</code> instance
-	 *                variable.
-	 * 
-	 */
-	protected final void setResult(boolean result) {
-		this.result = result;
-	}
-
-	/**
-	 * Actually does the work of determining whether the specific attribute
-	 * matches the state of the target object.
-	 *
-	 * @return <code>true</code> if the attribute matches; <code>false</code>
-	 *          otherwise.
-	 * @param target The target object.
-	 * @param name The attribute name.
-	 * @param value The attriute value.
-	 * 
-	 */
-	protected abstract boolean doTestAttribute(Object target, String name,
-		String value);
-
-	/**
-	 * Actually does the work of determining whether this provider provides the
-	 * specified operation.
-	 * 
-	 * @return <code>true</code> if this provider provides the operation;
-	 *          <code>false</code> otherwise.
-	 * @param operation The operation in question.
-	 * 
-	 */
-	protected abstract boolean doProvides(IOperation operation);
-
-	/**
-	 * Tests whether the specific attribute matches the state of the target
-	 * object, as a read action.
-	 *
-	 * @return <code>true</code> if the attribute matches; <code>false</code>
-	 *          otherwise.
-	 * @param target The target object.
-	 * @param name The attribute name.
-	 * @param value The attriute value.
-	 * 
-	 * @see org.eclipse.ui.IActionFilter#testAttribute(Object, String, String)
-	 * 
-	 */
-	public final boolean testAttribute(final Object target, final String name,
-		final String value) {
-
-        TransactionalEditingDomain domain = getEditingDomain(target);
-
-        if (domain == null) {
-            return false;
-        }
-            
-        try {
-            domain.runExclusive(new Runnable() {
-
-                public void run() {
-                    try {
-                        setResult(doTestAttribute(target, name, value));
-                    } catch (Exception e) {
-                        Trace.catching(MslUIPlugin.getDefault(),
-                            MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                            "testAttribute", e); //$NON-NLS-1$
-                        Log.warning(MslUIPlugin.getDefault(),
-                            MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                                .getMessage(), e);
-                        RuntimeException cre = new RuntimeException(e);
-                        Trace.throwing(MslUIPlugin.getDefault(),
-                            MslUIDebugOptions.EXCEPTIONS_THROWING, getClass(),
-                            "testAttribute", cre); //$NON-NLS-1$
-                        throw cre;
-                    }
-                }
-            });
-        } catch (InterruptedException e) {
-            Trace.catching(MslUIPlugin.getDefault(),
-                MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "testAttribute", e); //$NON-NLS-1$
-            Log.error(MslUIPlugin.getDefault(),
-                MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                    .getLocalizedMessage(), e);
-        }
-
-        return getResult();
-	}
-
-	/**
-     * Tests whether this provider provides the specified operation, as a read
-     * action.
-     * 
-     * @return <code>true</code> if this provider provides the operation;
-     *         <code>false</code> otherwise.
-     * @param operation
-     *            The operation in question.
-     * 
-     * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(IOperation)
-     * 
-     */
-	public final boolean provides(final IOperation operation) {
-
-        TransactionalEditingDomain domain = null;
-
-        if (operation instanceof TestAttributeOperation) {
-            Object target = ((TestAttributeOperation) operation).getTarget();
-
-            if (target != null) {
-                domain = getEditingDomain(target);
-            }
-        }
-
-        if (domain == null) {
-            return false;
-        }
-        
-		try {
-			domain.runExclusive(new Runnable() {
-
-				public void run() {
-					try {
-						setResult(doProvides(operation));
-					} catch (Exception e) {
-						Trace.catching(MslUIPlugin.getDefault(),
-							MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-							"provides", e); //$NON-NLS-1$
-						Log.warning(MslUIPlugin.getDefault(),
-							MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-								.getMessage(), e);
-						RuntimeException cre = new RuntimeException(
-							e);
-						Trace.throwing(MslUIPlugin.getDefault(),
-							MslUIDebugOptions.EXCEPTIONS_THROWING, getClass(),
-							"provides", cre); //$NON-NLS-1$
-						throw cre;
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-            Trace.catching(MslUIPlugin.getDefault(),
-                MslUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "provides", e); //$NON-NLS-1$
-            Log.error(MslUIPlugin.getDefault(),
-                MslUIStatusCodes.IGNORED_EXCEPTION_WARNING, e
-                    .getLocalizedMessage(), e);
-		}
-
-		return getResult();
-	}
-    
-    /**
-     * Determines the editing domain from the target object.
-     * 
-     * @param target
-     *            the target object
-     * @return the editing domain
-     */
-    protected TransactionalEditingDomain getEditingDomain(Object target) {
-        return TransactionUtil.getEditingDomain(target);
-    }
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/action/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/action/package.html
deleted file mode 100644
index 5e9d67d..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/action/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Extension of the Common UI action filter framework for filters that need to
-test elements of MSL-managed models.  Provides support for the MSL read
-action protocol, etc.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesForSREOnSourceOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesForSREOnSourceOperation.java
deleted file mode 100644
index 63c00b8..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesForSREOnSourceOperation.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * relationships that can be used to show related elements from a given source
- * object.
- * 
- * @author cmahoney
- */
-public class GetRelTypesForSREOnSourceOperation
-	implements IModelingAssistantOperation {
-
-	/** the source: adapts to EditPart, View, Element, etc. */
-	private final IAdaptable source;
-
-	/**
-	 * Creates a new <code>GetRelTypesForSREOnSourceOperation</code>.
-	 * 
-	 * @param source
-	 *            the source: adapts to EditPart, View, Element, etc.
-	 */
-	protected GetRelTypesForSREOnSourceOperation(IAdaptable source) {
-		this.source = source;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return GET_REL_TYPES_FOR_SRE_ON_SOURCE_ID;
-	}
-
-	/**
-	 * Returns the source. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getSource();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.getRelTypesForSREOnSource(getSource());
-	}
-
-	/**
-	 * Gets the source.
-	 * 
-	 * @return Returns the source.
-	 */
-	public IAdaptable getSource() {
-		return source;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesForSREOnTargetOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesForSREOnTargetOperation.java
deleted file mode 100644
index 440f46c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesForSREOnTargetOperation.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * relationships that can be used to show related elements from a given target
- * element.
- * 
- * @author cmahoney
- */
-public class GetRelTypesForSREOnTargetOperation
-	implements IModelingAssistantOperation {
-
-	/** the target: adapts to editpart, view, element, etc. */
-	private final IAdaptable target;
-
-	/**
-	 * Creates a new <code>GetRelTypesForSREOnTargetOperation</code>.
-	 * 
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 */
-	protected GetRelTypesForSREOnTargetOperation(IAdaptable target) {
-		this.target = target;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return GET_REL_TYPES_FOR_SRE_ON_TARGET_ID;
-	}
-
-	/**
-	 * Returns the target. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getTarget();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.getRelTypesForSREOnTarget(getTarget());
-	}
-
-	/**
-	 * Gets the target.
-	 * 
-	 * @return Returns the target.
-	 */
-	public IAdaptable getTarget() {
-		return target;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnSourceAndTargetOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnSourceAndTargetOperation.java
deleted file mode 100644
index ebadbc6..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnSourceAndTargetOperation.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * relationships that can be created between a given source and target element.
- * 
- * @author cmahoney
- */
-public class GetRelTypesOnSourceAndTargetOperation
-	implements IModelingAssistantOperation {
-
-	/** the source: adapts to editpart, view, element, etc. */
-	private final IAdaptable source;
-
-	/** the target: adapts to editpart, view, element, etc. */
-	private final IAdaptable target;
-
-	/**
-	 * Creates a new <code>GetRelTypesOnSourceAndTargetOperation</code>.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 */
-	protected GetRelTypesOnSourceAndTargetOperation(IAdaptable source,
-			IAdaptable target) {
-
-		this.source = source;
-		this.target = target;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return GET_REL_TYPES_ON_SOURCE_AND_TARGET_ID;
-	}
-
-	/**
-	 * Returns the source. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getSource();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.getRelTypesOnSourceAndTarget(getSource(), getTarget());
-	}
-
-	/**
-	 * Gets the source.
-	 * 
-	 * @return Returns the source.
-	 */
-	public IAdaptable getSource() {
-		return source;
-	}
-
-	/**
-	 * Gets the target.
-	 * 
-	 * @return Returns the target.
-	 */
-	public IAdaptable getTarget() {
-		return target;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnSourceOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnSourceOperation.java
deleted file mode 100644
index 33633a5..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnSourceOperation.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * relationships that can be created from a given source element.
- * 
- * @author cmahoney
- */
-public class GetRelTypesOnSourceOperation
-	implements IModelingAssistantOperation {
-
-	/** the source: adapts to editpart, view, element, etc. */
-	private final IAdaptable source;
-
-	/**
-	 * Creates a new <code>GetRelTypesOnSourceOperation</code>.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 */
-	protected GetRelTypesOnSourceOperation(IAdaptable source) {
-		this.source = source;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return GET_REL_TYPES_ON_SOURCE_ID;
-	}
-
-	/**
-	 * Returns the source. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getSource();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.getRelTypesOnSource(getSource());
-	}
-
-	/**
-	 * Gets the source.
-	 * 
-	 * @return Returns the source.
-	 */
-	public IAdaptable getSource() {
-		return source;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnTargetOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnTargetOperation.java
deleted file mode 100644
index 8de5a2e..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetRelTypesOnTargetOperation.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * relationships that can be created from a given target element.
- * 
- * @author cmahoney
- */
-public class GetRelTypesOnTargetOperation
-	implements IModelingAssistantOperation {
-
-	/** the target: adapts to editpart, view, element, etc. */
-	private final IAdaptable target;
-
-	/**
-	 * Creates a new <code>GetRelTypesOnTargetOperation</code>.
-	 * 
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 */
-	protected GetRelTypesOnTargetOperation(IAdaptable target) {
-		this.target = target;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return GET_REL_TYPES_ON_TARGET_ID;
-	}
-
-	/**
-	 * Returns the target. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getTarget();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.getRelTypesOnTarget(getTarget());
-	}
-
-	/**
-	 * Gets the target.
-	 * 
-	 * @return Returns the target.
-	 */
-	public IAdaptable getTarget() {
-		return target;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForPopupBarOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForPopupBarOperation.java
deleted file mode 100644
index 7995226..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForPopupBarOperation.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * elements that can be created from an action bar.
- * 
- * @author cmahoney
- */
-public class GetTypesForPopupBarOperation
-	implements IModelingAssistantOperation {
-
-	/** the host: adapts to editpart, view, element, etc. */
-	private final IAdaptable host;
-
-	/**
-	 * Creates a new <code>GetTypesForPopupBarOperation</code>.
-	 * 
-	 * @param host
-	 *            the host: adapts to editpart, view, element, etc.
-	 */
-	protected GetTypesForPopupBarOperation(IAdaptable host) {
-		this.host = host;
-	}
-
-	public String getId() {
-		return GET_TYPES_FOR_POPUP_BAR_ID;
-	}
-
-	/**
-	 * Returns the host. This is what will be used to assist in delayed loading
-	 * of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getHost();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.getTypesForPopupBar(getHost());
-	}
-
-	/**
-	 * @return Returns the host that is to have an action bar displayed on it.
-	 */
-	public final IAdaptable getHost() {
-		return host;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForSourceOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForSourceOperation.java
deleted file mode 100644
index f94295d..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForSourceOperation.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * elements that can be used for the source end of a relationship.
- * 
- * @author cmahoney
- */
-public class GetTypesForSourceOperation
-	implements IModelingAssistantOperation {
-
-	/** the target: adapts to EditPart, View, Element, etc. */
-	private final IAdaptable target;
-
-	/** the relationship type to be created */
-	private final IElementType relationshipType;
-
-	/**
-	 * Creates a new <code>GetTypesForSourceOperation</code>.
-	 * 
-	 * @param target
-	 *            the target: adapts to EditPart, View, Element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 *  
-	 */
-	protected GetTypesForSourceOperation(IAdaptable target,
-			IElementType relationshipType) {
-
-		this.target = target;
-		this.relationshipType = relationshipType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return GET_TYPES_FOR_SOURCE_ID;
-	}
-
-	/**
-	 * Returns the target. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getTarget();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider).getTypesForSource(
-			getTarget(), getRelationshipType());
-	}
-
-	/**
-	 * Gets the relationshipType.
-	 * 
-	 * @return Returns the relationshipType.
-	 */
-	public IElementType getRelationshipType() {
-		return relationshipType;
-	}
-
-	/**
-	 * Gets the target.
-	 * 
-	 * @return Returns the target.
-	 */
-	public IAdaptable getTarget() {
-		return target;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForTargetOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForTargetOperation.java
deleted file mode 100644
index 6d86de8..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesForTargetOperation.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * elements that can be used for the target end of a relationship.
- * 
- * @author cmahoney
- */
-public class GetTypesForTargetOperation
-	implements IModelingAssistantOperation {
-
-	/** the source: adapts to editpart, view, element, etc. */
-	private final IAdaptable source;
-
-	/** the relationship type to be created */
-	private final IElementType relationshipType;
-
-	/**
-	 * Creates a new <code>GetTypesForTargetOperation</code>.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 */
-	protected GetTypesForTargetOperation(IAdaptable source,
-			IElementType relationshipType) {
-
-		this.source = source;
-		this.relationshipType = relationshipType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return GET_TYPES_FOR_TARGET_ID;
-	}
-
-	/**
-	 * Returns the source. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getSource();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider).getTypesForTarget(
-			getSource(), getRelationshipType());
-	}
-
-	/**
-	 * Gets the relationshipType.
-	 * 
-	 * @return Returns the relationshipType.
-	 */
-	public IElementType getRelationshipType() {
-		return relationshipType;
-	}
-
-	/**
-	 * Gets the source.
-	 * 
-	 * @return Returns the source.
-	 */
-	public IAdaptable getSource() {
-		return source;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesOperation.java
deleted file mode 100644
index 2296de6..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/GetTypesOperation.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the modeling assistant service that gets the type of
- * elements that can be created or used for a specific hint or gesture and optional data.
- * 
- * @author cmahoney
- */
-public class GetTypesOperation
-	implements IModelingAssistantOperation {
-	
-	/** identifies the gesture */
-	private final String hint;
-
-	/** additional data required */
-	private final IAdaptable data;
-
-	/**
-	 * Creates a new <code>GetTypesOperation</code>.
-	 * 
-	 * @param hint
-	 *            identifies the hint or gesture
-	 * @param data
-	 *            <li>provides additional data that is required</li>
-	 *            <li>may be null depending on the hint</li>
-	 */
-	protected GetTypesOperation(String hint, IAdaptable data) {
-		this.hint = hint;
-		this.data = data;
-	}
-
-	/**
-	 * The ID for a this operation is the hint itself.
-	 */
-	public String getId() {
-		return getHint();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getContext()
-	 */
-	public IAdaptable getContext() {
-		return getData();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.getTypes(getHint(), getData());
-	}
-	
-	/**
-	 * Gets the hint that identifies the gesture.
-	 * 
-	 * @return the hint
-	 */
-	public String getHint() {
-		return hint;
-	}
-	
-	/**
-	 * Gets the additional data required (if applicable). 
-	 * @return the data, may be null.
-	 */
-	public IAdaptable getData() {
-		return data;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/IModelingAssistantOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/IModelingAssistantOperation.java
deleted file mode 100644
index bacb648..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/IModelingAssistantOperation.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-/**
- * Interface for all Modeling Assistant operations. Each operation must provide
- * an id string that is used in the plugin.xml for deferred loading. The ids are
- * defined here so it is easier to look them up. Each operation must all specify
- * a context object. The context object is an adaptable that adapts to the
- * editpart, view, or element.
- * 
- * @author cmahoney
- */
-public interface IModelingAssistantOperation
-	extends IOperation {
-
-	/** Id for the GetTypes operation */
-	final String GET_TYPES_ID = "GetTypes"; //$NON-NLS-1$
-
-	/** Id for the GetRelTypesOnSource operation */
-	final String GET_REL_TYPES_ON_SOURCE_ID = "GetRelTypesOnSource"; //$NON-NLS-1$
-
-	/** Id for the GetRelTypesOnTarget operation */
-	final String GET_REL_TYPES_ON_TARGET_ID = "GetRelTypesOnTarget"; //$NON-NLS-1$
-
-	/** Id for the GetRelTypesOnSourceAndTarget operation */
-	final String GET_REL_TYPES_ON_SOURCE_AND_TARGET_ID = "GetRelTypesOnSourceAndTarget"; //$NON-NLS-1$
-
-	/** Id for the GetRelTypesForSREOnSource operation */
-	final String GET_REL_TYPES_FOR_SRE_ON_SOURCE_ID = "GetRelTypesForSREOnSource"; //$NON-NLS-1$
-
-	/** Id for the GetRelTypesForSREOnTarget operation */
-	final String GET_REL_TYPES_FOR_SRE_ON_TARGET_ID = "GetRelTypesForSREOnTarget"; //$NON-NLS-1$
-
-	/** Id for the GetTypesForSource operation */
-	final String GET_TYPES_FOR_SOURCE_ID = "GetTypesForSource"; //$NON-NLS-1$
-
-	/** Id for the GetTypesForTarget operation */
-	final String GET_TYPES_FOR_TARGET_ID = "GetTypesForTarget"; //$NON-NLS-1$
-
-	/** Id for the SelectExistingElementForSource operation */
-	final String SELECT_EXISTING_ELEMENT_FOR_SOURCE_ID = "SelectExistingElementForSource"; //$NON-NLS-1$	
-
-	/** Id for the SelectExistingElementForTarget operation */
-	final String SELECT_EXISTING_ELEMENT_FOR_TARGET_ID = "SelectExistingElementForTarget"; //$NON-NLS-1$	
-
-	/** Id for the GetTypesForPopupBar operation */
-	final String GET_TYPES_FOR_POPUP_BAR_ID = "GetTypesForPopupBar"; //$NON-NLS-1$
-
-	/**
-	 * Returns the id string to match that specified in the plugin.xml for
-	 * deferred loading.
-	 * 
-	 * @return the id string
-	 */
-	String getId();
-
-	/**
-	 * Returns the context object to match that specified in the plugin.xml for
-	 * deferred loading.
-	 * 
-	 * @return the context object
-	 */
-	IAdaptable getContext();
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/IModelingAssistantProvider.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/IModelingAssistantProvider.java
deleted file mode 100644
index c19d761..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/IModelingAssistantProvider.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * The interface for providers of the modeling assistant service.
- * 
- * @author cmahoney
- */
-public interface IModelingAssistantProvider
-	extends IProvider {
-
-	/**
-	 * Gets a list of types to be used in the popup menu when performing some UI
-	 * gesture identified by the hint.
-	 * 
-	 * @param hint
-	 *            identifies the hint or gesture
-	 * @param data
-	 *            <li>provides additional data that is required</li>
-	 *            <li>may be null depending on the hint</li>
-	 * @return a list of element types (<code>IElementType</code>)
-	 */
-	List getTypes(String hint, IAdaptable data);
-
-	/**
-	 * Returns a list of relationship types that could appear in EITHER the
-	 * popup that appears when creating a connection from source to target or
-	 * the popup that appears when creating a connection from source to an
-	 * unspecified target.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @return a list of relationship types (<code>IElementType</code>)
-	 */
-	List getRelTypesOnSource(IAdaptable source);
-
-	/**
-	 * Returns a list of relationship types that could appear in EITHER the
-	 * popup that appears when creating a connection from target to source or
-	 * the popup that appears when creating a connection from target to an
-	 * unspecified source.
-	 * 
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 * @return a list of relationship types (<code>IElementType</code>)
-	 */
-	List getRelTypesOnTarget(IAdaptable target);
-
-	/**
-	 * Returns a list of relationship types to appear in the popup that the user
-	 * can select from when creating a relationship from a source element to a
-	 * target element.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 * @return a list of relationship types (<code>IElementType</code>)
-	 */
-	List getRelTypesOnSourceAndTarget(IAdaptable source, IAdaptable target);
-
-	/**
-	 * Returns a list of relationship types to appear in the popup that the user
-	 * can select from when showing related elements by double-clicking an
-	 * outgoing connector handle.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @return a list of relationship types (<code>IElementType</code>)
-	 */
-	List getRelTypesForSREOnSource(IAdaptable source);
-
-	/**
-	 * Returns a list of relationship types to appear in the popup that the user
-	 * can select from when showing related elements by double-clicking an
-	 * incoming connector handle.
-	 * 
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 * @return a list of relationship types (<code>IElementType</code>
-	 *         objects)
-	 */
-	List getRelTypesForSREOnTarget(IAdaptable target);
-
-	/**
-	 * Returns a list of element types to appear in the popup when creating a
-	 * relationship from a target element to an unspecified source from which
-	 * the user can select the source type.
-	 * 
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 * @return a list of types for the new source (<code>IElementType</code>
-	 *         objects)
-	 */
-	List getTypesForSource(IAdaptable target, IElementType relationshipType);
-
-	/**
-	 * Returns a list of element types to appear in the popup when creating a
-	 * relationship from a source element to an unspecified target from which
-	 * the user can select the target type.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 * @return a list of types for the new target (<code>IElementType</code>
-	 *         objects)
-	 */
-	List getTypesForTarget(IAdaptable source, IElementType relationshipType);
-
-	/**
-	 * Pops up a dialog that allows the user to select an existing element that
-	 * is to be used as the source in a new relationship being created.
-	 * 
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 * @return Returns the <code>EObject</code> the user selected, or null if
-	 *         an error occurred or the gesture was cancelled.
-	 */
-	EObject selectExistingElementForSource(IAdaptable target,
-			IElementType relationshipType);
-
-	/**
-	 * Pops up a dialog that allows the user to select an existing element that
-	 * is to be used as the target in a new relationship being created.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 * @return Returns the <code>IElement</code> the user selected, or null if
-	 *         an error occurred or the gesture was cancelled.
-	 */
-	EObject selectExistingElementForTarget(IAdaptable source,
-			IElementType relationshipType);
-
-
-	/**
-	 * Gets a list of types to be used in the popup bar to support creating an
-	 * shape or element within the context of another.
-	 * 
-	 * @param host
-	 *            the host on which the popup bar will be displayed: adapts to
-	 *            editpart, view, element, etc.
-	 * @return a list of element types (<code>IElementType</code>)
-	 */
-	List getTypesForPopupBar(IAdaptable host);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantProvider.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantProvider.java
deleted file mode 100644
index 3661154..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantProvider.java
+++ /dev/null

@@ -1,207 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Abstract class for the Modeling Assistant Provider so that subclasses don't
- * have to override methods they do not provide for. Provides some default
- * behavior.
- * 
- * @author cmahoney
- */
-public abstract class ModelingAssistantProvider
-	extends AbstractProvider
-	implements IModelingAssistantProvider {
-
-	/**
-	 * <p>
-	 * For the <code>Get*TypesFor*</code> operations, this will return true if
-	 * the corresponding <code>get*TypesFor*</code> call does not return an
-	 * empty list.
-	 * </p>
-	 * 
-	 * <p>
-	 * For the <code>SelectElementFor*</code> operations, this will return
-	 * true if the corresponding <code>getTypesFor*</code> call does not
-	 * return an empty list.
-	 * </p>
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetRelTypesOnSourceOperation) {
-
-			return !getRelTypesOnSource(
-				((GetRelTypesOnSourceOperation) operation).getSource())
-				.isEmpty();
-
-		} else if (operation instanceof GetRelTypesOnTargetOperation) {
-
-			return !getRelTypesOnTarget(
-				((GetRelTypesOnTargetOperation) operation).getTarget())
-				.isEmpty();
-
-		} else if (operation instanceof GetRelTypesOnSourceAndTargetOperation) {
-
-			return !getRelTypesOnSourceAndTarget(
-				((GetRelTypesOnSourceAndTargetOperation) operation).getSource(),
-				((GetRelTypesOnSourceAndTargetOperation) operation).getTarget())
-				.isEmpty();
-
-		} else if (operation instanceof GetTypesForSourceOperation) {
-
-			return !getTypesForSource(
-				((GetTypesForSourceOperation) operation).getTarget(),
-				((GetTypesForSourceOperation) operation).getRelationshipType())
-				.isEmpty();
-
-		} else if (operation instanceof GetTypesForTargetOperation) {
-
-			return !getTypesForTarget(
-				((GetTypesForTargetOperation) operation).getSource(),
-				((GetTypesForTargetOperation) operation).getRelationshipType())
-				.isEmpty();
-
-		} else if (operation instanceof GetRelTypesForSREOnSourceOperation) {
-
-			return !getRelTypesForSREOnSource(
-				((GetRelTypesForSREOnSourceOperation) operation).getSource())
-				.isEmpty();
-
-		} else if (operation instanceof GetRelTypesForSREOnTargetOperation) {
-
-			return !getRelTypesForSREOnTarget(
-				((GetRelTypesForSREOnTargetOperation) operation).getTarget())
-				.isEmpty();
-
-		} else if (operation instanceof SelectExistingElementForSourceOperation) {
-
-			return !getTypesForSource(
-				((SelectExistingElementForSourceOperation) operation)
-					.getTarget(),
-				((SelectExistingElementForSourceOperation) operation)
-					.getRelationshipType()).isEmpty();
-
-		} else if (operation instanceof SelectExistingElementForTargetOperation) {
-
-			return !getTypesForTarget(
-				((SelectExistingElementForTargetOperation) operation)
-					.getSource(),
-				((SelectExistingElementForTargetOperation) operation)
-					.getRelationshipType()).isEmpty();
-
-		} else if (operation instanceof GetTypesOperation) {
-
-			return !getTypes(((GetTypesOperation) operation).getHint(),
-				((GetTypesOperation) operation).getData()).isEmpty();
-
-		} else if (operation instanceof GetTypesForPopupBarOperation) {
-
-			return !getTypesForPopupBar(
-				((GetTypesForPopupBarOperation) operation).getHost())
-				.isEmpty();
-
-		}
-		return false;
-	}
-
-	/**
-	 * Returns an empty list.
-	 */
-	public List getTypes(String hint, IAdaptable data) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Returns the same list of relationship types as
-	 * <code>getRelTypesOnSource</code>.
-	 */
-	public List getRelTypesForSREOnSource(IAdaptable source) {
-		return getRelTypesOnSource(source);
-	}
-
-	/**
-	 * Returns the same list of relationship types as
-	 * <code>getRelTypesOnTarget</code>.
-	 */
-	public List getRelTypesForSREOnTarget(IAdaptable target) {
-		return getRelTypesOnTarget(target);
-	}
-
-	/**
-	 * Returns an empty list.
-	 */
-	public List getRelTypesOnSource(IAdaptable source) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Returns an empty list.
-	 */
-	public List getRelTypesOnTarget(IAdaptable target) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Returns an empty list.
-	 */
-	public List getRelTypesOnSourceAndTarget(IAdaptable source,
-			IAdaptable target) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Returns an empty list.
-	 */
-	public List getTypesForSource(IAdaptable target,
-			IElementType relationshipType) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Returns an empty list.
-	 */
-	public List getTypesForTarget(IAdaptable source,
-			IElementType relationshipType) {
-		return Collections.EMPTY_LIST;
-	}
-
-	public EObject selectExistingElementForSource(IAdaptable target,
-			IElementType relationshipType) {
-
-		return null;
-	}
-
-	/**
-	 * Returns null.
-	 */
-	public EObject selectExistingElementForTarget(IAdaptable source,
-			IElementType relationshipType) {
-
-		return null;
-	}
-
-	/**
-	 * Returns an empty list.
-	 */
-	public List getTypesForPopupBar(IAdaptable host) {
-		return Collections.EMPTY_LIST;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantProviderConfiguration.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantProviderConfiguration.java
deleted file mode 100644
index a78f3b6..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantProviderConfiguration.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-
-/**
- * A provider configuration for the ModelingAssistantService.  It helps in
- * filtering out and delay loading unrelated providers.
- * 
- * @author cmahoney
- */
-public class ModelingAssistantProviderConfiguration
-	extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String CONTEXT = "context"; //$NON-NLS-1$
-
-	private static final String OPERATION_ID = "operationId"; //$NON-NLS-1$
-
-	private static final String ELEMENTS = "elements"; //$NON-NLS-1$
-
-	/** a map of context descriptors supported by this provider to their target contexts */
-	private List contextDescriptors = new ArrayList();
-
-	/**
-	 * Builds a new provider contribution descriptor by parsing its configuration element
-	 * 
-	 * @param configElement A provider configuration element
-	 * @return A provider XML contribution descriptor
-	 */
-	public static ModelingAssistantProviderConfiguration parse(
-		IConfigurationElement configElement) {
-		assert configElement != null: "null provider configuration element"; //$NON-NLS-1$
-		return new ModelingAssistantProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ModelingAssistantProviderConfiguration</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private ModelingAssistantProviderConfiguration(
-		IConfigurationElement configElement) {
-		IConfigurationElement configChildren[];
-
-		// read the object descriptors
-		Map objects = new HashMap();
-		configChildren = configElement.getChildren(OBJECT);
-		for (int i = 0; i < configChildren.length; i++) {
-			String id = configChildren[i].getAttribute(ID);
-			if (id != null)
-				objects.put(id, new ObjectDescriptor(configChildren[i]));
-		}
-
-		// read the context descriptors
-		configChildren = configElement.getChildren(CONTEXT);
-		for (int i = 0; i < configChildren.length; i++) {
-			String operationType = configChildren[i].getAttribute(OPERATION_ID);
-			List elements = getObjectList(configChildren[i]
-				.getAttribute(ELEMENTS), objects, configElement);
-			if (operationType != null || elements != null)
-				contextDescriptors.add(new ContextDescriptor(operationType,
-					elements));
-		}
-	}
-
-	/**
-	 * Determines if the provider understands the given context
-	 * The provider understands the request if:
-	 * 1- There are no listed provider contexts
-	 * 2- The context matches one of the provider contexts 
-	 * 
-	 * @param operationType The operation type
-	 * @param context  The element context
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supports(String operationType, IAdaptable context) {
-		if (contextDescriptors.isEmpty())
-			return true;
-
-		Iterator iter = contextDescriptors.iterator();
-		while (iter.hasNext()) {
-			ContextDescriptor descriptor = (ContextDescriptor) iter.next();
-			if (descriptor.matches(operationType, context))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * A descriptor for a provider context
-	 */
-	private static class ContextDescriptor {
-
-		/** the operation type */
-		private final String operationType;
-
-		/** the elements */
-		private final List elements;
-
-		/**
-		 * creates a new context descriptor from its context info
-		 * 
-		 * @param operationType The operation type
-		 * @param elements The elements
-		 */
-		public ContextDescriptor(String operationType, List elements) {
-			this.operationType = operationType;
-			this.elements = elements;
-		}
-
-		/**
-		 * Determines if the context descriptor matches the given context
-		 * 
-		 * @param anOperationType The operation type
-		 * @param context The element context
-		 * @return boolean
-		 */
-		public boolean matches(String anOperationType, IAdaptable context) {
-			if (operationType != null) {
-				if (!operationType.equals(anOperationType))
-					return false;
-			}
-			if (elements != null) {
-				if (!objectMatches(context, elements))
-					return false;
-			}
-			return true;
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantService.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantService.java
deleted file mode 100644
index 06571e7..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/ModelingAssistantService.java
+++ /dev/null

@@ -1,271 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.internal.MslUIPlugin;
-
-/**
- * This service is used to assist the user with modeling gestures.
- * 
- * @author cmahoney
- */
-public class ModelingAssistantService
-	extends Service
-	implements IModelingAssistantProvider {
-
-	/**
-	 * A descriptor for <code>IModelingAssistantProvider</code> defined
-	 * by a configuration element.
-	 */
-	protected static class ProviderDescriptor
-		extends ActivityFilterProviderDescriptor {
-
-		/** the provider configuration parsed from XML */
-		private ModelingAssistantProviderConfiguration providerConfiguration;
-
-		/**
-		 * Constructs a <code>ISemanticProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element The configuration element describing the provider.
-		 */
-		public ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-			this.providerConfiguration = ModelingAssistantProviderConfiguration
-				.parse(element);
-			assert providerConfiguration != null: "providerConfiguration is null"; //$NON-NLS-1$
-		}
-
-		public boolean provides(IOperation operation) {
-			if (!super.provides(operation)) {
-				return false;
-			}
-			if (!policyInitialized){
-				policy = getPolicy();
-				policyInitialized = true;
-			}
-			if (policy != null)
-				return policy.provides(operation);
-
-			return isSupportedInExtension(operation) ? getProvider().provides(
-				operation) : false;
-		}
-
-		/**
-		 * Checks if the operation is supported by the XML extension
-		 * @param operation
-		 * @return true if the operation is supported; false otherwise
-		 */
-		private boolean isSupportedInExtension(IOperation operation) {
-			if (operation instanceof IModelingAssistantOperation) {
-				String operationId = ((IModelingAssistantOperation) operation)
-					.getId();
-				IAdaptable context = ((IModelingAssistantOperation) operation)
-					.getContext();
-
-				return providerConfiguration.supports(operationId, context);
-			}
-			return false;
-		}
-
-	}
-
-	/** The singleton instance of the modeling assistant service. */
-	private final static ModelingAssistantService service = new ModelingAssistantService();
-
-	static {
-		service.configureProviders(MslUIPlugin.getPluginId(), "modelingAssistantProviders"); //$NON-NLS-1$
-	}
-
-	protected Service.ProviderDescriptor newProviderDescriptor(
-		IConfigurationElement element) {
-		return new ProviderDescriptor(element);
-	}
-
-	/**
-	 * Retrieves the singleton instance of the modeling assistant service.
-	 * 
-	 * @return The modeling assistant service singleton.
-	 */
-	public static ModelingAssistantService getInstance() {
-		return service;
-	}
-
-	/**
-	 * Accepts a list that may contain other lists and returns a list
-	 * containing all the objects.  Also removes duplicates.
-	 * @param list
-	 * @return the collapsed list
-	 */
-	private static List collapseList(List list) {
-		List collapsedList = new ArrayList();
-
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			Object object = iter.next();
-			if (object instanceof List) {
-				for (Iterator iterator = ((List) object).iterator(); iterator
-					.hasNext();) {
-					Object subObject = iterator.next();
-					if (!collapsedList.contains(subObject)) {
-						collapsedList.add(subObject);
-					}
-				}
-			} else {
-				collapsedList.add(object);
-			}
-		}
-		return collapsedList;
-	}
-
-	/**
-	 * Executes the <code>GetTypesOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getTypes(String hint, IAdaptable data) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetTypesOperation(hint, data));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetRelTypesOnSourceOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getRelTypesOnSource(IAdaptable source) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetRelTypesOnSourceOperation(source));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetRelTypesOnTargetOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getRelTypesOnTarget(IAdaptable target) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetRelTypesOnTargetOperation(target));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetRelTypesOnSourceAndTargetOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getRelTypesOnSourceAndTarget(IAdaptable source, IAdaptable target) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetRelTypesOnSourceAndTargetOperation(source, target));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetRelTypesForSREOnSourceOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getRelTypesForSREOnSource(IAdaptable source) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetRelTypesForSREOnSourceOperation(source));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetRelTypesForSREOnTargetOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getRelTypesForSREOnTarget(IAdaptable target) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetRelTypesForSREOnTargetOperation(target));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetTypesForSourceOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getTypesForSource(IAdaptable target,
-		IElementType relationshipType) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetTypesForSourceOperation(target, relationshipType));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetTypesForTargetOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getTypesForTarget(IAdaptable source,
-		IElementType relationshipType) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetTypesForTargetOperation(source, relationshipType));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>SelectExistingElementForSourceOperation</code> using the 
-	 * <code>FIRST</code> execution strategy.
-	 */
-	public EObject selectExistingElementForSource(IAdaptable target,
-		IElementType relationshipType) {
-		List results = execute(ExecutionStrategy.FIRST,
-			new SelectExistingElementForSourceOperation(target,
-				relationshipType));
-		return (EObject) results.get(0);
-	}
-
-	/**
-	 * Executes the <code>SelectExistingElementForTargetOperation</code> using the 
-	 * <code>FIRST</code> execution strategy.
-	 */
-	public EObject selectExistingElementForTarget(IAdaptable source,
-		IElementType relationshipType) {
-		List results = execute(ExecutionStrategy.FIRST,
-			new SelectExistingElementForTargetOperation(source,
-				relationshipType));
-		return (EObject) results.get(0);
-	}
-
-	/**
-	 * Executes the <code>GetTypesForPopupBarOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 */
-	public List getTypesForPopupBar(IAdaptable host) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetTypesForPopupBarOperation(host));
-		return collapseList(results);
-	}
-
-	/**
-	 * Executes the <code>GetTypesForPopupBarOperation</code> using the 
-	 * <code>FORWARD</code> execution strategy.
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForActionBar(IAdaptable)
-	 * @deprecated Renamed to {@link #getTypesForPopupBar(IAdaptable)}
-	 */
-	public List getTypesForActionBar(IAdaptable host) {
-		List results = execute(ExecutionStrategy.FORWARD,
-			new GetTypesForPopupBarOperation(host));
-		return collapseList(results);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/SelectExistingElementForSourceOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/SelectExistingElementForSourceOperation.java
deleted file mode 100644
index f65b704..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/SelectExistingElementForSourceOperation.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * The operation used with the modeling assistant service that pops up a dialog
- * from which the user can select an existing element to be used as the source
- * end of a relationship.
- * 
- * @author cmahoney
- */
-public class SelectExistingElementForSourceOperation
-	implements IModelingAssistantOperation {
-
-	/** the target: adapts to editpart, view, element, etc. */
-	private final IAdaptable target;
-
-	/** the relationship type to be created */
-	private final IElementType relationshipType;
-
-	/**
-	 * Creates a new <code>GetTypesForSourceOperation</code>.
-	 * 
-	 * @param target
-	 *            the target: adapts to editpart, view, element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 */
-	public SelectExistingElementForSourceOperation(IAdaptable target,
-			IElementType relationshipType) {
-
-		this.target = target;
-		this.relationshipType = relationshipType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return SELECT_EXISTING_ELEMENT_FOR_SOURCE_ID;
-	}
-
-	/**
-	 * Returns the target. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getTarget();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.selectExistingElementForSource(getTarget(), getRelationshipType());
-	}
-
-	/**
-	 * Gets the relationshipType.
-	 * 
-	 * @return Returns the relationshipType.
-	 */
-	public IElementType getRelationshipType() {
-		return relationshipType;
-	}
-
-	/**
-	 * Gets the target.
-	 * 
-	 * @return Returns the target.
-	 */
-	public IAdaptable getTarget() {
-		return target;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/SelectExistingElementForTargetOperation.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/SelectExistingElementForTargetOperation.java
deleted file mode 100644
index ab28f92..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/SelectExistingElementForTargetOperation.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.modelingassistant;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * The operation used with the modeling assistant service that pops up a dialog
- * from which the user can select an existing element to be used as the target
- * end of a relationship.
- * 
- * @author cmahoney
- */
-public class SelectExistingElementForTargetOperation
-	implements IModelingAssistantOperation {
-
-	/** the source: adapts to editpart, view, element, etc. */
-	private final IAdaptable source;
-
-	/** the relationship type to be created */
-	private final IElementType relationshipType;
-
-	/**
-	 * Creates a new <code>GetTypesForTargetOperation</code>.
-	 * 
-	 * @param source
-	 *            the source: adapts to editpart, view, element, etc.
-	 * @param relationshipType
-	 *            the relationship type to be created
-	 */
-	public SelectExistingElementForTargetOperation(IAdaptable source,
-			IElementType relationshipType) {
-
-		this.source = source;
-		this.relationshipType = relationshipType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation#getId()
-	 */
-	public String getId() {
-		return SELECT_EXISTING_ELEMENT_FOR_TARGET_ID;
-	}
-
-	/**
-	 * Returns the source. This is what will be used to assist in delayed
-	 * loading of a modeling assistant provider.
-	 */
-	public IAdaptable getContext() {
-		return getSource();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IModelingAssistantProvider) provider)
-			.selectExistingElementForTarget(getSource(), getRelationshipType());
-	}
-
-	/**
-	 * Gets the relationshipType.
-	 * 
-	 * @return Returns the relationshipType.
-	 */
-	public IElementType getRelationshipType() {
-		return relationshipType;
-	}
-
-	/**
-	 * Gets the source.
-	 * 
-	 * @return Returns the source.
-	 */
-	public IAdaptable getSource() {
-		return source;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/package.html
deleted file mode 100644
index 5f1203c..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/modelingassistant/package.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-The Modeling Assistant Service provides an extensible algorithm for offering
-users easy access to the most common editing gestures in a particular context
-of model elements and/or diagrams.
-
-<h2>Package Specification</h2>
-<p>
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/ISemanticParser.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/ISemanticParser.java
deleted file mode 100644
index cc3c866..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/ISemanticParser.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.parser;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-
-/**
- * Parser that permit the clients to register themselves
- * with the semantic element changes with the event handler.
- * If the the semantic element has semantic children then
- * the Parser will also register the listener so it can
- * listener to changes in them to.
- * 
- * @author nbalaba
- */
-public interface ISemanticParser
-	extends IParser {
-
-	/**
-	 * Obtains the semantic elements which this parser uses to formulate text
-	 * for the specified <code>element</code>.
-	 * 
-	 * @param element The element that the receiver wishes to listen for changes on.
-	 * @return List A list of semantic elements that this parser is responsible for parsing.
-	 *   This should include the <code>element</code> itself and, optionally, other elements
-	 *   somehow related to it 
-	 */
-	public List getSemanticElementsBeingParsed(EObject element);
-
-	/**
-	 * Determines if the event affects the semantic elements the parser uses to
-	 * display strings. If true, the client should update the semantic elements
-	 * to listen to
-	 * 
-	 * @param listener
-	 *            the receiver (listener) of the event
-	 * @param notification
-	 *            the event notification
-	 * @return <code>true</code> if the event affects the semantic
-	 *         elements, otherwise <code>false</code>.
-	 */
-	public boolean areSemanticElementsAffected(EObject listener,
-			Object notification);
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/ParserHintAdapter.java b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/ParserHintAdapter.java
deleted file mode 100644
index 5a9dfa2..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/ParserHintAdapter.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.emf.ui.services.parser;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-
-
-public class ParserHintAdapter implements IAdaptable {
-	private EObject element = null;
-	private String parserHint = null;
-
-	/**
-	 * Method ParserHintAdapter.
-	 * @param element
-	 * @param parserHint
-	 */
-	public ParserHintAdapter(EObject element, String parserHint) {
-		this.element = element;
-		this.parserHint = parserHint;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
-	 */
-	public Object getAdapter(Class adapter) {
-
-		if (adapter.equals(EObject.class))
-			return element;
-		else if (adapter.equals(String.class))
-			return parserHint;
-		return null;
-	}
-
-}
-

diff --git a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/package.html b/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/package.html
deleted file mode 100644
index 91d60e0..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/services/parser/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-MSL-specific extensions to the common parser service.
-
-<h2>Package Specification</h2>
-<p>
-The {@link org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser}
-interface extends the common {@link org.eclipse.gmf.runtime.common.ui.services.parser.IParser}
-interface to provide information about the objects that parse strings are derived from, in
-cases where multiple objects together contribute to the parse string.
-</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.gef.ui/.classpath b/org.eclipse.gmf.runtime.gef.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.gef.ui/.cvsignore b/org.eclipse.gmf.runtime.gef.ui/.cvsignore
deleted file mode 100644
index 7f738d4..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-*.settings
-org
-org

diff --git a/org.eclipse.gmf.runtime.gef.ui/.options b/org.eclipse.gmf.runtime.gef.ui/.options
deleted file mode 100644
index 8f8976c..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.options
+++ /dev/null

@@ -1,17 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.gef.ui plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.gef.ui plug-in
-org.eclipse.gmf.runtime.gef.ui/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.gef.ui/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.gef.ui/debug/methods/exiting=false
-
-# Trace dnd
-org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing=false

diff --git a/org.eclipse.gmf.runtime.gef.ui/.project b/org.eclipse.gmf.runtime.gef.ui/.project
deleted file mode 100644
index 597f980..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.gef.ui</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.gef.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.gef.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index ae987a4..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.gef.ui
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.gef.ui.internal.GefPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.gef.ui.figures,
- org.eclipse.gmf.runtime.gef.ui.internal;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.actions;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.editparts;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.editpolicies;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.figures;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.handles;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.palette;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.parts;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.requests;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers",
- org.eclipse.gmf.runtime.gef.ui.internal.tools;x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.providers"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.gef.ui/about.html b/org.eclipse.gmf.runtime.gef.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.gef.ui/build.properties b/org.eclipse.gmf.runtime.gef.ui/build.properties
deleted file mode 100644
index dcb75e5..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = icons/,\
-               plugin.properties,\
-               .options,\
-               META-INF/,\
-               .,\
-               about.html
-
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Add.gif b/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Add.gif
deleted file mode 100644
index 75d6cc2..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Add.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Add_Mask.gif b/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Add_Mask.gif
deleted file mode 100644
index 0fb52a6..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Add_Mask.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Move.gif b/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Move.gif
deleted file mode 100644
index 7b0e9e7..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Move.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Move_Mask.gif b/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Move_Mask.gif
deleted file mode 100644
index 07ae0f5..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/icons/Seg_Move_Mask.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.runtime.gef.ui/plugin.properties b/org.eclipse.gmf.runtime.gef.ui/plugin.properties
deleted file mode 100644
index d72faad..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/plugin.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Presentation - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF GEF Additions
-Plugin.providerName = Eclipse.org
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/DefaultSizeNodeFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/DefaultSizeNodeFigure.java
deleted file mode 100644
index e688ce9..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/DefaultSizeNodeFigure.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.figures;
-
-import org.eclipse.draw2d.geometry.Dimension;
-
-/**
- * A node figure that ensures a minimum preferred size (called the default size)
- * Extend this class if your node figure wants to ensure a minimum preferred size
- * regardless of what the layout manager is calculating
- * 
- * @author melaasar
- */
-public class DefaultSizeNodeFigure extends NodeFigure {
-
-	private Dimension defaultSize = new Dimension();
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param defSize a <code>Dimension</code> that is used to initialize the default size
-	 */
-	public DefaultSizeNodeFigure(Dimension defSize) {
-		this(defSize.width, defSize.height);
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param width the initial width to initialize the default size with
-	 * @param height the initial height to initialize the default size with
-	 */
-	public DefaultSizeNodeFigure(int width, int height) {
-		setDefaultSize(width, height);
-	}
-
-	/**
-	 * @return a <code>Dimension</code> that represents the minimum or default size of 
-	 * this figure.
-	 */
-	public Dimension getDefaultSize() {
-		return defaultSize;
-	}
-
-	/**
-	 * @param d The <code>Dimension</code> to set that represents the minimum or default size of 
-	 * this figure.
-	 */
-	public void setDefaultSize(Dimension d) {
-		setDefaultSize(d.width, d.height);
-	}
-
-	/**
-	 * @param width the initial width to initialize the default size with
-	 * @param height the initial height to initialize the default size with
-	 */
-	public void setDefaultSize(int width, int height) {
-		this.defaultSize.width = width;
-		this.defaultSize.height = height;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return super.getPreferredSize(wHint, hHint).getUnioned(
-			getDefaultSize());
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/NodeFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/NodeFigure.java
deleted file mode 100644
index 85c5ccb..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/NodeFigure.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.figures;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.handles.HandleBounds;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.TransparentBorder;
-
-/**
- * Base class that most shape figures should extend from to gain default connection anchor behavior.
- * 
- * @author melaasar
- */
-public class NodeFigure 
-	extends Figure
-		implements HandleBounds, IAnchorableFigure {
-
-	private Hashtable connectionAnchors;
-	
-	/**
-	 * <code>String</code> that is the identifier for the default anchor
-	 */
-	static public final String szAnchor = ""; //$NON-NLS-1$
-
-	/** 
-	 * Constructor - sets the default colors for all node figures.
-	 */
-	public NodeFigure() {
-		// empty constructor
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.handles.HandleBounds#getHandleBounds()
-	 */
-	public Rectangle getHandleBounds() {
-		Insets insets = new Insets(0, 0, 0, 0);
-		if (getBorder() instanceof TransparentBorder) {
-			insets =
-				((TransparentBorder) getBorder()).getTransparentInsets(this);
-		}
-        
-		// Ignore the insets when placing the handles
-		return new Rectangle(
-				getBounds().x + insets.left,
-				getBounds().y + insets.top,
-				getBounds().width - (insets.right + insets.left),
-				getBounds().height - (insets.bottom + insets.top));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
-	 */
-	public ConnectionAnchor getConnectionAnchor(String terminal) {
-
-		ConnectionAnchor connectAnchor =
-			(ConnectionAnchor) getConnectionAnchors().get(terminal);
-		if (connectAnchor == null) {
-			if (terminal.equals(szAnchor)) {
-				// get a new one - this figure doesn't support static anchors
-				connectAnchor = createDefaultAnchor();
-				getConnectionAnchors().put(terminal,connectAnchor);
-			}
-			else {
-				connectAnchor = createAnchor(SlidableAnchor.parseTerminalString(terminal));
-			}
-		}
-
-		return connectAnchor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchorTerminal(org.eclipse.draw2d.ConnectionAnchor)
-	 */
-	public String getConnectionAnchorTerminal(ConnectionAnchor c) {
-		if (c instanceof SlidableAnchor) {
-			return ((SlidableAnchor) c).getTerminal();
-		}
-		if (getConnectionAnchors().containsValue(c)) {
-			Iterator iter = getConnectionAnchors().keySet().iterator();
-			String key;
-			while (iter.hasNext()) {
-				key = (String) iter.next();
-				if (getConnectionAnchors().get(key).equals(c))
-					return key;
-			}
-		}
-		getConnectionAnchor(szAnchor);
-		return szAnchor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getSourceConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
-		return createConnectionAnchor(p);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getTargetConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
-		return createConnectionAnchor(p);
-	}
-
-	/**
-	 * Returns a new anchor for this node figure.
-	 * 
-	 * @param p <code>Point</code> on the figure that gives a hint which anchor to return.
-	 * @return <code>ConnectionAnchor</code> reference to an anchor associated with the 
-	 * given point on the figure.
-	 */
-	protected ConnectionAnchor createConnectionAnchor(Point p) {
-		if (p == null) {
-			return getConnectionAnchor(szAnchor);
-		}
-		else {
-			Point temp = p.getCopy();
-			translateToRelative(temp);
-			PrecisionPoint pt = BaseSlidableAnchor.getAnchorRelativeLocation(temp, getBounds());
-			if (isDefaultAnchorArea(pt))
-				return getConnectionAnchor(szAnchor);
-			return createAnchor(pt);
-		}
-	} 
-	
-	/**
-	 * Checks whether the <PrecisionPoint> p which is a candidate for a relative reference
-	 * for the <Code>SlidableAnchor</Code> belongs to the area where the default anchor
-	 * must be created
-	 * 
-	 * @param p
-	 * @return <code>boolean</code> <code>true</code> if <PrecisionPoint> belongs to the area where the default anchor must be 
-	 * created, <code>false</code> otherwise
-	 */
-	protected boolean isDefaultAnchorArea(PrecisionPoint p) {
-		return p.preciseX >= getSlidableAnchorArea()/2 && p.preciseX <= 1 - getSlidableAnchorArea()/2 &&
-			p.preciseY >= getSlidableAnchorArea()/2 && p.preciseY <= 1 - getSlidableAnchorArea()/2;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		if (isOpaque() && getBorder() != null) {
-			Rectangle tempRect = new Rectangle(getBounds());
-			tempRect.crop(getBorder().getInsets(this));
-			graphics.fillRectangle(tempRect);
-			return;
-		}
-
-		super.paintFigure(graphics);
-	}
-	
-
-	/**
-	 * Returns the connectionAnchors.
-	 * @return Hashtable
-	 */
-	protected Hashtable getConnectionAnchors() {
-		if (connectionAnchors == null)
-			connectionAnchors = new Hashtable(1);
-		return connectionAnchors;
-	}
-		
-
-	/**
-	 * Specifies how large the area of the figure's bounds where <Code>SlidableAnchor</Code>
-	 * will be created. The result number: 0<=result<=1
-	 * 
-	 * @return  the size of the area of the figure's bounds
-	 */
-	protected double getSlidableAnchorArea() {
-		return 0.5;
-	}
-	
-	/**
-	 * Creates the default Slidable anchor with a reference point at the center
-	 * of the figure's bounds
-	 * 
-	 * @return - default SlidableAnchor, relative reference the center of the figure
-	 */
-	protected ConnectionAnchor createDefaultAnchor() {
-		return new SlidableAnchor(this);
-	}
-	
-	/**
-	 * Creates a slidable anchor at the specified point (from the ratio of the
-	 * reference's coordinates and bounds of the figure
-	 * 
-	 * @param p - relative reference for the <Code>SlidableAnchor</Code>
-	 * @return a <code>SlidableAnchor</code> for this figure with relative reference at p
-	 */
-	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
-		if (p==null)
-			// If the old terminal for the connection anchor cannot be resolved (by SlidableAnchor) a null
-			// PrecisionPoint will passed in - this is handled here
-			return createDefaultAnchor();
-		return new SlidableAnchor(this, p);
-	}
-
-	/**
-	 * @return <code>String</code> that is the identifier for the default anchor
-	 */
-	public static String getDefaultAnchorID() {
-		return szAnchor;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableAnchor.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableAnchor.java
deleted file mode 100644
index 0f22c6f..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableAnchor.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.handles.HandleBounds;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
-
-
-/**
- * Provides the implementation of Slidable anchor
- * 
- * @author oboyko
- *
- */
-public class SlidableAnchor
-	extends BaseSlidableAnchor {
-	
-	/**
-	 * Empty constructor 
-	 */
-	public SlidableAnchor() {
-		// empty constructor
-	}
-	
-	/**
-	 * Default constructor. The anchor will have the center of the figure as the
-	 * reference point 
-	 * 
-	 * @param f <code>IFigure</code> that this anchor is associated with.
-	 */
-	public SlidableAnchor(IFigure f) {
-		super(f);
-	}
-
-	/**
-	 * Constructor. Takes point p to store the reference point 
-	 * 
-	 * @param f <code>IFigure</code> that this anchor is associated with.
-	 * @param p the <code>PrecisionPoint</code> that the anchor will initially attach to.
-	 */
-	public SlidableAnchor(IFigure f, PrecisionPoint p) {
-		super(f, p);
-	}
-	
-	/**
-	 * Gets the anchors associated figure's bounding box in absolute coordinates.
-	 * 
-	 * @return a <code>Rectangle</code> that is the bounding box of the owner figure 
-	 * in absolute coordinates
-	 */
-	protected Rectangle getBox() {
-		Rectangle rBox = getOwner().getBounds().getCopy();
-		if (getOwner() instanceof HandleBounds)
-			rBox = ((HandleBounds)getOwner()).getHandleBounds().getCopy();
-		
-		getOwner().translateToAbsolute(rBox);
-		return rBox;
-	}
-	
-	
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java
deleted file mode 100644
index 2fbdd33..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java
+++ /dev/null

@@ -1,320 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.figures;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ImageFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-/**
- * @author oboyko
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SlidableImageAnchor
-	extends SlidableAnchor {
-
-	static private class ImageAnchorLocation {
-
-		static private Map imageAnchorLocationMap = new WeakHashMap();
-
-		/**
-		 * getInstance Static method for returning an instance of the
-		 * ImageAnchorLocation object corresponding to the given Image.
-		 * 
-		 * @param image
-		 *            Image to determine anchor location for
-		 * @return ImageAnchorLocation containing cached information about
-		 *         anchor
-		 */
-		static ImageAnchorLocation getInstance(Image image) {
-			ImageAnchorLocation imgAnchorLoc = (ImageAnchorLocation) imageAnchorLocationMap
-				.get(image);
-			if (imgAnchorLoc == null) {
-				imgAnchorLoc = new ImageAnchorLocation(image);
-				imageAnchorLocationMap.put(image, imgAnchorLoc);
-			}
-
-			return imgAnchorLoc;
-		}
-
-		private Map locationMap = new HashMap();
-
-		private ImageData imgData = null;
-
-		private ImageData transMaskData = null;
-
-		private ImageAnchorLocation(Image img) {
-			imgData = img.getImageData();
-			transMaskData = imgData.getTransparencyMask();
-		}
-
-		/**
-		 * @return Returns the imgData.
-		 */
-		protected ImageData getImageData() {
-			return imgData;
-		}
-
-		/**
-		 * @return Returns the transMaskData.
-		 */
-		protected ImageData getTransparencyMaskData() {
-			return transMaskData;
-		}
-
-		/**
-		 * isTransparentAt Accessor to determine if the image is transparent at
-		 * a given point.
-		 * 
-		 * @param x
-		 *            int location into the image
-		 * @param y
-		 *            int location into the image
-		 * @param checkAdjacent
-		 *            check adjacent pixels for transparency as well.
-		 * @return boolean true if transparent, false otherwise.
-		 */
-		protected boolean isTransparentAt(int x, int y, boolean checkAdjacent) {
-			// boundary checking
-			if (x < 0 || x >= getImageData().width || y < 0
-				|| y >= getImageData().height)
-				return true;
-
-			// check for alpha channel
-			int transValue = 255;
-			// check for transparency mask
-			if (getTransparencyMaskData() != null) {
-				transValue = getTransparencyMaskData().getPixel(x, y) == 0 ? 0
-					: 255;
-			}
-
-			if (transValue != 0) {
-				if (getImageData().alphaData != null) {
-					transValue = getImageData().getAlpha(x, y);
-				}
-			}
-
-			// use a tolerance
-			boolean trans = false;
-			if (transValue < 10) {
-				trans = true;
-
-				if (checkAdjacent) {
-					trans &= isTransparentAt(x + 1, y, false);
-					trans &= isTransparentAt(x + 1, y + 1, false);
-					trans &= isTransparentAt(x + 1, y - 1, false);
-					trans &= isTransparentAt(x - 1, y + 1, false);
-					trans &= isTransparentAt(x - 1, y, false);
-					trans &= isTransparentAt(x - 1, y - 1, false);
-					trans &= isTransparentAt(x, y + 1, false);
-					trans &= isTransparentAt(x, y - 1, false);
-				}
-			}
-
-			return trans;
-		}
-
-		/**
-		 * getLocation Delegation function used by the ConnectionAnchor
-		 * getLocation
-		 * 
-		 * @param start the <code>Point</code> that is the beginning of a line segment used to 
-		 * calculate the anchor location inside the image.
-		 * @param edge the <code>Point</code> that is the end of a line segment used to 
-		 * calculate the anchor location inside the image.
-		 * @param isDefaultAnchor - true if location for the default anchor should be calculated
-		 * @return Point representing the location inside the image to anchor
-		 *         to.
-		 */
-		private Point getLocation(Point start, Point edge, Rectangle containerRect, boolean isDefaultAnchor) {
-
-			int angle = calculateAngleOfEntry(start, edge);
-			Point top = containerRect.getTopLeft();
-			
-			Point ptIntersect = null;
-			
-			// Default anchors are cached
-			if (isDefaultAnchor) {
-				// determine if a cached value exists
-				ptIntersect = (Point) locationMap.get(new Integer(angle));
-			}
-			if (ptIntersect == null) {
-				// if no cached value exists return the calculated value and add to
-				// the map
-				Dimension dim = edge.getDifference(top);
-				Point edgeImg = new Point(Math.max(0, Math.min(dim.width,
-					getImageData().width - 1)), Math.max(0, Math.min(dim.height,
-					getImageData().height - 1)));
-				Dimension startDim = start.getDifference(top);
-				Point startImg = new Point(Math.max(0, Math.min(startDim.width,
-					getImageData().width - 1)), Math.max(0, Math.min(
-					startDim.height, getImageData().height - 1)));
-				ptIntersect = calculateIntersection(startImg, edgeImg);
-				if (ptIntersect == null)
-					return null;
-				if (isDefaultAnchor) {
-					locationMap.put(new Integer(angle), ptIntersect);
-				}
-			}
-			return ptIntersect.getTranslated(top.x, top.y);
-		}
-
-		/**
-		 * calculateAngleOfEntry Utility method to calculate the angle of entry
-		 * 
-		 * @param start
-		 * @param edge
-		 * @return int angle in degrees rounded to 15% for use as a key to a
-		 *         map.
-		 */
-		private int calculateAngleOfEntry(Point start, Point edge) {
-			LineSeg lineSeg = new LineSeg(start, edge);
-			Ray ray = new Ray(lineSeg.getOrigin(), new Point(lineSeg
-				.getOrigin().x + 1, lineSeg.getOrigin().y));
-
-			double angle = 0.0;
-			LineSeg.TrigValues trig = lineSeg.getTrigValues(ray);
-			if (trig != null)
-				angle = Math.atan2(-trig.sinTheta, -trig.cosTheta) + Math.PI;
-
-			int keyAngle = (int) Math.round(angle * 360 / (Math.PI * 2));
-			return keyAngle - (keyAngle % 10);
-		}
-
-		/**
-		 * calculateIntersection Utility method to calculate the intersection
-		 * point of a given point at an angle into the image to find the first
-		 * opaque pixel.
-		 * 
-		 * @param start
-		 *            Point that is in the center of the Image.
-		 * @param edge
-		 *            Point that is on the edge of the Image.
-		 * @return Point that is the intersection with the first opaque pixel.
-		 */
-		private Point calculateIntersection(Point start, Point edge) {
-			Point opaque = new Point(edge);
-
-			LineSeg line = new LineSeg(start, edge);
-			long distance = Math.round(line.length());
-
-			// otherwise calculate value
-			while (opaque.x >= 0 && opaque.x < getImageData().width
-				&& opaque.y >= 0 && opaque.y < getImageData().height) {
-
-				if (!isTransparentAt(opaque.x, opaque.y, true)) {
-					return opaque;
-				}
-
-				line.pointOn(distance, LineSeg.KeyPoint.ORIGIN, opaque);
-				distance--;
-			}
-
-			// default is to fall through and return the chopbox point
-			return null;
-		}
-	}
-
-	private ImageFigure imageFig;
-
-	/**
-	 * Empty constructor
-	 */
-	public SlidableImageAnchor() {
-		super();
-	}
-
-	/**
-	 * Dumb default constructor, for which reference point is at the center of the figure
-	 * @param f the <code>IFigure</code> bounding figure
-	 */
-	public SlidableImageAnchor(IFigure f) {
-		super(f);
-	}
-
-	/**
-	 * Default constructor, for which reference point is at the cneter of the figure
-	 * 
-	 * @param container the <code>IFigure</code> bounding figure
-	 * @param imageFig the <code>ImageFigure</code> inside the bounding figure
-	 */
-	public SlidableImageAnchor(IFigure container, ImageFigure imageFig) {
-		super(container);
-		this.imageFig = imageFig;
-	}
-
-	/**
-	 * Constructor, for which reference point is specified
-	 * 
-	 * @param f the <code>IFigure</code> bounding figure
-	 * @param imageFig the <code>ImageFigure</code> inside the bounding figure
-	 * @param p the <code>PrecisionPoint</code> relative reference
-	 */
-	public SlidableImageAnchor(IFigure f, ImageFigure imageFig, PrecisionPoint p) {
-		super(f, p);
-		this.imageFig = imageFig;
-	}
-
-	/**
-	 * Returns the image.
-	 * 
-	 * @return the <code>Image</code> object
-	 */
-	protected Image getImage() {
-		return imageFig.getImage();
-	}
-	
-	/**
-	 * Returns bounds of the figure.
-	 * 
-	 * @return the owner figure
-	 */
-	protected IFigure getContainer() {
-		return getOwner();
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor#getLocation(org.eclipse.draw2d.geometry.Point, org.eclipse.draw2d.geometry.Point)
-	 */
-	protected Point getLocation(Point ownReference, Point foreignReference) {
-		Image image = getImage();
-		if (image==null)
-			return super.getLocation(ownReference,foreignReference);
-		Rectangle ownerRect = new Rectangle(getBox());
-		PointList intersections = getIntersectionPoints(ownReference, foreignReference);
-		if (intersections!=null && intersections.size()!=0) {
-			Point ptRef = PointListUtilities.pickFarestPoint(intersections, foreignReference);
-			Point ptEdge = PointListUtilities.pickClosestPoint(intersections,foreignReference);
-			Point loc = ImageAnchorLocation.getInstance(getImage()).getLocation(ptRef, ptEdge, ownerRect, isDefaultAnchor());
-			if (loc != null)
-				loc = normalizeToStraightlineTolerance(foreignReference, loc, 3);
-			return loc;
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableOvalAnchor.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableOvalAnchor.java
deleted file mode 100644
index 5747ca8..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableOvalAnchor.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.figures;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IOvalAnchorableFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-
-
-/**
- * @author oboyko
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SlidableOvalAnchor
-	extends SlidableAnchor {
-
-	/**
-	 * Default constructor
-	 */
-	public SlidableOvalAnchor() {
-		super();
-	}
-	
-	/**
-	 * Creates default <Code>SlidableOvalAnchor</Code> with a reference points
-	 * at the center of the figure
-	 * 
-	 * @param f the <code>IOvalAnchorableFigure</code> that this anchor will be associated with
-	 */
-	public SlidableOvalAnchor(IOvalAnchorableFigure f) {
-		super(f);
-	}
-	
-	/**
-	 * Creates <Code>SlidableOvalAnchor</Code> with a specified reference points
-	 * 
-	 * @param f the <code>IOvalAnchorableFigure</code> that this anchor will be associated with
-	 * @param p the <code>PrecisionPoint</code> that the anchor will initially attach to.
-	 */
-	public SlidableOvalAnchor(IOvalAnchorableFigure f, PrecisionPoint p) {
-		super(f,p);
-	}	
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor#getBox()
-	 */
-	protected Rectangle getBox() {
-		Rectangle rBox = (((IOvalAnchorableFigure) getOwner()).getOvalBounds()).getCopy();
-		getOwner().translateToAbsolute(rBox);
-		return rBox;
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor#getIntersectionPoints(org.eclipse.draw2d.geometry.Point, org.eclipse.draw2d.geometry.Point)
-	 */
-	protected PointList getIntersectionPoints(Point ownReference, Point foreignReference) {
-		return (new LineSeg(ownReference, foreignReference)).getLineIntersectionsWithEllipse(getBox());
-	}
-}
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/WrapperNodeFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/WrapperNodeFigure.java
deleted file mode 100644
index d0accb4..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/WrapperNodeFigure.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.figures;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Wrapper <code>NodeFigure</code> figure to contain other figures, which may have different borders.
- * 
- * @author sshaw
- */
-public class WrapperNodeFigure extends NodeFigure {
-
-	private IFigure subFigure;
-
-	/**
-	 * Composite pattern for wrapping a template list compartment around any
-	 * potential figure.
-	 * 
-	 * @param subFigure the <code>IFigure</code> that is being wrapped.
-	 */
-	public WrapperNodeFigure(IFigure subFigure) {
-		setLayoutManager(new StackLayout() {
-			public boolean isObservingVisibility() {
-				return true;
-			}
-		});
-		add(subFigure);
-		this.subFigure = subFigure;
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.IFigure#containsPoint(int, int)
-	 */
-	public boolean containsPoint(int x, int y) {
-		
-		Iterator iter = this.getChildren().iterator();
-		while (iter.hasNext()){
-			Figure figure = (Figure)iter.next();
-			if (figure.containsPoint(x,y)){
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.handles.HandleBounds#getHandleBounds()
-	 */
-	public Rectangle getHandleBounds() {
-		ListIterator li = getChildren().listIterator();
-		Rectangle unionBounds = null;
-		while (li.hasNext()) {
-			IFigure fig = (IFigure) li.next();
-			if (fig.isVisible()) {
-				Rectangle figBounds = fig.getBounds();
-				if (fig instanceof NodeFigure) {
-					figBounds = ((NodeFigure) fig).getHandleBounds();
-				}
-
-				if (unionBounds == null)
-					unionBounds = new Rectangle(figBounds);
-				else
-					unionBounds.union(figBounds);
-			}
-		}
-
-		if (unionBounds != null)
-			return unionBounds;
-
-		return super.getHandleBounds();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		// Do nothing
-	}
-
-	/**
-	 * This will return null since we have override the setBorder(Border) api.
-	 */
-	public Border getBorder() {
-		return super.getBorder();
-	}
-
-	/**
-	 * Sets the subfigure border. We are not permitting them to update the
-	 * wrapper border. We intepret it as setting the border of the subFigure
-	 * instead.
-	 */
-	public void setBorder(Border border) {
-		subFigure.setBorder(border);
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getSourceConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
-		if( subFigure instanceof NodeFigure )
-			return ((NodeFigure)subFigure).getSourceConnectionAnchorAt(p);
-		return super.getSourceConnectionAnchorAt(p);
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getTargetConnectionAnchorAt(org.eclipse.draw2d.geometry.Point)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
-		if( subFigure instanceof NodeFigure )
-			return ((NodeFigure)subFigure).getTargetConnectionAnchorAt(p);
-		return super.getTargetConnectionAnchorAt(p);
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchor(java.lang.String)
-	 */
-	public ConnectionAnchor getConnectionAnchor(String terminal) {
-		if( subFigure instanceof NodeFigure )
-			return ((NodeFigure)subFigure).getConnectionAnchor(terminal);
-		return super.getConnectionAnchor(terminal);
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchorTerminal(org.eclipse.draw2d.ConnectionAnchor)
-	 */
-	public String getConnectionAnchorTerminal(ConnectionAnchor c) {
-		if( subFigure instanceof NodeFigure )
-			return ((NodeFigure)subFigure).getConnectionAnchorTerminal(c);
-		return super.getConnectionAnchorTerminal(c);		
-	}
-
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/package.html
deleted file mode 100644
index cedf8af..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Provides a set of classes that extend from the org.eclipse.draw2d 
-hierarchies for rendering, geometric manipulation and layout of figures
-on the drawing surface.
-
-<p>These classes can be used when constructing your figures for display.  These figures
-will typically have a GEF dependency which is why they cannot be placed in the pure draw2D.ui
-plug-in.  The dependency is usually caused by the <code>org.eclipse.gef.handles.HandleBounds</code>
-interface which needs to be installed on top level figures in order to accurately calculate
-the bounding box that the handle feedback needs to attach to. </p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefDebugOptions.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefDebugOptions.java
deleted file mode 100644
index e70cb25..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefDebugOptions.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal;
-
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- *
- */
-public final class GefDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private GefDebugOptions() {
-		// empty constructor
-	}
-
-	public static final String DEBUG = GefPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-    public static final String DND = DEBUG + "/dnd/tracing"; //$NON-NLS-1$  
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefPlugin.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefPlugin.java
deleted file mode 100644
index 5904252..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefPlugin.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author melaasar
- */
-public class GefPlugin
-	extends AbstractUIPlugin {
-
-	/** the plugin singleton */
-	private static GefPlugin singleton;
-
-	/**
-	 * Method getInstance.
-	 * 
-	 * @return Plugin
-	 */
-	public static GefPlugin getInstance() {
-		return singleton;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string and is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getInstance().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Creates the Gef plugin instance
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#Plugin()
-	 */
-	public GefPlugin() {
-		super();
-		if (singleton == null)
-			singleton = this;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefStatusCodes.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefStatusCodes.java
deleted file mode 100644
index e999427..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefStatusCodes.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- *
- */
-public final class GefStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private GefStatusCodes() {
-		// empty constructor
-	}
-
-	public static final int OK = 0;
-
-    /**
-     * Status code indicating that an error occurred with the drop action.
-     */
-    public static final int DROP_ACTION_FAILURE = 1;
-    
-    /**
-     * Status code indicating that an error occurred while generating an
-     * SVG document file
-     */
-    public static final int SVG_GENERATION_FAILURE = 2;
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/actions/MenuManagerEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/actions/MenuManagerEx.java
deleted file mode 100644
index 895e787..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/actions/MenuManagerEx.java
+++ /dev/null

@@ -1,585 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.action.ContributionManager;
-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.util.ListenerList;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-
-/**
- * A menu manager is a contribution manager which realizes itself and its items
- * in a menu control; either as a menu bar, a sub-menu, or a context menu.
- * <p>
- * This class may be instantiated; it may also be subclassed.
- * </p>
- * 
- * @deprecated Use MenuManager or ActionMenuManager instead.
- */
-/*
- * @canBeSeenBy %partners
- */
-public class MenuManagerEx
-	extends ContributionManager
-	implements IMenuManager {
-
-	/**
-	 * The menu control; <code>null</code> before
-	 * creation and after disposal.
-	 */
-	private Menu menu = null;
-
-	/**
-	 * List of registered menu listeners (element type: <code>IMenuListener</code>).
-	 */
-	private ListenerList listeners = new ListenerList(1);
-
-	/**
-	 * The menu id.
-	 */
-	private String id;
-
-	/**
-	 * The menu item widget; <code>null</code> before
-	 * creation and after disposal. This field is used
-	 * when this menu manager is a sub-menu.
-	 */
-	private MenuItem menuItem;
-
-	/**
-	 * The text for a sub-menu.
-	 */
-	private String menuText;
-
-	/**
-	 * Indicates whether <code>removeAll</code> should be
-	 * called just before the menu is displayed.
-	 */
-	private boolean removeAllWhenShown = false;
-
-	/**
-	 * Indicates this item is visible in its manager; <code>true</code> 
-	 * by default.
-	 */
-	private boolean visible = true;
-
-	/**
-	 * Creates a menu manager.  The text and id are <code>null</code>.
-	 * Typically used for creating a context menu, where it doesn't need to be referred to by id.
-	 */
-	public MenuManagerEx() {
-		this(null, null);
-	}
-	/**
-	 * Creates a menu manager with the given text. The id of the menu
-	 * is <code>null</code>.
-	 * Typically used for creating a sub-menu, where it doesn't need to be referred to by id.
-	 *
-	 * @param text the text for the menu, or <code>null</code> if none
-	 */
-	public MenuManagerEx(String text) {
-		this(text, null);
-	}
-	/**
-	 * Creates a menu manager with the given text and id.
-	 * Typically used for creating a sub-menu, where it needs to be referred to by id.
-	 *
-	 * @param text the text for the menu, or <code>null</code> if none
-	 * @param id the menu id, or <code>null</code> if it is to have no id
-	 */
-	public MenuManagerEx(String text, String id) {
-		this.menuText = text;
-		this.id = id;
-	}
-	/* (non-Javadoc)
-	 * Method declared on IMenuManager.
-	 */
-	public void addMenuListener(IMenuListener listener) {
-		listeners.add(listener);
-	}
-	/**
-	 * Creates and returns an SWT context menu control for this menu,
-	 * and installs all registered contributions.
-	 * Does not create a new control if one already exists.
-	 * <p>
-	 * Note that the menu is not expected to be dynamic.
-	 * </p>
-	 *
-	 * @param parent the parent control
-	 * @return the menu control
-	 */
-	public Menu createContextMenu(Control parent) {
-		if (menu == null || menu.isDisposed()) {
-			menu = new Menu(parent);
-			initializeMenu();
-		}
-		return menu;
-	}
-	/**
-	 * Creates and returns an SWT menu bar control for this menu,
-	 * for use in the given shell, and installs all registered contributions.
-	 * Does not create a new control if one already exists.
-	 *
-	 * @param parent the parent shell
-	 * @return the menu control
-	 */
-	public Menu createMenuBar(Shell parent) {
-		if (menu == null || menu.isDisposed()) {
-			menu = new Menu(parent, SWT.BAR);
-			update(false);
-		}
-		return menu;
-	}
-
-	/**
-	 * @param parent
-	 * @return <code>Menu</code>
-	 */
-	public Menu createSubMenu(Menu parent) {
-		if (menu == null || menu.isDisposed()) {
-			menu = new Menu(parent);
-			initializeMenu();
-		}
-		return menu;
-	}
-	/**
-	 * Disposes of this menu manager and frees all allocated SWT resources.
-	 * Note that this method does not clean up references between this menu
-	 * manager and its associated contribution items.
-	 * Use <code>removeAll</code> for that purpose.
-	 */
-	public void dispose() {
-		if (menu != null) {
-			menu.dispose();
-			menu = null;
-		}
-		if (menuItem != null) {
-			menuItem.dispose();
-			menuItem = null;
-		}
-	}
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public void fill(Composite parent) {
-		// empty method
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public void fill(Menu parent, int index) {
-		if (menuItem == null || menuItem.isDisposed()) {
-			if (index >= 0)
-				menuItem = new MenuItem(parent, SWT.CASCADE, index);
-			else
-				menuItem = new MenuItem(parent, SWT.CASCADE);
-
-			menuItem.setText(menuText);
-
-			if (menu == null || menu.isDisposed())
-				menu = new Menu(parent);
-
-			menuItem.setMenu(menu);
-
-			initializeMenu();
-
-			// populate the submenu, in order to enable accelerators
-			// and to set enabled state on the menuItem properly
-			update(true);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public void fill(ToolBar parent, int index) {
-		// empty method
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IMenuManager.
-	 */
-	public IMenuManager findMenuUsingPath(String path) {
-		IContributionItem item = findUsingPath(path);
-		if (item instanceof IMenuManager)
-			return (IMenuManager) item;
-		return null;
-	}
-	/* (non-Javadoc)
-	 * Method declared on IMenuManager.
-	 */
-	public IContributionItem findUsingPath(String path) {
-		String menuId = path;
-		String rest = null;
-		int separator = path.indexOf('/');
-		if (separator != -1) {
-			menuId = path.substring(0, separator);
-			rest = path.substring(separator + 1);
-		} else {
-			return super.find(path);
-		}
-
-		IContributionItem item = super.find(menuId);
-		if (item instanceof IMenuManager) {
-			IMenuManager manager = (IMenuManager) item;
-			return manager.findUsingPath(rest);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Notifies any menu listeners that a menu is about to show.
-	 * Only listeners registered at the time this method is called are notified.
-	 *
-	 * @param manager the menu manager
-	 *
-	 * @see IMenuListener#menuAboutToShow
-	 */
-	private void fireAboutToShow(IMenuManager manager) {
-		Object[] listenerList = this.listeners.getListeners();
-		for (int i = 0; i < listenerList.length; ++i) {
-			((IMenuListener) listenerList[i]).menuAboutToShow(manager);
-		}
-	}
-
-	/**
-	 * Returns the menu id.
-	 * The menu id is used when creating a contribution item 
-	 * for adding this menu as a sub menu of another.
-	 *
-	 * @return the menu id
-	 */
-	public String getId() {
-		return id;
-	}
-	/**
-	 * Returns the SWT menu control for this menu manager.
-	 *
-	 * @return the menu control
-	 */
-	public Menu getMenu() {
-		return menu;
-	}
-	/* (non-Javadoc)
-	 * Method declared on IMenuManager.
-	 */
-	public boolean getRemoveAllWhenShown() {
-		return removeAllWhenShown;
-	}
-	/**
-	 * Notifies all listeners that this menu is about to appear.
-	 */
-	private void handleAboutToShow() {
-		if (removeAllWhenShown)
-			removeAll();
-		fireAboutToShow(this);
-		update(false);
-	}
-	/**
-	 * Initializes the menu control.
-	 */
-	private void initializeMenu() {
-		menu.addMenuListener(new MenuAdapter() {
-			public void menuShown(MenuEvent e) {
-				handleAboutToShow();
-			}
-			public void menuHidden(MenuEvent e) {
-				//			ApplicationWindow.resetDescription(e.widget);
-			}
-		});
-		markDirty();
-		// Don't do an update(true) here, in case menu is never opened.
-		// Always do it lazily in handleAboutToShow().
-	}
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public boolean isDynamic() {
-		return false;
-	}
-	/**
-	 * Returns whether this menu should be enabled or not.
-	 * Used to enable the menu item containing this menu when it is realized as a sub-menu.
-	 * <p>
-	 * The default implementation of this framework method
-	 * returns <code>true</code>. Subclasses may reimplement.
-	 * </p>
-	 *
-	 * @return <code>true</code> if enabled, and
-	 *   <code>false</code> if disabled
-	 */
-	public boolean isEnabled() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public boolean isGroupMarker() {
-		return false;
-	}
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public boolean isSeparator() {
-		return false;
-	}
-	/**
-	 * @param item
-	 * @return <code>boolean</code>
-	 */
-	public boolean isSubstituteFor(IContributionItem item) {
-		return this.equals(item);
-	}
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public boolean isVisible() {
-		return visible;
-	}
-	/* (non-Javadoc)
-	 * Method declared on IMenuManager.
-	 */
-	public void removeMenuListener(IMenuListener listener) {
-		listeners.remove(listener);
-	}
-	/* (non-Javadoc)
-	 * Method declared on IMenuManager.
-	 */
-	public void setRemoveAllWhenShown(boolean removeAll) {
-		this.removeAllWhenShown = removeAll;
-	}
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public void setVisible(boolean visible) {
-		this.visible = visible;
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public void setParent(IContributionManager manager) {
-		// empty method
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IContributionItem.
-	 */
-	public void update() {
-		updateMenuItem();
-	}
-	/**
-	 * The <code>MenuManager</code> implementation of this <code>IContributionManager</code>
-	 * updates this menu, but not any of its submenus.
-	 *
-	 * @see #updateAll
-	 */
-	public void update(boolean force) {
-		update(force, false);
-	}
-	
-	/** 
-	 * Tests the supplied items <code>isVisible()</code> method.
-	 * This method may be overridden to provide more detailed testing.  
-	 * @param ci
-	 * @return <tt>true</tt> if the supplied item is visible, otherwise <tt>false</tt>.
-	 */
-	protected boolean shouldDisplay( IContributionItem ci ) { return ci.isVisible(); }
-			
-	
-	
-	/**
-	 * Incrementally builds the menu from the contribution items.
-	 * This method leaves out double separators and separators in the first 
-	 * or last position.
-	 *
-	 * @param force <code>true</code> means update even if not dirty,
-	 *   and <code>false</code> for normal incremental updating
-	 * @param recursive <code>true</code> means recursively update 
-	 *   all submenus, and <code>false</code> means just this menu
-	 */
-	protected void update(boolean force, boolean recursive) {
-		if (isDirty() || force) {
-			if (menu != null && !menu.isDisposed()) {
-
-				// clean contains all active items without double separators
-				IContributionItem[] items = getItems();
-				List clean = new ArrayList(items.length);
-				IContributionItem separator = null;
-				for (int i = 0; i < items.length; ++i) {
-					IContributionItem ci = items[i];
-					if ( !shouldDisplay(ci) ) { 
-						continue; 
-					}
-					if (ci.isSeparator()) {
-						// delay creation until necessary 
-						// (handles both adjacent separators, and separator at end)
-						separator = ci;
-					} else {
-						if (separator != null) {
-							if (clean.size() > 0) // no separator if first item
-								clean.add(separator);
-							separator = null;
-						}
-						clean.add(ci);
-					}
-				}
-
-				// remove obsolete (removed or non active)
-				Item[] mi = menu.getItems();
-				for (int i = 0; i < mi.length; i++) {
-					Object data = mi[i].getData();
-					if (data == null
-						|| !clean.contains(data)
-						|| (data instanceof IContributionItem
-							&& ((IContributionItem) data).isDynamic()))
-						mi[i].dispose();
-				}
-
-				// add new
-				mi = menu.getItems();
-				int srcIx = 0;
-				int destIx = 0;
-				for (Iterator e = clean.iterator(); e.hasNext();) {
-					IContributionItem src = (IContributionItem) e.next();
-					IContributionItem dest;
-
-					// get corresponding item in SWT widget
-					if (srcIx < mi.length)
-						dest = (IContributionItem) mi[srcIx].getData();
-					else
-						dest = null;
-
-					if (dest != null && src.equals(dest)) {
-						srcIx++;
-						destIx++;
-					} else if (
-						dest != null
-							&& dest.isSeparator()
-							&& src.isSeparator()) {
-						mi[srcIx].setData(src);
-						srcIx++;
-						destIx++;
-					} else {
-						int start = menu.getItemCount();
-						src.fill(menu, destIx);
-						int newItems = menu.getItemCount() - start;
-						Item[] tis = menu.getItems();
-						for (int i = 0; i < newItems; i++)
-							tis[destIx + i].setData(src);
-						destIx += newItems;
-					}
-
-					// May be we can optimize this call. If the menu has just
-					// been created via the call src.fill(fMenuBar, destIx) then
-					// the menu has already been updated with update(true) 
-					// (see MenuManager). So if force is true we do it again. But
-					// we can't set force to false since then information for the
-					// sub sub menus is lost.
-					if (recursive) {
-						if (src instanceof IMenuManager)
-							 ((IMenuManager) src).updateAll(force);
-					}
-
-				}
-
-				setDirty(false);
-
-				updateMenuItem();
-			}
-		} else {
-			// I am not dirty. Check if I must recursivly walk down the hierarchy.
-			if (recursive) {
-				IContributionItem[] items = getItems();
-				for (int i = 0; i < items.length; ++i) {
-					IContributionItem ci = items[i];
-					if (ci instanceof IMenuManager) {
-						IMenuManager mm = (IMenuManager) ci;
-						if (mm.isVisible()) {
-							mm.updateAll(force);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public void update(String property) {
-		IContributionItem items[] = getItems();
-		for (int i = 0; i < items.length; i++) {
-			items[i].update(property);
-		}
-		if (menu != null && (IAction.TEXT.equals(property))) {
-			String text = getOverrides().getText(this);
-			if (text == null)
-				text = menuText;
-			if (menu == null || menu.isDisposed())
-				return;
-			if ((text != null) && (menu.getParentItem() != null))
-				menu.getParentItem().setText(text);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IMenuManager.
-	 */
-	public void updateAll(boolean force) {
-		update(force, true);
-	}
-	/**
-	 * Updates the menu item for this sub menu.
-	 * The menu item is disabled if this sub menu is empty.
-	 * Does nothing if this menu is not a submenu.
-	 */
-	private void updateMenuItem() {
-		if (menuItem != null && !menuItem.isDisposed()) {
-			boolean enabled = menu.getItemCount() > 0;
-			// Workaround for 1GDDCN2: SWT:Linux - MenuItem.setEnabled() always causes a redraw
-			if (menuItem.getEnabled() != enabled)
-				menuItem.setEnabled(enabled);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.CoolBar, int)
-	 */
-	public void fill(CoolBar parent, int index) {
-		// TODO Auto-generated method stub
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IContributionItem#saveWidgetState()
-	 */
-	public void saveWidgetState() {
-		// TODO Auto-generated method stub
-		
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/actions/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/actions/package.html
deleted file mode 100644
index 14d92f8..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/actions/package.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains a set of classes for defining <i>Actions</i> which are run
-in order to carry out application behaviour that the user has requested
-through the user-interface.
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatableZoomManager.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatableZoomManager.java
deleted file mode 100644
index 5b849c2..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatableZoomManager.java
+++ /dev/null

@@ -1,209 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ScalableFigure;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editparts.ZoomListener;
-import org.eclipse.gef.editparts.ZoomManager;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.AnimationModel;
-
-
-/**
- * @author sshaw
- *
- * Overriden to fully support animated zoom.
- */
-public class AnimatableZoomManager
-	extends ZoomManager {
-
-	private int zoomAnimationStyle = ANIMATE_NEVER;
-	private List animationListeners = new ArrayList();
-
-	/**
-	 * @return Returns the zoomAnimationStyle.
-	 */
-	public int getZoomAnimationStyle() {
-		return zoomAnimationStyle;
-	}
-	
-	/**
-	 * @param pane
-	 * @param viewport
-	 */
-	public AnimatableZoomManager(ScalableFigure pane, Viewport viewport) {
-		super(pane, viewport);
-	}
-
-	/**
-	 * Sets which zoom methods get animated.
-	 * 
-	 * @param style the style bits determining the zoom methods to be animated.
-	 */
-	public void setZoomAnimationStyle(int style) {
-		zoomAnimationStyle = style;
-	}
-	
-	/**
-	 * Adds the given ZoomListener to this ZoomManager's list of listeners.
-	 * @param listener the ZoomListener to be added
-	 */
-	public void addZoomListener(ZoomListener listener) {
-		super.addZoomListener(listener);
-		if (listener instanceof AnimatedZoomListener) {
-			animationListeners.add(listener);
-		}
-	}
-	
-	/**
-	 * Notifies listeners that the animated zoom has started.
-	 */
-	protected void fireAnimatedZoomStarted() {
-		Iterator iter = animationListeners.iterator();
-		while (iter.hasNext())
-			((AnimatedZoomListener)iter.next()).animatedZoomStarted();
-	}
-	
-	/**
-	 * Notifies listeners that the animated zoom has ended.
-	 */
-	protected void fireAnimatedZoomEnded() {
-		Iterator iter = animationListeners.iterator();
-		while (iter.hasNext())
-			((AnimatedZoomListener)iter.next()).animatedZoomEnded();
-	}
-	
-	/**
-	 * Allows implementators to zoom to a certain level centered around a given point.
-	 * 
-	 * @param zoom <code>double</code> value where 1.0 represents 100%.
-	 * @param center <code>Point</code> around which the zoom will be centered in absolute coordinates
-	 */
-	public void zoomTo(double zoom, Point center) {
-		Point centerRel = center.getCopy();
-		getScalableFigure().translateToRelative(centerRel);
-		primSetZoom(zoom, centerRel);
-	}
-	
-	/**
-	 * Allows implementors to zoom into or out to a rectangular area.
-	 * 
-	 * @param rect <code>Rectangle</code> that the edit part will zoom into our out to in 
-	 * absolute coordinates.
-	 */
-	public void zoomTo(Rectangle rect) {
-		Dimension available = getViewport().getClientArea().getSize();
-		Dimension desired = rect.getSize();
-
-		double scaleX = available.width * getZoom() / desired.width;
-		double scaleY = available.height * getZoom() / desired.height;
-		
-		double zoom = Math.min(getMaxZoom(), Math.max(getMinZoom(), Math.min(scaleX, scaleY)));
-		zoomTo(zoom, rect.getCenter());
-	}
-	
-	private static final int DURATION_INCREMENT = 400;
-
-	/**
-	 * Sets the zoom level to the given value.  Min-max range check is not done.
-	 * 
-	 * @param zoom the new zoom level
-	 */
-	protected void primSetZoom(double zoom) {
-		Point center = getViewport().getClientArea().getCenter();
-		primSetZoom(zoom, center);
-	}
-	
-	/**
-	 * Calculate the animation duration based on the number of zoom increments being traversed.
-	 * 
-	 * @param zoom
-	 * @return <code>AnimationModel</code> that is appropriate for the zoom difference between requested and the
-	 * current zoom level.
-	 */
-	private AnimationModel calculateAnimationModel(double zoom) {
-        double dmod = Math.pow(zoom / getZoom(),(double)1/8);
-		int steps = (int)Math.round(dmod > 1 ? dmod : 1/dmod);
-		
-		int duration = Math.max(DURATION_INCREMENT, steps * DURATION_INCREMENT);
-		AnimationModel animationModel = new AnimationModel(duration, true);
-		animationModel.animationStarted();
-		return animationModel;
-	}
-	
-	/**
-	 * Sets the zoom level to the given value.  Min-max range check is not done.
-	 * 
-	 * @param zoom the new zoom level
-	 */
-	private void primSetZoom(double zoom, Point finalCenterAbs) {
-		primAnimateSetZoom(zoom, finalCenterAbs, 
-				getZoomAnimationStyle() == ANIMATE_ZOOM_IN_OUT ? calculateAnimationModel(zoom) : null);
-	}
-
-	/**
-	 * Performs the zoom with animation.
-	 * 
-	 * @param zoom
-	 * @param finalCenter
-	 * @param animationModel
-	 */
-	private void primAnimateSetZoom(double zoom, Point finalCenter, AnimationModel animationModel) {
-		
-		double initialZoom = getZoom();
-		double finalZoom = zoom;
-		
-		Point finalCenterRel = finalCenter.getCopy();
-		Point originalViewLocation = getViewport().getViewLocation();
-		Dimension centerDiff = originalViewLocation.getDifference(getViewport().getClientArea().getCenter());
-		Point finalViewLocation = finalCenterRel.scale(finalZoom / initialZoom).getTranslated(centerDiff);
-		LineSeg scrollVector = new LineSeg(originalViewLocation, finalViewLocation);
-		
-		float progress = 1.0f;
-		if (animationModel != null) {
-			animationModel.animationStarted();
-			progress = animationModel.getProgress();
-		}
-		boolean finished = false;
-		
-		fireAnimatedZoomStarted();
-		
-		while(!finished) {
-			
-			if (animationModel == null || animationModel.isFinished())
-				finished = true;
-			
-			double currentZoom = initialZoom + ((finalZoom - initialZoom) * progress);
-			
-			super.primSetZoom(currentZoom);
-			
-			Point currentViewLocation = scrollVector.locatePoint(progress, 0, LineSeg.Sign.POSITIVE);
-			setViewLocation(currentViewLocation);	
-			
-			getViewport().getUpdateManager().performUpdate();
-			
-			if (animationModel != null)
-				progress = animationModel.getProgress();
-		}
-		
-		fireAnimatedZoomEnded();
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatedZoomListener.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatedZoomListener.java
deleted file mode 100644
index df1befd..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/AnimatedZoomListener.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.editparts;
-
-import org.eclipse.gef.editparts.ZoomListener;
-
-/**
- * Listens to animated zoom changes.
- * @author Steve Shaw
- */
-public interface AnimatedZoomListener extends ZoomListener {
-
-	/**
-	 * Called whenever the ZoomManager's starts an animated
-	 * zoom.
-	 */
-	void animatedZoomStarted();
-
-	/**
-	 * Called whenever the ZoomManager's ends an animated
-	 * zoom.
-	 */
-	void animatedZoomEnded();
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/package.html
deleted file mode 100644
index 9c2f4a3..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editparts/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-<p>
-This package contains the <i>edit part</i> classes and some related classes.
-An edit part is a controller that specifies how model elements are mapped to visual figures and coordinates 
-the editing behavior of the model.
-</p>
-
-<p>Classes in this package should only depend on the pure GEF editparts and related classes and could
-conceivably be candidates for submission to the GEF project.</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/ConnectionBendpointEditPolicy.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/ConnectionBendpointEditPolicy.java
deleted file mode 100644
index 8c68d58..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/ConnectionBendpointEditPolicy.java
+++ /dev/null

@@ -1,854 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.editpolicies;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.BendpointLocator;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.AccessibleHandleProvider;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy;
-import org.eclipse.gef.handles.BendpointMoveHandle;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.FeedbackConnection;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.OrthogonalRouterUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.internal.handles.BendpointCreationInvisibleHandle;
-import org.eclipse.gmf.runtime.gef.ui.internal.handles.LineSegMoveInvisibleHandle;
-import org.eclipse.jface.util.Assert;
-
-/**
- * This EditPolicy defines the behavior of Bendpoints on a Connection.
- */
-/*
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- */
-abstract public class ConnectionBendpointEditPolicy
-	extends SelectionHandlesEditPolicy
-	implements PropertyChangeListener {
-
-	private static List NULL_CONSTRAINT = new ArrayList();
-	private static final int STICKY_TOLERANCE_DP = 6;
-
-	private LineMode lineSegMode = LineMode.OBLIQUE;
-	
-	static private class FeedbackState {
-		public List originalConstraint;
-		public Point ref1 = new Point();
-		public Point ref2 = new Point();
-		public boolean isDeleting = false;
-		public boolean isOutsideSource = false;
-		public boolean isOutsideTarget = false;
-		public boolean init = false;
-	}
-	
-	private FeedbackState feedbackState = null;
-	
-	private FeedbackState getFeedbackState() {
-		if (feedbackState == null) {
-			feedbackState = new FeedbackState();
-		}
-		
-		return feedbackState;
-	}
-	
-	private boolean useRealtimeFeedback() {
-		return false;
-	}
-	
-	/**
-	 * Constructor for EditPolicy
-	 * @param lineSegMode
-	 */
-	public ConnectionBendpointEditPolicy(LineMode lineSegMode) {
-		super();
-		this.lineSegMode = lineSegMode;
-	}
-
-	/**
-	 * @return Returns the lineSegMode.
-	 */
-	public LineMode getLineSegMode() {
-		return lineSegMode;
-	}
-
-	/** 
-	 * Adds a PropertyChangeListener to the Connection so we can react
-	 * to point changes in the connection.  
-	 *
-	 * @see SelectionHandlesEditPolicy#activate()
-	 */
-	public void activate() {
-		super.activate();
-		getConnection().addPropertyChangeListener(
-			Connection.PROPERTY_POINTS,
-			this);
-	}
-
-	/**
-	 * @return <code>Connection</code> representing drag source feedback
-	 */
-	protected Connection createDragSourceFeedbackConnection() {
-		if (useRealtimeFeedback()) {
-			// Use the actual figure for feedback
-			return getConnection();
-		} else {
-			// Use a ghost rectangle for feedback
-			FeedbackConnection r = new FeedbackConnection(getConnection());
-			addFeedback(r);
-			return r;
-		}
-	}
-
-	/**
-	 * Adds selection handles to the connection for the bendpoints.  In this class,
-	 * this method just decides if it is appropriate to add the handles, and then
-	 * calls on the superclass to do the dirty work.s
-	 */
-	protected void addSelectionHandles() {
-		if (handles == null)
-			super.addSelectionHandles();
-		else {
-			int count = handles.size();
-			int points = getConnection().getPoints().size();
-			if (count != points * 2 - 3)
-				super.addSelectionHandles();
-		}
-	}
-
-	/**
-	 * @return list of manual handles
-	 */
-	protected List createManualHandles() {
-		List list = new ArrayList();
-		ConnectionEditPart connEP = (ConnectionEditPart) getHost();
-		PointList points = getConnection().getPoints();
-		for (int i = 1; i < points.size() - 1; i++) {
-			addInvisibleCreationHandle(list, connEP, i - 1);
-			list.add(
-				new BendpointMoveHandle(
-					connEP,
-					i,
-					new BendpointLocator(getConnection(), i)));
-		}
-		addInvisibleCreationHandle(list, connEP, points.size() - 2);
-		return list;
-	}
-
-	/**
-	 * Method addInvisibleCreationHandle.
-	 * This handle is necessary for the accessibility feature to allow keyboard navigation to
-	 * the add bendpoint feature.
-	 * @param list
-	 * @param connEP
-	 * @param i
-	 */
-	protected void addInvisibleCreationHandle(
-		List list,
-		ConnectionEditPart connEP,
-		int i) {
-		if (getLineSegMode() != LineMode.OBLIQUE) {
-			list.add(new LineSegMoveInvisibleHandle(connEP, i));
-		} else {
-			list.add(new BendpointCreationInvisibleHandle(connEP, i));
-		}
-	}
-
-	/**
-	 * Creates selection handles for the bendpoints.  Explicit (user-defined)
-	 * bendpoints will have {@link BendpointMoveHandle}s on them with a single 
-	 * {@link BendpointCreationHandle} between 2 consecutive explicit bendpoints.
-	 * If implicit bendpoints (such as those created by the {@link AutomaticRouter})
-	 * are used, one {@link BendpointCreationHandle} is placed in the middle
-	 * of the Connection.
-	 */
-	protected List createSelectionHandles() {
-		List list = new ArrayList();
-		list = createManualHandles();
-		return list;
-	}
-
-	/**
-	 * Removes this from the Connection's list of PropertyChangeListeners.
-	 *
-	 * @see SelectionHandlesEditPolicy#deactivate()
-	 */
-	public void deactivate() {
-		getConnection().removePropertyChangeListener(
-			Connection.PROPERTY_POINTS,
-			this);
-
-		super.deactivate();
-	}
-
-	/**
-	 * Erases bendpoint feedback.  Since the original figure is used
-	 * for feedback, we just restore the original constraint that
-	 * was saved before feedback started to show.
-	 */
-	protected void eraseConnectionFeedback(
-		BendpointRequest request,
-		boolean removeFeedbackFigure) {
-		restoreOriginalConstraint();
-		getFeedbackState().originalConstraint = null;
-		if (removeFeedbackFigure)
-			feedbackState = null;
-	}
-
-	/**
-	 * Erases feedback, when appropriate.
-	 *
-	 * @see #eraseConnectionFeedback(BendpointRequest, boolean)
-	 */
-	public void eraseSourceFeedback(Request request) {
-		if (REQ_MOVE_BENDPOINT.equals(request.getType())
-			|| REQ_CREATE_BENDPOINT.equals(request.getType()))
-			eraseConnectionFeedback((BendpointRequest) request, true);
-	}
-
-	/**
-	 * Returns the appropriate Command for the request type given.  Handles
-	 * creating, moving and deleting bendpoints.  The actual creation of the
-	 * command is taken care of by subclasses implementing the appropriate
-	 * methods.
-	 *
-	 * @see #getCreateBendpointCommand(BendpointRequest)
-	 * @see #getMoveBendpointCommand(BendpointRequest)
-	 * @see #getDeleteBendpointCommand(BendpointRequest)
-	 */
-	public Command getCommand(Request request) {
-		if (REQ_MOVE_BENDPOINT.equals(request.getType())) {
-			if (getLineSegMode() != LineMode.OBLIQUE) {
-				return getMoveLineSegCommand((BendpointRequest) request);
-			} else {
-				if (getFeedbackState().isDeleting)
-					return getDeleteBendpointCommand(
-						(BendpointRequest) request);
-				return getMoveBendpointCommand((BendpointRequest) request);
-			}
-		}
-		if (REQ_CREATE_BENDPOINT.equals(request.getType()))
-			return getCreateBendpointCommand((BendpointRequest) request);
-
-		return null;
-	}
-
-	/**
-	 * Returns the Connection associated with this EditPolicy.
-	 */
-	protected Connection getConnection() {
-		return (Connection) ((ConnectionEditPart) getHost()).getFigure();
-	}
-
-	/**
-	 * @return Point cached value representing the first reference point.
-	 */
-	private Point getFirstReferencePoint() {
-		return getFeedbackState().ref1;
-	}
-
-	/**
-	 * @return Point cached value representing the second reference point.
-	 */
-	private Point getSecondReferencePoint() {
-		return getFeedbackState().ref2;
-	}
-
-	/**
-	 * Utility method to determine if point p passes through the line segment 
-	 * defined by p1 and p2.
-	 * 
-	 * @param p1 Point that is the first point in the line segment to test against.
-	 * @param p2 Point that is the second point in the line segment to test against.
-	 * @param p Point that is tested to see if it falls in the line segment defined by p1 and p2.
-	 * @return true if line segment contains Point p, false otherwise.
-	 */
-	private boolean lineContainsPoint(Point p1, Point p2, Point p) {
-		LineSeg line = new LineSeg(p1, p2);
-		return line.containsPoint(p, getStickyTolerance() / 3);
-	}
-
-	/**
-	 * Adds selection handles to the Connection, if it is selected, when the points 
-	 * property changes.  Since we only listen for changes in the points property, 
-	 * this method is only called when the points of the Connection have changed.
-	 */
-	public void propertyChange(PropertyChangeEvent evt) {
-		if (getHost().getSelected() != EditPart.SELECTED_NONE) {
-//			int count = handles.size();
-//			int points = getConnection().getPoints().size();
-//			if (count != points * 2 - 3)
-				addSelectionHandles();
-		}
-	}
-
-	/**
-	 * Restores the original constraint that was saved before feedback
-	 * began to show.
-	 */
-	protected void restoreOriginalConstraint() {
-		if (getFeedbackState().originalConstraint != null) {
-			Assert.isTrue(getFeedbackState().originalConstraint.size() >= 2);
-			getConnection().setRoutingConstraint(
-				getFeedbackState().originalConstraint);
-		}
-	}
-
-	/**
-	 * Since the original figure is used for feedback, this method saves the 
-	 * original constraint, so that is can be restored when the feedback is
-	 * erased.
-	 */
-	protected void saveOriginalConstraint() {
-		getFeedbackState().originalConstraint = (List)
-			getConnection().getRoutingConstraint();
-		if (getFeedbackState().originalConstraint == null)
-			getFeedbackState().originalConstraint = NULL_CONSTRAINT;
-
-		if (getLineSegMode() != LineMode.OBLIQUE && !getFeedbackState().init) {
-			// Update the constraint based on the current figure
-			List newConstraint = new ArrayList(getFeedbackState().originalConstraint.size());
-			PointList pts =
-				PointListUtilities.copyPoints(getConnection().getPoints());
-			OrthogonalRouterUtilities.resetEndPointsToCenter(getConnection(), pts);
-
-			for (int i = 0; i < pts.size(); i++) {
-				Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-				newConstraint.add(abp);
-			}
-
-			Assert.isTrue(getFeedbackState().originalConstraint.size() >= 2);
-			getConnection().setRoutingConstraint(
-				newConstraint);
-
-			// reset booleans
-			getFeedbackState().isOutsideSource = false;
-			getFeedbackState().isOutsideTarget = false;
-		} else {
-			// if the constraint and the connection figure points list don't match then reset the constraint
-			// based on the connection figure list.  This could happen in certain cases - sepcifically when
-			// fan router detects a collision or when a self relation is routed.
-			int nConstraintSize = getFeedbackState().originalConstraint.size();
-			PointList pts = getConnection().getPoints();
-			int nPointSize = pts.size();
-
-			if (!getFeedbackState().init && nConstraintSize != nPointSize) {
-
-				while (getFeedbackState().originalConstraint.size() > 0) {
-					getFeedbackState().originalConstraint.remove(0);
-				}
-
-				for (int i = 0; i < pts.size(); i++) {
-					Bendpoint bpNew = new AbsoluteBendpoint(pts.getPoint(i));
-					getFeedbackState().originalConstraint.add(i, bpNew);
-				}
-			}
-
-			Assert.isTrue(getFeedbackState().originalConstraint.size() >= 2);
-			getConnection().setRoutingConstraint(
-				new ArrayList(getFeedbackState().originalConstraint));
-		}
-		
-		getFeedbackState().init = true;
-	}
-
-	/**
-	 * Method setReferencePoints.
-	 * This method will calculate the two end reference points for a point that is
-	 * being moved or created.  The reference points are used to determine if the 
-	 * request point can be deleted or not (for straight line tolerance).
-	 * 
-	 * @param request BendpointRequest object containing index information.
-	 */
-	private void setReferencePoints(BendpointRequest request) {
-		if (getFeedbackState().originalConstraint == null) {
-			saveOriginalConstraint();
-		}
-
-		List constraint = (List)
-			getConnection().getRoutingConstraint();
-		Bendpoint bp = (Bendpoint) constraint.get(Math.max(0, request.getIndex() - 1));
-		getFeedbackState().ref1 = bp.getLocation();
-
-		bp = (Bendpoint) constraint.get(Math.min(request.getIndex() + 1, constraint.size() -1));
-		getFeedbackState().ref2 = bp.getLocation();
-	}
-
-	private void setNewFeedbackConstraint(List constraint) {
-		Assert.isTrue(constraint.size() >= 2);
-		getConnection().setRoutingConstraint(constraint);
-	}
-
-	/**
-	 * Shows feedback when a bendpoint is being created.  The original figure
-	 * is used for feedback and the original constraint is saved, so that it
-	 * can be restored when feedback is erased.
-	 */
-	protected void showCreateBendpointFeedback(BendpointRequest request) {
-		Point p = new Point(request.getLocation());
-		List constraint;
-		
-		getConnection().translateToRelative(p);
-
-		Bendpoint bp = new AbsoluteBendpoint(p);
-		if (getFeedbackState().originalConstraint == null) {
-			saveOriginalConstraint();
-			constraint = (List)
-				getConnection().getRoutingConstraint();
-			constraint.add(request.getIndex() + 1, bp);
-		} else {
-			constraint = (List)
-				getConnection().getRoutingConstraint();
-		}
-
-		stickyStraightLineFeedback(constraint, request.getIndex() + 1, bp);
-
-		setNewFeedbackConstraint(constraint);
-	}
-
-	/**
-	 * Shows feedback when a bendpoint is being deleted.  This method is
-	 * only called once when the bendpoint is first deleted, not every
-	 * mouse move.  The original figure is used for feedback and the original 
-	 * constraint is saved, so that it can be restored when feedback is erased.
-	 */
-	protected void showDeleteBendpointFeedback(BendpointRequest request) {
-		if (getFeedbackState().originalConstraint == null) {
-			saveOriginalConstraint();
-			List constraint = (List)
-				getConnection().getRoutingConstraint();
-			constraint.remove(request.getIndex());
-
-			setNewFeedbackConstraint(constraint);
-		}
-	}
-
-	/**
-	 * Shows feedback when a bendpoint is being moved.  Also checks to see if the bendpoint 
-	 * should be deleted and then calls {@link #showDeleteBendpointFeedback(BendpointRequest)}
-	 * if needed.  The original figure is used for feedback and the original constraint is 
-	 * saved, so that it can be restored when feedback is erased.
-	 */
-	protected void showMoveBendpointFeedback(BendpointRequest request) {
-		Point p = new Point(request.getLocation());
-		if (!getFeedbackState().isDeleting) {
-			setReferencePoints(request);
-		}
-
-		getConnection().translateToRelative(p);
-		Bendpoint bp = new AbsoluteBendpoint(p);
-
-		if (getFeedbackState().originalConstraint == null) {
-			saveOriginalConstraint();
-		}
-
-		if (lineContainsPoint(getFirstReferencePoint(),
-			getSecondReferencePoint(),
-			p)) {
-			if (!getFeedbackState().isDeleting) {
-				getFeedbackState().isDeleting = true;
-				eraseConnectionFeedback(request, false);
-				showDeleteBendpointFeedback(request);
-			}
-			return;
-		}
-		if (getFeedbackState().isDeleting) {
-			getFeedbackState().isDeleting = false;
-			eraseConnectionFeedback(request, false);
-		}
-
-		List constraint = (List)
-			getConnection().getRoutingConstraint();
-		stickyStraightLineFeedback(constraint, request.getIndex(), bp);
-
-		setNewFeedbackConstraint(constraint);
-	}
-
-	/**
-	 * This method will set the constraint with the given bendpoint, with the additional behavior of
-	 * "sticking" the point around a tolerance to a straight line.  If it's within a tolerance of the
-	 * previous point, stick it to the horizontal or vertical coordinates that make it straight.
-	 */
-	protected void stickyStraightLineFeedback(
-		List constraint,
-		int nIndex,
-		Bendpoint bp) {
-		Point ptLoc = new Point(bp.getLocation());
-		
-		int sticky_tolerance = getStickyTolerance();
-		
-		if (nIndex > 0) {
-			Point ptPrev;
-			if ((nIndex - 1) == 0) {
-				ptPrev =
-					getConnection()
-						.getSourceAnchor()
-						.getReferencePoint();
-				getConnection().translateToRelative(ptPrev);
-			} else
-				ptPrev = ((Bendpoint) constraint.get(nIndex - 1)).getLocation();
-
-			if (Math.abs(ptPrev.x - ptLoc.x) < sticky_tolerance)
-				ptLoc.x = ptPrev.x;
-			if (Math.abs(ptPrev.y - ptLoc.y) < sticky_tolerance)
-				ptLoc.y = ptPrev.y;
-		}
-
-		if (nIndex < constraint.size() - 1) {
-			Point ptNext;
-			if ((nIndex + 1) == (constraint.size() - 1)) {
-				ptNext =
-					getConnection()
-						.getTargetAnchor()
-						.getReferencePoint();
-				getConnection().translateToRelative(ptNext);
-			} else
-				ptNext = ((Bendpoint) constraint.get(nIndex + 1)).getLocation();
-
-			if (Math.abs(ptNext.x - ptLoc.x) < sticky_tolerance)
-				ptLoc.x = ptNext.x;
-			if (Math.abs(ptNext.y - ptLoc.y) < sticky_tolerance)
-				ptLoc.y = ptNext.y;
-		}
-
-		if (!ptLoc.equals(bp.getLocation())) {
-			Bendpoint bpNew = new AbsoluteBendpoint(ptLoc);
-			constraint.set(nIndex, bpNew);
-		} else {
-			constraint.set(nIndex, bp);
-		}
-	}
-
-	private int getStickyTolerance() {
-		int sticky_tolerance = MapModeUtil.getMapMode(getConnection()).DPtoLP(STICKY_TOLERANCE_DP);
-		return sticky_tolerance;
-	}
-
-	/**
-	 * Shows feedback, when appropriate.  Calls a different method
-	 * depending on the request type.
-	 *
-	 * @see #showCreateBendpointFeedback(BendpointRequest)
-	 * @see #showMoveBendpointFeedback(BendpointRequest)
-	 */
-	public void showSourceFeedback(Request request) {
-		if (getLineSegMode() != LineMode.OBLIQUE) {
-			if (REQ_CREATE_BENDPOINT.equals(request.getType())
-				|| REQ_MOVE_BENDPOINT.equals(request.getType())) {
-				showMoveLineSegFeedback((BendpointRequest) request);
-			}
-		} else {
-			if (REQ_MOVE_BENDPOINT.equals(request.getType()))
-				showMoveBendpointFeedback((BendpointRequest) request);
-			else if (REQ_CREATE_BENDPOINT.equals(request.getType()))
-				showCreateBendpointFeedback((BendpointRequest) request);
-		}
-
-		super.showSourceFeedback(request);
-	}
-
-	/**
-	 * Method getBendpointsChangedCommand.
-	 * This method will return a SetBendpointsCommand with the points retrieved from
-	 * the user feedback in the figure.
-	 * @param request BendpointRequest from the user gesture for moving / creating a bendpoint
-	 * @return Command SetBendpointsCommand that contains the point changes for the connection.
-	 */
-	abstract protected Command getBendpointsChangedCommand(BendpointRequest request);
-
-	protected Command getCreateBendpointCommand(BendpointRequest request) {
-		return getBendpointsChangedCommand(request);
-	}
-
-	protected Command getMoveBendpointCommand(BendpointRequest request) {
-		return getBendpointsChangedCommand(request);
-	}
-
-	protected Command getDeleteBendpointCommand(BendpointRequest request) {
-		return getBendpointsChangedCommand(request);
-	}
-
-	protected final LineSeg getLineSeg(List bendPoints, int nIndex) {
-		Point pt1 =
-			new Point(((Bendpoint) bendPoints.get(nIndex - 1)).getLocation());
-		Point pt2 =
-			new Point(((Bendpoint) bendPoints.get(nIndex)).getLocation());
-
-		return new LineSeg(pt1, pt2);
-	}
-
-	/**
-	 * @param bendPoints
-	 * @param nIndex
-	 * @param newLine
-	 */
-	protected void setLineSeg(List bendPoints, int nIndex, LineSeg newLine) {
-		Bendpoint bp1 = new AbsoluteBendpoint(newLine.getOrigin());
-		Bendpoint bp2 = new AbsoluteBendpoint(newLine.getTerminus());
-
-		bendPoints.set(nIndex - 1, bp1);
-		bendPoints.set(nIndex, bp2);
-	}
-
-	/**
-	 * @param request
-	 * @return move line segment command
-	 */
-	protected Command getMoveLineSegCommand(BendpointRequest request) {
-		return getBendpointsChangedCommand(request);
-	}
-
-
-	/**
-	* Method lineOutsideSource.
-	* Utility method to determine if the constraint needs to be adjusted becauase the line is
-	* outside of the source bounds.
-	* 
-	* @param line LineSeg defining the new line moved by the user gesture
-	* @return boolean true if origin of line lies outside the starting source element, false otherwise.
-	*/
-	protected boolean lineOutsideSource(LineSeg line) {
-
-		// check if end points are outside of bounds and if so - add a new point
-		Rectangle startRect =
-			new Rectangle(
-				getConnection().getSourceAnchor().getOwner().getBounds());
-		getConnection().getSourceAnchor().getOwner().translateToAbsolute(
-			startRect);
-		getConnection().translateToRelative(startRect);
-		if (getLineSegMode().equals(LineMode.ORTHOGONAL_CONSTRAINED))
-			startRect.expand(MapModeUtil.getMapMode(getConnection()).DPtoLP(-2), 
-							MapModeUtil.getMapMode(getConnection()).DPtoLP(-2));
-		
-		if (!startRect.contains(line.getOrigin())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Method lineOutsideTarget.
-	* Utility method to determine if the constraint needs to be adjusted becauase the line is
-	* outside of the target bounds.
-	* 
-	* @param line LineSeg defining the new line moved by the user gesture.
-	* @return boolean true if terminus of line lies outside the target element, false otherwise.
-	*/
-	protected boolean lineOutsideTarget(LineSeg line) {
-
-		// check if end points are outside of bounds and if so - add a new point
-		Rectangle endRect =
-			new Rectangle(
-				getConnection().getTargetAnchor().getOwner().getBounds());
-		getConnection().getTargetAnchor().getOwner().translateToAbsolute(
-			endRect);
-		getConnection().translateToRelative(endRect);
-		if (getLineSegMode().equals(LineMode.ORTHOGONAL_CONSTRAINED))
-			endRect.expand(MapModeUtil.getMapMode(getConnection()).DPtoLP(-2), 
-						MapModeUtil.getMapMode(getConnection()).DPtoLP(-2)); 
-		
-		if (!endRect.contains(line.getTerminus())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Method removeOutsideSourceFeedback.
-	* Removes a bendpoint from the beginning of the constraint.
-	* 
-	* @param constraint List of bendpoints that the source point will be added too.
-	*/
-	protected void removeOutsideSourceFeedback(List constraint) {
-		constraint.remove(0);
-	}
-
-	/**
-	* Method removeOutsideTargetFeedback.
-	* Removes a bendpoint from the end of the constraint.
-	* 
-	* @param constraint List of bendpoints that the target point will be added too.
-	*/
-	protected void removeOutsideTargetFeedback(List constraint) {
-		constraint.remove(constraint.size() - 1);
-	}
-	
-	/**
-	* Method showOutsideSourceFeedback.
-	* Adds a bendpoint to the beginning of the constraint.
-	* 
-	* @param constraint List of bendpoints that the source point will be added too.
-	*/
-	protected void showOutsideSourceFeedback(List constraint) {
-		Point ptAdd = ((Bendpoint) constraint.get(0)).getLocation();
-		Bendpoint bp = new AbsoluteBendpoint(ptAdd);
-		constraint.add(0, bp);
-	}
-
-	/**
-	* Method showOutsideTargetFeedback.
-	* Adds a bendpoint to the end of the constraint.
-	* 
-	* @param constraint List of bendpoints that the target point will be added too.
-	*/
-	protected void showOutsideTargetFeedback(List constraint) {
-		Point ptAdd =
-			((Bendpoint) constraint.get(constraint.size() - 1))
-				.getLocation();
-		Bendpoint bp = new AbsoluteBendpoint(ptAdd);
-		constraint.add(constraint.size() - 1, bp);
-	}
-
-	/**
-	* Shows feedback when a line segment is being moved.  Also checks to see if the bendpoint 
-	* should be deleted and then calls {@link #showDeleteBendpointFeedback(BendpointRequest)}
-	* if needed.  The original figure is used for feedback and the original constraint is 
-	* saved, so that it can be restored when feedback is erased.
-	*/
-	protected void showMoveLineSegFeedback(BendpointRequest request) {
-
-		if (getFeedbackState().originalConstraint == null) {
-			saveOriginalConstraint();
-		}
-
-		Point ptLoc = new Point(request.getLocation());
-		List constraint = (List)
-			getConnection().getRoutingConstraint();
-
-		getConnection().translateToRelative(ptLoc);
-
-		// adjust request index to account for source bendpoint if needed
-		int index =
-			getFeedbackState().isOutsideSource ? request.getIndex() + 1 : request.getIndex();
-
-		LineSeg moveLine = getLineSeg(constraint, index + 1);
-		LineSeg newLine = moveLine.getParallelLineSegThroughPoint(ptLoc);
-		if (!newLine.isHorizontal() && !newLine.isVertical()) {
-			if (Math.abs(newLine.getOrigin().x - newLine.getTerminus().x) < 
-				Math.abs(newLine.getOrigin().y - newLine.getTerminus().y)) {
-				newLine.setTerminus(new Point(newLine.getOrigin().x, newLine.getTerminus().y));
-			}
-			else {
-				newLine.setTerminus(new Point(newLine.getTerminus().x, newLine.getOrigin().y));
-			}
-		}
-		
-		index = adjustOutsideBoundsLineFeedback(request, constraint, index, newLine);
-
-		setLineSeg(constraint, index + 1, newLine);
-		getConnection().setRoutingConstraint(constraint);
-	}
-
-	/**
-	 * adjustOutsideBoundsLineFeedback
-	 * Method to handle feedback where the line is dragged outside of the source or target shapes bounding box.
-	 * 
-	 * @param request BendpointRequest that triggered the gesture
-	 * @param constraint List of Bendpoint objects that is the constraint to the gesture.
-	 * @param index int index of the line that the user is currently manipulating.
-	 * @param newLine LineSeg representing the line currently being manipulated.
-	 * @return int new index value after the constraint and feedback have been adjusted.
-	 */
-	protected int adjustOutsideBoundsLineFeedback(BendpointRequest request, List constraint, int index, LineSeg newLine) {
-		
-		if (getLineSegMode().equals(LineMode.ORTHOGONAL_CONSTRAINED)) {
-			// merely enforce the fact that we can't adjust the line outside the bounds of the source and target.
-			if ((index == 0 && lineOutsideSource(newLine)) ||
-				((index + 1 == constraint.size() - 1)&& lineOutsideTarget(newLine))) {
-				LineSeg moveLine = getLineSeg(constraint, index + 1);
-				newLine.setOrigin(moveLine.getOrigin());
-				newLine.setTerminus(moveLine.getTerminus());
-			}
-
-			return index;
-		}
-		
-		boolean bRemoveSource = false;
-		boolean bRemoveTarget = false;
-		boolean bSetNewSource = false;
-		boolean bSetNewTarget = false;
-
-		// Check source to see if we need to add a bendpoint
-		if (request.getIndex() == 0 && lineOutsideSource(newLine)) {
-			if (!getFeedbackState().isOutsideSource) {
-				getFeedbackState().isOutsideSource = true;
-				bSetNewSource = true;
-			}
-		} else if (getFeedbackState().isOutsideSource) {
-			getFeedbackState().isOutsideSource = false;
-			bRemoveSource = true;
-		}
-
-		// Check target to see if we need to add a bendpoint
-		int checkTargetIndex = index + 1 + (getFeedbackState().isOutsideTarget ? 1 : 0);
-		if ((checkTargetIndex == constraint.size() - 1)
-			&& lineOutsideTarget(newLine)) {
-			if (!getFeedbackState().isOutsideTarget) {
-				getFeedbackState().isOutsideTarget = true;
-				bSetNewTarget = true;
-			}
-		} else if (getFeedbackState().isOutsideTarget) {
-			getFeedbackState().isOutsideTarget = false;
-			bRemoveTarget = true;
-		}
-
-		if (bRemoveSource) {
-			removeOutsideSourceFeedback(constraint);
-			index = request.getIndex();
-		}
-		
-		if (bRemoveTarget) {
-			removeOutsideTargetFeedback(constraint);
-		}
-
-		if (bSetNewSource) {
-			showOutsideSourceFeedback(constraint);
-			index = request.getIndex() + 1;
-		}
-
-		if (bSetNewTarget) {
-			showOutsideTargetFeedback(constraint);
-		}
-		return index;
-	}
-
-	/**
-	 * Override for AccessibleHandleProvider when deactivated
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=69316
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key == AccessibleHandleProvider.class)
-			//handles == null when deactivated
-			if (handles == null) {
-				return null;
-			}
-		return super.getAdapter(key);
-	}	
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/GraphicalEditPolicyEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/GraphicalEditPolicyEx.java
deleted file mode 100644
index b4871b5..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/GraphicalEditPolicyEx.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.editpolicies;
-
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
-
-/**
- * Extends GEF's <code>GraphicalEditPolicy</code> to add the ability to be 
- * refreshed from its editpart.
- * 
- * @author chmahone
- */
-public abstract class GraphicalEditPolicyEx extends GraphicalEditPolicy {
-
-	/**
-	 * This method is called when the editpart is refreshed.
-	 */
-	public void refresh() {
-	  // Default behaviour is to do nothing
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/LineMode.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/LineMode.java
deleted file mode 100644
index 679ef51..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/LineMode.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.editpolicies;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-
-/**
- * @author sshaw
- *
- * <code>EnumeratedType</code> describing the different line editing modes
- */
-public class LineMode
-	extends EnumeratedType {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for this enumerated type.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * Indicates that the line is oblique meaning that the line segments can be at any angle.
-	 */
-	public static final LineMode OBLIQUE = new LineMode("Oblique"); //$NON-NLS-1$
-	/**
-	 * Indicates that the line is orthogonal meaning that the line segments must be horizontal
-	 * or vertical.
-	 */
-	public static final LineMode ORTHOGONAL_FREE = new LineMode("Orthogonal_Free"); //$NON-NLS-1$
-	/**
-	 * Indicates that the line is orthogonal meaning that the line segments must be horizontal
-	 * or vertical but additionally they are constrained by some value.
-	 */
-	public static final LineMode ORTHOGONAL_CONSTRAINED = new LineMode("Orthogonal_Constrained"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final LineMode[] VALUES = {OBLIQUE, ORTHOGONAL_FREE, ORTHOGONAL_CONSTRAINED};
-
-	/**
-	 * Constructs a new paste option with the specified name and ordinal.
-	 * 
-	 * @param name the name of the new paste option.
-	 * @param ordinal the ordinal for the new paste option.
-	 */
-	protected LineMode(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Constructs a new paste option with the specified name.
-	 * 
-	 * @param name the name of the new LineMode option.
-	 */
-	private LineMode(String name) {
-		this(name, nextOrdinal++);
-	}
-
-	/**
-	 * Retrieves the list of constants for this enumerated type.
-	 * 
-	 * @return The list of constants for this enumerated type.
-	 * 
-	 * @see EnumeratedType#getValues()
-	 */
-	protected List getValues() {
-		return Collections.unmodifiableList(Arrays.asList(VALUES));
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/package.html
deleted file mode 100644
index aed7f11..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/package.html
+++ /dev/null

@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the <i>edit policy</i> classes. 
-</p><p>
-Edit policy information:
-<ul>
-<li> Brings an editing functionality into an editpart (when installed on it)
-<li> Responsible for satisfying requests and feedback management
-<li> Categorized into different roles (component, connection, container, selectionetc).
-<li> Every role is responsible for satisfying one or more requests by returning commands
-</ul>
-
-</p>
-
-@canBeSeenBy %level0
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/CircleFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/CircleFigure.java
deleted file mode 100644
index 0b6f1be..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/CircleFigure.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.figures;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IOvalAnchorableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.SlidableOvalAnchor;
-
-/**
- * Draws a circle figure.  The figures bounds are guaranteed to be the circle
- * diameter
- * @author mhanner
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- */
-public class CircleFigure extends DefaultSizeNodeFigure implements IOvalAnchorableFigure {
-
-	
-	/**
-	 * Constructor for StateLineFigure.
-	 * @param width figure width
-	 * @param height figure height
-	 */
-	public CircleFigure(int width, int height) {
-		super( width, height );
-	}
-	
-	/**
-	 * Constructor for StateLineFigure.
-	 * @param dim figure dimensions
-	 */
-	public CircleFigure( Dimension dim ) {
-		super(dim);
-	}
-	
-	/**
-	 * Constructor for StateLineFigure.
-	 * @param diameter circle diameter
-	 */
-	public CircleFigure( int diameter ) {
-		this( diameter, diameter );
-	}
-	/**
-	 * Draw the state object.
-	 * @see org.eclipse.draw2d.Figure#paintBorder(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		Rectangle r = Rectangle.SINGLETON;
-		r.setBounds(getBounds());
-		//
-		// draw the circle.
-		g.fillOval(r);
-
-		r.width--;
-		r.height--;
-		g.drawOval(r);
-	}
-
-	
-	/** Return <code>getBounds()</code>. */
-	public final Rectangle getOvalBounds() {
-		return getBounds();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createAnchor(org.eclipse.draw2d.geometry.PrecisionPoint)
-	 */
-	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
-		if (p==null)
-			// If the old terminal for the connection anchor cannot be resolved (by SlidableAnchor) a null
-			// PrecisionPoint will passed in - this is handled here
-			return createDefaultAnchor();
-		return new SlidableOvalAnchor(this, p);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createDefaultAnchor()
-	 */
-	protected ConnectionAnchor createDefaultAnchor() {
-		return new SlidableOvalAnchor(this);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/ConvexPentagonNodeFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/ConvexPentagonNodeFigure.java
deleted file mode 100644
index 8c2de9e..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/ConvexPentagonNodeFigure.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-
-
-/**
- * Provides support for Convex Pentagon figure (Send Signal Action for Activity diagram) 
- * 
- * @author oboyko
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- */
-public class ConvexPentagonNodeFigure
-	extends DefaultSizeNodeFigure implements IPolygonAnchorableFigure{
-
-	private static final double DEFAULT_CONVEX_RATIO = 0.25;
-
-	/**
-	 * Constructor
-	 * @param defSize
-	 */
-	public ConvexPentagonNodeFigure(Dimension defSize) {
-		super(defSize);
-	}
-
-	/**
-	 * Constructor
-	 * @param width
-	 * @param height
-	 */
-	public ConvexPentagonNodeFigure(int width, int height) {
-		super(width, height);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		PointList pointList = getPolygonPoints();
-
-		graphics.fillPolygon(pointList);
-		graphics.drawPolygon(pointList);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figures.IPolygonAnchorableFigure#getPolygonPoints()
-	 */
-	public PointList getPolygonPoints() {
-		PointList ptList = new PointList();
-		ptList.addPoint(new Point(getBounds().x, getBounds().y));
-		ptList.addPoint(new Point(getBounds().x + getBounds().width*(1-DEFAULT_CONVEX_RATIO), getBounds().y));
-		ptList.addPoint(new Point(getBounds().x+getBounds().width, getBounds().y+getBounds().height/2));
-		ptList.addPoint(new Point(getBounds().x+getBounds().width*(1-DEFAULT_CONVEX_RATIO), getBounds().y+getBounds().height));
-		ptList.addPoint(new Point(getBounds().x, getBounds().y+getBounds().height));
-		ptList.addPoint(new Point(getBounds().x, getBounds().y));
-		return ptList;
-	}
-	
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DiamondFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DiamondFigure.java
deleted file mode 100644
index 85031d7..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DiamondFigure.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-
-/**
- * Draws a diamond figure.
- * @author mmuszyns
- * @canBeSeenBy %level0
- */
-public class DiamondFigure extends NodeFigure implements IPolygonAnchorableFigure{
-
-	/** 
-	 * Create an instance.
-	 * @param dim the preferred size.
-	 */
-	public DiamondFigure( Dimension dim ) { 
-		setPreferredSize(dim);
-	}
-	
-	/**
-	 * paints the object flow figure: a rectangular shape.
-	 * @param graphics
-	 */
-	protected void paintFigure(Graphics graphics) {
-		Rectangle r = new Rectangle();
-		PointList pointList = new PointList();
-
-		r.x = bounds.x;
-		r.y = bounds.y;
-		r.width = bounds.width - 1;
-		r.height = bounds.height - 1;
-		pointList.removeAllPoints();
-		pointList.addPoint(r.x + r.width / 2, r.y);
-		pointList.addPoint(r.x + r.width, r.y + r.height / 2);
-		pointList.addPoint(r.x + r.width / 2, r.y + r.height);
-		pointList.addPoint(r.x, r.y + r.height / 2);
-		graphics.fillPolygon(pointList);
-		graphics.drawPolygon(pointList);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figures.IPolygonAnchorableFigure#getPolygonPoints()
-	 */
-	public PointList getPolygonPoints() {
-		PointList ptList = new PointList();
-		ptList.addPoint(new Point(getBounds().x+getBounds().width/2, getBounds().y));
-		ptList.addPoint(new Point(getBounds().x+getBounds().width, getBounds().y+getBounds().height/2));
-		ptList.addPoint(new Point(getBounds().x+getBounds().width/2, getBounds().y+getBounds().height));
-		ptList.addPoint(new Point(getBounds().x, getBounds().y+getBounds().height/2));
-		ptList.addPoint(new Point(getBounds().x+getBounds().width/2, getBounds().y));
-		return ptList;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getSlidableAnchorArea()
-	 */
-	protected double getSlidableAnchorArea() {
-		return 0.7;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DynamicNodeFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DynamicNodeFigure.java
deleted file mode 100644
index 6cd9ac4..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DynamicNodeFigure.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.figures;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/*
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- */
-public class DynamicNodeFigure extends NodeFigure {
-
-	protected Hashtable connectionAnchors = new Hashtable(7);
-
-	/** 
-	 * Returns a string identifier associated with a given ConnectionAnchor.
-	 * @param c ConnectionAnchor to determine the name of
-	 * @return String name associated with the given ConnectionAnchor.
-	 */
-	public String getConnectionAnchorTerminal(ConnectionAnchor c) {
-		if (connectionAnchors.containsValue(c)) {
-			Iterator iter = connectionAnchors.keySet().iterator();
-			String key;
-			while (iter.hasNext()) {
-				key = (String) iter.next();
-				if (connectionAnchors.get(key).equals(c))
-					return key;
-			}
-		}
-		return null;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/OvalFigure.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/OvalFigure.java
deleted file mode 100644
index 96df5b2..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/OvalFigure.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.figures;
-
-
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IOvalAnchorableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.SlidableOvalAnchor;
-
-/**
- * @author choang
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- *
- * Graphic 2D figure for a oval whoses anchoring will use the OvalAnchor
- * 
- */
-public class OvalFigure extends NodeFigure implements IOvalAnchorableFigure{
-
-	public static double TAB_HEIGHT_PERCENT = .2;
-	
-	
-	/**
-	 * Constructor for OvalFigure.
-	 */
-	public OvalFigure() {
-		super();
-	} 
-	
-	protected void paintFigure(Graphics g) {
-		super.paintFigure(g);
-
-		Rectangle ovalRect = getOvalBounds();
-
-		g.fillOval(ovalRect);
-		g.drawOval(ovalRect);		
-
-	}
-
-	/**
-	 * @return Rectangle that bounds the oval that is to be drawn.
-	 * This may or may not be the same as the bounds of the figure itself.
-	 */
-	public Rectangle getOvalBounds() {
-		
-		Rectangle r = getBounds();
-
-		Rectangle ovalRect = new Rectangle(r);
-
-		// not using the full bounds of the rectangle to draw
-		// the oval in as it results in the top and the left
-		// edge of the oval being chopped off.  That is why 
-		// we are indenting by 1
-		ovalRect.setSize(r.width-1, r.height-1);
-		
-		return ovalRect;
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createAnchor(org.eclipse.draw2d.geometry.PrecisionPoint)
-	 */
-	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
-		if (p==null)
-			// If the old terminal for the connection anchor cannot be resolved (by SlidableAnchor) a null
-			// PrecisionPoint will passed in - this is handled here
-			return createDefaultAnchor();
-		return new SlidableOvalAnchor(this, p);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createDefaultAnchor()
-	 */
-	protected ConnectionAnchor createDefaultAnchor() {
-		return new SlidableOvalAnchor(this);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/RelativeToBorderLocator.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/RelativeToBorderLocator.java
deleted file mode 100644
index 26b8a34..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/RelativeToBorderLocator.java
+++ /dev/null

@@ -1,196 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.handles.HandleBounds;
-
-/**
- * This locator places the figure relative to the reference figure's edge 
- * (where the reference figure's edge is the same as where the resize/move
- * handles would be placed).  
- * There are three options available for controlling where the figure is 
- * placed:
- * <ol>
- * <li>direction - A direction to place the figure relative to the reference
- * figure as defined in {@link PositionConstants}
- * <li>margin - The margin is the space between the reference figure's edge 
- * and the figure.  A positive margin will place the figure outside the
- * reference figure, a negative margin will place the figure inside the 
- * reference figure.
- * </ol>
- * 
- * NOTE: This locator uses the size of the figure to calculate where it should
- * be placed.  Therefore it may be necessary to explicitly set this figure's
- * size.
- * 
- * @author cmahoney
- */
-public class RelativeToBorderLocator implements Locator {
-
-	/** the margin to leave by the edge of the parent figure */
-	private int margin;
-
-	/** the direction */
-	protected int direction;
-
-	/** the parent figure */
-	protected IFigure reference;
-	
-	/**
-	 * Constructor for <code>RelativeToBorderLocator</code>.
-	 * 
-	 * @param reference the parent figure
-	 * @param direction A direction to place the figure relative to the reference
-	 * figure as defined in {@link PositionConstants}
-	 * @param margin The margin is the space between the reference figure's edge 
-	 * and the figure.  A positive margin will place the figure outside the
-	 * reference figure, a negative margin will place the figure inside the 
-	 * reference figure.
-	 */
-	public RelativeToBorderLocator(
-		IFigure reference,
-		int direction,
-		int margin) {
-			
-		this.reference = reference;
-		this.direction = direction;
-		this.margin = margin;
-	}
-
-	/**
-	 * Puts the figure either inside or outside the parent edge (where the edge 
-	 * is the same as where the resize/move handles would be placed),
-	 * identified by the direction, with a margin.
-	 * 
-	 * @see org.eclipse.draw2d.Locator#relocate(org.eclipse.draw2d.IFigure)
-	 */
-	public void relocate(IFigure target) {
-		Rectangle bounds =
-			reference instanceof HandleBounds
-				? ((HandleBounds) reference).getHandleBounds().getCopy()
-				: reference.getBounds().getCopy();	
-
-		reference.translateToAbsolute(bounds);
-		target.translateToRelative(bounds);
-
-		int width = target.getBounds().width;
-		int halfWidth = width / 2;
-
-		int height = target.getBounds().height;
-		int halfHeight = height / 2;
-
-		if (direction == PositionConstants.CENTER) {
-
-			Dimension shift = new Dimension(-halfWidth, -halfHeight);
-			target.setLocation(bounds.getCenter().getTranslated(shift));
-
-		} else if (margin < 0) {
-
-			if (direction == PositionConstants.NORTH_WEST) {
-
-				Dimension shift = new Dimension(-margin, -margin);
-				target.setLocation(bounds.getTopLeft().getTranslated(shift));
-
-			} else if (direction == PositionConstants.NORTH) {
-
-				Dimension shift = new Dimension(-halfWidth, -margin);
-				target.setLocation(bounds.getTop().getTranslated(shift));
-
-			} else if (direction == PositionConstants.NORTH_EAST) {
-
-				Dimension shift = new Dimension(-(width + -margin), -margin);
-				target.setLocation(bounds.getTopRight().getTranslated(shift));
-
-			} else if (direction == PositionConstants.SOUTH_WEST) {
-
-				Dimension shift = new Dimension(-margin, -(height + -margin));
-				target.setLocation(bounds.getBottomLeft().getTranslated(shift));
-
-			} else if (direction == PositionConstants.SOUTH) {
-
-				Dimension shift = new Dimension(-halfWidth, -(height + -margin));
-				target.setLocation(bounds.getBottom().getTranslated(shift));
-
-			} else if (direction == PositionConstants.SOUTH_EAST) {
-
-				Dimension shift = new Dimension(-(width + -margin),
-					-(height + -margin));
-				target
-					.setLocation(bounds.getBottomRight().getTranslated(shift));
-
-			} else if (direction == PositionConstants.WEST) {
-
-				Dimension shift = new Dimension(-margin, -halfHeight);
-				target.setLocation(bounds.getLeft().getTranslated(shift));
-
-			} else if (direction == PositionConstants.EAST) {
-
-				Dimension shift = new Dimension(-(width + -margin), -halfHeight);
-				target.setLocation(bounds.getRight().getTranslated(shift));
-
-			}
-		} else {
-
-			if (direction == PositionConstants.NORTH_WEST) {
-
-				Dimension shift =
-					new Dimension(- (width + margin), - (height + margin));
-				target.setLocation(bounds.getTopLeft().getTranslated(shift));
-
-			} else if (direction == PositionConstants.NORTH) {
-
-				Dimension shift =
-					new Dimension(-halfWidth, - (height + margin));
-				target.setLocation(bounds.getTop().getTranslated(shift));
-
-			} else if (direction == PositionConstants.NORTH_EAST) {
-
-				Dimension shift = new Dimension(margin, - (height + margin));
-				target.setLocation(bounds.getTopRight().getTranslated(shift));
-
-			} else if (direction == PositionConstants.SOUTH_WEST) {
-
-				Dimension shift = new Dimension(- (width + margin), margin);
-				target.setLocation(bounds.getBottomLeft().getTranslated(shift));
-
-			} else if (direction == PositionConstants.SOUTH) {
-
-				Dimension shift = new Dimension(-halfWidth, margin);
-				target.setLocation(bounds.getBottom().getTranslated(shift));
-
-			} else if (direction == PositionConstants.SOUTH_EAST) {
-
-				Dimension shift = new Dimension(margin, margin);
-				target.setLocation(
-					bounds.getBottomRight().getTranslated(shift));
-
-			} else if (direction == PositionConstants.WEST) {
-
-				Dimension shift =
-					new Dimension(- (width + margin), -halfHeight);
-				target.setLocation(bounds.getLeft().getTranslated(shift));
-
-			} else if (direction == PositionConstants.EAST) {
-
-				Dimension shift = new Dimension(margin, -halfHeight);
-				target.setLocation(bounds.getRight().getTranslated(shift));
-
-			}
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/package.html
deleted file mode 100644
index e3c76c5..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy %level0
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/BendpointCreationInvisibleHandle.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/BendpointCreationInvisibleHandle.java
deleted file mode 100644
index c6b0188..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/BendpointCreationInvisibleHandle.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.handles;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.handles.BendpointCreationHandle;
-
-import org.eclipse.gmf.runtime.gef.ui.internal.l10n.Cursors;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class BendpointCreationInvisibleHandle extends BendpointCreationHandle {
-
-	/**
-	 * Creates a new BendpointCreationHandle, sets its owner to <code>owner</code>
-	 * and its index to <code>index</code>, and sets its locator to a new
-	 * {@link org.eclipse.draw2d.MidpointLocator}.
-	 */
-	public BendpointCreationInvisibleHandle(
-		ConnectionEditPart owner,
-		int index) {
-		super(owner, index);
-		
-		setCursor(Cursors.CURSOR_SEG_ADD);
-	}
-
-	/**
-	 * Draws the handle with fill color and outline color dependent 
-	 * on the primary selection status of the owner editpart.
-	 *
-	 * @param g The graphics used to paint the figure.
-	 */
-	public void paintFigure(Graphics g) {
-		// do nothing - this handle is invisible
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/LineSegMoveInvisibleHandle.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/LineSegMoveInvisibleHandle.java
deleted file mode 100644
index b2c9669..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/LineSegMoveInvisibleHandle.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.handles;
-
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.tools.ConnectionBendpointTracker;
-
-import org.eclipse.gmf.runtime.gef.ui.internal.l10n.Cursors;
-
-/**
- * @author sshaw
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class LineSegMoveInvisibleHandle extends BendpointCreationInvisibleHandle {
-
-	/**
-	 * Creates a new BendpointCreationHandle, sets its owner to <code>owner</code>
-	 * and its index to <code>index</code>, and sets its locator to a new
-	 * {@link org.eclipse.draw2d.MidpointLocator}.
-	 */
-	public LineSegMoveInvisibleHandle(
-		ConnectionEditPart owner,
-		int index) {
-		super(owner, index);
-		
-		setCursor(Cursors.CURSOR_SEG_MOVE);
-	}
-
-	/**
-	 * Creates and returns a new {@link ConnectionBendpointTracker}.
-	 * @return the new ConnectionBendpointTracker
-	 */
-	protected DragTracker createDragTracker() {
-		ConnectionBendpointTracker tracker;
-		tracker = new ConnectionBendpointTracker(
-			(ConnectionEditPart)getOwner(),
-			getIndex()) {
-			
-			/**
-			 * Called once the drag has been interpreted.  This is where the real work of the drag is
-			 * carried out.  By default, the current command is executed.
-			 */
-			protected void performDrag() {
-				setCurrentCommand(getCommand());
-				executeCurrentCommand();
-			}
-		};
-		tracker.setType(RequestConstants.REQ_CREATE_BENDPOINT);
-		tracker.setDefaultCursor(getCursor());
-		return tracker;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/package.html
deleted file mode 100644
index e663c86..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/Cursors.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/Cursors.java
deleted file mode 100644
index 60ce009..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/Cursors.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.l10n;
-
-import org.eclipse.swt.graphics.Cursor;
-
-
-/**
- * This is class that stores a series of globally accessible cursors.
- * 
- * @author sshaw
- * @canBeSeenBy %partners
- *
- */
-public class Cursors {
-
-    /**
-     * Constant define for a cursor used by adding line segments to an
-     * existing line.
-     */
-    public static final Cursor CURSOR_SEG_ADD;
-    
-    /**
-     * Constant define for a cusor used to move an existing line segment
-     */
-    public static final Cursor CURSOR_SEG_MOVE;
-
-    static {
-		CURSOR_SEG_ADD = new Cursor(null, GefUIPluginImages.DESC_SEG_ADD_MASK
-			.getImageData(), GefUIPluginImages.DESC_SEG_ADD.getImageData(), 0,
-			0);
-
-		CURSOR_SEG_MOVE = new Cursor(null, GefUIPluginImages.DESC_SEG_MOVE_MASK
-			.getImageData(), GefUIPluginImages.DESC_SEG_MOVE.getImageData(), 0,
-			0);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/GefUIPluginImages.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/GefUIPluginImages.java
deleted file mode 100644
index 54709f5..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/GefUIPluginImages.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.l10n;
-
-import org.eclipse.gmf.runtime.gef.ui.internal.GefPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- * Bundle of all images used by this plugin. Image descriptors can be retrieved
- * by referencing the public image descriptor variable directly. The public
- * strings represent images that will be cached and can be retrieved using
- * {@link #get(String)} which should <b>not</b> be disposed by the client.
- *
- * @author cmahoney
- */
-public class GefUIPluginImages {
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "icons/"; //$NON-NLS-1$
-
-	// Image descriptors.
-
-	public static final ImageDescriptor DESC_SEG_ADD_MASK = create(PREFIX_ROOT
-		+ "Seg_Add_Mask.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SEG_ADD = create(PREFIX_ROOT
-		+ "Seg_Add.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SEG_MOVE_MASK = create(PREFIX_ROOT
-		+ "Seg_Move_Mask.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SEG_MOVE = create(PREFIX_ROOT
-		+ "Seg_Move.gif"); //$NON-NLS-1$
-
-	/**
-	 * Creates the image descriptor from the filename given.
-	 * 
-	 * @param imageName
-	 *            the full filename of the image
-	 * @return the new image descriptor
-	 */
-	private static ImageDescriptor create(String imageName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(GefPlugin
-			.getPluginId(), imageName);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/package.html
deleted file mode 100644
index a862027..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains classes to manage the string, image, font and cursor resources for this plugin. Messages and labels on GUI components that need to be localized (adapted for a specific region or language) should be placed in the <i>messages.properties</i> file in this package.
-Classes in this plugin should use the ResourceManager class to access the I18N resources that is needs. It is not intended to be accessed by other plug-ins.
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/package.html
deleted file mode 100644
index 90b388e..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/package.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-This package contains the necessary plugin classes:
-<ul>
-<li>DebugOptions
-<li>Plugin
-<li>StatusCodes
-</ul>
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteDrawer.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteDrawer.java
deleted file mode 100644
index 66dd265..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteDrawer.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.palette;
-
-
-/**
- * @author melaaser, choang
- *
- * A org.eclipse.gef.palette.PaletteDrawer Palette category with and id and priority and
- * who will be collapsed by default.
- * 
- */
-public class PaletteDrawer
-	extends org.eclipse.gef.palette.PaletteDrawer {
-
-	/**
-	 * @param id The drawer's id
-	 * @param label The drawer's label
-	 */
-	public PaletteDrawer(String id, String label) {
-		super(label);
-		setId(id);
-		this.setInitialState(INITIAL_STATE_CLOSED);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteGroup.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteGroup.java
deleted file mode 100644
index 0bb04ce..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteGroup.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.palette;
-
-
-/**
- * An implementation of a palette group with identity
- * 
- * @author melaasar
- */
-public class PaletteGroup
-	extends org.eclipse.gef.palette.PaletteGroup {
-
-	/**
-	 * @param id
-	 * @param label
-	 */
-	public PaletteGroup(String id, String label) {
-		super(label);
-		setId(id);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteIdentity.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteIdentity.java
deleted file mode 100644
index 3b7365f..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteIdentity.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.palette;
-
-/**
- * An interface that adds identity to a palette entry
- * 
- * @author melaasar
- * @canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
- */
-public interface PaletteIdentity {
-
-	/**
-	 * Returns the id of a palette entry
-	 * 
-	 * @return The id of the palette entry
-	 */
-	String getId();
-}
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteSeparator.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteSeparator.java
deleted file mode 100644
index 38bc650..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteSeparator.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-/*
- * Created on Oct 23, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.gmf.runtime.gef.ui.internal.palette;
-
-/**
- * @author melaasar
- *
- * The palette separator class implementsing <code>PaletteIdentity</code>
- */
-public class PaletteSeparator
-	extends org.eclipse.gef.palette.PaletteSeparator {
-
-	/**
-	 * Creates a new Palette Separator
-	 * @param id
-	 */
-	public PaletteSeparator(String id) {
-		super(id);
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteStack.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteStack.java
deleted file mode 100644
index 5d64ec2..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteStack.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
- package org.eclipse.gmf.runtime.gef.ui.internal.palette;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-/**
- * An implementation of a palette stack with identity
- * 
- * @author cmahoney
- */
-public class PaletteStack
-	extends org.eclipse.gef.palette.PaletteStack
-	implements PaletteIdentity {
-
-	/** the drawer's id */
-	private String id;
-
-	/**
-	 * Creates a new PaletteStack.
-	 * @param id the id
-	 * @param name the name, shown only in the customize menu
-	 * @param desc the description, shown only in the customize menu
-	 * @param icon the name, shown only in the customize menu
-	 */
-	public PaletteStack(String id, String name, String desc,
-			ImageDescriptor icon) {
-		super(name, desc, icon);
-		this.id = id;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteIdentity#getId()
-	 */
-	public String getId() {
-		return id;
-	}
-
-}
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/package.html
deleted file mode 100644
index e663c86..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/package.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2004,2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Aurora internal packages
-
-
-<h2>Package Specification</h2>
-<p>
-ToDo: Fill in specific content</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.gef.ui.*
-</body>
-</html>
-

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/TextCellEditorEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/TextCellEditorEx.java
deleted file mode 100644
index 5e4a393..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/TextCellEditorEx.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.parts;
-
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Extends the TextCellEditor to provide a convenient method
- * that will permitting the set of the value and doing the necessary
- * process to update the state of the cell editor and also notify
- * all lisnteners listening on changes in the cell editor value.
- * 
- * @canBeSeenBy %partners
- */
-public class TextCellEditorEx extends TextCellEditor {
-	
-	private Object originalValue;
-	private boolean deactivationLock = false;
-
-	/**
-	 */
-	public TextCellEditorEx() {
-		// empty
-	}
-	
-	/**
-	 * @param parent the parent control
-	 */
-	public TextCellEditorEx(Composite parent) {
-		super(parent);
-	}
-	/**
-	 * Creates a new text string cell editor parented under the given control.
-	 * The cell editor value is the string itself, which is initially the empty string. 
-	 * Initially, the cell editor has no cell validator.
-	 *
-	 * @param parent the parent control
-	 * @param style the style bits
-	 */
-	public TextCellEditorEx(Composite parent, int style) {
-		super(parent, style);
-	}
-	
-	/**
-	 * This will be used when an edit has occurred by a ModifyEvent has been been send.
-	 * Will call #setValue(Object) but will also call editOccured(null)
-	 * to make sure that the dirty flag is set probably and that any listeners
-	 * are informed about the changed.
-	 * @param value Value to set the cell editor to.
-	 * 
-	 * Note:  This happens address defect RATLC00522324.  For our topgraphical edit parts
-	 * we delagate the direct edit request to a primary edit part and set focus on that.  The issue
-	 * is that if the user has typed in an initial character when setting focus
-	 * to the edit part, which typically is a TextCompartmentEditPart then
-	 * setting that intial value does not fire the necessary change events that
-	 * need to occur in order for that value to be recongnized.  If you don't
-	 * use this method then the result is that if you just type in the initial character
-	 * and that is it then the text compartment loses focus then the value will not
-	 * be saved.  This is because setting the value of the cell doesn't think its value
-	 * has changed since the first character is not recongized as a change.
-	 */
-	public void setValueAndProcessEditOccured(Object value){
-		setValue(value);
-		// do the processing to ensure if we exit the cell then
-		// value will be applied.
-		editOccured(null); 
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.CellEditor#doSetValue(java.lang.Object)
-	 */
-	protected void doSetValue(Object value) {
-		if (originalValue == null)
-			originalValue = value;
-		super.doSetValue(value);
-	}
-	
-	/**
-	 * @return boolean value specifying whether or not the value has been changed
-	 */
-	public boolean hasValueChanged() {
-		if (getValue() == null)
-			return originalValue != null;
-		return !getValue().equals(originalValue);
-	}
-
-	/* 
-	 * Runs super deactivate unless it has been locked
-	 * and otherwise unlocks deactivation
-	 * @see org.eclipse.jface.viewers.CellEditor#deactivate()
-	 */
-	public void deactivate() {
-		if (! isDeactivationLocked())
-			super.deactivate();
-		setDeactivationLock(false);
-	}
-
-	/**
-	 * Returns true if deactivation has been locked
-	 * @return
-	 */
-	public boolean isDeactivationLocked() {
-		return deactivationLock;
-	}
-
-	
-	/**
-	 * Sets deactivation lock so that the cell editor 
-	 * does not perform deactivate
-	 * @param deactivationLock
-	 */
-	public void setDeactivationLock(boolean deactivationLock) {
-		this.deactivationLock = deactivationLock;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/WrapTextCellEditor.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/WrapTextCellEditor.java
deleted file mode 100644
index f01b939..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/WrapTextCellEditor.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.parts;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A cell editor that manages a multiline wrappable text entry field.
- * The cell editor's value is the text string itself.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * 
- * @canBeSeenBy %partners
- */
-public class WrapTextCellEditor extends TextCellEditorEx {
-
-	/**
-	 * Default MultiLineTextCellEditor style
-	 * specify no borders on text widget as cell outline in table already
-	 * provides the look of a border.
-	 */
-	private static final int defaultStyle = SWT.WRAP | SWT.MULTI;
-
-	/**
-	 * Creates a new text string cell editor with no control
-	 * The cell editor value is the string itself, which is initially the empty
-	 * string. Initially, the cell editor has no cell validator.
-	 */
-	public WrapTextCellEditor() {
-		setStyle(defaultStyle);
-	}
-	/**
-	 * Creates a new text string cell editor parented under the given control.
-	 * The cell editor value is the string itself, which is initially the empty string. 
-	 * Initially, the cell editor has no cell validator.
-	 *
-	 * @param parent the parent control
-	 */
-	public WrapTextCellEditor(Composite parent) {
-		this(parent, defaultStyle);
-	}
-	/**
-	 * Creates a new text string cell editor parented under the given control.
-	 * The cell editor value is the string itself, which is initially the empty string. 
-	 * Initially, the cell editor has no cell validator.
-	 *
-	 * @param parent the parent control
-	 * @param style the style bits
-	 */
-	public WrapTextCellEditor(Composite parent, int style) {
-		super(parent, style);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.CellEditor#keyReleaseOccured(org.eclipse.swt.events.KeyEvent)
-	 */
-	protected void keyReleaseOccured(KeyEvent keyEvent) {
-		// The super behavior of this method is to apply the cell editor value
-		// if the 'Return' key is pressed with the 'CTRL' key. Otherwise, the
-		// 'Return' key is used to insert a new line. This is exactly opposite
-		// to what we expect in this editor and that is why we are reversing it.
-		if (keyEvent.character == '\r') {
-	        if ((keyEvent.stateMask & SWT.CTRL) != 0)
-	        	keyEvent.stateMask &= ~SWT.CTRL; 
-	        else
-	        	keyEvent.stateMask |= SWT.CTRL;
-		}
-		super.keyReleaseOccured(keyEvent);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/package.html
deleted file mode 100644
index 501dead..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/package.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Contains classes that extend from other parts of Eclipse such as SWT, JFace and the workbench
-interfaces.  It is usefull to group them in this package because they are extensions that
-help realize the GEF infrastructure but they are not explicitly part of the main hierarchies
-with-in GEF.
-
-<p>The example with-in this package is the <code>TextCellEditorEx which was extended from the
-JFace implementation to allow for DirectEdit of name labels so that the first character
-typed is not lost.</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/requests/RotateShapeRequest.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/requests/RotateShapeRequest.java
deleted file mode 100644
index eca5384..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/requests/RotateShapeRequest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.requests;
-
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-
-
-/**
- * Provides support for shape rotations
- * Essentially, same as ChangeBoundsRequest with an extra variable that allows rotation
- * 
- * @author oboyko
- */
-public class RotateShapeRequest
-	extends ChangeBoundsRequest {
-	
-	// Rotate permission: true if rotation permitted
-	private boolean rotate;
-	
-	/**
-	 * Builds an instance of the request
-	 * 
-	 * @param type
-	 */
-	public RotateShapeRequest(Object type) {
-		super(type);
-		rotate = true; 
-	}
-	
-	/**
-	 * Sets the rotation permission 
-	 * 
-	 * @param rotate the <code>boolean</code> <code>true</code> if rotation is permitted, 
-	 * <code>false</code> otherwise.
-	 */
-	public void setRotate(boolean rotate) {
-		this.rotate = rotate;
-	}
-	
-	/**
-	 * Returns the rotation permission
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if rotation is permitted, 
-	 * <code>false</code> otherwise.
-	 */
-	public boolean shouldRotate() {
-		return rotate;
-	}
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/requests/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/requests/package.html
deleted file mode 100644
index 55af620..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/requests/package.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Provides a set of classes that extend from the org.eclipse.gef.Request 
-hierarchy that are used to store additional information that are necessary
-in order for the <code>EditPart</code> / <code>EditPolicy</code> to process the request 
-and return an appropriate command.
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/DelegatingDragEditPartsTracker.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/DelegatingDragEditPartsTracker.java
deleted file mode 100644
index caf7185..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/DelegatingDragEditPartsTracker.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.tools;
-
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.tools.SelectEditPartTracker;
-import org.eclipse.gef.tools.SelectionTool;
-import org.eclipse.swt.events.MouseEvent;
-
-/**
- * A drag tracker that allows a delegating editpart to be selected while
- * another (delegate) editpart to be dragable.
- * 
- * This class subclasses <code>SelectionTool</code> since it already implements
- * the delegating pattern to a drag tracker.
- * 
- * @author melaasar
- */
-public class DelegatingDragEditPartsTracker
-	extends SelectionTool
-	implements DragTracker {
-
-	/**
-	 * The delegating editpart (the selectable)
-	 */
-	private EditPart delegatingEditPart;
-	/**
-	 * The delegate editpart (the dragable)
-	 */
-	private EditPart delegateEditPart;
-	/**
-	 * The initial mouse event upon dragging
-	 */
-	private MouseEvent initialME;
-
-	/**
-	 * Creates an instance of the delegating drag editparts tracker
-	 * 
-	 * @param delegatingEditPart the <code>EditPart</code> that the selection gets delegated to
-	 * @param delegateEditPart the <code>EditPart</code> that the drag gets delegated to.
-	 */
-	public DelegatingDragEditPartsTracker(
-		EditPart delegatingEditPart,
-		EditPart delegateEditPart) {
-		this.delegatingEditPart = delegatingEditPart;
-		this.delegateEditPart = delegateEditPart;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)
-	 */
-	protected boolean handleButtonDown(int button) {
-		setDragTracker(new SelectEditPartTracker(delegatingEditPart));
-		lockTargetEditPart(delegatingEditPart);
-		return true;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.Tool#mouseDown(org.eclipse.swt.events.MouseEvent, org.eclipse.gef.EditPartViewer)
-	 */
-	public void mouseDown(MouseEvent e, EditPartViewer viewer) {
-		initialME = e;
-		super.mouseDown(e, viewer);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted()
-	 */
-	protected boolean handleDragStarted() {
-		DragTracker tracker = delegateEditPart.getDragTracker(getTargetRequest());
-		if (tracker != null){
-			setDragTracker(tracker);
-			lockTargetEditPart(delegateEditPart);
-			tracker.mouseDown(initialME, getCurrentViewer());
-		}
-		return super.handleDragStarted();
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/SelectConnectionEditPartTracker.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/SelectConnectionEditPartTracker.java
deleted file mode 100644
index 6c927be..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/SelectConnectionEditPartTracker.java
+++ /dev/null

@@ -1,328 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.gef.ui.internal.tools;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.gef.tools.SelectEditPartTracker;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.gef.ui.internal.l10n.Cursors;
-import org.eclipse.swt.graphics.Cursor;
-
-/**
- * Specialized <code>SelectEditPartTracker</code> that allows for a request action to be 
- * taken on a <code>Connection</code> shapes anywhere along the extent of the line.  
- * Depending on whether the user clicks on a bendpoint along a line or on the line itself, 
- * this is interpreted as either a <code>RequestConstants.REQ_MOVE_BENDPOINT</code> request 
- * or a <code>RequestConstants.REQ_CREATE_BENDPOINT</code> request respectively.
- * 
- * @author sshaw
- * @canBeSeenBy %partners
- *
- */
-public class SelectConnectionEditPartTracker extends SelectEditPartTracker {
-
-	/**
-	 * Method SelectConnectionEditPartTracker.
-	 * @param owner ConnectionNodeEditPart that creates and owns the tracker object
-	 */
-	public SelectConnectionEditPartTracker(ConnectionEditPart owner) {
-		super(owner);
-	}
-
-	private Request sourceRequest;
-	private int index = -1;
-	private String type;
-	private boolean bSourceFeedback = false;
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)
-	 */
-	protected boolean handleButtonDown(int button) {
-		if (!super.handleButtonDown(button))
-			return false;
-
-		Point p = getLocation();
-		getConnection().translateToRelative(p);
-		
-		PointList points = getConnection().getPoints();
-		Dimension size = new Dimension(7, 7);
-		for (int i=1; i<points.size()-1; i++) {
-			Point ptCenter = points.getPoint(i);
-			Rectangle rect = new Rectangle( ptCenter.x - size.width / 2, ptCenter.y - size.height / 2, size.width, size.height);
-			
-			if (rect.contains(p)) {
-				setType(RequestConstants.REQ_MOVE_BENDPOINT);
-				setIndex(i);
-			}
-		}
-		
-		if (getIndex() == -1) {
-			setIndex(PointListUtilities.findNearestLineSegIndexOfPoint(getConnection().getPoints(), new Point(p.x, p.y)));
-	
-			setIndex(getIndex() - 1);
-			setType(RequestConstants.REQ_CREATE_BENDPOINT);
-		}
-		
-		return true;
-	}
-
-	/**
-	 * Determines if the the connection should be dragged or not.
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if dragging can occur, 
-	 * <code>false</code> otherwise.
-	 */
-	protected boolean shouldAllowDrag() {
-		return (getIndex() != -1);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
-	 */
-	protected boolean handleButtonUp(int button) {
-		boolean bExecuteDrag = isInState(STATE_DRAG_IN_PROGRESS) && shouldAllowDrag();
-		
-		boolean bRet = super.handleButtonUp(button);
-
-		if (bExecuteDrag) {
-			eraseSourceFeedback();
-			setCurrentCommand(getCommand());
-			executeCurrentCommand();
-		}
-
-		return bRet;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()
-	 */
-	protected boolean handleDragInProgress() {
-		if (isInState(STATE_DRAG_IN_PROGRESS) && shouldAllowDrag()) {
-			updateSourceRequest();
-			showSourceFeedback();
-			setCurrentCommand(getCommand());
-		}
-		return true;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted()
-	 */
-	protected boolean handleDragStarted() {
-		return stateTransition(STATE_DRAG, STATE_DRAG_IN_PROGRESS);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#calculateCursor()
-	 */
-	protected Cursor calculateCursor() {
-		if (getType() == RequestConstants.REQ_MOVE_BENDPOINT) {
-			return Cursors.CURSOR_SEG_MOVE;
-		}
-		
-		return getConnection().getCursor();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.Tool#deactivate()
-	 */
-	public void deactivate() {
-		if (!isInState(STATE_TERMINAL))
-			eraseSourceFeedback();
-		sourceRequest = null;
-		super.deactivate();
-	}
-
-	/**
-	 * @return boolean true if feedback is being displayed, false otherwise.
-	 */
-	private boolean isShowingFeedback() {
-		return bSourceFeedback;
-	}
-
-	/**
-	 * Method setShowingFeedback.
-	 * @param bSet boolean to set the feedback flag on or off.
-	 */
-	private void setShowingFeedback(boolean bSet) {
-		bSourceFeedback = bSet;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#createOperationSet()
-	 */
-	protected List createOperationSet() {
-		List list = new ArrayList();
-		list.add(getConnectionEditPart());
-		return list;
-	}
-	
-	/**
-	 * Method showSourceFeedback.
-	 * Show the source drag feedback for the drag occurring
-	 * within the viewer.
-	 */
-	private void showSourceFeedback() {
-		List editParts = getOperationSet();
-		for (int i = 0; i < editParts.size(); i++) {
-			EditPart editPart = (EditPart) editParts.get(i);
-			editPart.showSourceFeedback(getSourceRequest());
-		}
-		setShowingFeedback(true);
-	}
-
-	/**
-	 * Method eraseSourceFeedback.
-	 * Show the source drag feedback for the drag occurring
-	 * within the viewer.
-	 */
-	private void eraseSourceFeedback() {
-		if (!isShowingFeedback())
-			return;
-		setShowingFeedback(false);
-		List editParts = getOperationSet();
-
-		for (int i = 0; i < editParts.size(); i++) {
-			EditPart editPart = (EditPart) editParts.get(i);
-			editPart.eraseSourceFeedback(getSourceRequest());
-		}
-	}
-
-	/**
-	 * Method getSourceRequest.
-	 * @return Request
-	 */
-	private Request getSourceRequest() {
-		if (sourceRequest == null)
-			sourceRequest = createSourceRequest();
-		return sourceRequest;
-	}
-
-	/**
-	 * Determines the type of request that will be created for the drag
-	 * operation.
-	 * @return Object
-	 */
-	protected Object getType() {
-		return type;
-	}
-
-	/**
-	 * Sets the type of request that will be created for the drag operation.
-	 * 
-	 * @param type the <code>String</code> that represents the type of request.
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	/**
-	 * Creates the source request that is activated when the drag operation
-	 * occurs.
-	 * 
-	 * @return a <code>Request</code> that is the newly created source request
-	 */
-	protected Request createSourceRequest() {
-		BendpointRequest request = new BendpointRequest();
-		request.setType(getType());
-		request.setIndex(getIndex());
-		request.setSource((ConnectionEditPart)getSourceEditPart());
-		return request;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()
-	 */
-	protected Command getCommand() {
-		return getSourceEditPart().getCommand(getSourceRequest());
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
-	 */
-	protected String getCommandName() {
-		return getType().toString();
-	}
-
-	/**
-	 * @return the <code>Connection</code> that is referenced by the connection edit part.
-	 */
-	private Connection getConnection() {
-		return (Connection) getConnectionEditPart().getFigure();
-	}
-
-	/**
-	 * Method getConnectionEditPart.
-	 * @return ConnectionEditPart
-	 */
-	private ConnectionEditPart getConnectionEditPart() {
-		return (ConnectionEditPart)getSourceEditPart();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
-	 */
-	protected String getDebugName() {
-		return "Bendpoint Handle Tracker " + getCommandName(); //$NON-NLS-1$
-	}
-
-	/**
-	 * Gets the current line segment index that the user clicked on to 
-	 * activate the drag tracker.
-	 * 
-	 * @return int
-	 */
-	protected int getIndex() {
-		return index;
-	}
-
-	/**
-	 * Method setIndex.
-	 * Sets the current line segment index based on the location the user 
-	 * clicked on the connection.
-	 * @param i int representing the line segment index in the connection.
-	 */
-	public void setIndex(int i) {
-		index = i;
-	}
-
-	/**
-	 * Updates the source request to reflect the current location.
-	 */
-	protected void updateSourceRequest() {
-		BendpointRequest request = (BendpointRequest) getSourceRequest();
-		request.setLocation(getLocation());
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/package.html b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/package.html
deleted file mode 100644
index ff92f91..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/package.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
--->
-</head>
-<body>
-
-Provides a set of classes that extend from the org.eclipse.gef.tools.AbstractTool 
-hierarchy that are used for creating custom drag trackers and tools accessed from the
-palette.
-<p></p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>

diff --git a/org.eclipse.gmf.runtime.notation.providers/.classpath b/org.eclipse.gmf.runtime.notation.providers/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.runtime.notation.providers/.cvsignore b/org.eclipse.gmf.runtime.notation.providers/.cvsignore
deleted file mode 100644
index f9d708c..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-org
-org

diff --git a/org.eclipse.gmf.runtime.notation.providers/.options b/org.eclipse.gmf.runtime.notation.providers/.options
deleted file mode 100644
index ded80e5..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.options
+++ /dev/null

@@ -1,15 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.notation.providers plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.notation.providers plug-in
-org.eclipse.gmf.runtime.notation.providers/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.notation.providers/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting=false
-

diff --git a/org.eclipse.gmf.runtime.notation.providers/.project b/org.eclipse.gmf.runtime.notation.providers/.project
deleted file mode 100644
index 8652fc1..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.notation.providers</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.runtime.notation.providers/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.notation.providers/META-INF/MANIFEST.MF
deleted file mode 100644
index 81d2978..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.notation.providers; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.notation.providers.internal.util.NotationMSLPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.notation.providers.internal.copypaste;x-internal:=true,
- org.eclipse.gmf.runtime.notation.providers.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.notation.providers.internal.util;x-internal:=true
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.runtime.notation.providers/about.html b/org.eclipse.gmf.runtime.notation.providers/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.notation.providers/build.properties b/org.eclipse.gmf.runtime.notation.providers/build.properties
deleted file mode 100644
index 995e756..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               .options,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.notation.providers/plugin.properties b/org.eclipse.gmf.runtime.notation.providers/plugin.properties
deleted file mode 100644
index f706186..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Notation Metamodel
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.runtime.notation.providers/plugin.xml b/org.eclipse.gmf.runtime.notation.providers/plugin.xml
deleted file mode 100644
index ad4322f..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/plugin.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-   <extension
-         point="org.eclipse.gmf.runtime.emf.clipboard.core.clipboardSupport">
-      <factory
-            nsURI="http://www.eclipse.org/gmf/runtime/1.0.0/notation"
-            priority="lowest"
-            class="org.eclipse.gmf.runtime.notation.providers.internal.copypaste.ClipboardSupportFactory">
-      </factory>
-   </extension>
-
-</plugin>

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ClipboardSupportFactory.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ClipboardSupportFactory.java
deleted file mode 100644
index 1b0be37..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ClipboardSupportFactory.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.notation.providers.internal.copypaste;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportFactory;
-
-
-/**
- * Implementation of the extension point for creating clipboard support
- * utilities.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class ClipboardSupportFactory
-	implements IClipboardSupportFactory {
-
-	private final IClipboardSupport clipHelper =
-		new NotationClipboardOperationHelper();
-
-	/**
-	 * Initializes me.
-	 */
-	public ClipboardSupportFactory() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * Implements the interface method.
-	 */
-	public IClipboardSupport newClipboardSupport(EPackage ePackage) {
-		return clipHelper;
-	}
-
-}

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ConnectorViewPasteOperation.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ConnectorViewPasteOperation.java
deleted file mode 100644
index ba15f0d..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ConnectorViewPasteOperation.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.notation.providers.internal.copypaste;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardSupportUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ObjectInfo;
-import org.eclipse.gmf.runtime.emf.clipboard.core.OverridePasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PostPasteChildOperation;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author Yasser Lulu 
- */
-public class ConnectorViewPasteOperation
-	extends OverridePasteChildOperation {
-
-	private boolean pasteSemanticElement;
-
-	private Edge connectorView;
-
-	private View sourceView;
-
-	private View targetView;
-
-	/**
-	 * @param overriddenChildPasteOperation
-	 */
-	public ConnectorViewPasteOperation(
-		PasteChildOperation overriddenChildPasteOperation) {
-		super(overriddenChildPasteOperation);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation#paste()
-	 */
-	public void paste() throws Exception {
-		//basically delay...
-		connectorView = (Edge) getEObject();
-		sourceView = connectorView.getSource();
-		targetView = connectorView.getTarget();
-		EObject element = connectorView.getElement();
-		if (element != null) {
-			if (element.eIsProxy()) {
-				element = ClipboardSupportUtil.resolve(element,
-					getParentPasteProcess().getLoadedIDToEObjectMapCopy());
-			}
-			if (element.eIsProxy() == false) {
-				pasteSemanticElement = true;
-			}
-		}
-	}
-
-	protected boolean shouldPasteAlwaysCopyObject(
-		ObjectInfo alwaysCopyObjectInfo) {
-		return false;
-	}
-
-	protected PasteChildOperation makeAuxiliaryChildPasteProcess(
-		ObjectInfo auxiliaryChildEObjectInfo) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation#getPostPasteOperation()
-	 */
-	public PasteChildOperation getPostPasteOperation() {
-		return new PostPasteChildOperation(this, EMPTY_ARRAY) {
-
-			public void paste() throws Exception {
-				//delay
-			}
-
-			public PasteChildOperation getPostPasteOperation() {
-				return new PostPasteChildOperation(this, EMPTY_ARRAY) {
-
-					public void paste() throws Exception {
-						//delay
-					}
-
-					public PasteChildOperation getPostPasteOperation() {
-						return new ConnectorViewPostPasteChildOperation(
-							ConnectorViewPasteOperation.this,
-							ConnectorViewPasteOperation.this.pasteSemanticElement);
-					}
-				};
-			}
-		};
-	}
-
-	protected ObjectInfo getChildObjectInfo() {
-		return super.getChildObjectInfo();
-	}
-
-	protected List getAlwaysCopyObjectPasteOperations() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @return Returns the sourceView.
-	 */
-	protected View getSourceView() {
-		return sourceView;
-	}
-
-	/**
-	 * @return Returns the targetView.
-	 */
-	protected View getTargetView() {
-		return targetView;
-	}
-
-	/**
-	 * @return Returns the connectorView.
-	 */
-	protected Edge getConnectorView() {
-		return connectorView;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ConnectorViewPostPasteChildOperation.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ConnectorViewPostPasteChildOperation.java
deleted file mode 100644
index 91fb025..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/ConnectorViewPostPasteChildOperation.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.notation.providers.internal.copypaste;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardSupportUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ObjectInfo;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PostPasteChildOperation;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author Yasser Lulu
- */
-class ConnectorViewPostPasteChildOperation
-	extends PostPasteChildOperation {
-
-	private boolean pasteSemanticElement;
-
-	private List semanticElementPasteOperations;
-
-	ConnectorViewPostPasteChildOperation(
-			ConnectorViewPasteOperation connectorViewPasteOperation,
-			boolean pasteSemanticElement) {
-		super(connectorViewPasteOperation, EMPTY_ARRAY);
-		this.pasteSemanticElement = pasteSemanticElement;
-	}
-
-	private ConnectorViewPasteOperation getConnectorViewPasteOperation() {
-		return (ConnectorViewPasteOperation) getPasteChildOperation();
-	}
-
-	public void paste()
-		throws Exception {
-
-		EObject pastedElement = doPaste();
-		//did we succeed?
-		if (pastedElement != null) {
-			setPastedElement(pastedElement);
-			addPastedElement(pastedElement);
-		} else {
-			addPasteFailuresObject(getEObject());
-		}
-
-	}
-
-
-	/**
-	 * @return
-	 * @throws Exception
-	 */
-	private EObject doPaste()
-		throws Exception {
-
-		View sourceView = getConnectorViewPasteOperation().getSourceView();
-		View targetView = getConnectorViewPasteOperation().getTargetView();
-
-		if ((sourceView == null) || (targetView == null)) {
-			return null;
-		}
-
-		EObject sourceViewContainer = sourceView.eContainer();
-		EObject targetViewContainer = targetView.eContainer();
-
-		if ((sourceViewContainer == null) || (targetViewContainer == null)) {
-			return null;
-		}
-
-		if (sourceViewContainer.equals(targetViewContainer) == false) {
-			//not in the same container, let's try to see if they are in the
-			// same diagram at least
-			Diagram sourceViewDiagram = NotationClipboardOperationHelper
-				.getContainingDiagram((View) sourceViewContainer);
-			Diagram targetViewDiagram = NotationClipboardOperationHelper
-				.getContainingDiagram((View) targetViewContainer);
-			if ((sourceViewDiagram == null) || (targetViewDiagram == null)
-				|| (sourceViewDiagram.equals(targetViewDiagram) == false)) {
-				return null;
-			}
-		}
-		
-		Edge connectorView = getConnectorViewPasteOperation()
-			.getConnectorView();
-
-		if (pasteSemanticElement) {			
-			EObject semanticElement = connectorView.getElement();
-			if (semanticElement != null) {
-				if (semanticElement.eIsProxy()) {
-					semanticElement = ClipboardSupportUtil.resolve(semanticElement,
-						getParentPasteProcess().getLoadedIDToEObjectMapCopy());
-				}
-				String loadedId = getLoadedEObjectID(semanticElement);
-				if (loadedId != null) {
-					//even if we failed to paste the semantic element, we'll
-					// proceed to paste the edge view
-					doPasteSemanticElement();
-					//should have been pasted by now, if not then return
-					String newId = getEObjectID(semanticElement);
-					if (newId == null) {
-						return null;
-					}
-				}
-			}
-		}
-		EObject pastedElement = null;
-		Diagram pasteTargetDiagram = NotationClipboardOperationHelper
-			.getContainingDiagram((View) sourceViewContainer);
-		if (pasteTargetDiagram != null) {
-			//if we reached here then we should paste the connector and set
-			// refs to it accordingly
-			pastedElement = ClipboardSupportUtil.appendEObjectAt(
-				pasteTargetDiagram, getContainmentFeature(), connectorView);
-			if (pastedElement != null) {
-				ClipboardSupportUtil.appendEObjectAt(sourceView,
-					NotationPackage.eINSTANCE.getView_SourceEdges(),
-					connectorView);
-				ClipboardSupportUtil.appendEObjectAt(targetView,
-					NotationPackage.eINSTANCE.getView_TargetEdges(),
-					connectorView);
-			}
-		}
-
-		return pastedElement;
-	}
-
-	private void doPasteSemanticElement()
-		throws Exception {
-		List list = new ArrayList();
-		Iterator it = getSemanticElementPasteOperations().iterator();
-		while (it.hasNext()) {
-			PasteChildOperation operation = (PasteChildOperation) it.next();
-			operation.paste();
-			PasteChildOperation postPasteOperation = operation
-				.getPostPasteOperation();
-			if (postPasteOperation != null) {
-				list.add(postPasteOperation);
-			}
-		}
-		performSemanticElementPostPasteOperations(list);
-	}
-
-	private void performSemanticElementPostPasteOperations(List operations)
-		throws Exception {
-		if (operations.isEmpty() == false) {
-			List postPasteOperations = new ArrayList();
-			Iterator it = operations.iterator();
-			while (it.hasNext()) {
-				PasteChildOperation pasteOperation = (PasteChildOperation) it
-					.next();
-				pasteOperation.paste();
-				PasteChildOperation postPasteOperation = pasteOperation
-					.getPostPasteOperation();
-				if (postPasteOperation != null) {
-					postPasteOperations.add(postPasteOperation);
-				}
-			}
-			//perform those newly added post paste operations
-			performSemanticElementPostPasteOperations(postPasteOperations);
-		}
-	}
-
-	protected List getPostPasteOperations()
-		throws Exception {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @return
-	 */
-	private List getSemanticElementPasteOperations() {
-		if (semanticElementPasteOperations == null) {
-			semanticElementPasteOperations = new ArrayList();
-			//use either source or target views since by now they should have
-			// been pasted already
-			EObject semanticPasteTarget = NotationClipboardOperationHelper
-				.getSemanticPasteTarget(getConnectorViewPasteOperation()
-					.getSourceView());
-			if (semanticPasteTarget != null) {
-				Iterator alwaysCopyEObjectInfoIt = getChildObjectInfo()
-					.getCopyAlwaysObjectInfoList().iterator();
-				while (alwaysCopyEObjectInfoIt.hasNext()) {
-					ObjectInfo alwaysCopyObjectInfo = (ObjectInfo) alwaysCopyEObjectInfoIt
-						.next();
-					PasteChildOperation pasteOperation = new PasteChildOperation(
-						getParentPasteProcess().clone(semanticPasteTarget),
-						alwaysCopyObjectInfo);
-					semanticElementPasteOperations.add(pasteOperation);
-				} //while always-copy
-			}
-		}
-		return semanticElementPasteOperations;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/NotationClipboardOperationHelper.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/NotationClipboardOperationHelper.java
deleted file mode 100644
index f276fdb..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/NotationClipboardOperationHelper.java
+++ /dev/null

@@ -1,285 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.notation.providers.internal.copypaste;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardSupportUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.CopyOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.OverrideCopyOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.OverridePasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteAction;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteOption;
-import org.eclipse.gmf.runtime.emf.core.clipboard.AbstractClipboardSupport;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A minimal clipboard operation helper for the notation metamodel. Extenders of
- * the notation metamodel should probably provide their own implementation of
- * this via their own
- * {@link org.eclipse.gmf.runtime.emf.core.internal.services.metamodel.IMetamodelSupport}
- * implementation.
- * 
- * @author Christian W. Damus
- * @author Yasser Lulu
- */
-public class NotationClipboardOperationHelper
-	extends AbstractClipboardSupport {
-
-	public void destroy(EObject eObject) {
-		DestroyElementCommand.destroy(eObject);
-	}
-	
-	/**
-	 * By default, there are no collisions in pasting.
-	 * 
-	 * @return the {@link PasteAction#ADD}action, always
-	 */
-	public PasteAction getPasteCollisionAction(EClass eClass) {
-		return PasteAction.ADD;
-	}
-
-	/**
-	 * By default, the following paste options are supported:
-	 * <ul>
-	 * <li>{@link PasteOption#NORMAL}: always</li>
-	 * <li>{@link PasteOption#PARENT}: never</li>
-	 * <li>{@link PasteOption#DISTANT}: if and only only if the
-	 * <code>eStructuralFeature</code> is a
-	 * {@link org.eclipse.gmf.runtime.notation.View}'s reference to its semantic
-	 * {@linkplain org.eclipse.gmf.runtime.notation.View#getElement() element}</li>
-	 * </ul>
-	 */
-	public boolean hasPasteOption(EObject contextEObject,
-			EStructuralFeature eStructuralFeature, PasteOption pasteOption) {
-		if (pasteOption.equals(PasteOption.NORMAL)) {
-			return true;
-		} else if (pasteOption.equals(PasteOption.PARENT)) {
-			//disable the copy-parent functionality completely.
-			return false;
-		} else if (pasteOption.equals(PasteOption.DISTANT)) {
-			if (eStructuralFeature == null) {
-				return false;
-			} else {
-				return NotationPackage.eINSTANCE.getView_Element().equals(
-					eStructuralFeature);
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * By default, transient and derived references are never copied, and
-	 * containment references and the
-	 * {@linkplain org.eclipse.gmf.runtime.notation.View#getElement() element}reference
-	 * always are copied.
-	 */
-	public boolean isCopyAlways(EObject context, EReference eReference,
-			Object value) {
-		if ((eReference.isTransient()) || (eReference.isDerived())) {
-			return false;
-		} else if (eReference.equals(NotationPackage.eINSTANCE
-			.getView_Element())) {
-			return true;
-		} else {
-			return eReference.isContainment();
-		}
-	}
-
-	/**
-	 * By default, don't provide any child paste override behaviour.
-	 */
-	public boolean shouldOverrideChildPasteOperation(EObject parentElement,
-			EObject childEObject) {
-		return (childEObject.eClass().getEPackage() == NotationPackage.eINSTANCE);
-	}
-
-	/**
-	 * By default, don't provide any copy override behaviour.
-	 */
-	public boolean shouldOverrideCopyOperation(Collection eObjects, Map hintMap) {
-		return false;
-	}
-
-	private boolean shouldAllowPaste(
-			PasteChildOperation overriddenChildPasteOperation) {
-		EObject eObject = overriddenChildPasteOperation.getEObject();
-		EObject parentEObject = overriddenChildPasteOperation
-			.getParentEObject();
-		if ((parentEObject instanceof Diagram) && (eObject instanceof View)) {
-			EObject semanticChildElement = ((View) eObject).getElement();
-			if (semanticChildElement == null) {
-				return true;
-			}
-			if (semanticChildElement.eIsProxy()) {
-				semanticChildElement = ClipboardSupportUtil.resolve(
-					semanticChildElement, overriddenChildPasteOperation
-						.getParentPasteProcess().getLoadedIDToEObjectMapCopy());
-				if (semanticChildElement.eIsProxy()) {
-					semanticChildElement = EcoreUtil.resolve(
-						semanticChildElement, getResource(parentEObject));
-				}
-			}
-
-			EPackage semanticChildEpackage = semanticChildElement.eClass()
-				.getEPackage();
-			EPackage diagramRootContainerEpackage = EcoreUtil.getRootContainer(
-				parentEObject).eClass().getEPackage();
-			EPackage sematicDiagramRootContainerEpackage = null;
-			EObject sematicDiagramElement = ((View) parentEObject).getElement();
-			if (sematicDiagramElement != null) {
-				sematicDiagramRootContainerEpackage = EcoreUtil
-					.getRootContainer(sematicDiagramElement).eClass()
-					.getEPackage();
-			}
-
-			if (diagramRootContainerEpackage != NotationPackage.eINSTANCE) {
-				if (semanticChildEpackage != diagramRootContainerEpackage) {
-					return false;
-				}
-			}
-
-			if ((sematicDiagramRootContainerEpackage != null)
-				&& (sematicDiagramRootContainerEpackage != NotationPackage.eINSTANCE)) {
-				if (semanticChildEpackage != sematicDiagramRootContainerEpackage) {
-					return false;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * By default, don't provide any child paste override behaviour.
-	 * 
-	 * @return <code>null</code>, always
-	 */
-	public OverridePasteChildOperation getOverrideChildPasteOperation(
-			PasteChildOperation overriddenChildPasteOperation) {
-		if (shouldAllowPaste(overriddenChildPasteOperation)) {
-			EObject eObject = overriddenChildPasteOperation.getEObject();
-			if (eObject instanceof org.eclipse.gmf.runtime.notation.Node) {
-				org.eclipse.gmf.runtime.notation.Node node = (org.eclipse.gmf.runtime.notation.Node) eObject;
-				EObject element = node.getElement();
-				if ((element != null)) {
-					return new PositionalGeneralViewPasteOperation(
-						overriddenChildPasteOperation, true);
-				} else {
-					return new PositionalGeneralViewPasteOperation(
-						overriddenChildPasteOperation, false);
-				}
-			} else if (eObject instanceof Edge) {
-				return new ConnectorViewPasteOperation(
-					overriddenChildPasteOperation);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * By default, don't provide any copy override behaviour.
-	 * 
-	 * @return <code>null</code>, always
-	 */
-	public OverrideCopyOperation getOverrideCopyOperation(
-			CopyOperation overriddenCopyOperation) {
-		return null;
-	}
-
-	/**
-	 * By default, don't exclude any objects from the copy operation.
-	 * 
-	 * @return an empty collection
-	 */
-	public Collection getExcludedCopyObjects(Set eObjects) {
-		return Collections.EMPTY_SET;
-	}
-
-	/**
-	 * By default, just get the resource that contains the object.
-	 */
-	public XMLResource getResource(EObject eObject) {
-		XMLResource eResource = (XMLResource) eObject.eResource();
-		if (eResource == null) {
-			if (eObject instanceof View) {
-				EObject element = ((View) eObject).getElement();
-				if ((element != null)) {
-					return (XMLResource) element.eResource();
-				}
-			}
-		}
-		return eResource;
-	}
-
-	/**
-	 * By default, we always copy all contents of an object.
-	 * 
-	 * @return <code>true</code>
-	 */
-	public boolean shouldSaveContainmentFeature(EObject eObj) {
-		if (EcorePackage.eINSTANCE.getEClassifiers().contains(eObj.eClass())) {
-			return false;
-		}
-		try {
-			eObj.eResource().getURIFragment(eObj);
-		} catch (Exception ex) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * By default, there is no post processing to be done.
-	 */
-	public void performPostPasteProcessing(Set pastedEObjects) {
-		// nothing to do
-	}
-
-	static Diagram getContainingDiagram(View view) {
-		EObject current = view;
-		while (current != null) {
-			if (current instanceof Diagram) {
-				return (Diagram) current;
-			}
-			current = current.eContainer();
-		}
-		return null;
-	}
-
-	static EObject getSemanticPasteTarget(View view) {
-		Diagram diagram = getContainingDiagram(view);
-		if (diagram != null) {
-			return diagram.getElement();
-		}
-		return null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/PositionalGeneralViewPasteOperation.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/PositionalGeneralViewPasteOperation.java
deleted file mode 100644
index e0f29f0..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/PositionalGeneralViewPasteOperation.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.notation.providers.internal.copypaste;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.ObjectInfo;
-import org.eclipse.gmf.runtime.emf.clipboard.core.OverridePasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PostPasteChildOperation;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author Yasser Lulu
- */
-public class PositionalGeneralViewPasteOperation
-	extends OverridePasteChildOperation {
-
-	private boolean shouldPasteAlwaysCopyObject;
-
-	/**
-	 * @param overriddenChildPasteOperation
-	 */
-	public PositionalGeneralViewPasteOperation(
-			PasteChildOperation overriddenChildPasteOperation,
-			boolean shouldPasteAlwaysCopyObject) {
-		super(overriddenChildPasteOperation);
-		this.shouldPasteAlwaysCopyObject = shouldPasteAlwaysCopyObject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation#paste()
-	 */
-	public void paste()
-		throws Exception {
-		//		delay unsetting of connector refs
-	}
-
-	protected boolean shouldPasteAlwaysCopyObject(
-			ObjectInfo alwaysCopyObjectInfo) {
-		return shouldPasteAlwaysCopyObject;
-	}
-
-	public PasteChildOperation getPostPasteOperation() {
-
-		return new PostPasteChildOperation(this, EMPTY_ARRAY) {
-
-			public void paste()
-				throws Exception {
-				//unset connectors before pasting so that it won't affect
-				//real connectors especially if they happen to belong to the
-				// same
-				//target diagram
-				Node view = (Node) getEObject();
-				view.eUnset(NotationPackage.eINSTANCE.getView_SourceEdges());
-				view.eUnset(NotationPackage.eINSTANCE.getView_TargetEdges());
-
-				//now paste view
-				EObject pastedElement = doPasteInto(getParentEObject());
-				//did we succeed?
-				if (pastedElement != null) {
-					setPastedElement(pastedElement);
-					addPastedElement(pastedElement);
-				} else {
-					addPasteFailuresObject(getEObject());
-				}
-			}
-
-			protected boolean shouldPasteAlwaysCopyObject(
-					ObjectInfo alwaysCopyObjectInfo) {
-				return PositionalGeneralViewPasteOperation.this
-					.shouldPasteAlwaysCopyObject(alwaysCopyObjectInfo);
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.gmf.runtime.emf.core.internal.copypaste.PasteChildOperation#makeAuxiliaryChildPasteProcess(org.eclipse.gmf.runtime.emf.core.internal.copypaste.ObjectInfo)
-			 */
-			protected PasteChildOperation makeAuxiliaryChildPasteProcess(
-					ObjectInfo auxiliaryChildEObjectInfo) {				
-				EObject semanticPasteTarget = NotationClipboardOperationHelper
-					.getSemanticPasteTarget((View) getPastedElement());
-				if (semanticPasteTarget == null) {
-					return null;
-				}
-				return new PasteChildOperation(getParentPasteProcess().clone(
-					semanticPasteTarget), auxiliaryChildEObjectInfo);
-			}
-
-			public PasteChildOperation getPostPasteOperation() {
-				List operations = getAlwaysCopyObjectPasteOperations();
-				return new PostPasteChildOperation(this, operations);
-			}
-		};
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/l10n/NotationProvidersMessages.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/l10n/NotationProvidersMessages.java
deleted file mode 100644
index 3a02670..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/l10n/NotationProvidersMessages.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.gmf.runtime.notation.providers.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class NotationProvidersMessages
-	extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.notation.providers.internal.l10n.NotationProvidersMessages";//$NON-NLS-1$
-
-	private NotationProvidersMessages() {
-		// Do not instantiate
-	}
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, NotationProvidersMessages.class);
-	}
-}

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/l10n/NotationProvidersMessages.properties b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/l10n/NotationProvidersMessages.properties
deleted file mode 100644
index 7f377ff..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/l10n/NotationProvidersMessages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/util/NotationMSLDebugOptions.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/util/NotationMSLDebugOptions.java
deleted file mode 100644
index 630d305..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/util/NotationMSLDebugOptions.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.notation.providers.internal.util;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author rafikj
- */
-public final class NotationMSLDebugOptions {
-
-	private NotationMSLDebugOptions() {
-		// private
-	}
-
-	public static final String DEBUG = NotationMSLPlugin.getPluginId()
-		+ "/debug"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_CATCHING = DEBUG
-		+ "/exceptions/catching"; //$NON-NLS-1$
-
-	public static final String EXCEPTIONS_THROWING = DEBUG
-		+ "/exceptions/throwing"; //$NON-NLS-1$
-
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/util/NotationMSLPlugin.java b/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/util/NotationMSLPlugin.java
deleted file mode 100644
index 336c5f1..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/util/NotationMSLPlugin.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.notation.providers.internal.util;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The plug-in for EMF implementation of UML.
- * 
- * @author mgoyal
- */
-public class NotationMSLPlugin
-	extends Plugin {
-
-	/**
-	 * Extension point names.
-	 */
-	protected static final String UML2_PROFILES_EXT_P_NAME = "UMLProfiles"; //$NON-NLS-1$
-
-	protected static final String UML2_LIBRARIES_EXT_P_NAME = "UMLLibraries"; //$NON-NLS-1$
-
-	/**
-	 * This plug-in's shared instance.
-	 */
-	private static NotationMSLPlugin plugin;
-
-	/**
-	 * Creates a new plug-in runtime object for the given plug-in descriptor.
-	 * 
-	 * @param descriptor
-	 *            The plug-in descriptor.
-	 */
-	public NotationMSLPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static NotationMSLPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Retrieves the unique identifier of this plug-in.
-	 * 
-	 * @return A non-empty string which is unique within the plug-in registry.
-	 */
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.runtime.rcp-feature/.project b/org.eclipse.gmf.runtime.rcp-feature/.project
deleted file mode 100644
index d345621..0000000
--- a/org.eclipse.gmf.runtime.rcp-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.rcp-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.gmf.runtime.rcp-feature/build.properties b/org.eclipse.gmf.runtime.rcp-feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/org.eclipse.gmf.runtime.rcp-feature/build.properties
+++ /dev/null

@@ -1 +0,0 @@
-bin.includes = feature.xml

diff --git a/org.eclipse.gmf.runtime.rcp-feature/feature.xml b/org.eclipse.gmf.runtime.rcp-feature/feature.xml
deleted file mode 100644
index 2e9a377..0000000
--- a/org.eclipse.gmf.runtime.rcp-feature/feature.xml
+++ /dev/null

@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.gmf.runtime.rcp"
-      label="GMF RCP Runtime"
-      version="2.0.0"
-      provider-name="Eclipse.org">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.rcp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.gef"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.rcp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.gmf.platform"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
-      <import plugin="com.ibm.icu" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.team.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.ui.services.action" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.ui.services" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.notation" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.type.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.commands.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.gef.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.ui.action" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.aspectj.runtime"/>
-      <import plugin="org.eclipse.gmf.dev"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.ui.services.dnd" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.providers" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.actions" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.ui.printing" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.printing" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui.render" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.ui.properties" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.common.ui.services.properties" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.properties" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui.render.awt" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.apache.batik" version="1.6.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.workspace" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.clipboard.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.action"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.printing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.services.action"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.services.dnd"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.common.ui.services.properties"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.actions"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.dnd"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.geoshapes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.printing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.printing.render"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.properties"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.providers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.render"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.diagram.ui.resources.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.draw2d.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.draw2d.ui.render"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.draw2d.ui.render.awt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.clipboard.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.commands.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.type.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.type.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.emf.ui.properties"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.gef.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.notation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.notation.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.notation.providers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/org.eclipse.gmf.tests.runtime.common.core/.classpath b/org.eclipse.gmf.tests.runtime.common.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.common.core/.cvsignore b/org.eclipse.gmf.tests.runtime.common.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.common.core/.project b/org.eclipse.gmf.tests.runtime.common.core/.project
deleted file mode 100644
index 3a41f69..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.common.core</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.tests.runtime.common.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.common.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 788c86c..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.common.core
-Bundle-Version: 1.0.3.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.common.core.Activator
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.common.core;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.core.internal.command;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.core.internal.service;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.core.internal.util;x-friends:="org.eclipse.gmf.tests.runtime.emf.ui,org.eclipse.gmf.tests.runtime.diagram.ui"
-Require-Bundle: org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.common.core/about.html b/org.eclipse.gmf.tests.runtime.common.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.core/build.properties b/org.eclipse.gmf.tests.runtime.common.core/build.properties
deleted file mode 100644
index d3350e8..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.common.core/plugin.properties b/org.eclipse.gmf.tests.runtime.common.core/plugin.properties
deleted file mode 100644
index 8b64d48..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Common Core Tests
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/Activator.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/Activator.java
deleted file mode 100644
index 7c402de..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/Activator.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.core;
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Linda Damus
- */
-public class Activator extends Plugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/AllTests.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/AllTests.java
deleted file mode 100644
index d1dfcc2..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/AllTests.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.common.core.internal.command.AbstractCommandTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.command.CompositeCommandTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.command.FileModificationApproverTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.command.OneTimeCommandTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.service.AbstractProviderTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.service.ExecutionStrategyTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.service.ProviderPriorityTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.service.ServiceTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.util.HashUtilTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.util.ProxyTest;
-import org.eclipse.gmf.tests.runtime.common.core.internal.util.StringUtilTest;
-
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        TestSuite suite = new TestSuite();
-        suite.addTest(AbstractCommandTest.suite());
-        suite.addTest(AbstractProviderTest.suite());
-        suite.addTest(CompositeCommandTest.suite());
-		suite.addTest(ExecutionStrategyTest.suite());
-        suite.addTest(FileModificationApproverTest.suite());
-        suite.addTest(HashUtilTest.suite());
-        suite.addTest(OneTimeCommandTest.suite());
-        suite.addTest(ProviderPriorityTest.suite());
-        suite.addTest(ProxyTest.suite());
-        suite.addTest(StringUtilTest.suite());
-        suite.addTest(ServiceTest.suite());
-        return suite;
-    }
-
-    public AllTests() {
-        super(""); //$NON-NLS-1$
-    }
-
-    public Object run(Object args) throws Exception {
-        TestRunner.run(suite());
-        return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/CommonCoreTestsStatusCodes.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/CommonCoreTestsStatusCodes.java
deleted file mode 100644
index 3e559e7..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/CommonCoreTestsStatusCodes.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class CommonCoreTestsStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonCoreTestsStatusCodes() {
-		/* private constructor */
-	}
-
-	/**
-	 * Status code indicating that everything is OK.
-	 */
-	public static final int OK = 0;
-
-	/**
-	 * Status code indicating that an error occurred during plug-in start-up.
-	 */
-	public static final int PLUGIN_STARTUP_FAILURE = 1;
-
-	/**
-	 * Status code indicating that an error occurred during plug-in shut-down.
-	 */
-	public static final int PLUGIN_SHUTDOWN_FAILURE = 2;
-
-	/**
-	 * Status code indicating that an error occurred with internationalization.
-	 */
-	public static final int L10N_FAILURE = 3;
-
-	/**
-	 * Status code indicating that an error occurred with a command.
-	 */
-	public static final int COMMAND_FAILURE = 4;
-	
-	/**
-	 * Status code indicating that an error occurred with a service.
-	 */
-	public static final int SERVICE_FAILURE = 5;
-	
-	/**
-	 * Status code indicating that an operation was cancelled.
-	 */
-	public static final int CANCELLED = 6;
-	
-	/**
-	 * Status code indicating that an operation was rolled back due to live
-	 * validation errors.
-	 */
-	public static final int VALIDATION_FAILURE = 7;
-	
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/AbstractCommandTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/AbstractCommandTest.java
deleted file mode 100644
index 2f23750..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/AbstractCommandTest.java
+++ /dev/null

@@ -1,438 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.command;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.ObjectUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-/**
- * Tests the {@link AbstractCommand}.
- * 
- * @author ldamus
- */
-public class AbstractCommandTest
-    extends TestCase {
-
-    private IOperationHistory history;
-    private IProject project;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(AbstractCommandTest.class);
-    }
-
-    public AbstractCommandTest(String name) {
-        super(name);
-    }
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-
-        history = OperationHistoryFactory.getOperationHistory();
-
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        project = root.getProject("AbstractCommandTest"); //$NON-NLS-1$
-        project.create(null);
-        project.open(null);
-    }
-
-    protected void tearDown()
-        throws Exception {
-        super.tearDown();
-
-        project.close(new NullProgressMonitor());
-        project.delete(true, true, new NullProgressMonitor());
-        project = null;
-        history = null;
-    }
-
-    private List getFiles(String str) {
-        IFile file = project.getFile(str);
-        return Collections.singletonList(file);
-    }
-
-    /**
-     * Tests that commands can be executed, undone and redone through the
-     * operation history.
-     */
-    public void test_execute_undo_redo() {
-        String name = "test_execute_undo_redo"; //$NON-NLS-1$
-        TestCommand c = new TestCommand(name, null);
-        IUndoContext ctx = new ObjectUndoContext(this);
-
-        try {
-            c.addContext(ctx);
-            history.execute(c, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        c.assertExecuted();
-
-        try {
-            assertTrue(history.canUndo(ctx));
-            history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        c.assertUndone();
-
-        try {
-            assertTrue(history.canRedo(ctx));
-            history.redo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        c.assertRedone();
-    }
-
-    /**
-     * Tests that composing two commands results in a command that combines the
-     * contexts and affected files from both children.
-     */
-    public void test_compose() {
-        String name = "test_compose"; //$NON-NLS-1$
-
-        IUndoContext ctx1 = new UndoContext();
-        IUndoContext ctx2 = new UndoContext();
-
-        ICommand c1 = new TestCommand(name, getFiles("compose1")); //$NON-NLS-1$
-        c1.addContext(ctx1);
-
-        ICommand c2 = new TestCommand(name, getFiles("compose2")); //$NON-NLS-1$
-        c2.addContext(ctx2);
-
-        List threeFiles = new ArrayList(3);
-        threeFiles.addAll(c1.getAffectedFiles());
-        threeFiles.addAll(c2.getAffectedFiles());
-        threeFiles.add(getFiles("compose3")); //$NON-NLS-1$
-        ICommand c3 = new TestCommand(name, threeFiles);
-
-        ICommand composition = c1.compose(c2).compose(c3);
-
-        List affectedFiles = composition.getAffectedFiles();
-        assertTrue(affectedFiles.containsAll(c1.getAffectedFiles()));
-        assertTrue(affectedFiles.containsAll(c2.getAffectedFiles()));
-        
-        // should be no duplicates
-        assertEquals(3, affectedFiles.size());
-
-        List contexts = Arrays.asList(composition.getContexts());
-        assertTrue(contexts.contains(ctx1));
-        assertTrue(contexts.contains(ctx2));
-    }
-
-    /**
-     * Tests that the reduction of an AbstractCommand returns itself.
-     */
-    public void test_reduce() {
-        String name = "test_reduce"; //$NON-NLS-1$
-
-        ICommand c = new TestCommand(name, null);
-        ICommand reduction = c.reduce();
-
-        assertSame(c, reduction);
-    }
-
-    /**
-     * Tests that the affected files set in the command constructor are
-     * available through the getAffectedFiles() method.
-     */
-    public void test_getAffectedFiles() {
-        String fixtureName = "test_getAffectedFiles"; //$NON-NLS-1$
-
-        // no affected files
-        ICommand c = new TestCommand(fixtureName, null);
-        assertTrue(c.getAffectedFiles().isEmpty());
-
-        // an affected file
-        List affectedFiles = getFiles("null:/AbstractCommandTest"); //$NON-NLS-1$
-
-        c = new TestCommand(fixtureName, affectedFiles);
-
-        assertEquals(affectedFiles.size(), c.getAffectedFiles().size());
-        assertTrue(c.getAffectedFiles().containsAll(affectedFiles));
-    }
-    
-    /**
-	 * Verifies that no exceptions are thrown when a command is executed, undone
-	 * or redone that has no command result.
-	 */
-    public void test_noCommandResult_146064() {
-    	 String name = "test_noCommandResult_146064"; //$NON-NLS-1$
-         TestCommand c = new TestCommandNoResults(name, null);
-         IUndoContext ctx = new ObjectUndoContext(this);
-
-         try {
-             c.addContext(ctx);
-             history.execute(c, new NullProgressMonitor(), null);
-         } catch (ExecutionException e) {
-             e.printStackTrace();
-             fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-         }
-
-         c.assertExecuted();
-
-         try {
-             assertTrue(history.canUndo(ctx));
-             history.undo(ctx, new NullProgressMonitor(), null);
-         } catch (ExecutionException e) {
-             e.printStackTrace();
-             fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-         }
-
-         c.assertUndone();
-
-         try {
-             assertTrue(history.canRedo(ctx));
-             history.redo(ctx, new NullProgressMonitor(), null);
-         } catch (ExecutionException e) {
-             e.printStackTrace();
-             fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-         }
-
-         c.assertRedone();
-    }
-    
-    /**
-	 * Verifies that subclasses of AbstractCommand don't need to check whether
-	 * or not the progress monitor input to #doExecute, #doUndo and #doRedo is
-	 * null.
-	 */
-	public void test_nullMonitor_149057() {
-		TestCommandWithProgress c = new TestCommandWithProgress(
-				"test_nullMonitor_149057");  //$NON-NLS-1$
-		
-		IUndoContext ctx = new ObjectUndoContext(this);
-
-        try {
-            c.addContext(ctx);
-            history.execute(c, null, null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getCause()); //$NON-NLS-1$
-        }
-
-        c.assertExecuted();
-
-        try {
-            assertTrue(history.canUndo(ctx));
-            history.undo(ctx, null, null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getCause()); //$NON-NLS-1$
-        }
-
-        c.assertUndone();
-
-        try {
-            assertTrue(history.canRedo(ctx));
-            history.redo(ctx, null, null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getCause()); //$NON-NLS-1$
-        }
-
-        c.assertRedone();
-	}
-
-    // 
-    // TEST FIXTURES
-    //
-
-    protected static class TestCommand
-        extends AbstractCommand {
-
-        private static final String EXECUTED = "executed"; //$NON-NLS-1$
-
-        private static final String UNDONE = "undone"; //$NON-NLS-1$
-
-        private static final String REDONE = "redone"; //$NON-NLS-1$
-
-        protected boolean executed;
-
-        protected boolean undone;
-
-        protected boolean redone;
-
-        public TestCommand(String label, List affectedFiles) {
-            super(label, affectedFiles);
-        }
-
-        protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = true;
-            undone = false;
-            redone = false;
-            return CommandResult.newOKCommandResult(EXECUTED);
-        }
-
-        protected CommandResult doRedoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = false;
-            redone = true;
-            return CommandResult.newOKCommandResult(REDONE);
-        }
-
-        protected CommandResult doUndoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = true;
-            redone = false;
-            return CommandResult.newOKCommandResult(UNDONE);
-        }
-
-        public void assertExecuted() {
-            assertTrue(executed);
-            assertFalse(undone);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(EXECUTED, getCommandResult().getReturnValue());
-        }
-
-        public void assertUndone() {
-            assertTrue(undone);
-            assertFalse(executed);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(UNDONE, getCommandResult().getReturnValue());
-        }
-
-        public void assertRedone() {
-            assertTrue(redone);
-            assertFalse(undone);
-            assertFalse(executed);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(REDONE, getCommandResult().getReturnValue());
-        }
-    }
-    
-    protected static class TestCommandNoResults extends TestCommand {
-
-		public TestCommandNoResults(String label, List affectedFiles) {
-			super(label, affectedFiles);
-		}
-
-		protected CommandResult doExecuteWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-
-			super.doExecuteWithResult(progressMonitor, info);
-			return null;
-		}
-
-		protected CommandResult doRedoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			super.doRedoWithResult(progressMonitor, info);
-			return null;
-		}
-
-		protected CommandResult doUndoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			super.doUndoWithResult(progressMonitor, info);
-			return null;
-		}
-		
-        public void assertExecuted() {
-            assertTrue(executed);
-            assertFalse(undone);
-            assertFalse(redone);
-            assertNull(getCommandResult());
-        }
-
-        public void assertUndone() {
-            assertTrue(undone);
-            assertFalse(executed);
-            assertFalse(redone);
-            assertNull(getCommandResult());
-        }
-
-        public void assertRedone() {
-            assertTrue(redone);
-            assertFalse(undone);
-            assertFalse(executed);
-            assertNull(getCommandResult());
-        }
-	}
-    
-    protected static class TestCommandWithProgress extends TestCommand {
-
-		public TestCommandWithProgress(String label) {
-			super(label, null);
-		}
-
-		protected CommandResult doExecuteWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			progressMonitor.worked(1);
-			return super.doExecuteWithResult(progressMonitor, info);
-		}
-
-		protected CommandResult doRedoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			progressMonitor.worked(1);
-			return super.doRedoWithResult(progressMonitor, info);
-		}
-
-		protected CommandResult doUndoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			progressMonitor.worked(1);
-			return super.doUndoWithResult(progressMonitor, info);
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/CompositeCommandTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/CompositeCommandTest.java
deleted file mode 100644
index 7d5e585..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/CompositeCommandTest.java
+++ /dev/null

@@ -1,1059 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.command;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.ListIterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-/**
- * Tests the {@link AbstractCommand}.
- * 
- * @author ldamus
- */
-public class CompositeCommandTest
-    extends TestCase {
-
-    private IOperationHistory history;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(CompositeCommandTest.class);
-    }
-
-    public CompositeCommandTest(String name) {
-        super(name);
-    }
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-        history = OperationHistoryFactory.getOperationHistory();
-    }
-
-    /**
-     * Records a failure due to an exception that should not have been thrown.
-     * 
-     * @param e
-     *            the exception
-     */
-    protected void fail(Exception e) {
-        e.printStackTrace();
-        fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-    }
-
-    /**
-     * Tests that the undo contexts of the composite correctly aggregate the
-     * contexts of the children that it contains.
-     */
-    public void test_contexts() {
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        IUndoContext ctx1 = new UndoContext();
-        IUndoContext ctx2 = new UndoContext();
-        IUndoContext ctx3 = new UndoContext();
-
-        ICommand child1 = new TestCommand();
-        ICommand child2 = new TestCommand();
-        ICommand child3 = new TestCommand();
-
-        // configure some contexts
-        child1.addContext(ctx1);
-        child2.addContext(ctx2);
-        child2.addContext(ctx1);
-        child3.addContext(ctx3);
-
-        // no contexts, yet
-        assertEquals(Collections.EMPTY_LIST, Arrays.asList(composite
-            .getContexts()));
-
-        composite.add(child1);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1}), Arrays
-            .asList(composite.getContexts()));
-
-        // note that we don't get ctx1 twice
-        composite.add(child2);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1, ctx2}), Arrays
-            .asList(composite.getContexts()));
-
-        composite.add(child3);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1, ctx2, ctx3}),
-            Arrays.asList(composite.getContexts()));
-
-        // still have ctx1, but not ctx2
-        composite.remove(child2);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1, ctx3}), Arrays
-            .asList(composite.getContexts()));
-
-        composite.remove(child1);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx3}), Arrays
-            .asList(composite.getContexts()));
-
-        composite.remove(child3);
-        assertEquals(Collections.EMPTY_LIST, Arrays.asList(composite
-            .getContexts()));
-    }
-
-    /**
-     * Tests that the undo contexts of the composite correctly aggregate the
-     * contexts of the children that it contains, when manipulating the children
-     * using a list iterator.
-     */
-    public void test_contexts_listIterator() {
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        IUndoContext ctx1 = new UndoContext();
-        IUndoContext ctx2 = new UndoContext();
-        IUndoContext ctx3 = new UndoContext();
-
-        ICommand child1 = new TestCommand();
-        ICommand child2 = new TestCommand();
-        ICommand child3 = new TestCommand();
-
-        // configure some contexts
-        child1.addContext(ctx1);
-        child2.addContext(ctx2);
-        child2.addContext(ctx1);
-        child3.addContext(ctx3);
-
-        ListIterator iter = composite.listIterator();
-
-        // no contexts, yet
-        assertEquals(Collections.EMPTY_LIST, Arrays.asList(composite
-            .getContexts()));
-
-        iter.add(child1);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1}), Arrays
-            .asList(composite.getContexts()));
-
-        // note that we don't get ctx1 twice
-        iter.add(child2);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1, ctx2}), Arrays
-            .asList(composite.getContexts()));
-
-        iter.add(child3);
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1, ctx2, ctx3}),
-            Arrays.asList(composite.getContexts()));
-
-        // still have ctx1, but not ctx2 when we remove child2
-        iter.previous();
-        iter.previous();
-        iter.remove();
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx1, ctx3}), Arrays
-            .asList(composite.getContexts()));
-
-        // removing child1
-        iter.previous();
-        iter.remove();
-        assertEquals(Arrays.asList(new IUndoContext[] {ctx3}), Arrays
-            .asList(composite.getContexts()));
-
-        // removing child3
-        iter.next();
-        iter.remove();
-        assertEquals(Collections.EMPTY_LIST, Arrays.asList(composite
-            .getContexts()));
-    }
-
-    /**
-     * Tests the aggregation of canUndo() from child operations.
-     */
-    public void test_canUndo() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-        CompositeCommand composite2 = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        composite.add(new TestCommand());
-        composite.add(new TestCommand());
-        composite.add(composite2);
-        composite.add(new TestCommand());
-
-        composite2.add(new TestCommand());
-        composite2.add(new TestCommand(true, false)); // can't undo this one
-        composite2.add(new TestCommand());
-
-        composite.addContext(ctx);
-        assertTrue(composite.canExecute());
-
-        try {
-            history.execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        assertFalse(composite.canUndo());
-        assertFalse(history.canUndo(ctx));
-    }
-
-    /**
-     * Tests the aggregation of canRedo() from child operations.
-     */
-    public void test_canRedo() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-        CompositeCommand composite2 = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        composite.add(new TestCommand());
-        composite.add(new TestCommand());
-        composite.add(composite2);
-        composite.add(new TestCommand());
-
-        composite2.add(new TestCommand());
-        composite2.add(new TestCommand(true, true, false)); // can undo but not
-        // redo
-        composite2.add(new TestCommand());
-
-        composite.addContext(ctx);
-        assertTrue(composite.canExecute());
-
-        try {
-            history.execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        assertTrue(composite.canUndo());
-        assertTrue(history.canUndo(ctx));
-
-        try {
-            history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        assertFalse(composite.canRedo());
-        assertFalse(history.canRedo(ctx));
-    }
-
-    public void test_execute_undo_redo() {
-
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        TestCommand child1 = new TestCommand();
-        TestCommand child2 = new TestCommand();
-        TestCommand child3 = new TestCommand();
-
-        composite.add(child1);
-        composite.add(child2);
-        composite.add(child3);
-
-        try {
-            composite.addContext(ctx);
-            history.execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        child1.assertExecuted();
-        child2.assertExecuted();
-        child3.assertExecuted();
-
-        CommandResult result = composite.getCommandResult();
-
-        IStatus status = result.getStatus();
-        assertTrue(status.isOK());
-
-        Object returnValue = result.getReturnValue();
-        assertTrue(returnValue instanceof Collection);
-
-        Collection collection = (Collection) returnValue;
-        assertEquals(3, collection.size());
-        assertTrue(collection.contains(child1.getCommandResult()
-            .getReturnValue()));
-        assertTrue(collection.contains(child2.getCommandResult()
-            .getReturnValue()));
-        assertTrue(collection.contains(child3.getCommandResult()
-            .getReturnValue()));
-
-        try {
-            assertTrue(history.canUndo(ctx));
-            history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        child1.assertUndone();
-        child2.assertUndone();
-        child3.assertUndone();
-
-        result = composite.getCommandResult();
-
-        status = result.getStatus();
-        assertTrue(status.isOK());
-
-        returnValue = result.getReturnValue();
-        assertTrue(returnValue instanceof Collection);
-
-        collection = (Collection) returnValue;
-        assertEquals(3, collection.size());
-        assertTrue(collection.contains(child1.getCommandResult()
-            .getReturnValue()));
-        assertTrue(collection.contains(child2.getCommandResult()
-            .getReturnValue()));
-        assertTrue(collection.contains(child3.getCommandResult()
-            .getReturnValue()));
-
-        try {
-            assertTrue(history.canRedo(ctx));
-            history.redo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        child1.assertRedone();
-        child2.assertRedone();
-        child3.assertRedone();
-
-        result = composite.getCommandResult();
-
-        status = result.getStatus();
-        assertTrue(status.isOK());
-
-        returnValue = result.getReturnValue();
-        assertTrue(returnValue instanceof Collection);
-
-        collection = (Collection) returnValue;
-        assertEquals(3, collection.size());
-        assertTrue(collection.contains(child1.getCommandResult()
-            .getReturnValue()));
-        assertTrue(collection.contains(child2.getCommandResult()
-            .getReturnValue()));
-        assertTrue(collection.contains(child3.getCommandResult()
-            .getReturnValue()));
-    }
-
-    /**
-     * Tests error detection during execution.
-     */
-    public void test_execute_error() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation c = new FailCancelOperation(ERROR_STATUS,
-            Status.OK_STATUS, Status.OK_STATUS, false);
-        composite.add(c);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertFalse(marker2.wasExecuted);
-        assertTrue(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.ERROR, status.getSeverity());
-    }
-
-    /**
-     * Tests cancel-status detection during execution.
-     */
-    public void test_execute_cancel() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.CANCEL_STATUS,
-            Status.OK_STATUS, Status.OK_STATUS, false);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertFalse(marker2.wasExecuted);
-        assertTrue(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.CANCEL, status.getSeverity());
-    }
-
-    /**
-     * Tests monitor-cancel detection during execution.
-     */
-    public void test_execute_cancelMonitor() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.CANCEL_STATUS,
-            Status.OK_STATUS, Status.OK_STATUS, true);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertFalse(marker2.wasExecuted);
-        assertTrue(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.CANCEL, status.getSeverity());
-    }
-
-    /**
-     * Tests error detection during undo.
-     */
-    public void test_undo_error() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.OK_STATUS,
-            ERROR_STATUS, Status.OK_STATUS, false);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertTrue(marker2.wasExecuted);
-        assertFalse(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertFalse(marker1.wasUndone);
-        assertTrue(marker2.wasUndone);
-        assertTrue(marker2.wasRedone);
-
-        // check overall operation status
-        assertEquals(IStatus.ERROR, status.getSeverity());
-    }
-
-    /**
-     * Tests cancel-status detection during undo.
-     */
-    public void test_undo_cancel() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.OK_STATUS,
-            Status.CANCEL_STATUS, Status.OK_STATUS, false);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertTrue(marker2.wasExecuted);
-        assertFalse(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertFalse(marker1.wasUndone);
-        assertTrue(marker2.wasUndone);
-        assertTrue(marker2.wasRedone);
-
-        // check overall operation status
-        assertEquals(IStatus.CANCEL, status.getSeverity());
-    }
-
-    /**
-     * Tests monitor-cancel detection during undo.
-     */
-    public void test_undo_cancelMonitor() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.OK_STATUS,
-            Status.CANCEL_STATUS, Status.OK_STATUS, true);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertTrue(marker2.wasExecuted);
-        assertFalse(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertFalse(marker1.wasUndone);
-        assertTrue(marker2.wasUndone);
-        assertTrue(marker2.wasRedone);
-
-        // check overall operation status
-        assertEquals(IStatus.CANCEL, status.getSeverity());
-    }
-
-    /**
-     * Tests error detection during redo.
-     */
-    public void test_redo_error() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.OK_STATUS,
-            Status.OK_STATUS, ERROR_STATUS, false);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertTrue(marker2.wasExecuted);
-        assertFalse(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertTrue(marker1.wasUndone);
-        assertTrue(marker2.wasUndone);
-        assertFalse(marker2.wasRedone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.redo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertTrue(marker1.wasRedone);
-        assertFalse(marker2.wasRedone);
-        assertTrue(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.ERROR, status.getSeverity());
-    }
-
-    /**
-     * Tests cancel-status detection during redo.
-     */
-    public void test_redo_cancel() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.OK_STATUS,
-            Status.OK_STATUS, Status.CANCEL_STATUS, false);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertTrue(marker2.wasExecuted);
-        assertFalse(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertTrue(marker1.wasUndone);
-        assertTrue(marker2.wasUndone);
-        assertFalse(marker2.wasRedone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.redo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertTrue(marker1.wasRedone);
-        assertFalse(marker2.wasRedone);
-        assertTrue(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.CANCEL, status.getSeverity());
-    }
-
-    /**
-     * Tests monitor-cancel detection during redo.
-     */
-    public void test_redo_cancelMonitor() {
-        IUndoContext ctx = new UndoContext();
-
-        CompositeCommand composite = new CompositeCommand("Composite"); //$NON-NLS-1$
-
-        MarkerOperation marker1 = new MarkerOperation();
-        composite.add(marker1);
-
-        FailCancelOperation op = new FailCancelOperation(Status.OK_STATUS,
-            Status.OK_STATUS, Status.CANCEL_STATUS, true);
-        composite.add(op);
-
-        MarkerOperation marker2 = new MarkerOperation();
-        composite.add(marker2);
-
-        IStatus status = null;
-
-        try {
-            composite.addContext(ctx);
-            status = history
-                .execute(composite, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were executed and which rolled back
-        assertTrue(marker1.wasExecuted);
-        assertTrue(marker2.wasExecuted);
-        assertFalse(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertTrue(marker1.wasUndone);
-        assertTrue(marker2.wasUndone);
-        assertFalse(marker2.wasRedone);
-
-        // check overall operation status
-        assertEquals(IStatus.OK, status.getSeverity());
-
-        marker1.reset();
-        marker2.reset();
-
-        try {
-            status = history.redo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        // check which markers were undone and which were redone
-        assertTrue(marker1.wasRedone);
-        assertFalse(marker2.wasRedone);
-        assertTrue(marker1.wasUndone);
-
-        // check overall operation status
-        assertEquals(IStatus.CANCEL, status.getSeverity());
-    }
-
-    //
-    // TEST FIXTURES
-    //
-
-    private static IStatus ERROR_STATUS = new Status(IStatus.ERROR,
-        "error", 1, "no message", null); //$NON-NLS-1$ //$NON-NLS-2$
-
-    protected static class TestCommand
-        extends AbstractCommand {
-
-        private boolean executed;
-
-        private boolean undone;
-
-        private boolean redone;
-
-        private final boolean isExecutable;
-
-        private final boolean isUndoable;
-
-        private final boolean isRedoable;
-
-        public TestCommand() {
-            this(true, true, true, null);
-        }
-
-        public TestCommand(List affectedFiles) {
-            this(true, true, true, affectedFiles);
-        }
-
-        public TestCommand(boolean isExecutable) {
-            this(isExecutable, true, true, null);
-        }
-
-        public TestCommand(boolean isExecutable, boolean isUndoable) {
-            this(isExecutable, isUndoable, true, null);
-        }
-
-        public TestCommand(boolean isExecutable, boolean isUndoable,
-                boolean isRedoable) {
-            this(isExecutable, isUndoable, isRedoable, null);
-        }
-
-        public TestCommand(boolean isExecutable, boolean isUndoable,
-                boolean isRedoable, List affectedFiles) {
-            super("TestCommand", affectedFiles); //$NON-NLS-1$
-
-            this.isExecutable = isExecutable;
-            this.isUndoable = isUndoable;
-            this.isRedoable = isRedoable;
-        }
-
-        public boolean canExecute() {
-            return isExecutable;
-        }
-
-        public boolean canUndo() {
-            return isUndoable;
-        }
-
-        public boolean canRedo() {
-            return isRedoable;
-        }
-
-        protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = true;
-            undone = false;
-            redone = false;
-            return CommandResult.newOKCommandResult(this);
-        }
-
-        protected CommandResult doRedoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = false;
-            redone = true;
-            return CommandResult.newOKCommandResult(this);
-        }
-
-        protected CommandResult doUndoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = true;
-            redone = false;
-            return CommandResult.newOKCommandResult(this);
-        }
-
-        public void assertExecuted() {
-            assertTrue(executed);
-            assertFalse(undone);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(this, getCommandResult().getReturnValue());
-        }
-
-        public void assertUndone() {
-            assertTrue(undone);
-            assertFalse(executed);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(this, getCommandResult().getReturnValue());
-        }
-
-        public void assertRedone() {
-            assertTrue(redone);
-            assertFalse(undone);
-            assertFalse(executed);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(this, getCommandResult().getReturnValue());
-        }
-
-    }
-
-    private static class FailCancelOperation
-        extends AbstractOperation {
-
-        private IStatus executeStatus;
-
-        private IStatus undoStatus;
-
-        private IStatus redoStatus;
-
-        private boolean cancelMonitor;
-
-        FailCancelOperation(IStatus exec, IStatus undo, IStatus redo,
-                boolean cancel) {
-            super("Fail/Cancel Operation"); //$NON-NLS-1$
-            this.executeStatus = exec;
-            this.undoStatus = undo;
-            this.redoStatus = redo;
-            this.cancelMonitor = cancel;
-        }
-
-        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            if ((executeStatus.getSeverity() == IStatus.CANCEL)
-                && cancelMonitor) {
-                monitor.setCanceled(true);
-                return Status.OK_STATUS;
-            }
-
-            return executeStatus;
-        }
-
-        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            if ((undoStatus.getSeverity() == IStatus.CANCEL) && cancelMonitor) {
-                monitor.setCanceled(true);
-                return Status.OK_STATUS;
-            }
-
-            return undoStatus;
-        }
-
-        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            if ((redoStatus.getSeverity() == IStatus.CANCEL) && cancelMonitor) {
-                monitor.setCanceled(true);
-                return Status.OK_STATUS;
-            }
-
-            return redoStatus;
-        }
-    }
-
-    static class MarkerOperation
-        extends AbstractOperation {
-
-        boolean wasExecuted;
-
-        boolean wasUndone;
-
-        boolean wasRedone;
-
-        MarkerOperation() {
-            super("Marker operation"); //$NON-NLS-1$
-        }
-
-        void reset() {
-            wasExecuted = false;
-            wasUndone = false;
-            wasRedone = false;
-        }
-
-        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            wasExecuted = true;
-            return Status.OK_STATUS;
-        }
-
-        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            wasUndone = true;
-            return Status.OK_STATUS;
-        }
-
-        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            wasRedone = true;
-            return Status.OK_STATUS;
-        }
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/FileModificationApproverTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/FileModificationApproverTest.java
deleted file mode 100644
index 8b67a1a..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/FileModificationApproverTest.java
+++ /dev/null

@@ -1,326 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.command;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourceAttributes;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.internal.command.FileModificationApprover;
-
-/**
- * Tests the {@link FileModificationApprover}.
- * 
- * @author ldamus
- */
-public class FileModificationApproverTest
-    extends TestCase {
-
-    private IOperationHistory history;
-    private IProject project;
-    private IFile file;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(FileModificationApproverTest.class);
-    }
-
-    public FileModificationApproverTest(String name) {
-        super(name);
-    }
-
-    protected void setUp()
-        throws Exception {
-
-        super.setUp();
-
-        history = OperationHistoryFactory.getOperationHistory();
-
-        try {
-            IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-            project = root.getProject("FileModificationApproverTest"); //$NON-NLS-1$
-
-            project.create(null);
-            project.open(null);
-
-            file = project.getFile("test.txt"); //$NON-NLS-1$
-            InputStream contents = new ByteArrayInputStream(new byte[0]);
-
-            file.create(contents, false, new NullProgressMonitor());
-
-        } catch (CoreException e) {
-            fail(e);
-        }
-    }
-    
-    protected void tearDown()
-        throws Exception {
-        
-        super.tearDown();
-        
-        file.delete(true, new NullProgressMonitor());
-        project.close(new NullProgressMonitor());
-        project.delete(true, true, new NullProgressMonitor());
-        project = null;
-        file = null;
-        history = null;
-    }
-    
-    private void fail(Exception e) {
-        e.printStackTrace();
-        fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-    }
-
-    /**
-     * Tests that commands that affect read-only files cannot be executed, undone and redone through the
-     * operation history.
-     */
-    public void test_execute_undo_redo() {
-        
-        TestCommand c = new TestCommand("test_execute_undo_redo", Collections.singletonList(file)); //$NON-NLS-1$
-        IUndoContext ctx = new UndoContext();
-        c.addContext(ctx);
-        
-
-        ResourceAttributes attributes = file.getResourceAttributes();
-
-        
-        // Execute fails when file is read-only
-        try {
-            attributes.setReadOnly(true);
-            file.setResourceAttributes(attributes);
-            
-            history.execute(c, new NullProgressMonitor(), null);
-            
-        } catch (CoreException e) {
-            fail(e);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        c.assertNotExecuted();
-        c.reset();
-        
-        // Execute succeeds when file is writable
-        try {
-            attributes.setReadOnly(false);
-            file.setResourceAttributes(attributes);
-            
-            history.execute(c, new NullProgressMonitor(), null);
-            
-        } catch (CoreException e) {
-            fail(e);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        c.assertExecuted();
-        c.reset();
-        
-        // Undo fails when file is read-only
-        try {
-            attributes.setReadOnly(true);
-            file.setResourceAttributes(attributes);
-            
-            assertTrue(history.canUndo(ctx));
-            
-            history.undo(ctx, new NullProgressMonitor(), null);
-            
-        } catch (CoreException e) {
-            fail(e);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        c.assertNotUndone();
-        c.reset();
-        
-        // Undo succeeds when file is writable
-        try {
-            attributes.setReadOnly(false);
-            file.setResourceAttributes(attributes);
-            
-            assertTrue(history.canUndo(ctx));
-            
-            history.undo(ctx, new NullProgressMonitor(), null);
-            
-        } catch (CoreException e) {
-            fail(e);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        c.assertUndone();
-        c.reset();
-        
-        // Redo fails when file is read-only
-        try {
-            attributes.setReadOnly(true);
-            file.setResourceAttributes(attributes);
-            
-            assertTrue(history.canRedo(ctx));
-            
-            history.redo(ctx, new NullProgressMonitor(), null);
-            
-        } catch (CoreException e) {
-            fail(e);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        c.assertNotRedone();
-        c.reset();
-        
-        
-        // Redo succeeds when file is writable
-        try {
-            attributes.setReadOnly(false);
-            file.setResourceAttributes(attributes);
-            
-            assertTrue(history.canRedo(ctx));
-            
-            history.redo(ctx, new NullProgressMonitor(), null);
-            
-        } catch (CoreException e) {
-            fail(e);
-        } catch (ExecutionException e) {
-            fail(e);
-        }
-
-        c.assertRedone();
-        c.reset();
- 
-    }
-
-    // 
-    // TEST FIXTURES
-    //
-
-    protected static class TestCommand
-        extends AbstractCommand {
-
-        private static final String EXECUTED = "executed"; //$NON-NLS-1$
-
-        private static final String UNDONE = "undone"; //$NON-NLS-1$
-
-        private static final String REDONE = "redone"; //$NON-NLS-1$
-
-        private boolean executed;
-
-        private boolean undone;
-
-        private boolean redone;
-
-        public TestCommand(String label, List affectedFiles) {
-            super(label, affectedFiles);
-        }
-
-        protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = true;
-            undone = false;
-            redone = false;
-            return CommandResult.newOKCommandResult(EXECUTED);
-        }
-
-        protected CommandResult doRedoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = false;
-            redone = true;
-            return CommandResult.newOKCommandResult(REDONE);
-        }
-
-        protected CommandResult doUndoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = true;
-            redone = false;
-            return CommandResult.newOKCommandResult(UNDONE);
-        }
-
-        public void assertExecuted() {
-            assertTrue(executed);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(EXECUTED, getCommandResult().getReturnValue());
-        }
-        
-        public void assertNotExecuted() {
-            assertFalse(executed);
-            //our validator should have marked it invalid
-            assertFalse(getCommandResult().getStatus().isOK());
-        }
-
-        public void assertUndone() {
-            assertTrue(undone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(UNDONE, getCommandResult().getReturnValue());
-        }
-        
-        public void assertNotUndone() {
-            assertFalse(undone);
-            //our validator should have marked it invalid
-            assertFalse(getCommandResult().getStatus().isOK());
-        }
-
-        public void assertRedone() {
-            assertTrue(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(REDONE, getCommandResult().getReturnValue());
-        }
-        
-        public void assertNotRedone() {
-            assertFalse(redone);
-            //our validator should have marked it invalid
-            assertFalse(getCommandResult().getStatus().isOK());
-        }
-        
-        public void reset() {
-            executed = false;
-            undone = false;
-            redone = false;
-            setResult(null);
-        }
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/OneTimeCommandTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/OneTimeCommandTest.java
deleted file mode 100644
index 60dfe54..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/command/OneTimeCommandTest.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.command;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IOperationHistoryListener;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryEvent;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.OneTimeCommand;
-
-public class OneTimeCommandTest
-    extends TestCase {
-
-    private IOperationHistory history;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(OneTimeCommandTest.class,
-            "OneTimeCommand Test Suite"); //$NON-NLS-1$
-    }
-
-    public OneTimeCommandTest(String name) {
-        super(name);
-    }
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-        history = OperationHistoryFactory.getOperationHistory();
-    }
-
-    /**
-     * Verifies that subclasses of IsolatedCommand can be not undoable but also
-     * not cause the undo history to be flushed when they are executed in a
-     * linear undo model.
-     */
-    public void test_historyNotFlushed_132371()
-        throws Exception {
-
-        // create an undo context
-        final IUndoContext context = new UndoContext();
-
-        // add a listener to enforce a linear undo model for the undo context,
-        // which flushes the undo history when the top-most operation is not
-        // undoable
-        IOperationHistoryListener historyListener = new IOperationHistoryListener() {
-
-            public void historyNotification(OperationHistoryEvent event) {
-                switch (event.getEventType()) {
-                    case OperationHistoryEvent.OPERATION_ADDED:
-                    case OperationHistoryEvent.OPERATION_REMOVED:
-                    case OperationHistoryEvent.UNDONE:
-                    case OperationHistoryEvent.REDONE:
-                        if (!history.canUndo(context)) {
-                            history.dispose(context, true, false, false);
-                        }
-                        break;
-                }
-            };
-        };
-        history.addOperationHistoryListener(historyListener);
-
-        // put a marker operation on the history
-        IUndoableOperation marker = new MarkerOperation();
-        marker.addContext(context);
-        history.execute(marker, new NullProgressMonitor(), null);
-        assertTrue(
-            "Marker operation must be undoable", history.canUndo(context)); //$NON-NLS-1$
-
-        // create a command with no undo context
-        OneTimeCommand command = new OneTimeCommand(
-            "test_historyNotFlushed_132371") { //$NON-NLS-1$
-
-            protected CommandResult doExecuteWithResult(
-                    IProgressMonitor progressMonitor, IAdaptable info)
-                throws ExecutionException {
-                return CommandResult.newOKCommandResult();
-            };
-        };
-
-        command.addContext(context);
-        assertFalse("Unexpected undo context", command.hasContext(context)); //$NON-NLS-1$
-
-        // execute the command
-        history.execute(command, new NullProgressMonitor(), null);
-
-        // verify that the marker operation is still undoable
-        assertTrue(
-            "Undo history should not have been flushed", history.canUndo(context)); //$NON-NLS-1$
-        assertSame(
-            "Marker operation should be on top of the undo history.", marker, history.getUndoOperation(context)); //$NON-NLS-1$
-    }
-
-    //
-    // TEST FIXTURES
-    //
-
-    static class MarkerOperation
-        extends AbstractOperation {
-
-        boolean wasExecuted;
-
-        boolean wasUndone;
-
-        boolean wasRedone;
-
-        MarkerOperation() {
-            super("Marker operation"); //$NON-NLS-1$
-        }
-
-        void reset() {
-            wasExecuted = false;
-            wasUndone = false;
-            wasRedone = false;
-        }
-
-        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            wasExecuted = true;
-            return Status.OK_STATUS;
-        }
-
-        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            wasUndone = true;
-            return Status.OK_STATUS;
-        }
-
-        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-            wasRedone = true;
-            return Status.OK_STATUS;
-        }
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/AbstractProviderTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/AbstractProviderTest.java
deleted file mode 100644
index 4c36b04..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/AbstractProviderTest.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.service;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
-import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
-
-public class AbstractProviderTest extends TestCase {
-
-    protected static class Fixture extends AbstractProvider {
-
-        protected Fixture() {
-            super();
-        }
-
-        protected void fireProviderChange(ProviderChangeEvent event) {
-            super.fireProviderChange(event);
-        }
-
-        public boolean provides(IOperation operation) {
-            return true;
-        }
-
-    }
-
-    private Fixture fixture = null;
-
-    private Exception exception = null;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(AbstractProviderTest.class);
-    }
-
-    public AbstractProviderTest(String name) {
-        super(name);
-    }
-
-    protected Fixture getFixture() {
-        return fixture;
-    }
-
-    private void setFixture(Fixture fixture) {
-        this.fixture = fixture;
-    }
-
-    protected Exception getException() {
-        return exception;
-    }
-
-    protected void setException(Exception exception) {
-        this.exception = exception;
-    }
-
-    protected void setUp() {
-        setFixture(new Fixture());
-    }
-
-    public void test_add_remove_ProviderChangeListener() {
-        IProviderChangeListener listener = new IProviderChangeListener() {
-            public final void providerChanged(ProviderChangeEvent event) {
-                throw new RuntimeException();
-            }
-        };
-
-        getFixture().addProviderChangeListener(listener);
-        try {
-            getFixture().fireProviderChange(
-                new ProviderChangeEvent(getFixture()));
-            fail();
-        } catch (Exception e) {
-        	// Nothing to do
-        }
-
-        getFixture().removeProviderChangeListener(listener);
-        try {
-            getFixture().fireProviderChange(
-                new ProviderChangeEvent(getFixture()));
-        } catch (Exception e) {
-            fail();
-        }
-    }
-
-    public void test_fireProviderChange() {
-        final int count = 99;
-
-        final IProviderChangeListener[] listeners =
-            new IProviderChangeListener[count];
-
-        for (int i = 0; i < count; i++) {
-            listeners[i] = new IProviderChangeListener() {
-                public void providerChanged(ProviderChangeEvent event) {
-                	//Nothing to do 	
-                }
-            };
-        }
-
-        Thread addThread = new Thread(new Runnable() {
-            public void run() {
-                for (int i = 0; i < count; i++) {
-                    getFixture().addProviderChangeListener(listeners[i]);
-
-                    if (null != getException()) {
-                        break;
-                    }
-                }
-            }
-        });
-        addThread.start();
-
-        Thread fireThread = new Thread(new Runnable() {
-            public void run() {
-                ProviderChangeEvent event =
-                    new ProviderChangeEvent(getFixture());
-
-                try {
-                    for (int i = 0; i < count; i++) {
-                        getFixture().fireProviderChange(event);
-
-                        try {
-                            Thread.sleep(1);
-                        } catch (InterruptedException ie) {
-                        	//Nothing to do	
-                        }
-
-                    }
-                } catch (Exception e) {
-                    setException(e);
-                }
-            }
-        });
-        fireThread.start();
-
-        Thread removeThread = new Thread(new Runnable() {
-            public void run() {
-                for (int i = 0; i < count; i++) {
-                    getFixture().removeProviderChangeListener(listeners[i]);
-
-                    if (null != getException()) {
-                        break;
-                    }
-                }
-            }
-        });
-        removeThread.start();
-
-        try {
-            fireThread.join();
-        } catch (InterruptedException ie) {
-            setException(ie);
-        }
-
-        if (null != getException()) {
-            fail();
-        }
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ExecutionStrategyTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ExecutionStrategyTest.java
deleted file mode 100644
index e9d543c..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ExecutionStrategyTest.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.service;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.ProviderPriority;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-
-/**
- * @author khussey
- */
-public class ExecutionStrategyTest extends TestCase {
-
-    protected static class Provider extends AbstractProvider {
-
-        private final String name;
-
-        protected Provider(String name) {
-            super();
-
-            this.name = name;
-        }
-
-        protected String getName() {
-            return name;
-        }
-
-        public boolean provides(IOperation operation) {
-            return true;
-        }
-
-    }
-
-    protected static class Operation implements IOperation {
-
-        protected Operation() {
-            super();
-        }
-
-        public Object execute(IProvider provider) {
-            return ((Provider) provider).getName();
-        }
-
-    }
-
-    protected static class Fixture extends ExecutionStrategy {
-
-    	private static final long serialVersionUID = 1L;
-
-        protected Fixture() {
-            super("Fixture", 0); //$NON-NLS-1$
-        }
-
-        protected List getValues() {
-            return super.getValues();
-        }
-
-        public List execute(Service service, IOperation operation) {
-            return Collections.EMPTY_LIST;
-        }
-
-    }
-
-    private Fixture fixture = null;
-
-    private ServiceTest.Fixture service = null;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ExecutionStrategyTest.class);
-    }
-
-    public ExecutionStrategyTest(String name) {
-        super(name);
-    }
-
-    protected Fixture getFixture() {
-        return fixture;
-    }
-
-    private void setFixture(Fixture fixture) {
-        this.fixture = fixture;
-    }
-
-    protected ServiceTest.Fixture getService() {
-        return service;
-    }
-
-    private void setService(ServiceTest.Fixture service) {
-        this.service = service;
-    }
-
-    protected void setUp() {
-        setFixture(new Fixture());
-
-        setService(new ServiceTest.Fixture());
-
-        getService().addFixtureProvider(
-            ProviderPriority.HIGHEST,
-            new ServiceTest.Fixture.ProviderDescriptor(
-                new Provider("Highest"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.HIGHEST,
-            new ServiceTest.Fixture.ProviderDescriptor(
-                new Provider("tsehgiH"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.HIGH,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("High"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.HIGH,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("hgiH"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.MEDIUM,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("Medium"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.MEDIUM,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("muideM"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.LOW,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("Low"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.LOW,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("woL"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.LOWEST,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("Lowest"))); //$NON-NLS-1$
-        getService().addFixtureProvider(
-            ProviderPriority.LOWEST,
-            new ServiceTest.Fixture.ProviderDescriptor(new Provider("tsewoL"))); //$NON-NLS-1$
-    }
-
-    public void test_readResolve() {
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-        ObjectOutput output = null;
-        ObjectInput input = null;
-        try {
-            output = new ObjectOutputStream(stream);
-            for (Iterator i = getFixture().getValues().iterator();
-                i.hasNext();
-                ) {
-                output.writeObject(i.next());
-            }
-            output.flush();
-
-            input =
-                new ObjectInputStream(
-                    new ByteArrayInputStream(stream.toByteArray()));
-            for (Iterator i = getFixture().getValues().iterator();
-                i.hasNext();
-                ) {
-                assertSame(i.next(), input.readObject());
-            }
-        } catch (Exception e) {
-            fail();
-        } finally {
-            try {
-                output.close();
-                input.close();
-            } catch (Exception e) {
-            	// Nothing to do
-            }
-        }
-    }
-
-    public void test_execute_FIRST() {
-        List result = Fixture.FIRST.execute(getService(), new Operation());
-        assertEquals(1, result.size());
-        assertEquals("Highest", result.get(0)); //$NON-NLS-1$
-    }
-
-    public void test_execute_LAST() {
-        List result = Fixture.LAST.execute(getService(), new Operation());
-        assertEquals(1, result.size());
-        assertEquals("tsewoL", result.get(0)); //$NON-NLS-1$
-    }
-
-    public void test_execute_FORWARD() {
-        List result =
-		Fixture.FORWARD.execute(getService(), new Operation());
-        assertEquals(10, result.size());
-        assertEquals("Highest", result.get(0)); //$NON-NLS-1$
-        assertEquals("tsehgiH", result.get(1)); //$NON-NLS-1$
-        assertEquals("High", result.get(2)); //$NON-NLS-1$
-        assertEquals("hgiH", result.get(3)); //$NON-NLS-1$
-        assertEquals("Medium", result.get(4)); //$NON-NLS-1$
-        assertEquals("muideM", result.get(5)); //$NON-NLS-1$
-        assertEquals("Low", result.get(6)); //$NON-NLS-1$
-        assertEquals("woL", result.get(7)); //$NON-NLS-1$
-        assertEquals("Lowest", result.get(8)); //$NON-NLS-1$
-        assertEquals("tsewoL", result.get(9)); //$NON-NLS-1$
-    }
-
-    public void test_execute_REVERSE() {
-        List result =
-		Fixture.REVERSE.execute(getService(), new Operation());
-        assertEquals(10, result.size());
-        assertEquals("tsewoL", result.get(0)); //$NON-NLS-1$
-        assertEquals("Lowest", result.get(1)); //$NON-NLS-1$
-        assertEquals("woL", result.get(2)); //$NON-NLS-1$
-        assertEquals("Low", result.get(3)); //$NON-NLS-1$
-        assertEquals("muideM", result.get(4)); //$NON-NLS-1$
-        assertEquals("Medium", result.get(5)); //$NON-NLS-1$
-        assertEquals("hgiH", result.get(6)); //$NON-NLS-1$
-        assertEquals("High", result.get(7)); //$NON-NLS-1$
-        assertEquals("tsehgiH", result.get(8)); //$NON-NLS-1$
-        assertEquals("Highest", result.get(9)); //$NON-NLS-1$
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ProviderPriorityTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ProviderPriorityTest.java
deleted file mode 100644
index 32b1c5d..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ProviderPriorityTest.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.service;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.core.service.ProviderPriority;
-
-/**
- * @author khussey
- */
-public class ProviderPriorityTest extends TestCase {
-
-    protected static class Fixture extends ProviderPriority {
-
-    	private static final long serialVersionUID = 1L;
-
-        protected Fixture() {
-            super("Fixture", 0); //$NON-NLS-1$
-        }
-
-        protected List getValues() {
-            return super.getValues();
-        }
-
-    }
-
-    private Fixture fixture = null;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ProviderPriorityTest.class);
-    }
-
-    public ProviderPriorityTest(String name) {
-        super(name);
-    }
-
-    protected Fixture getFixture() {
-        return fixture;
-    }
-
-    private void setFixture(Fixture fixture) {
-        this.fixture = fixture;
-    }
-
-    protected void setUp() {
-        setFixture(new Fixture());
-    }
-
-    public void test_readResolve() {
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-        ObjectOutput output = null;
-        ObjectInput input = null;
-        try {
-            output = new ObjectOutputStream(stream);
-            for (Iterator i = getFixture().getValues().iterator();
-                i.hasNext();
-                ) {
-                output.writeObject(i.next());
-            }
-            output.flush();
-
-            input =
-                new ObjectInputStream(
-                    new ByteArrayInputStream(stream.toByteArray()));
-            for (Iterator i = getFixture().getValues().iterator();
-                i.hasNext();
-                ) {
-                assertSame(i.next(), input.readObject());
-            }
-        } catch (Exception e) {
-            fail();
-        } finally {
-            try {
-                output.close();
-                input.close();
-            } catch (Exception e) {
-            	// Nothing to do
-            }
-        }
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ServiceTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ServiceTest.java
deleted file mode 100644
index d0ba835..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/service/ServiceTest.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.service;
-
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
-import org.eclipse.gmf.runtime.common.core.service.IProviderPolicy;
-import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
-import org.eclipse.gmf.runtime.common.core.service.ProviderPriority;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-
-public class ServiceTest extends TestCase {
-
-    protected static class Fixture extends Service {
-
-        protected static class ProviderDescriptor
-            extends Service.ProviderDescriptor {
-
-            protected ProviderDescriptor(IProvider provider) {
-                super(null);
-
-                this.provider = provider;
-                provider.addProviderChangeListener(this);
-            }
-
-            public IProvider getProvider() {
-                return provider;
-            }
-
-            protected IProviderPolicy getPolicy() {
-                return null;
-            }
-
-        }
-
-        protected Fixture() {
-            super(true);
-        }
-
-        protected List getFixtureProviders(
-            ExecutionStrategy strategy,
-            ProviderPriority priority,
-            IOperation operation) {
-            return super.getProviders(strategy, priority, operation);
-        }
-
-        protected void addFixtureProvider(
-            ProviderPriority priority,
-            Service.ProviderDescriptor provider) {
-            super.addProvider(priority, provider);
-        }
-
-        protected void removeFixtureProvider(
-            Service.ProviderDescriptor provider) {
-            super.removeProvider(provider);
-        }
-
-    }
-
-    private Fixture fixture = null;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ServiceTest.class);
-    }
-
-    public ServiceTest(String name) {
-        super(name);
-    }
-
-    protected Fixture getFixture() {
-        return fixture;
-    }
-
-    private void setFixture(Fixture fixture) {
-        this.fixture = fixture;
-    }
-
-    protected void setUp() {
-        setFixture(new Fixture());
-    }
-
-    public void test_providerChanged() {
-        getFixture().addProviderChangeListener(new IProviderChangeListener() {
-            public final void providerChanged(ProviderChangeEvent event) {
-                assertEquals(getFixture(), event.getSource());
-                throw new RuntimeException();
-            }
-        });
-
-        try {
-            getFixture().providerChanged(new ProviderChangeEvent(getFixture()));
-            fail();
-        } catch (Exception e) {
-        	// Nothing to do
-        }
-    }
-
-    public void test_provides() {
-        ExecutionStrategy strategy = new ExecutionStrategy("Dummy") {//$NON-NLS-1$
-        	
-        	private static final long serialVersionUID = 1L;
-
-    		public List execute(Service service, IOperation operation) {
-                return Collections.EMPTY_LIST;
-            }
-        };
-
-        IOperation operation = new IOperation() {
-            public Object execute(IProvider provider) {
-                return null;
-            }
-        };
-        assertTrue(!getFixture().provides(operation));
-
-        IProvider trueProvider = new AbstractProvider() {
-            public boolean provides(IOperation op) {
-                return true;
-            }
-        };
-        Fixture.ProviderDescriptor trueProviderDescriptor =
-            new Fixture.ProviderDescriptor(trueProvider);
-        getFixture().addFixtureProvider(
-            ProviderPriority.MEDIUM,
-            trueProviderDescriptor);
-        assertTrue(getFixture().provides(operation));
-
-        List cachedProviders =
-            getFixture().getFixtureProviders(
-            	strategy,
-                ProviderPriority.MEDIUM,
-                operation);
-        assertTrue(trueProvider == cachedProviders.get(0));
-
-        IProvider falseProvider = new AbstractProvider() {
-            public boolean provides(IOperation op) {
-                return false;
-            }
-        };
-        Fixture.ProviderDescriptor falseProviderDescriptor =
-            new Fixture.ProviderDescriptor(falseProvider);
-        getFixture().addFixtureProvider(
-            ProviderPriority.MEDIUM,
-            falseProviderDescriptor);
-        assertTrue(getFixture().provides(operation));
-        assertTrue(
-            cachedProviders
-                != getFixture().getFixtureProviders(
-                	strategy,
-                    ProviderPriority.MEDIUM,
-                    operation));
-        assertTrue(
-            trueProvider
-                == getFixture().getFixtureProviders(
-                	strategy,
-                    ProviderPriority.MEDIUM,
-                    operation).get(
-                    0));
-
-        getFixture().removeFixtureProvider(trueProviderDescriptor);
-        assertTrue(!getFixture().provides(operation));
-
-        getFixture().removeFixtureProvider(falseProviderDescriptor);
-        assertTrue(!getFixture().provides(operation));
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/HashUtilTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/HashUtilTest.java
deleted file mode 100644
index 36c8a10..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/HashUtilTest.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.util;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.core.util.HashUtil;
-
-public class HashUtilTest extends TestCase {
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(HashUtilTest.class);
-    }
-
-    public HashUtilTest(String name) {
-        super(name);
-    }
-
-    protected void setUp() {
-    	// nothing to do
-    }
-
-    public void test_hash_boolean() {
-        assertTrue(37 * 17 == HashUtil.hash(false) - 1);
-        assertTrue(37 * 1 == HashUtil.hash(1, false) - 1);
-
-        assertTrue(37 * 17 == HashUtil.hash(true) - 0);
-        assertTrue(37 * 0 == HashUtil.hash(0, true) - 0);
-    }
-
-    public void test_hash_byte() {
-        assertTrue(37 * 17 == HashUtil.hash(Byte.MAX_VALUE) - Byte.MAX_VALUE);
-        assertTrue(
-            37 * Byte.MIN_VALUE
-                == HashUtil.hash(Byte.MIN_VALUE, Byte.MAX_VALUE) - Byte.MAX_VALUE);
-    }
-
-    public void test_hash_char() {
-        assertTrue(37 * 17 == HashUtil.hash(Character.MAX_VALUE) - Character.MAX_VALUE);
-        assertTrue(
-            37 * Character.MIN_VALUE
-                == HashUtil.hash(Character.MIN_VALUE, Character.MAX_VALUE) - Character.MAX_VALUE);
-    }
-
-    public void test_hash_double() {
-        assertTrue(
-            37 * 17
-                == HashUtil.hash(Double.doubleToLongBits(Double.MAX_VALUE))
-                    - (int) (Double.doubleToLongBits(Double.MAX_VALUE)
-                        ^ (Double.doubleToLongBits(Double.MAX_VALUE) >>> 32)));
-
-        assertTrue(
-            37
-                * (int) (Double.doubleToLongBits(Double.MIN_VALUE)
-                    ^ (Double.doubleToLongBits(Double.MIN_VALUE) >>> 32))
-                == HashUtil.hash(
-                    (int) (Double.doubleToLongBits(Double.MIN_VALUE)
-                        ^ (Double.doubleToLongBits(Double.MIN_VALUE) >>> 32)),
-                    Double.doubleToLongBits(Double.MAX_VALUE))
-                    - (int) (Double.doubleToLongBits(Double.MAX_VALUE)
-                        ^ (Double.doubleToLongBits(Double.MAX_VALUE) >>> 32)));
-    }
-
-    public void test_hash_float() {
-        assertTrue(
-            37 * 17
-                == HashUtil.hash(Float.MAX_VALUE) - Float.floatToIntBits(Float.MAX_VALUE));
-        assertTrue(
-            37 * Float.floatToIntBits(Float.MIN_VALUE)
-                == HashUtil.hash(Float.floatToIntBits(Float.MIN_VALUE), Float.MAX_VALUE)
-                    - Float.floatToIntBits(Float.MAX_VALUE));
-    }
-
-    public void test_hash_int() {
-        assertTrue(37 * 17 == HashUtil.hash(Integer.MAX_VALUE) - Integer.MAX_VALUE);
-        assertTrue(
-            37 * Integer.MIN_VALUE
-                == HashUtil.hash(Integer.MIN_VALUE, Integer.MAX_VALUE) - Integer.MAX_VALUE);
-    }
-
-    public void test_hash_long() {
-        assertTrue(
-            37 * 17
-                == HashUtil.hash(Long.MAX_VALUE)
-                    - (int) (Long.MAX_VALUE ^ (Long.MAX_VALUE >>> 32)));
-        assertTrue(
-            37 * (int) (Long.MIN_VALUE ^ (Long.MIN_VALUE >>> 32))
-                == HashUtil.hash((int) (Long.MIN_VALUE ^ (Long.MIN_VALUE >>> 32)), Long.MAX_VALUE)
-                    - (int) (Long.MAX_VALUE ^ (Long.MAX_VALUE >>> 32)));
-    }
-
-    public void test_hash_short() {
-        assertTrue(37 * 17 == HashUtil.hash(Short.MAX_VALUE) - Short.MAX_VALUE);
-        assertTrue(
-            37 * Short.MIN_VALUE
-                == HashUtil.hash(Short.MIN_VALUE, Short.MAX_VALUE) - Short.MAX_VALUE);
-    }
-
-    public void test_hash_Object() {
-        assertTrue(37 * 17 == HashUtil.hash(this) - hashCode());
-
-        assertTrue(37 * hashCode() == HashUtil.hash(hashCode(), this) - hashCode());
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/ProxyTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/ProxyTest.java
deleted file mode 100644
index 1abc8d7..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/ProxyTest.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.util;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.core.util.Proxy;
-
-public class ProxyTest extends TestCase {
-
-    protected static class Fixture extends Proxy {
-
-        protected Fixture(Object realObject) {
-            super(realObject);
-        }
-
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ProxyTest.class);
-    }
-
-    public ProxyTest(String name) {
-        super(name);
-    }
-
-    public void test_Proxy() {
-        try {
-            new Fixture(null);
-            fail();
-        } catch (Throwable e) {
-			//for our implementation, the Throwable is an AssertionError
-        	// nothing to do
-        }
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/StringUtilTest.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/StringUtilTest.java
deleted file mode 100644
index e679bc2..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/StringUtilTest.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.util;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.core.util.Proxy;
-import org.eclipse.gmf.runtime.common.core.util.StringUtil;
-
-/**
- * Tests org.eclipse.gmf.runtime.common.core.internal.util.StringUtil
- * @author Wayne Diu, wdiu
- */
-public class StringUtilTest extends TestCase {
-
-    private final String src = "I am writing a test case with the word a.\nThe word a is a very important word because I want to replace all instances of it.  It is a word.  And I must test case sensitive replaces too, okay?"; //$NON-NLS-1$ 
-
-    protected static class Fixture extends Proxy {
-
-        protected Fixture(Object realObject) {
-            super(realObject);
-        }
-
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(StringUtilTest.class);
-    }
-
-    public StringUtilTest(String name) {
-        super(name);
-    }
-    
-    /*
-     * The test cases replace a with a a because that could result in
-     * infinite recursion if I did not write the replace methods correctly.
-     */
-
-    public void test_Replace() {
-    	assertTrue(StringUtil.replace(src, "a", "a a", false).equals("I a am writing a test case with the word a.\nThe word a is a very important word because I want to replace all instances of it.  It is a word.  And I must test case sensitive replaces too, okay?")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    	assertTrue(StringUtil.replaceAll(src, "a", "a a", true).equals("I a am writing a a test ca ase with the word a a.\nThe word a a is a a very importa ant word beca ause I wa ant to repla ace a all insta ances of it.  It is a a word.  And I must test ca ase sensitive repla aces too, oka ay?")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    }
-
-    public void test_ReplaceWholeWords() {
-    	assertTrue(StringUtil.replaceWholeWords(src, "a", "a a", true).equals("I am writing a a test case with the word a.\nThe word a is a very important word because I want to replace all instances of it.  It is a word.  And I must test case sensitive replaces too, okay?")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    	assertTrue(StringUtil.replaceAllWholeWords(src, "a", "a a", false).equals("I am writing a a test case with the word a a.\nThe word a a is a a very important word because I want to replace all instances of it.  It is a a word.  And I must test case sensitive replaces too, okay?")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    }
-    
-    public void test_dgdEncodeURL() {
-    	//These should not change after encoding
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.ca/").equals("http://www.ibm.ca/")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.ca").equals("http://www.ibm.ca")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("C:\\dir\\sub").equals("C:\\dir\\sub")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("Fil\u00E9name with spaces.doc").equals("Fil\u00E9name with spaces.doc")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.com/Search/?q=rational&v=14&lang=en&cc=ca").equals("http://www.ibm.com/Search/?q=rational&v=14&lang=en&cc=ca")); //$NON-NLS-1$ //$NON-NLS-2$
-
-    	//These should change after encoding
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.com/Search/?q=\u00E9\u00E7\u00E5\u00E2\u00E8&v=14&lang=en&cc=ca").equals("http://www.ibm.com/Search/?q=%C3%A9%C3%A7%C3%A5%C3%A2%C3%A8&v=14&lang=en&cc=ca")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.com/Search/?q=\u00E9\u00E7\u00E5\u00E2\u00E8%3d&v=14&lang=en&cc=ca").equals("http://www.ibm.com/Search/?q=%C3%A9%C3%A7%C3%A5%C3%A2%C3%A8%3d&v=14&lang=en&cc=ca")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.com/Search/?q=\u00E9\u00E7\u00E5\u00E2\u00E8%a&v=14&lang=en&cc=ca").equals("http://www.ibm.com/Search/?q=%C3%A9%C3%A7%C3%A5%C3%A2%C3%A8%25a&v=14&lang=en&cc=ca")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.com/Search/?q=\u00E9\u00E7\u00E5\u00E2\u00E8%fg%a&v=14&lang=en&cc=ca").equals("http://www.ibm.com/Search/?q=%C3%A9%C3%A7%C3%A5%C3%A2%C3%A8%25fg%25a&v=14&lang=en&cc=ca")); //$NON-NLS-1$ //$NON-NLS-2$
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.com/Search/?q=\u00E9\u00E7\u00E5\u00E2\u00E8%%a&v=14&lang=en&cc=ca").equals("http://www.ibm.com/Search/?q=%C3%A9%C3%A7%C3%A5%C3%A2%C3%A8%25%25a&v=14&lang=en&cc=ca")); //$NON-NLS-1$ //$NON-NLS-2$ 
-    	assertTrue(StringUtil.encodeURL("http://www.ibm.com/Search/?q=\u00E9\u00E7\u00E5\u00E2\u00E8%&v=14&lang=en&cc=ca").equals("http://www.ibm.com/Search/?q=%C3%A9%C3%A7%C3%A5%C3%A2%C3%A8%25&v=14&lang=en&cc=ca")); //$NON-NLS-1$ //$NON-NLS-2$
-    }    
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/TestingConfigurationElement.java b/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/TestingConfigurationElement.java
deleted file mode 100644
index 9ce7ee0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/TestingConfigurationElement.java
+++ /dev/null

@@ -1,198 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.core.internal.util;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.Status;
-
-/**
- * @author Yasser Lulu
- * 
- */
-public class TestingConfigurationElement implements IConfigurationElement {
-    private Map attributeMap;
-    private Map childrenMap;
-    public static final TestingConfigurationElement[] EMPTY_TESTING_CONFIG_ELEMENT =
-        new TestingConfigurationElement[0];
-
-    /**
-     * Constructor for TestingConfigurationElement.
-     */
-    public TestingConfigurationElement(Map attributeMap, Map childrenMap) {
-        setAttributeMap(attributeMap);
-        setChildrenMap(childrenMap);
-    }  
-    
-
-    /**
-     * Constructor for TestingConfigurationElement.
-     */
-    public TestingConfigurationElement() {
-        this(new HashMap(), new HashMap());
-    }
-
-    public void addAttribute(String name, String value) {
-        getAttributeMap().put(name, value);
-    }
-
-    public void addChildren(String name, List childrenList) {
-        getChildrenMap().put(name, childrenList);
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#createExecutableExtension(String)
-     */
-    public Object createExecutableExtension(String propertyName)
-        throws CoreException {
-        throw new CoreException(new Status(Status.ERROR, "", 0, "", null)); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getAttribute(String)
-     */
-    public String getAttribute(String name) {
-        return (String) getAttributeMap().get(name);
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getAttributeAsIs(String)
-     */
-    public String getAttributeAsIs(String name) {
-        return getAttribute(name);
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getAttributeNames()
-     */
-    public String[] getAttributeNames() {
-        return null;
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getChildren()
-     */
-    public IConfigurationElement[] getChildren() {
-        return null;
-    }
-    
-    public final List getChildrenList(String name){
-        return (List)getChildrenMap().get(name);
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getChildren(String)
-     */
-    public IConfigurationElement[] getChildren(String name) {
-        List childrenList = getChildrenList(name);
-        return ((childrenList != null) && (childrenList.isEmpty() == false))
-            ? (TestingConfigurationElement[]) childrenList.toArray(
-                EMPTY_TESTING_CONFIG_ELEMENT)
-            : EMPTY_TESTING_CONFIG_ELEMENT;
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getDeclaringExtension()
-     */
-    public IExtension getDeclaringExtension() {
-        return null;
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getName()
-     */
-    public String getName() {
-        return null;
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getValue()
-     */
-    public String getValue() {
-        return null;
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IConfigurationElement#getValueAsIs()
-     */
-    public String getValueAsIs() {
-        return null;
-    }
-
-    /**
-     * Returns the attributeMap.
-     * @return Map
-     */
-    public Map getAttributeMap() {
-        return attributeMap;
-    }
-
-    /**
-     * Returns the childrenMap.
-     * @return Map
-     */
-    public Map getChildrenMap() {
-        return childrenMap;
-    }
-
-    /**
-     * Sets the attributeMap.
-     * @param attributeMap The attributeMap to set
-     */
-    private void setAttributeMap(Map attributeMap) {
-        this.attributeMap = attributeMap;
-    }
-
-    /**
-     * Sets the childrenMap.
-     * @param childrenMap The childrenMap to set
-     */
-    private void setChildrenMap(Map childrenMap) {
-        this.childrenMap = childrenMap;
-    }
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IConfigurationElement#getParent()
-	 */
-	public Object getParent() {
-		return null;
-	}
-
-
-	public String getNamespace() throws InvalidRegistryObjectException {
-		return null;
-	}
-
-
-	public boolean isValid() {
-		return false;
-	}
-    
-    public IContributor getContributor()
-        throws InvalidRegistryObjectException {
-        return null;
-    }
-    
-    public String getNamespaceIdentifier()
-        throws InvalidRegistryObjectException {
-        return null;
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.core/test.xml b/org.eclipse.gmf.tests.runtime.common.core/test.xml
deleted file mode 100644
index 13674c0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.common.core"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.common.core.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-	
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/.classpath b/org.eclipse.gmf.tests.runtime.common.ui.services.action/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.common.ui.services.action/.cvsignore b/org.eclipse.gmf.tests.runtime.common.ui.services.action/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/.project b/org.eclipse.gmf.tests.runtime.common.ui.services.action/.project
deleted file mode 100644
index 90b4b51..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.common.ui.services.action</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/org.eclipse.gmf.tests.runtime.common.ui.services.action/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.common.ui.services.action/META-INF/MANIFEST.MF
deleted file mode 100644
index 958aac8..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.common.ui.services.action; singleton:=true
-Bundle-Version: 1.0.3.qualifier
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.common.ui.services.action;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.action.internal.filter;x-internal:=true
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-Activator: org.eclipse.gmf.tests.runtime.common.ui.services.action.Activator

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/about.html b/org.eclipse.gmf.tests.runtime.common.ui.services.action/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/build.properties b/org.eclipse.gmf.tests.runtime.common.ui.services.action/build.properties
deleted file mode 100644
index c2ec11b..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/plugin.properties b/org.eclipse.gmf.tests.runtime.common.ui.services.action/plugin.properties
deleted file mode 100644
index 5d0e197..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Common UI Services Action Tests
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/plugin.xml b/org.eclipse.gmf.tests.runtime.common.ui.services.action/plugin.xml
deleted file mode 100644
index 3fb2025..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/plugin.xml
+++ /dev/null

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-   <extension
-         id="ContributionItemProvider1"
-         name="ContributionItemProvider1"
-         point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider
-            checkPluginLoaded="false"
-            class="org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem.ContributionItemProvider1">
-         <Priority
-               name="Lowest">
-         </Priority>        
-         <partContribution class="org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem.MyWorkbenchPart">       
-            <partAction menubarPath="/additionsGroup" toolbarPath="/additionsGroup" id="action1">
-            </partAction>
-            <partMenu menubarPath="/additionsGroup" toolbarPath="/additionsGroup" id="menu1">
-            </partMenu>
-            <partAction menubarPath="/menu1/additionsGroup" toolbarPath="/additionsGroup" id="action1">
-            </partAction>
-         </partContribution>         
-      </contributionItemProvider>
-   </extension> 
-
-   <extension
-         id="ContributionItemProvider2"
-         name="ContributionItemProvider2"
-         point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider
-            checkPluginLoaded="false"
-            class="org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem.ContributionItemProvider2">
-         <Priority
-               name="Low">
-         </Priority>         
-         <partContribution class="org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem.MyWorkbenchPart">       
-            <partAction menubarPath="/additionsGroup" toolbarPath="/additionsGroup" global="false" id="action2"/>
-            <partMenu menubarPath="/menu1/additionsGroup" toolbarPath="/menu1/additionsGroup" id="menu2"/>
-         </partContribution>         
-      </contributionItemProvider>
-   </extension>
-
-   <!-- testCapabilityFiltering -->   
-   <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            id="MyActivityID"
-            name="MyActivityID"/>
-      <activityPatternBinding
-            activityId="MyActivityID"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.common\.ui\.services\.action/ContributionItemProvider2"/>
-   </extension>
-   
-   <!-- testPolicy_ClassAttribute -->
-   <extension
-         id="ContributionItemProvider3"
-         name="ContributionItemProvider3"
-         point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider
-            checkPluginLoaded="false"
-            class="org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem.ContributionItemProvider2">
-         <Priority name="Lowest"/>
-         <popupContribution class="org.eclipse.jface.action.MenuManager">
-            <popupStructuredContributionCriteria
-                  objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart"
-                  policyClass="org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem.ContributionPolicy"/>
-            <popupMenu
-                  id="org.eclipse.gmf.tests.runtime.common.ui.services.action.popupMenu1"
-                  path="/additionsGroup"/>
-            <popupMenuGroup
-                  id="org.eclipse.gmf.tests.runtime.common.ui.services.action.popupMenuGroup1"
-                  path="/"
-                  separator="true"/>
-         </popupContribution>
-      </contributionItemProvider>
-   </extension>
-   
-   <!-- testCapabilityFilteringOfSpecificEntries -->
-   <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            id="MyActivityIDOfSpecificEntries"
-            name="MyActivityIDOfSpecificEntries"/>
-      <activityPatternBinding
-            activityId="MyActivityIDOfSpecificEntries"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.common\.ui\.services\.action/menu2"/>
-      <activityPatternBinding
-            activityId="MyActivityIDOfSpecificEntries"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.common\.ui\.services\.action/action2"/>
-   </extension>  
-   
-</plugin>

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/Activator.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/Activator.java
deleted file mode 100644
index 1a25b01..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/Activator.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.action;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Anthony Hunter
- */
-public class Activator extends AbstractUIPlugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/AllTests.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/AllTests.java
deleted file mode 100644
index 5925049..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/AllTests.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem.ContributionItemServiceTests;
-import org.eclipse.gmf.tests.runtime.common.ui.services.action.internal.filter.ActionFilterServiceTest;
-
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTest(ActionFilterServiceTest.suite());
-		suite.addTest(ContributionItemServiceTests.suite());
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemProvider1.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemProvider1.java
deleted file mode 100644
index bcb6179..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemProvider1.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-
-/**
- * A contribution item provider used to test the contribution item service. The
- * plugin.xml defines where the contributions are made.
- * 
- * @author cmahoney
- */
-public class ContributionItemProvider1
-	extends AbstractContributionItemProvider {
-
-	public static final String ACTION1 = "action1"; //$NON-NLS-1$
-
-	public static final String MENU1 = "menu1"; //$NON-NLS-1$
-
-	protected IAction createAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-		if (actionId.equals(ACTION1)) {
-			return new MyAction(ACTION1);
-		}
-		return null;
-	}
-
-	protected IMenuManager createMenuManager(String menuId,
-			IWorkbenchPartDescriptor partDescriptor) {
-		if (menuId.equals(MENU1)) {
-			return new MenuManager(MENU1, MENU1);
-		}
-		return null;
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemProvider2.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemProvider2.java
deleted file mode 100644
index 77e4878..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemProvider2.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-
-/**
- * A contribution item provider used to test the contribution item service. The
- * plugin.xml defines where the contributions are made.
- * 
- * @author cmahoney
- */
-public class ContributionItemProvider2
-	extends AbstractContributionItemProvider {
-
-	public static final String ACTION2 = "action2"; //$NON-NLS-1$
-
-	public static final String MENU2 = "menu2"; //$NON-NLS-1$
-
-	protected IAction createAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-		if (actionId.equals(ACTION2)) {
-			return new MyAction(ACTION2);
-		}
-		return null;
-	}
-
-	protected IMenuManager createMenuManager(String menuId,
-			IWorkbenchPartDescriptor partDescriptor) {
-		if (menuId.equals(MENU2)) {
-			return new MenuManager(MENU2, MENU2);
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemServiceTests.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemServiceTests.java
deleted file mode 100644
index bc33d3e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionItemServiceTests.java
+++ /dev/null

@@ -1,544 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-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.ToolBarManager;
-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.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclipse.ui.services.IServiceLocator;
-
-/**
- * Tests for the Contribution Item Service.
- * 
- * @author cmahoney, mmostafa
- */
-public class ContributionItemServiceTests
-	extends TestCase {
-
-	private static final String MY_ACTIVITY_ID = "MyActivityID"; //$NON-NLS-1$
-    private static final String MY_ACTIVITY_ID_OF_SPECIFIC_ENTRIES = "MyActivityIDOfSpecificEntries"; //$NON-NLS-1$
-
-	class MyActionBars
-		implements IActionBars {
-
-		IToolBarManager myToolBarManager = new ToolBarManager();
-
-		IMenuManager myMenuManager = new MenuManager();
-
-		public void clearGlobalActionHandlers() {
-			// do nothing
-		}
-
-		public IAction getGlobalActionHandler(String actionId) {
-			return null;
-		}
-
-		public IMenuManager getMenuManager() {
-			return myMenuManager;
-		}
-
-		public IStatusLineManager getStatusLineManager() {
-			return null;
-		}
-
-		public IToolBarManager getToolBarManager() {
-			return myToolBarManager;
-		}
-
-		public void setGlobalActionHandler(String actionId, IAction handler) {
-			// do nothing
-		}
-
-		public void updateActionBars() {
-			// do nothing
-		}
-        
-        public IServiceLocator getServiceLocator() {
-            return null;
-        }
-
-	}
-    
-    class MySelection
-        implements ISelection, IStructuredSelection {
-
-        public boolean isEmpty() {
-            return true;
-        }
-
-        public Object getFirstElement() {
-            return null;
-        }
-
-        public Iterator iterator() {
-            return Collections.EMPTY_LIST.iterator();
-        }
-
-        public int size() {
-            return 0;
-        }
-
-        public Object[] toArray() {
-            return null;
-        }
-
-        public List toList() {
-            return null;
-        }
-
-    }
-
-    class MySelectionProvider
-        implements ISelectionProvider {
-
-        public void addSelectionChangedListener(
-                ISelectionChangedListener listener) {
-            // nothing to do here
-        }
-
-        public ISelection getSelection() {
-            return new MySelection();
-        }
-
-        public void removeSelectionChangedListener(
-                ISelectionChangedListener listener) {
-            // nothing to do here
-        }
-
-        public void setSelection(ISelection selection) {
-            // nothing to do here
-        }
-
-    }
-
-    class MySite
-        implements IWorkbenchPartSite {
-
-        public String getId() {
-            return null;
-        }
-
-        public IKeyBindingService getKeyBindingService() {
-            return null;
-        }
-
-        public IWorkbenchPart getPart() {
-            return null;
-        }
-
-        public String getPluginId() {
-            return null;
-        }
-
-        public String getRegisteredName() {
-            return null;
-        }
-
-        public void registerContextMenu(MenuManager menuManager,
-                ISelectionProvider selectionProvider) {
-            // nothing to do here
-        }
-
-        public void registerContextMenu(String menuId, MenuManager menuManager,
-                ISelectionProvider selectionProvider) {
-            // nothing to do here
-        }
-
-        public IWorkbenchPage getPage() {
-            return null;
-        }
-
-        public ISelectionProvider getSelectionProvider() {
-            return new MySelectionProvider();
-        }
-
-        public Shell getShell() {
-            return null;
-        }
-
-        public IWorkbenchWindow getWorkbenchWindow() {
-            return null;
-        }
-
-        public void setSelectionProvider(ISelectionProvider provider) {
-            // nothing to do here
-        }
-
-        public Object getAdapter(Class adapter) {
-            return null;
-        }
-
-        public Object getService(Class api) {
-            return null;
-        }
-
-        public boolean hasService(Class api) {
-            return false;
-        }
-
-    }
-
-    class MyWorkBenchPart
-        implements IWorkbenchPart {
-
-        public void addPropertyListener(IPropertyListener listener) {
-            // nothing to do here
-
-        }
-
-        public void createPartControl(Composite parent) {
-            // nothing to do here
-
-        }
-
-        public void dispose() {
-            // nothing to do here
-
-        }
-
-        public IWorkbenchPartSite getSite() {
-            return new MySite();
-        }
-
-        public String getTitle() {
-            return null;
-        }
-
-        public Image getTitleImage() {
-            return null;
-        }
-
-        public String getTitleToolTip() {
-            return null;
-        }
-
-        public void removePropertyListener(IPropertyListener listener) {
-            // nothing to do here
-
-        }
-
-        public void setFocus() {
-            // nothing to do here
-
-        }
-
-        public Object getAdapter(Class adapter) {
-            return null;
-        }
-
-    }
-
-	class MyWorkbenchPartDescriptor
-		implements IWorkbenchPartDescriptor {
-
-		String partId;
-
-		public MyWorkbenchPartDescriptor(String id) {
-			partId = id;
-		}
-
-		public String getPartId() {
-			return partId;
-		}
-
-		public Class getPartClass() {
-			return MyWorkbenchPart.class;
-		}
-
-		public IWorkbenchPage getPartPage() {
-			return null;
-		}
-	}
-
-	public ContributionItemServiceTests(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ContributionItemServiceTests.class);
-	}
-
-    protected void setUp() throws Exception {
-        // start with both activities enabled
-        toggleActivity(MY_ACTIVITY_ID, true);
-        toggleActivity(MY_ACTIVITY_ID_OF_SPECIFIC_ENTRIES, true);    }
-    
-	/**
-     * Tests the filtering of contribution item providers given a disabled
-     * capability/activity.
-     * 
-     * @throws Exception
-     */
-	public void testCapabilityFiltering()
-        throws Exception {
-
-        String EDITOR1 = "editor1"; //$NON-NLS-1$
-        String EDITOR2 = "editor2"; //$NON-NLS-1$
-
-        IWorkbenchPartDescriptor editor1Descriptor = new MyWorkbenchPartDescriptor(
-            EDITOR1);
-        IWorkbenchPartDescriptor editor2Descriptor = new MyWorkbenchPartDescriptor(
-            EDITOR2);
-
-        MyActionBars editor1ActionBars = new MyActionBars();
-        MyActionBars editor2ActionBars = new MyActionBars();
-
-        toggleActivity(MY_ACTIVITY_ID, false);
-
-        ContributionItemService.getInstance().contributeToActionBars(
-            editor1ActionBars, editor1Descriptor);
-
-        validateActionBars(editor1ActionBars, false, false);
-
-        ContributionItemService.getInstance().contributeToActionBars(
-            editor2ActionBars, editor2Descriptor);
-
-        validateActionBars(editor2ActionBars, false, false);
-
-        // now enable provider2 and update editor 1 only
-        toggleActivity(MY_ACTIVITY_ID, true);
-        ContributionItemService.getInstance().updateActionBars(
-            editor1ActionBars, editor1Descriptor);
-
-        validateActionBars(editor1ActionBars, true, true);
-        validateActionBars(editor2ActionBars, false, true);
-
-        // now update editor 2
-        ContributionItemService.getInstance().updateActionBars(
-            editor2ActionBars, editor2Descriptor);
-
-        validateActionBars(editor1ActionBars, true, true);
-        validateActionBars(editor2ActionBars, true, true);
-
-        // try a double update to make sure nothing changes
-        int expectedLength = editor2ActionBars.getToolBarManager().getItems().length;
-        IContributionItem expectedItem0 = editor2ActionBars.getToolBarManager().getItems()[0];
-        IContributionItem expectedItem2 = editor2ActionBars.getToolBarManager().getItems()[2];
-        
-        ContributionItemService.getInstance().updateActionBars(
-            editor2ActionBars, editor2Descriptor);
-        
-        assertEquals(expectedLength, editor2ActionBars.getToolBarManager()
-            .getItems().length);
-        assertEquals(expectedItem0, editor2ActionBars.getToolBarManager()
-            .getItems()[0]);
-        assertEquals(expectedItem2, editor2ActionBars.getToolBarManager()
-            .getItems()[2]);
-
-        validateActionBars(editor1ActionBars, true, true);
-        validateActionBars(editor2ActionBars, true, true);
-
-        // now disable provider2
-        toggleActivity(MY_ACTIVITY_ID, false);
-
-        validateActionBars(editor1ActionBars, true, false);
-        validateActionBars(editor2ActionBars, true, false);
-
-        // now enable provider2
-        toggleActivity(MY_ACTIVITY_ID, true);
-
-        validateActionBars(editor1ActionBars, true, true);
-        validateActionBars(editor2ActionBars, true, true);
-
-    }
-    
-
-    /**
-     * Tests the filtering of specific contribution items given a disabled
-     * capability/activity.
-     * 
-     * @throws Exception
-     */
-    public void testCapabilityFilteringOfSpecificEntries()
-        throws Exception {
-
-        String EDITOR1 = "editor1"; //$NON-NLS-1$
-        IWorkbenchPartDescriptor editor1Descriptor = new MyWorkbenchPartDescriptor(
-            EDITOR1);
-        MyActionBars editor1ActionBars = new MyActionBars();
-
-        // disable the activity associated with specific entries
-        toggleActivity(MY_ACTIVITY_ID_OF_SPECIFIC_ENTRIES, false);
-
-        ContributionItemService.getInstance().contributeToActionBars(
-            editor1ActionBars, editor1Descriptor);
-        validateActionBars(editor1ActionBars, true, false);
-
-        // enable it again
-        toggleActivity(MY_ACTIVITY_ID_OF_SPECIFIC_ENTRIES, true);
-        ContributionItemService.getInstance().updateActionBars(
-            editor1ActionBars, editor1Descriptor);
-        validateActionBars(editor1ActionBars, true, true);
-    }    
-    
-    /**
-     * Tests the loading of the class provided by the Policy_Class attribute
-     * 
-     * @throws Exception
-     */
-    public void testPolicy_ClassAttribute()
-        throws Exception {
-        toggleActivity(MY_ACTIVITY_ID, true);
-        ContributionItemService.getInstance().contributeToPopupMenu(
-            new MenuManager(), new MyWorkBenchPart());
-        assertTrue(
-            "The policy should be called at least once", ContributionPolicy.getCallCount() >= 1); //$NON-NLS-1$
-
-    }
-
-	/**
-	 * Toggles the enablement of the activity <code>MY_ACTIVITY_ID</code>
-	 * which is defined in the plugin.xml.
-	 * 
-     * @param activityID the activity id
-	 * @param enabled true to enable; false to disable
-	 */
-	private void toggleActivity(String activityID, boolean enabled) {
-		IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI
-			.getWorkbench().getActivitySupport();
-
-		Set enabledActivityIds = new HashSet(workbenchActivitySupport
-			.getActivityManager().getEnabledActivityIds());
-
-		boolean changeMade = enabled ? enabledActivityIds.add(activityID)
-			: enabledActivityIds.remove(activityID);
-
-		if (changeMade) {
-			workbenchActivitySupport.setEnabledActivityIds(enabledActivityIds);
-		}
-	}
-
-	/**
-	 * Validates the presence and visibility state of some of the entries in the
-	 * action bars.
-	 * 
-	 * @param actionBars
-	 * @param provider2Contributed
-	 *            Should items from provider2 be contributed?
-	 * @param provider2Visible
-	 *            Should items from provider2 be visible?
-	 */
-	private void validateActionBars(IActionBars actionBars,
-			boolean provider2Contributed, boolean provider2Visible) {
-
-		// a few tests to make sure things were contributed that should have
-		// been
-		assertNotNull(actionBars.getToolBarManager().find(
-			ContributionItemProvider1.ACTION1));
-
-		if (provider2Contributed) {
-			assertNotNull(actionBars.getToolBarManager().find(
-				ContributionItemProvider2.ACTION2));
-			assertNotNull(((IMenuManager) actionBars.getToolBarManager().find(
-				ContributionItemProvider1.MENU1))
-				.find(ContributionItemProvider2.MENU2));
-		} else {
-			assertNull(actionBars.getToolBarManager().find(
-				ContributionItemProvider2.ACTION2));
-			assertNull(((IMenuManager) actionBars.getToolBarManager().find(
-				ContributionItemProvider1.MENU1))
-				.find(ContributionItemProvider2.MENU2));
-		}
-
-		if (provider2Contributed) {
-			validateVisibility(actionBars.getMenuManager().getItems(),
-				provider2Visible);
-			validateVisibility(actionBars.getToolBarManager().getItems(),
-				provider2Visible);
-		}
-	}
-
-	/**
-	 * Validates the visibility state of any <code>ACTION2</code> contribution items.
-	 * 
-	 * @param items
-	 *            an array of contribution items
-	 * @param visibility
-	 *            Should the items be visible?
-	 */
-	private void validateVisibility(IContributionItem[] items,
-			boolean visibility) {
-		for (int i = 0; i < items.length; i++) {
-			IContributionItem item = items[i];
-			// if the item was contributed by provider2, check the visibility
-			if (item.getId().equals(ContributionItemProvider2.ACTION2)) { 
-				assertEquals(visibility, item.isVisible());
-			}
-			if (item instanceof IMenuManager) {
-				validateVisibility(((IMenuManager) item).getItems(), visibility);
-			}
-		}
-	}
-
-	/**
-	 * Prints out the contribution items in the actionbars to the console. Used
-	 * for debugging.
-	 */
-//	private void printActionBars(IActionBars actionBars) {
-//		System.out.println("    ******************************"); //$NON-NLS-1$
-//		System.out.println("TOOLBAR: "); //$NON-NLS-1$
-//		printContributionItems(actionBars.getToolBarManager().getItems(), "  "); //$NON-NLS-1$
-//		System.out.println("MENU: "); //$NON-NLS-1$
-//		printContributionItems(actionBars.getMenuManager().getItems(), "  "); //$NON-NLS-1$
-//		System.out.println("    ******************************"); //$NON-NLS-1$
-//	}
-//
-//	private void printContributionItems(IContributionItem[] items, String prefix) {
-//		for (int i = 0; i < items.length; i++) {
-//			IContributionItem item = items[i];
-//			System.out.println(prefix + item.getId());
-//			if (item instanceof IMenuManager) {
-//				printContributionItems(((IMenuManager) item).getItems(), prefix
-//					+ "  "); //$NON-NLS-1$
-//			}
-//		}
-//	}
-
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionPolicy.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionPolicy.java
deleted file mode 100644
index b49f0a0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/ContributionPolicy.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IPopupMenuContributionPolicy;
-import org.eclipse.jface.viewers.ISelection;
-
-public class ContributionPolicy
-    implements IPopupMenuContributionPolicy {
-
-    static int callcount = 0;
-
-    public boolean appliesTo(ISelection selection,
-            IConfigurationElement configuration) {
-        callcount++;
-        return false;
-    }
-
-    static int getCallCount() {
-        return callcount;
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/MyAction.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/MyAction.java
deleted file mode 100644
index 6dcf890..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/MyAction.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem;
-
-import org.eclipse.jface.action.Action;
-
-/**
- * A concrete action class to be used the test contribution item providers.
- * 
- * @author cmahoney
- */
-public class MyAction
-	extends Action {
-
-	public MyAction(String id) {
-		super(id);
-		setId(id);
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/MyWorkbenchPart.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/MyWorkbenchPart.java
deleted file mode 100644
index 039209c..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/contributionitem/MyWorkbenchPart.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action.contributionitem;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-
-/**
- * This defines the workbench part that the test contribution item providers
- * will contribute to. This is referenced in the plugin.xml.
- * 
- * @author cmahoney
- */
-public class MyWorkbenchPart
-	implements IWorkbenchPart {
-
-	public void addPropertyListener(IPropertyListener listener) {
-		// do nothing
-	}
-
-	public void createPartControl(Composite parent) {
-		// do nothing
-	}
-
-	public void dispose() {
-		// do nothing
-	}
-
-	public IWorkbenchPartSite getSite() {
-		return null;
-	}
-
-	public String getTitle() {
-		return null;
-	}
-
-	public Image getTitleImage() {
-		return null;
-	}
-
-	public String getTitleToolTip() {
-		return null;
-	}
-
-	public void removePropertyListener(IPropertyListener listener) {
-		// do nothing
-	}
-
-	public void setFocus() {
-		// do nothing
-	}
-
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/internal/filter/ActionFilterServiceTest.java b/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/internal/filter/ActionFilterServiceTest.java
deleted file mode 100644
index c05f793..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/src/org/eclipse/gmf/tests/runtime/common/ui/services/action/internal/filter/ActionFilterServiceTest.java
+++ /dev/null

@@ -1,264 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.services.action.internal.filter;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.IProviderPolicy;
-import org.eclipse.gmf.runtime.common.core.service.ProviderPriority;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.ui.action.ActionManager;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.AbstractActionFilterProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.TestAttributeOperation;
-
-/**
- * @author khussey
- *
- */
-public class ActionFilterServiceTest extends TestCase {
-
-	public class ActionFilterProvider extends AbstractActionFilterProvider {
-
-		private final String name;
-
-		private final String value;
-
-		protected ActionFilterProvider(String name, String value) {
-			super();
-
-			this.name = name;
-			this.value = value;
-		}
-
-		protected String getName() {
-			return name;
-		}
-
-		protected String getValue() {
-			return value;
-		}
-
-		public boolean provides(IOperation operation) {
-			TestAttributeOperation tao = (TestAttributeOperation) operation;
-
-			return tao.getName().equals(getName())
-				&& tao.getValue().equals(getValue());
-		}
-
-		public boolean testAttribute(
-			Object target,
-			String nam,
-			String val) {
-
-			return String.valueOf(target).equals(val);
-		}
-
-	}
-
-	protected static class Fixture extends ActionFilterService {
-
-		protected static class ProviderDescriptor
-			extends ActionFilterService.ProviderDescriptor {
-
-			protected ProviderDescriptor(IProvider provider) {
-				super(null);
-
-				this.provider = provider;
-				provider.addProviderChangeListener(this);
-			}
-
-			public IProvider getProvider() {
-				return provider;
-			}
-
-			protected IProviderPolicy getPolicy() {
-				return null;
-			}
-
-			public boolean provides(IOperation operation) {
-				return getProvider().provides(operation);
-			}
-
-		}
-
-		protected Fixture() {
-			super();
-		}
-
-		protected void addFixtureProvider(
-			ProviderPriority priority,
-			Service.ProviderDescriptor provider) {
-
-			super.addProvider(priority, provider);
-		}
-
-		protected void removeFixtureProvider(
-			Service.ProviderDescriptor provider) {
-
-			super.removeProvider(provider);
-		}
-
-	}
-
-	private Fixture fixture = null;
-
-	public ActionFilterServiceTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ActionFilterServiceTest.class);
-	}
-
-	protected Fixture getFixture() {
-		return fixture;
-	}
-
-	private void setFixture(Fixture fixture) {
-		this.fixture = fixture;
-	}
-
-	protected void setUp() throws Exception {
-		setFixture(new Fixture());
-	}
-
-	public void test_testAttribute() {
-        
-		String prefix = "@"; //$NON-NLS-1$
-
-		String zero = "zero"; //$NON-NLS-1$
-		String one = "one"; //$NON-NLS-1$
-
-		assertTrue(!getFixture().testAttribute(zero, prefix + getName(), zero));
-
-
-        IOperationHistory history = ActionManager.getDefault().getOperationHistory();
-        IUndoableOperation operation = new AbstractOperation(
-            "ActionFilterServiceTest") { //$NON-NLS-1$
-
-            public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-
-            public IStatus redo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-
-            public IStatus undo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-        };
-        
-		ActionFilterProvider provider0 =
-			new ActionFilterProvider(getName(), zero);
-		Fixture.ProviderDescriptor providerDescriptor0 =
-			new Fixture.ProviderDescriptor(provider0);
-		getFixture().addFixtureProvider(
-			ProviderPriority.HIGHEST,
-			providerDescriptor0);
-
-		assertTrue(!getFixture().testAttribute(zero, prefix + getName(), zero));
-
-        try {
-            history.execute(operation, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-        history.dispose(
-            IOperationHistory.GLOBAL_UNDO_CONTEXT, true, true, false);
-
-		assertTrue(getFixture().testAttribute(zero, prefix + getName(), zero));
-		assertTrue(getFixture().testAttribute(one, prefix + getName(), zero));
-
-        try {
-            history.execute(operation, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-        
-        history.dispose(
-            IOperationHistory.GLOBAL_UNDO_CONTEXT, true, true, false);
-
-		assertTrue(!getFixture().testAttribute(one, prefix + getName(), zero));
-		assertTrue(!getFixture().testAttribute(one, prefix + getName(), one));
-
-		ActionFilterProvider provider1 =
-			new ActionFilterProvider(getName(), one);
-		Fixture.ProviderDescriptor providerDescriptor1 =
-			new Fixture.ProviderDescriptor(provider1);
-		getFixture().addFixtureProvider(
-			ProviderPriority.LOWEST,
-			providerDescriptor1);
-
-		assertTrue(!getFixture().testAttribute(one, prefix + getName(), one));
-
-        try {
-            history.execute(operation, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-        history.dispose(
-            IOperationHistory.GLOBAL_UNDO_CONTEXT, true, true, false);
-
-		assertTrue(getFixture().testAttribute(one, prefix + getName(), one));
-		assertTrue(getFixture().testAttribute(zero, prefix + getName(), one));
-
-        try {
-            history.execute(operation, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-        history.dispose(
-            IOperationHistory.GLOBAL_UNDO_CONTEXT, true, true, false);
-
-		assertTrue(!getFixture().testAttribute(zero, prefix + getName(), one));
-		assertTrue(getFixture().testAttribute(zero, prefix + getName(), zero));
-
-		getFixture().removeFixtureProvider(providerDescriptor0);
-
-		assertTrue(getFixture().testAttribute(zero, prefix + getName(), zero));
-
-        try {
-            history.execute(operation, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-        history.dispose(
-            IOperationHistory.GLOBAL_UNDO_CONTEXT, true, true, false);
-
-		assertTrue(!getFixture().testAttribute(zero, prefix + getName(), zero));
-
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.action/test.xml b/org.eclipse.gmf.tests.runtime.common.ui.services.action/test.xml
deleted file mode 100644
index f209f07..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.common.ui.services.action"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.common.ui.services.action.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-	
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.classpath b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.classpath
deleted file mode 100644
index 4848249..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.cvsignore b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.cvsignore
deleted file mode 100644
index 092357e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin


diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.project b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.project
deleted file mode 100644
index c3ed7da..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.project
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.gmf.tests.runtime.common.ui.services.provider</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/org.eclipse.gmf.tests.runtime.common.ui.services.provider/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/META-INF/MANIFEST.MF
deleted file mode 100644
index 156c877..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.common.ui.services.provider; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.CommonUIServicesProviderPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.common.ui.services.provider;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies;x-friends:="org.eclipse.gmf.tests.runtime.common.ui",
- org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers;x-friends:="org.eclipse.gmf.tests.runtime.common.ui",
- org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses;x-friends:="org.eclipse.gmf.tests.runtime.common.ui"
-Require-Bundle: org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/about.html b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/build.properties b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/build.properties
deleted file mode 100644
index 97d7a81..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================

-#*+------------------------------------------------------------------------+

-#*| Copyright (c) 2005  IBM Corporation and others.                        |

-#*| 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:                                                          |

-#*|    IBM Corporation - initial API and implementation                    |

-#*+------------------------------------------------------------------------+

-# ==============================================================================

-bin.includes = plugin.properties,\

-               META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html

-jars.compile.order = .
-source.. = src/

-output.. = bin/


diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/plugin.properties b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/plugin.properties
deleted file mode 100644
index 884b0c3..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Common UI Test Parser Provider for JUnits
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/plugin.xml b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/plugin.xml
deleted file mode 100644
index d4ce943..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/plugin.xml
+++ /dev/null

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<plugin>

-

-   <extension

-         id="parserProviders"

-         name="%ext.parserProviders"

-         point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">

-         

-      <ParserProvider

-            class="org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers.TestParserProvider">

-         <Priority name="Highest"/>

-         <Policy class="org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies.TestParserPolicy"/>

-      </ParserProvider>

-

-   </extension>   

-      

-   <extension

-         id="iconProviders"

-         name="%ext.parserProviders"

-         point="org.eclipse.gmf.runtime.common.ui.services.iconProviders">

-      

-      

-      <IconProvider

-            class="org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers.TestExceptionThrowingPolicyIconProvider">

-         <Priority name="Medium"/>

-         <Policy class="org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies.TestExceptionThrowingIconPolicy"/>

-      </IconProvider>

-      

-      <IconProvider

-            class="org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers.TestExceptionThrowingIconProvider">

-         <Priority name="Low"/>

-      </IconProvider>

-      

-      <IconProvider

-            class="org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers.TestNoExceptionsIconProvider">

-         <Priority name="Lowest"/>

-         <Policy class="org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies.TestNoExceptionsAdaptableIconPolicy"/>

-      </IconProvider>

-      

-   </extension>   

-

-</plugin>


diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/AllTests.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/AllTests.java
deleted file mode 100644
index cc75725..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/AllTests.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.provider;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * The org.eclipse.gmf.tests.runtime.common.ui.services.provider tests plug-in
- * is not a JUnit test plug-in. This plug-in is used by
- * org.eclipse.gmf.tests.runtime.common.ui for ProviderPolicyExceptionsTest and
- * ProviderPolicyTest.
- * <p>
- * This AllTests simply is a place holder if someone does try to run the plug-in
- * as a tests plug-in.
- */
-public class AllTests
-	extends TestCase
-	implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTest(AllTestsTest.suite());
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args)
-		throws Exception {
-		TestRunner.run(suite());
-		return Arrays
-			.asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/AllTestsTest.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/AllTestsTest.java
deleted file mode 100644
index b13c32d..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/AllTestsTest.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.provider;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * The org.eclipse.gmf.tests.runtime.common.ui.services.provider tests plug-in
- * is not a JUnit test plug-in. This plug-in is used by
- * org.eclipse.gmf.tests.runtime.common.ui for ProviderPolicyExceptionsTest and
- * ProviderPolicyTest.
- * <p>
- * This AllTestsTest simply is a place holder if someone does try to run the
- * plug-in as a tests plug-in.
- */
-public class AllTestsTest
-	extends TestCase {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(AllTestsTest.class);
-	}
-
-	public void test_testNothing() {
-		// the test is successful
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/CommonUIServicesProviderPlugin.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/CommonUIServicesProviderPlugin.java
deleted file mode 100644
index 7dd6f24..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/CommonUIServicesProviderPlugin.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2005, 2006 IBM Corporation and others.

- * 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:

- *    IBM Corporation - initial API and implementation 

- ****************************************************************************/

-

-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal;

-

-import org.eclipse.core.runtime.Plugin;

-

-/**

- * Main plugin class. 

- * 

- * @author Wayne Diu, wdiu

- */

-public class CommonUIServicesProviderPlugin

-	extends Plugin {

-

-	/**

-	 * This plug-in's shared instance.

-	 */

-	private static CommonUIServicesProviderPlugin plugin;

-

-	/**

-	 * Creates a new plug-in runtime object.

-	 */

-	public CommonUIServicesProviderPlugin() {

-		super();

-		plugin = this;

-	}

-

-	/**

-	 * Retrieves this plug-in's shared instance.

-	 * 

-	 * @return This plug-in's shared instance.

-	 */

-	public static CommonUIServicesProviderPlugin getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Retrieves the unique identifier of this plug-in.

-	 * 

-	 * @return A non-empty string which is unique within the plug-in registry.

-	 */

-	public static String getPluginId() {

-		return getDefault().getBundle().getSymbolicName();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestExceptionThrowingIconPolicy.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestExceptionThrowingIconPolicy.java
deleted file mode 100644
index 073d3a7..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestExceptionThrowingIconPolicy.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProviderPolicy;
-import org.eclipse.gmf.runtime.common.ui.services.icon.GetIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconOperation;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;
-
-/**
- * A policy that purposely throws an exception
- * 
- * @author wdiu, Wayne Diu
- */
-public class TestExceptionThrowingIconPolicy
-	implements IProviderPolicy {
-
-	/**
-	 * Set to true after the provides method has been executed, implying an
-	 * exception has been thrown
-	 */
-	public static boolean providesExecuted = false;
-
-	/*
-	 * This test method purposely throws an exception
-	 */
-	public boolean provides(IOperation operation) {
-		providesExecuted = true;
-
-		if (operation instanceof GetIconOperation) {
-			if (((IIconOperation) operation).getHint() instanceof TestAdaptable) {
-				throw new NullPointerException();
-			}
-		}
-		return false;
-
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestNoExceptionsAdaptableIconPolicy.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestNoExceptionsAdaptableIconPolicy.java
deleted file mode 100644
index 68f287e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestNoExceptionsAdaptableIconPolicy.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProviderPolicy;
-import org.eclipse.gmf.runtime.common.ui.services.icon.GetIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconOperation;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;
-
-/**
- * Basic icon policy that does not throw exceptions.
- * 
- * @author wdiu, Wayne Diu
- */
-public class TestNoExceptionsAdaptableIconPolicy
-	implements IProviderPolicy {
-
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetIconOperation) {
-			return (((IIconOperation) operation).getHint() instanceof TestAdaptable);
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestParserPolicy.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestParserPolicy.java
deleted file mode 100644
index 64b9211..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/policies/TestParserPolicy.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2005 IBM Corporation and others.

- * 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:

- *    IBM Corporation - initial API and implementation 

- ****************************************************************************/

-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProviderPolicy;

-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;

-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;

-

-/**

- * For provides test will fail the first time, then pass on subsequent times.

- * 

- * @author wdiu, Wayne Diu

- */

-public class TestParserPolicy

-	implements IProviderPolicy {

-

-	/**

-	 * Set to true after the provides method has been executed

-	 */

-	public static boolean providesExecuted = false;

-

-	/*

-	 * Returns false unless the GetParserOperation hint is TestAdaptable

-	 */

-	public boolean provides(IOperation operation) {

-		providesExecuted = true;

-

-		if (operation instanceof GetParserOperation) {

-			return (((GetParserOperation) operation).getHint() instanceof TestAdaptable);

-		}

-

-		return false;

-	}

-

-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestExceptionThrowingIconProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestExceptionThrowingIconProvider.java
deleted file mode 100644
index 539aadf..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestExceptionThrowingIconProvider.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.GetIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconOperation;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;
-
-/**
- * Provider that purposely throws an exception.
- * 
- * @author wdiu, Wayne Diu
- */
-public class TestExceptionThrowingIconProvider
-	extends TestNoExceptionsIconProvider {
-
-	/**
-	 * Set to true after the provides method has been executed, implying an
-	 * exception has been thrown
-	 */
-	public static boolean providesExecuted = false;
-
-	/*
-	 * This test method purposely throws an exception
-	 */
-	public boolean provides(IOperation operation) {
-		providesExecuted = true;
-		if (operation instanceof GetIconOperation) {
-			if (((IIconOperation) operation).getHint() instanceof TestAdaptable) {
-				throw new NullPointerException();
-			}
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestExceptionThrowingPolicyIconProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestExceptionThrowingPolicyIconProvider.java
deleted file mode 100644
index c673ed7..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestExceptionThrowingPolicyIconProvider.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.GetIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconOperation;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;
-
-/**
- * Provider that complements a policy that purposely throws an exception. This
- * provider itself does not throw exceptions.
- * 
- * @author wdiu, Wayne Diu
- */
-public class TestExceptionThrowingPolicyIconProvider
-	extends TestNoExceptionsIconProvider {
-
-	/**
-	 * Set to true after the provides method has been executed
-	 */
-	public static boolean providesExecuted = false;
-
-	public boolean provides(IOperation operation) {
-		providesExecuted = true;
-
-		if (operation instanceof GetIconOperation) {
-			return (((IIconOperation) operation).getHint() instanceof TestAdaptable);
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestNoExceptionsIconProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestNoExceptionsIconProvider.java
deleted file mode 100644
index 43084eb..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestNoExceptionsIconProvider.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
-import org.eclipse.gmf.runtime.common.ui.services.icon.GetIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconOperation;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Base test icon provider.
- * 
- * @author wdiu, Wayne Diu
- */
-public class TestNoExceptionsIconProvider
-	implements IIconProvider {
-
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetIconOperation) {
-			if (((IIconOperation) operation).getHint() instanceof TestAdaptable) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public Image getIcon(IAdaptable hint, int flags) {
-		return new Image(Display.getDefault(), 10, 10);
-	}
-
-	public void addProviderChangeListener(IProviderChangeListener listener) {
-		//do nothing
-	}
-
-	public void removeProviderChangeListener(IProviderChangeListener listener) {
-		//do nothing
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestParserProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestParserProvider.java
deleted file mode 100644
index a8875c9..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/providers/TestParserProvider.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2005 IBM Corporation and others.

- * 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:

- *    IBM Corporation - initial API and implementation 

- ****************************************************************************/

-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;

-import org.eclipse.gmf.runtime.common.core.util.StringStatics;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-

-/**

- * Base test parser provider

- * 

- * @author wdiu, Wayne Diu

- */

-public class TestParserProvider implements IParserProvider {

-

-	public IParser getParser(IAdaptable hint) {

-		return new IParser() {

-

-			public String getEditString(IAdaptable element, int flags) {

-				return StringStatics.BLANK;

-			}

-

-			public IParserEditStatus isValidEditString(IAdaptable element, String editString) {

-				return null;

-			}

-

-			public ICommand getParseCommand(IAdaptable element, String newString, int flags) {

-				return null;

-			}

-

-			public String getPrintString(IAdaptable element, int flags) {

-				return StringStatics.BLANK;

-			}

-

-			public boolean isAffectingEvent(Object event, int flags) {

-				return false;

-			}

-

-			public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {

-				return null;

-			}

-			

-		};

-	}

-

-	public void addProviderChangeListener(IProviderChangeListener listener) {

-		//does nothing

-	}

-

-	public boolean provides(IOperation operation) {

-		return false;

-	}

-

-	public void removeProviderChangeListener(IProviderChangeListener listener) {

-		//does nothing

-	}

-

-}


diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/testClasses/TestAdaptable.java b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/testClasses/TestAdaptable.java
deleted file mode 100644
index 3f4d2b5..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/src/org/eclipse/gmf/tests/runtime/common/ui/services/provider/internal/testClasses/TestAdaptable.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2005 IBM Corporation and others.

- * 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:

- *    IBM Corporation - initial API and implementation 

- ****************************************************************************/

-package org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses;

-

-import org.eclipse.core.runtime.IAdaptable;

-

-/**

- * Test IAdaptable

- * 

- * @author wdiu, Wayne Diu

- */

-public final class TestAdaptable implements IAdaptable {

-

-	public Object getAdapter(Class adapter) {

-		return null;

-	}

-	

-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/.classpath b/org.eclipse.gmf.tests.runtime.common.ui.services/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/.cvsignore b/org.eclipse.gmf.tests.runtime.common.ui.services/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/.project b/org.eclipse.gmf.tests.runtime.common.ui.services/.project
deleted file mode 100644
index c4ecb69..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.common.ui.services</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/org.eclipse.gmf.tests.runtime.common.ui.services/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.common.ui.services/META-INF/MANIFEST.MF
deleted file mode 100644
index 76d09e0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.common.ui.services;singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.common.ui.services.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-Vendor: %Plugin.providerName
-Export-Package: org.eclipse.gmf.tests.runtime.common.ui.services;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.actions;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.dialogs;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.elementselection;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders;x-internal:=true

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/about.html b/org.eclipse.gmf.tests.runtime.common.ui.services/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/build.properties b/org.eclipse.gmf.tests.runtime.common.ui.services/build.properties
deleted file mode 100644
index 89adf2e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/icons/sample.gif b/org.eclipse.gmf.tests.runtime.common.ui.services/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/plugin.properties b/org.eclipse.gmf.tests.runtime.common.ui.services/plugin.properties
deleted file mode 100644
index 7550f92..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Common UI Tests
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/plugin.xml b/org.eclipse.gmf.tests.runtime.common.ui.services/plugin.xml
deleted file mode 100644
index 8bec629..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/plugin.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2006, 2006  IBM Corporation and others.                 -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-   <!--extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            id="org.eclipse.gmf.tests.runtime.common.ui.services.actionSet"
-            label="Element Selection Service Tests"
-            visible="true">
-         <menu
-               id="sampleMenu"
-               label="Element Selection Service Tests">
-            <separator name="sampleGroup"/>
-         </menu>
-         <action
-               class="org.eclipse.gmf.tests.runtime.common.ui.services.actions.TestSelectElementDialogActionDelegate"
-               icon="icons/sample.gif"
-               id="org.eclipse.gmf.tests.runtime.common.ui.services.actions.TestSelectElementDialogActionDelegate"
-               label="Test Select Element Dialog"
-               menubarPath="sampleMenu/sampleGroup"/>
-         <action
-               class="org.eclipse.gmf.tests.runtime.common.ui.services.actions.TestSelectElementListActionDelegate"
-               icon="icons/sample.gif"
-               id="org.eclipse.gmf.tests.runtime.common.ui.services.actions.TestSelectElementListActionDelegate"
-               label="Test Select Element List"
-               menubarPath="sampleMenu/sampleGroup"/>
-      </actionSet>
-   </extension-->
-   <extension
-         id="org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders.RedTestElementSectionProvider"
-         name="RedTestElementSectionProvider"
-         point="org.eclipse.gmf.runtime.common.ui.services.elementSelectionProviders">
-      <ElementSelectionProvider class="org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders.RedTestElementSectionProvider">
-         <Priority name="Lowest"/>
-      </ElementSelectionProvider>
-   </extension>
-   <extension
-         id="org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders.BlueTestElementSectionProvider"
-         name="BlueTestElementSectionProvider"
-         point="org.eclipse.gmf.runtime.common.ui.services.elementSelectionProviders">
-      <ElementSelectionProvider class="org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders.BlueTestElementSectionProvider">
-         <Priority name="Lowest"/>
-      </ElementSelectionProvider>
-   </extension>
-   <extension
-         id="org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders.YellowTestElementSectionProvider"
-         name="YellowTestElementSectionProvider"
-         point="org.eclipse.gmf.runtime.common.ui.services.elementSelectionProviders">
-      <ElementSelectionProvider class="org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders.YellowTestElementSectionProvider">
-         <Priority name="Lowest"/>
-      </ElementSelectionProvider>
-   </extension>
-
-</plugin>

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/Activator.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/Activator.java
deleted file mode 100644
index 4624d92..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/Activator.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Anthony Hunter
- */
-public class Activator extends AbstractUIPlugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/AllTests.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/AllTests.java
deleted file mode 100644
index 93f2be1..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/AllTests.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.ElementSelectionFilterTest;
-import org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.ElementSelectionScopeTest;
-import org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.ElementSelectionUserInputTest;
-
-/**
- * All tests for the plug-in.
- * 
- * @author Anthony Hunter
- */
-public class AllTests
-    extends TestCase
-    implements IPlatformRunnable {
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        TestSuite suite = new TestSuite();
-        suite.addTest(ElementSelectionScopeTest.suite());
-        suite.addTest(ElementSelectionFilterTest.suite());
-        suite.addTest(ElementSelectionUserInputTest.suite());
-        return suite;
-    }
-
-    public AllTests() {
-        super(""); //$NON-NLS-1$
-    }
-
-    public Object run(Object args)
-        throws Exception {
-        TestRunner.run(suite());
-        return Arrays
-            .asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/AbstractTestElementSelectionServiceActionDelegate.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/AbstractTestElementSelectionServiceActionDelegate.java
deleted file mode 100644
index 51ffe96..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/AbstractTestElementSelectionServiceActionDelegate.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.actions;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionScope;
-import org.eclipse.gmf.tests.runtime.common.ui.services.dialogs.TestElementSelectionProviderContext;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Action to test UI capabilities of the ElementSelectionService.
- * 
- * @author Anthony Hunter
- */
-public abstract class AbstractTestElementSelectionServiceActionDelegate
-    implements IWorkbenchWindowActionDelegate {
-
-    protected IWorkbenchWindow window;
-
-    /**
-     * The string input filter for the input which matches everything.
-     */
-    protected String inputString = "*"; //$NON-NLS-1$
-
-    /**
-     * The filter for the input which matches everything.
-     */
-    protected IFilter filter = new IFilter() {
-
-        public boolean select(Object toTest) {
-            return true;
-        }
-
-    };
-
-    /**
-     * ElementSelectionScope.VISIBLE - provide all visible elements based on the
-     * provided context.
-     */
-    protected ElementSelectionScope scope = ElementSelectionScope.VISIBLE;
-
-    /**
-     * The context for the input.
-     */
-    protected IAdaptable context = new TestElementSelectionProviderContext();
-
-    /**
-     * {@inheritDoc}
-     */
-    public abstract void run(IAction action);
-
-    /**
-     * {@inheritDoc}
-     */
-    public void selectionChanged(IAction action, ISelection selection) {
-        // empty
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void dispose() {
-        // empty
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void init(IWorkbenchWindow aWindow) {
-        this.window = aWindow;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/TestSelectElementDialogActionDelegate.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/TestSelectElementDialogActionDelegate.java
deleted file mode 100644
index 91169cb..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/TestSelectElementDialogActionDelegate.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.actions;
-
-import java.util.List;
-
-import org.eclipse.gmf.tests.runtime.common.ui.services.dialogs.TestSelectElementDialog;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Action to launch the TestSelectElementDialog.
- * 
- * @author Anthony Hunter
- */
-public class TestSelectElementDialogActionDelegate
-    extends AbstractTestElementSelectionServiceActionDelegate {
-
-    /**
-     * {@inheritDoc}
-     */
-    public void run(IAction action) {
-        TestSelectElementDialog dialog = new TestSelectElementDialog(window
-            .getShell());
-        dialog.open();
-        if (dialog.getReturnCode() != Dialog.CANCEL) {
-            List selectedElements = dialog.getSelectedElements();
-            MessageDialog.openInformation(window.getShell(),
-                "Result", "Selected "//$NON-NLS-2$//$NON-NLS-1$
-                    + ((String) selectedElements.get(0)));
-        }
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/TestSelectElementListActionDelegate.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/TestSelectElementListActionDelegate.java
deleted file mode 100644
index 6a14e03..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/actions/TestSelectElementListActionDelegate.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.actions;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.AbstractElementSelectionInput;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionService;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IMatchingObject;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Action to launch to test the SelectElementList.
- * 
- * @author Anthony Hunter
- */
-public class TestSelectElementListActionDelegate
-    extends AbstractTestElementSelectionServiceActionDelegate {
-
-    /**
-     * {@inheritDoc}
-     */
-    public void run(IAction action) {
-        AbstractElementSelectionInput input = new AbstractElementSelectionInput(
-            filter, context, scope, inputString);
-        List results = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        if (results.size() == 0) {
-            MessageDialog.openInformation(window.getShell(),
-                "Result", "Received Nothing");//$NON-NLS-2$//$NON-NLS-1$
-        } else {
-            MessageDialog.openInformation(window.getShell(),
-                "Result", "Received " //$NON-NLS-2$//$NON-NLS-1$
-                    + results.size()
-                    + " matches, first one "//$NON-NLS-1$
-                    + ((IMatchingObject) results.get(0)).getDisplayName());
-        }
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/dialogs/TestElementSelectionProviderContext.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/dialogs/TestElementSelectionProviderContext.java
deleted file mode 100644
index 06cf59d..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/dialogs/TestElementSelectionProviderContext.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.dialogs;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * A context for the tests.
- * 
- * @author Anthony Hunter
- */
-public class TestElementSelectionProviderContext
-    implements IAdaptable {
-
-    /**
-     * {@inheritDoc}
-     */
-    public Object getAdapter(Class adapter) {
-        return null;
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/dialogs/TestSelectElementDialog.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/dialogs/TestSelectElementDialog.java
deleted file mode 100644
index 69b64b1..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/dialogs/TestSelectElementDialog.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.dialogs;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.AbstractElementSelectionInput;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionComposite;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionScope;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A dialog to select an existing element.
- * 
- * @author Anthony Hunter
- */
-public class TestSelectElementDialog
-    extends Dialog {
-
-    /**
-     * The element selection composite with filter and list.
-     */
-    private ElementSelectionComposite selectElementComposite;
-
-    /**
-     * ElementSelectionScope.VISIBLE - provide all visible elements based on the
-     * provided context.
-     */
-    private ElementSelectionScope scope = ElementSelectionScope.VISIBLE;
-
-    /**
-     * The context for the input.
-     */
-    private IAdaptable context = new TestElementSelectionProviderContext();
-
-    /**
-     * Constructor for TestSelectElementDialog
-     * @param parentShell the parent shell.
-     */
-    public TestSelectElementDialog(Shell parentShell) {
-        super(parentShell);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Control createDialogArea(Composite parent) {
-        getShell().setText("Select Element"); //$NON-NLS-1$
-
-        IFilter filter = new IFilter() {
-
-            public boolean select(Object toTest) {
-                return true;
-            }
-
-        };
-
-        /*
-         * The input for the element selection service.
-         */
-        AbstractElementSelectionInput input = new AbstractElementSelectionInput(filter,
-            context, scope, StringStatics.BLANK);
-
-        selectElementComposite = new ElementSelectionComposite(
-            "Select an element (? = any character, * = any string):", //$NON-NLS-1$
-            input) {
-
-            protected void handleWidgetDefaultSelected() {
-                okPressed();
-            }
-
-            protected boolean isValidSelection(List currentSelectedElements) {
-                return true;
-            }
-
-            public void handleSelection(boolean isValid) {
-                if (getButton(IDialogConstants.OK_ID) != null) {
-                    getButton(IDialogConstants.OK_ID).setEnabled(isValid);
-                }
-            }
-
-        };
-        Composite result = new Composite(parent, SWT.NONE);
-        result.setLayout(new GridLayout());
-        result.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-        selectElementComposite.createComposite(result);
-
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void createButtonsForButtonBar(Composite parent) {
-        super.createButtonsForButtonBar(parent);
-        /**
-         * Initially disable OK button.
-         */
-        getButton(IDialogConstants.OK_ID).setEnabled(false);
-    }
-
-    /**
-     * Retrieve the user selected elements.
-     * 
-     * @return the user selected elements
-     */
-    public List getSelectedElements() {
-        return selectElementComposite.getSelectedElements();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void cancelPressed() {
-        selectElementComposite.cancel();
-        super.cancelPressed();
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionFilterTest.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionFilterTest.java
deleted file mode 100644
index 200bc70..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionFilterTest.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.AbstractElementSelectionInput;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionScope;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionService;
-import org.eclipse.gmf.tests.runtime.common.ui.services.dialogs.TestElementSelectionProviderContext;
-import org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders.TestMatchingObject;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Test cases for the filter for the element selection service, the filter being
- * the programatic filter at the application level to filter specific element
- * types.
- * 
- * @author Anthony Hunter
- */
-public class ElementSelectionFilterTest
-    extends TestCase {
-
-    private AbstractElementSelectionInput input;
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-        ElementSelectionScope scope = ElementSelectionScope.VISIBLE;
-        IAdaptable context = new TestElementSelectionProviderContext();
-        IFilter filter = new IFilter() {
-
-            public boolean select(Object toTest) {
-                return true;
-            }
-
-        };
-        input = new AbstractElementSelectionInput(filter, context, scope, "t");//$NON-NLS-1$
-    }
-
-    protected void tearDown()
-        throws Exception {
-        super.tearDown();
-        input = null;
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ElementSelectionFilterTest.class);
-    }
-
-    public void testAllElementsFilter() {
-        List matches = ElementSelectionService.getInstance()
-        .getMatchingObjects(input);
-        assertTrue(matches.size() == 6);
-    }
-
-    public void testBlueElementsFilter() {
-        input.setFilter(new IFilter() {
-
-            public boolean select(Object element) {
-                if (element instanceof TestMatchingObject) {
-                    if (((TestMatchingObject) element).getComponent().equals(
-                        "Blue")) {//$NON-NLS-1$
-                        return true;
-                    }
-                }
-                return false;
-            }
-        });
-        List matches = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        assertTrue(matches.size() == 2);
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionScopeTest.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionScopeTest.java
deleted file mode 100644
index 74a6055..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionScopeTest.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection;
-
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionScope;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Test cases for the scope for the element selection service.
- * 
- * @author Anthony Hunter
- */
-public class ElementSelectionScopeTest
-    extends TestCase {
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ElementSelectionScopeTest.class);
-    }
-
-    /**
-     * Test that you can set one ElementSelectionScope.
-     */
-    public void test_oneScopeSet() {
-        ElementSelectionScope scope = new ElementSelectionScope();
-        scope.set(ElementSelectionScope.GLOBAL);
-        assertFalse(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.VISIBLE));
-        assertTrue(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.GLOBAL));
-        assertFalse(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.BINARIES));
-        assertFalse(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.SOURCES));
-    }
-
-    /**
-     * Test that you can set two kinds of ElementSelectionScope.
-     */
-    public void test_twoScopeSet() {
-        ElementSelectionScope scope = new ElementSelectionScope();
-        scope.set(ElementSelectionScope.GLOBAL);
-        scope.set(ElementSelectionScope.VISIBLE);
-        assertTrue(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.VISIBLE));
-        assertTrue(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.GLOBAL));
-        assertFalse(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.BINARIES));
-        assertFalse(ElementSelectionScope.isSet(scope.intValue(),
-            ElementSelectionScope.SOURCES));
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionUserInputTest.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionUserInputTest.java
deleted file mode 100644
index 9c0ec93..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/ElementSelectionUserInputTest.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.AbstractElementSelectionInput;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionScope;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionService;
-import org.eclipse.gmf.tests.runtime.common.ui.services.dialogs.TestElementSelectionProviderContext;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Test cases for the user input for the element selection service.
- * 
- * @author Anthony Hunter
- */
-public class ElementSelectionUserInputTest
-    extends TestCase {
-
-    private AbstractElementSelectionInput input;
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-        ElementSelectionScope scope = ElementSelectionScope.VISIBLE;
-        IAdaptable context = new TestElementSelectionProviderContext();
-        IFilter filter = new IFilter() {
-
-            public boolean select(Object toTest) {
-                return true;
-            }
-
-        };
-        input = new AbstractElementSelectionInput(filter, context, scope,
-            StringStatics.BLANK);
-    }
-
-    protected void tearDown()
-        throws Exception {
-        super.tearDown();
-        input = null;
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ElementSelectionUserInputTest.class);
-    }
-
-    public void testBlankUserInput() {
-        input.setInput(StringStatics.BLANK);
-        List matches = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        assertTrue(matches.size() == 0);
-    }
-
-    public void testFullNameUserInput() {
-        input.setInput("one");//$NON-NLS-1$
-        List matches = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        assertTrue(matches.size() == 3);
-    }
-
-    public void testNamePrefixUserInput() {
-        input.setInput("t");//$NON-NLS-1$
-        List matches = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        assertTrue(matches.size() == 6);
-    }
-
-    public void testAnotherNamePrefixUserInput() {
-        input.setInput("th");//$NON-NLS-1$
-        List matches = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        assertTrue(matches.size() == 3);
-    }
-
-    public void testAnyStringUserInput() {
-        input.setInput("t*ee");//$NON-NLS-1$
-        List matches = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        assertTrue(matches.size() == 3);
-    }
-
-    public void testOnCharacterUserInput() {
-        input.setInput("t?ree");//$NON-NLS-1$
-        List matches = ElementSelectionService.getInstance()
-            .getMatchingObjects(input);
-        assertTrue(matches.size() == 3);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/AbstractTestElementSelectionProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/AbstractTestElementSelectionProvider.java
deleted file mode 100644
index 2f7c9cc..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/AbstractTestElementSelectionProvider.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.AbstractElementSelectionProvider;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.AbstractMatchingObject;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IMatchingObject;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IMatchingObjectsOperation;
-import org.eclipse.gmf.tests.runtime.common.ui.services.dialogs.TestElementSelectionProviderContext;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * An abstract class for the element selection providers used by the tests.
- * 
- * @author Anthony Hunter
- */
-public abstract class AbstractTestElementSelectionProvider
-    extends AbstractElementSelectionProvider {
-
-    private List matchingObjects = new ArrayList();
-
-    public AbstractTestElementSelectionProvider() {
-        super();
-        initializeMatchingObjects();
-    }
-
-    private void initializeMatchingObjects() {
-        String[] names = new String[] {"One", "Two", "Three", "Four", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-            "Five", "Six", "Seven", "Eight", "Nine"}; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$
-        String component = getTestElementComponent();
-        Image image = getTestElementImage();
-        for (int i = 0; i < names.length; i++) {
-            TestMatchingObject testMatchingObject = new TestMatchingObject(
-                names[i], component, names[i] + TestMatchingObject.DASHES
-                    + component, image, this);
-            matchingObjects.add(testMatchingObject);
-        }
-    }
-
-    protected abstract String getTestElementComponent();
-
-    protected abstract Image getTestElementImage();
-
-    public void run(IProgressMonitor monitor) {
-        /**
-         * filter the matching objects using the user input and filter.
-         */
-        String filter = validatePattern(getElementSelectionInput().getInput());
-        Pattern pattern = Pattern.compile(filter);
-        for (Iterator iter = matchingObjects.iterator(); iter.hasNext();) {
-            AbstractMatchingObject element = (AbstractMatchingObject) iter
-                .next();
-            Matcher matcher = pattern.matcher(element.getName().toLowerCase());
-            /**
-             * If element matches user input.
-             */
-            if (matcher.matches()) {
-                /**
-                 * If element matches input filter.
-                 */
-                if (getElementSelectionInput().getFilter().select(element)) {
-                    fireMatchingObjectEvent(element);
-                }
-            }
-            if (monitor.isCanceled()) {
-                break;
-            }
-        }
-
-        fireEndOfMatchesEvent();
-    }
-
-    public boolean provides(IOperation operation) {
-        assert operation instanceof IMatchingObjectsOperation;
-        Object context = ((IMatchingObjectsOperation) operation)
-            .getElementSelectionInput().getContext();
-        if (context instanceof TestElementSelectionProviderContext) {
-            return true;
-        }
-        return false;
-    }
-
-    public Object resolve(IMatchingObject object) {
-        /**
-         * Just return a String for the tests
-         */
-        return object.getDisplayName();
-    }
-
-    /**
-     * Convert the UNIX style pattern entered by the user to a Java regex
-     * pattern (? = any character, * = any string).
-     * 
-     * @param string
-     *            the UNIX style pattern.
-     * @return a Java regex pattern.
-     */
-    private String validatePattern(String string) {
-        if (string.equals(StringStatics.BLANK)) {
-            return string;
-        }
-        StringBuffer result = new StringBuffer();
-        for (int i = 0; i < string.length(); i++) {
-            char c = Character.toLowerCase(string.charAt(i));
-            if (c == '?') {
-                result.append('.');
-            } else if (c == '*') {
-                result.append(".*"); //$NON-NLS-1$
-            } else if (c == '?') {
-                result.append("\\."); //$NON-NLS-1$
-            } else {
-                result.append(c);
-            }
-        }
-        result.append(".*"); //$NON-NLS-1$
-        return result.toString();
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/BlueTestElementSectionProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/BlueTestElementSectionProvider.java
deleted file mode 100644
index 97bdf0e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/BlueTestElementSectionProvider.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * An element selection provider used by the tests.
- * 
- * @author Anthony Hunter
- */
-public class BlueTestElementSectionProvider
-    extends AbstractTestElementSelectionProvider {
-
-    protected String getTestElementComponent() {
-        return "Blue";//$NON-NLS-1$;
-    }
-
-    protected Image getTestElementImage() {
-        return PlatformUI.getWorkbench().getSharedImages().getImage(
-            ISharedImages.IMG_OBJS_INFO_TSK);
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/RedTestElementSectionProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/RedTestElementSectionProvider.java
deleted file mode 100644
index 45d8ff3..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/RedTestElementSectionProvider.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * An element selection provider used by the tests.
- * 
- * @author Anthony Hunter
- */
-public class RedTestElementSectionProvider
-    extends AbstractTestElementSelectionProvider {
-
-    protected String getTestElementComponent() {
-        return "Red";//$NON-NLS-1$;
-    }
-
-    protected Image getTestElementImage() {
-        return PlatformUI
-        .getWorkbench().getSharedImages().getImage(
-            ISharedImages.IMG_OBJS_ERROR_TSK);
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/TestMatchingObject.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/TestMatchingObject.java
deleted file mode 100644
index 70e75bc..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/TestMatchingObject.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders;
-
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.AbstractMatchingObject;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IElementSelectionProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * A matching object used by the tests.
- * 
- * @author Anthony Hunter
- */
-public class TestMatchingObject
-    extends AbstractMatchingObject {
-
-    private String component;
-    
-    public TestMatchingObject(String name, String component,
-            String displayName, Image image, IElementSelectionProvider provider) {
-        super(name, displayName, image, provider);
-        this.component = component;
-    }
-
-    public String getComponent() {
-        return component;
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/YellowTestElementSectionProvider.java b/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/YellowTestElementSectionProvider.java
deleted file mode 100644
index dbda858..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/src/org/eclipse/gmf/tests/runtime/common/ui/services/elementselection/testproviders/YellowTestElementSectionProvider.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.services.elementselection.testproviders;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * An element selection provider used by the tests.
- * 
- * @author Anthony Hunter
- */
-public class YellowTestElementSectionProvider
-extends AbstractTestElementSelectionProvider {
-
-    protected String getTestElementComponent() {
-        return "Yellow";//$NON-NLS-1$;
-    }
-
-    protected Image getTestElementImage() {
-        return PlatformUI
-        .getWorkbench().getSharedImages().getImage(
-            ISharedImages.IMG_OBJS_WARN_TSK);
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui.services/test.xml b/org.eclipse.gmf.tests.runtime.common.ui.services/test.xml
deleted file mode 100644
index a35778b..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2006  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.common.ui.services"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.common.ui.services.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/.classpath b/org.eclipse.gmf.tests.runtime.common.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.common.ui/.cvsignore b/org.eclipse.gmf.tests.runtime.common.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/.project b/org.eclipse.gmf.tests.runtime.common.ui/.project
deleted file mode 100644
index b04221a..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.common.ui</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.tests.runtime.common.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.common.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 4553e92..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.common.ui
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.common.ui.Activator
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.common.ui;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.action.actions.global;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.internal.action;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.internal.dialogs;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.internal.resources;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.internal.views.properties.tests;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.providers;x-internal:=true,
- org.eclipse.gmf.tests.runtime.common.ui.util;x-internal:=true
-Require-Bundle: org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.tests.runtime.common.ui.services.provider;bundle-version="[1.0.0,2.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/about.html b/org.eclipse.gmf.tests.runtime.common.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/build.properties b/org.eclipse.gmf.tests.runtime.common.ui/build.properties
deleted file mode 100644
index d3350e8..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/plugin.properties b/org.eclipse.gmf.tests.runtime.common.ui/plugin.properties
deleted file mode 100644
index 7550f92..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Common UI Tests
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/Activator.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/Activator.java
deleted file mode 100644
index 348f21f..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/Activator.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Anthony Hunter
- */
-public class Activator extends AbstractUIPlugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/AllTests.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/AllTests.java
deleted file mode 100644
index 8b64b74..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/AllTests.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.common.ui.action.actions.global.GlobalRedoActionTest;
-import org.eclipse.gmf.tests.runtime.common.ui.action.actions.global.GlobalUndoActionTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.action.AbstractActionDelegateTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.action.AbstractActionHandlerTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.action.ActionManagerTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.action.RemoveMnemonicTests;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.dialogs.SelectableElementTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.resources.FileChangeEventTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.resources.FileChangeEventTypeTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.resources.FileObserverFilterTest;
-import org.eclipse.gmf.tests.runtime.common.ui.internal.resources.FileObserverFilterTypeTest;
-import org.eclipse.gmf.tests.runtime.common.ui.util.StatusLineUtilTest;
-
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-        suite.addTest(AbstractActionDelegateTest.suite());
-        suite.addTest(AbstractActionHandlerTest.suite());
-		suite.addTest(ActionManagerTest.suite());
-		suite.addTest(RemoveMnemonicTests.suite());
-//		suite.addTest(ExtendedPropertyDescriptorTest.suite());
-//		suite.addTest(ExtendedTextPropertyDescriptorTest.suite());
-//		suite.addTest(PropertiesServiceTest.suite());
-//		suite.addTest(PropertySourceTest.suite());
-		suite.addTest(FileChangeEventTypeTest.suite());
-		suite.addTest(FileChangeEventTest.suite());
-		suite.addTest(FileObserverFilterTypeTest.suite());
-		suite.addTest(FileObserverFilterTest.suite());
-        suite.addTest(GlobalRedoActionTest.suite());
-        suite.addTest(GlobalUndoActionTest.suite());
-        suite.addTest(SelectableElementTest.suite());
-        suite.addTest(StatusLineUtilTest.suite());
-        /**
-         * waiting for resolution of Bugzilla 115843
-         */
-		//run ProviderPolicyTest before ProviderPolicyExceptionsTest
-//		suite.addTest(ProviderPolicyTest.suite());
-//		suite.addTest(ProviderPolicyExceptionsTest.suite());
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/action/actions/global/GlobalRedoActionTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/action/actions/global/GlobalRedoActionTest.java
deleted file mode 100644
index 9fcdbe5..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/action/actions/global/GlobalRedoActionTest.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.action.actions.global;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalRedoAction;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-public class GlobalRedoActionTest
-    extends TestCase {
-
-    private GlobalRedoAction redoAction;
-    private IViewPart part;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(GlobalRedoActionTest.class,
-            "GlobalRedoAction Test Suite"); //$NON-NLS-1$
-    }
-
-    protected void setUp()
-        throws Exception {
-        part = (IViewPart) PlatformUI.getWorkbench()
-            .getActiveWorkbenchWindow().getActivePage().getActivePart();
-
-        IOperationHistory history = OperationHistoryFactory
-            .getOperationHistory();
-        IUndoContext undoContext = new UndoContext();
-
-        redoAction = new GlobalRedoAction(part);
-        redoAction.setUndoContext(undoContext);
-
-        IUndoableOperation operation = new AbstractOperation(
-            "test_nullWorkbenchPart") { //$NON-NLS-1$
-
-            public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-
-            public IStatus undo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-
-            public IStatus redo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-        };
-
-        try {
-            operation.addContext(undoContext);
-            history.execute(operation, new NullProgressMonitor(), null);
-            history.execute(operation, new NullProgressMonitor(), null);
-            history.undo(undoContext, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Tests that the action is not enabled when it's part is closed.
-     */
-    public void test_dispose_131781() {
-
-        // Enables testing that closing the view doesn't cause exceptions to be
-        // reported to the user
-        SafeRunnable.setIgnoreErrors(false);
-
-        // Re-set the undo context to ensure that the RedoActionHandler's part
-        // listener is registered AFTER the GlobalRedoAction. We can then test
-        // that closing the part doesn't cause the RedoActionHandler's part
-        // listener to throw an NPE.
-        redoAction.setUndoContext(redoAction.getUndoContext());
-        
-        try {
-            OperationHistoryFactory.getOperationHistory().undo(
-                redoAction.getUndoContext(), new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }       
-        
-        assertTrue(redoAction.isEnabled());
-
-        // Close the view
-        PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-            .hideView(part);
-
-        assertFalse(redoAction.isEnabled());
-        
-        SafeRunnable.setIgnoreErrors(true);
-    }
-
-    /**
-     * Tests that the delegate is disposed when the undo context is set to null.
-     */
-    public void test_nullUndoContext() {
-        assertTrue(redoAction.isEnabled());
-        redoAction.setUndoContext(null);
-        assertFalse(redoAction.isEnabled());
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/action/actions/global/GlobalUndoActionTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/action/actions/global/GlobalUndoActionTest.java
deleted file mode 100644
index 7207963..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/action/actions/global/GlobalUndoActionTest.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.action.actions.global;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.GlobalUndoAction;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-public class GlobalUndoActionTest
-    extends TestCase {
-
-    private GlobalUndoAction undoAction;
-    private IViewPart part;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(GlobalUndoActionTest.class,
-            "GlobalUndoAction Test Suite"); //$NON-NLS-1$
-    }
-
-    protected void setUp()
-        throws Exception {
-        part = (IViewPart) PlatformUI.getWorkbench()
-            .getActiveWorkbenchWindow().getActivePage().getActivePart();
-
-        IOperationHistory history = OperationHistoryFactory
-            .getOperationHistory();
-        IUndoContext undoContext = new UndoContext();
-
-        undoAction = new GlobalUndoAction(part);
-        undoAction.setUndoContext(undoContext);
-
-        IUndoableOperation operation = new AbstractOperation(
-            "test_nullWorkbenchPart") { //$NON-NLS-1$
-
-            public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-
-            public IStatus undo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-
-            public IStatus redo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-                return Status.OK_STATUS;
-            }
-        };
-
-        try {
-            operation.addContext(undoContext);
-            history.execute(operation, new NullProgressMonitor(), null);
-            history.execute(operation, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Tests that the action is not enabled when it's part is closed.
-     */
-    public void test_dispose_131781() {
-        
-        // Enables testing that closing the view doesn't cause exceptions to be
-        // reported to the user
-        SafeRunnable.setIgnoreErrors(false);
-        
-        // Re-set the undo context to ensure that the UndoActionHandler's part
-        // listener is registered AFTER the GlobalUndoAction. We can then test
-        // that closing the part doesn't cause the UndoActionHandler's part
-        // listener to throw an NPE.
-        undoAction.setUndoContext(undoAction.getUndoContext());
-        
-        try {
-            OperationHistoryFactory.getOperationHistory().undo(
-               undoAction.getUndoContext(), new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }  
-        
-        assertTrue(undoAction.isEnabled());
-        
-        // Close the view
-        PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-            .hideView(part);
-        
-        assertFalse(undoAction.isEnabled());
-        
-        SafeRunnable.setIgnoreErrors(true);
-    }
-
-    /**
-     * Tests that the delegate is disposed when the undo context is set to null.
-     */
-    public void test_nullUndoContext() {
-        assertTrue(undoAction.isEnabled());
-        undoAction.setUndoContext(null);
-        assertFalse(undoAction.isEnabled());
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/AbstractActionDelegateTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/AbstractActionDelegateTest.java
deleted file mode 100644
index 0dca8ce..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/AbstractActionDelegateTest.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.internal.action;
-
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionDelegate;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-
-public class AbstractActionDelegateTest extends TestCase {
-
-	public AbstractActionDelegateTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(AbstractActionDelegateTest.class);
-	}
-
-    /**
-     * Tests that an error dialog can be successfully shown when
-     * the action delegate runs on a non-UI thread.
-     */
-    public void test_errorDialogOnNonUIThread_125482() {
-        
-        // This line must be enabled to really perform the test. Otherwise, the
-        // error dialog is not displayed and the SWTException would NEVER occur.
-        // However, for the purpose of automated testing, the automated mode
-        // will be true.
-        //
-        // ErrorDialog.AUTOMATED_MODE = false;
-        
-
-        AbstractActionDelegate actionDelegate = new AbstractActionDelegate() {
-
-            protected void doRun(IProgressMonitor progressMonitor) {
-
-                final Exception e = new Exception("Forced Exception"); //$NON-NLS-1$
-                final IWorkbenchPart part = PlatformUI.getWorkbench()
-                    .getActiveWorkbenchWindow().getActivePage().getActivePart();
-
-                IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-                    public void run(IProgressMonitor monitor)
-                        throws InvocationTargetException, InterruptedException {
-                        try {
-                            setAction(new Action("AbstractActionDelegateTest") { //$NON-NLS-1$
-                                // nothing
-                            });
-                            setWorkbenchPart(part);
-
-                            handle(e);
-                        } catch (SWTException swte) {
-                            fail("Do not expect SWT Exception: " + swte.getLocalizedMessage()); //$NON-NLS-1$
-                        }
-                    }
-                };
-
-                try {
-                    ModalContext.run(runnable, true, new NullProgressMonitor(),
-                        Display.getCurrent());
-                } catch (InterruptedException ie) {
-                    // do nothing
-                } catch (InvocationTargetException ite) {
-                    // do nothing
-                }
-            }
-        };
-        actionDelegate.run(new NullProgressMonitor());
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/AbstractActionHandlerTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/AbstractActionHandlerTest.java
deleted file mode 100644
index 39a1c14..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/AbstractActionHandlerTest.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.common.ui.internal.action;
-
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-
-public class AbstractActionHandlerTest extends TestCase {
-
-	public AbstractActionHandlerTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(AbstractActionHandlerTest.class);
-	}
-
-    /**
-     * Tests that an error dialog can be successfully shown when
-     * the action handler runs on a non-UI thread.
-     */
-    public void test_errorDialogOnNonUIThread_132143() {
-        
-        // This line must be enabled to really perform the test. Otherwise, the
-        // error dialog is not displayed and the SWTException would NEVER occur.
-        // However, for the purpose of automated testing, the automated mode
-        // will be true.
-        //
-        // ErrorDialog.AUTOMATED_MODE = false;
-        
-         final IWorkbenchPart part = PlatformUI.getWorkbench()
-         .getActiveWorkbenchWindow().getActivePage().getActivePart();
-
-        AbstractActionHandler actionHandler = new AbstractActionHandler(part) {
-
-            protected void doRun(IProgressMonitor progressMonitor) {
-
-                final Exception e = new Exception("Forced Exception"); //$NON-NLS-1$
-                
-                IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-                    public void run(IProgressMonitor monitor)
-                        throws InvocationTargetException, InterruptedException {
-                            setText("test_errorDialogOnNonUIThread_132143"); //$NON-NLS-1$
-                            setWorkbenchPart(part);
-                            handle(e);
-                    }
-                };
-
-                try {
-                    ModalContext.run(runnable, true, new NullProgressMonitor(),
-                        Display.getCurrent());
-                    
-                } catch (InvocationTargetException ite) {
-                    fail("Unexpected exception:" + ite); //$NON-NLS-1$
-                    
-                } catch (InterruptedException ie) {
-                    fail("Unexpected exception:" + ie); //$NON-NLS-1$
-                }
-            }
-            
-            public void refresh() {
-                // do nothing
-            }
-        };
-        actionHandler.run(new NullProgressMonitor());
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/ActionManagerTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/ActionManagerTest.java
deleted file mode 100644
index 22f0224..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/ActionManagerTest.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.action;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.ui.action.ActionManager;
-import org.eclipse.gmf.runtime.common.ui.action.ActionManagerChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.action.IActionManagerChangeListener;
-import org.eclipse.gmf.runtime.common.ui.action.IActionWithProgress;
-
-/**
- * @author khussey
- */
-public class ActionManagerTest extends TestCase {
-
-    protected static class RepeatableAction implements IActionWithProgress {
-
-        private final String label;
-
-        private final boolean runnable;
-
-        public RepeatableAction(
-            String label,
-            boolean runnable) {
-            super();
-
-            this.label = label;
-            this.runnable = runnable;
-        }
-
-        public String getLabel() {
-            return label;
-        }
-
-        public boolean isRunnable() {
-            return runnable;
-        }
-
-        public void refresh() {/*Empty block*/}
-
-        public void run(IProgressMonitor progressMonitor) {/*Empty block*/}
-
-        public WorkIndicatorType getWorkIndicatorType() {
-            return WorkIndicatorType.NONE;
-        }
-        
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#setup()
-		 */
-		public boolean setup() {
-			return true;
-		}
-    }
-
-    protected static class Fixture extends ActionManager {
-
-        public Fixture() {
-            super(OperationHistoryFactory.getOperationHistory());
-        }
-
-        protected IActionWithProgress getFixtureAction() {
-            return super.getAction();
-        }
-
-        protected void setFixtureAction(IActionWithProgress action) {
-            super.setAction(action);
-        }
-
-        protected void fireActionManagerChange(ActionManagerChangeEvent event) {
-            super.fireActionManagerChange(event);
-        }
-
-    }
-
-    private ActionManagerChangeEvent actionManagerChangeEvent = null;
-
-    private Exception exception = null;
-
-    private Fixture fixture = null;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(ActionManagerTest.class);
-    }
-
-    public ActionManagerTest(String name) {
-        super(name);
-    }
-
-    protected ActionManagerChangeEvent getActionManagerChangeEvent() {
-        return actionManagerChangeEvent;
-    }
-
-    protected void setActionManagerChangeEvent(ActionManagerChangeEvent actionManagerChangeEvent) {
-        this.actionManagerChangeEvent = actionManagerChangeEvent;
-    }
-
-    protected Exception getException() {
-        return exception;
-    }
-
-    protected void setException(Exception exception) {
-        this.exception = exception;
-    }
-
-    protected Fixture getFixture() {
-        return fixture;
-    }
-
-    protected void setFixture(Fixture fixture) {
-        this.fixture = fixture;
-    }
-
-    protected void setUp() {
-        setFixture(new Fixture());
-    }
-
-    public void test_add_remove_ActionManagerChangeListener() {
-        IActionManagerChangeListener listener =
-            new IActionManagerChangeListener() {
-            public void actionManagerChanged(ActionManagerChangeEvent event) {
-                setActionManagerChangeEvent(event);
-            }
-        };
-
-        assertNull(getActionManagerChangeEvent());
-
-        getFixture().addActionManagerChangeListener(listener);
-        getFixture().fireActionManagerChange(
-            new ActionManagerChangeEvent(getFixture()));
-
-        assertNotNull(getActionManagerChangeEvent());
-        assertSame(getFixture(), getActionManagerChangeEvent().getSource());
-
-        setActionManagerChangeEvent(null);
-        getFixture().removeActionManagerChangeListener(listener);
-        getFixture().fireActionManagerChange(
-            new ActionManagerChangeEvent(getFixture()));
-
-        assertNull(getActionManagerChangeEvent());
-    }
-
-    public void test_fireActionManagerChange() {
-        final int count = 99;
-
-        final IActionManagerChangeListener[] listeners =
-            new IActionManagerChangeListener[count];
-
-        for (int i = 0; i < count; i++) {
-            listeners[i] = new IActionManagerChangeListener() {
-                public void actionManagerChanged(ActionManagerChangeEvent event) {/*Empty block*/}
-            };
-        }
-
-        Thread addThread = new Thread(new Runnable() {
-            public void run() {
-                for (int i = 0; i < count; i++) {
-                    getFixture().addActionManagerChangeListener(listeners[i]);
-
-                    if (null != getException()) {
-                        break;
-                    }
-                }
-            }
-        });
-        addThread.start();
-
-        Thread fireThread = new Thread(new Runnable() {
-            public void run() {
-                ActionManagerChangeEvent event =
-                    new ActionManagerChangeEvent(getFixture());
-
-                try {
-                    for (int i = 0; i < count; i++) {
-                        getFixture().fireActionManagerChange(event);
-
-                        try {
-                            Thread.sleep(1);
-                        } catch (InterruptedException ie) {/*Empty block*/}
-
-                    }
-                } catch (Exception e) {
-                    setException(e);
-                }
-            }
-        });
-        fireThread.start();
-
-        Thread removeThread = new Thread(new Runnable() {
-            public void run() {
-                for (int i = 0; i < count; i++) {
-                    getFixture().removeActionManagerChangeListener(
-                        listeners[i]);
-
-                    if (null != getException()) {
-                        break;
-                    }
-                }
-            }
-        });
-        removeThread.start();
-
-        try {
-            fireThread.join();
-        } catch (InterruptedException ie) {
-            setException(ie);
-        }
-
-        if (null != getException()) {
-            fail();
-        }
-    }
-
-    public void test_clear() {
-        assertNull(getFixture().getFixtureAction());
-
-        getFixture().setFixtureAction(
-            new RepeatableAction(getName(), true));
-        assertNotNull(getFixture().getFixtureAction());
-
-        getFixture().clear();
-        assertNull(getFixture().getFixtureAction());
-    }
-
-    public void test_run() {
-        assertNull(getFixture().getFixtureAction());
-
-        try {
-            getFixture().run(new RepeatableAction(getName(), false));
-            fail();
-        } catch (UnsupportedOperationException uoe) {
-            assertNull(getFixture().getFixtureAction());
-        }
-
-        IActionWithProgress action = new RepeatableAction(getName(), true);
-        try {
-            getFixture().run(action);
-            assertSame(action, getFixture().getFixtureAction());
-        } catch (UnsupportedOperationException uoe) {
-            fail();
-        }
-
-        try {
-            getFixture().run(new RepeatableAction(getName(), false));
-            fail();
-        } catch (UnsupportedOperationException uoe) {
-            assertSame(action, getFixture().getFixtureAction());
-        }
-
-        action = new RepeatableAction(getName(), true);
-        try {
-            getFixture().run(action);
-            assertSame(action, getFixture().getFixtureAction());
-        } catch (Exception e) {
-            fail();
-        }
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/RemoveMnemonicTests.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/RemoveMnemonicTests.java
deleted file mode 100644
index 411873e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/action/RemoveMnemonicTests.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.action;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction;
-
-/**
- * Tests the action classes that remove the mnemonics and specifically removes
- * the Korean (&X). See RATLC00530818.
- * 
- * @author cmahoney
- */
-public class RemoveMnemonicTests
-	extends TestCase {
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(RemoveMnemonicTests.class);
-    }
-
-    public RemoveMnemonicTests(String name) {
-        super(name);
-    }
-    
-	public void test_RATLC00530818() {
-		String cmd = "My Command"; //$NON-NLS-1$
-		String cmdEnglish = "My &Command"; //$NON-NLS-1$
-		String cmdKorean = "My Command(&C)"; //$NON-NLS-1$
-
-		assertEquals(cmd, GlobalAction.removeMnemonics(cmdEnglish));
-		assertEquals(cmd, GlobalAction.removeMnemonics(cmdKorean));
-
-		assertEquals(cmd, AbstractActionHandler.removeMnemonics(cmdEnglish));
-		assertEquals(cmd, AbstractActionHandler.removeMnemonics(cmdKorean));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/dialogs/SelectableElementTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/dialogs/SelectableElementTest.java
deleted file mode 100644
index 43c759a..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/dialogs/SelectableElementTest.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.dialogs;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElement;
-import org.eclipse.gmf.runtime.common.ui.dialogs.SelectedType;
-
-/**
- * @author cmcgee
-*/
-public class SelectableElementTest extends TestCase {
-
-    SelectableElement root,branch1,branch2,brancha,branchb,branchc,branchd;
-    TestHint branchcHint, branchdHint;
-    
-    private static class TestHint extends SelectableElement {
-    	String name, id;
-    	public TestHint(String name, String id) {
-    		super(name,id, null, null);
-    		
-    		this.name = name;
-    		this.id = id;
-    	}
-    	
-    	public String getId() {
-    		return id;
-    	}
-    }
-    
-    /*
-     * @see TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        branchcHint = new TestHint("branchc","org.eclipse.gmf.tests.runtime.common.ui.branchc");  //$NON-NLS-1$//$NON-NLS-2$
-        branchdHint = new TestHint("branchd","org.eclipse.gmf.tests.runtime.common.ui.branchd"); //$NON-NLS-1$ //$NON-NLS-2$
-        
-        root = new SelectableElement("", "",null,new String("root"));  //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-        branch1 = new SelectableElement("branch1","branch1",null,new String("branch1"));  //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-        branch2 = new SelectableElement("branch2","branch2",null,new String("branch2")); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
-        brancha = new SelectableElement("brancha","brancha",null,new String("brancha"));  //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-        branchb = new SelectableElement("branchb","branchb",null,new String("branchb"));  //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-        branchc = new SelectableElement("branchc","branchc",null,branchcHint);  //$NON-NLS-1$//$NON-NLS-2$
-        branchd = new SelectableElement("branchd","branchd",null,branchdHint); //$NON-NLS-1$ //$NON-NLS-2$
-        root.addChild(branch1);
-        root.addChild(branch2);
-        branch1.addChild(brancha);
-        branch1.addChild(branchb);
-        branch2.addChild(brancha);
-        branch2.addChild(branchb);
-        branch2.addChild(branchc);
-        branch2.addChild(branchd);
-        
-        brancha.setSelectedType(SelectedType.SELECTED);
-        branchc.setSelectedType(SelectedType.SELECTED);
-    }
-
-    public void test_getSelectedElementIds() {
-    	List ids = root.getSelectedElementIds();
-    	Set hints = new HashSet();
-    	root.getHints(ids,hints);
-    	Assert.assertTrue(hints.contains("brancha")); //$NON-NLS-1$
-    	Assert.assertTrue(hints.contains(branchcHint));
-    	Assert.assertFalse(hints.contains(branchdHint));
-    }
-    
-    public static Test suite() {
-        return new TestSuite(SelectableElementTest.class);
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileChangeEventTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileChangeEventTest.java
deleted file mode 100644
index 15f9622..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileChangeEventTest.java
+++ /dev/null

@@ -1,562 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.resources;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URI;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFileState;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourceAttributes;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileChangeEventType;
-
-/**
- * 
- * 
- * @author Anthony Hunter 
- * <a href="mailto:ahunter@rational.com">ahunter@rational.com</a>
- */
-public class FileChangeEventTest extends TestCase {
-
-	protected class File implements IFile {
-
-		private IPath path;
-
-		public File(IPath path) {
-			this.path = path;
-		}
-
-		public void appendContents(
-			InputStream source,
-			boolean force,
-			boolean keepHistory,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setCharset(String newCharset, IProgressMonitor monitor)
-			throws CoreException {
-			// blank
-
-		}
-		public void appendContents(
-			InputStream source,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void create(
-			InputStream source,
-			boolean force,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void create(
-			InputStream source,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void createLink(
-			IPath localLocation,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void delete(
-			boolean force,
-			boolean keepHistory,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public InputStream getContents() throws CoreException {
-			return null;
-		}
-
-		public InputStream getContents(boolean force) throws CoreException {
-			return null;
-		}
-
-		public int getEncoding() throws CoreException {
-			// Can't get rid of warning as depricated abstract method
-			// must be implemented
-			return 0;
-		}
-
-		public IPath getFullPath() {
-			return null;
-		}
-
-		public IFileState[] getHistory(IProgressMonitor monitor)
-			throws CoreException {
-			return null;
-		}
-
-		public String getName() {
-			return null;
-		}
-
-		public boolean isReadOnly() {
-			return false;
-		}
-
-		public void move(
-			IPath destination,
-			boolean force,
-			boolean keepHistory,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setContents(
-			IFileState source,
-			boolean force,
-			boolean keepHistory,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setContents(
-			IFileState source,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setContents(
-			InputStream source,
-			boolean force,
-			boolean keepHistory,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setContents(
-			InputStream source,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void accept(IResourceProxyVisitor visitor, int memberFlags)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void accept(
-			IResourceVisitor visitor,
-			int depth,
-			boolean includePhantoms)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void accept(
-			IResourceVisitor visitor,
-			int depth,
-			int memberFlags)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void accept(IResourceVisitor visitor) throws CoreException {
-			/*Empty block*/
-		}
-
-		public void clearHistory(IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void copy(
-			IPath destination,
-			boolean force,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void copy(
-			IPath destination,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void copy(
-			IProjectDescription description,
-			boolean force,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void copy(
-			IProjectDescription description,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public IMarker createMarker(String type) throws CoreException {
-			return null;
-		}
-
-		public void delete(boolean force, IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void delete(int updateFlags, IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void deleteMarkers(
-			String type,
-			boolean includeSubtypes,
-			int depth)
-			throws CoreException {/*Empty block*/
-		}
-
-		public boolean exists() {
-			return false;
-		}
-
-		public IMarker findMarker(long id) throws CoreException {
-			return null;
-		}
-
-		public IMarker[] findMarkers(
-			String type,
-			boolean includeSubtypes,
-			int depth)
-			throws CoreException {
-			return null;
-		}
-
-		public String getFileExtension() {
-			return null;
-		}
-
-		public IPath getLocation() {
-			return path;
-		}
-
-		public IMarker getMarker(long id) {
-			return null;
-		}
-
-		public long getModificationStamp() {
-			return 0;
-		}
-
-		public IContainer getParent() {
-			return null;
-		}
-
-		public String getPersistentProperty(QualifiedName key)
-			throws CoreException {
-			return null;
-		}
-
-		public IProject getProject() {
-			return null;
-		}
-
-		public IPath getProjectRelativePath() {
-			return null;
-		}
-
-		public IPath getRawLocation() {
-			return null;
-		}
-
-		public Object getSessionProperty(QualifiedName key)
-			throws CoreException {
-			return null;
-		}
-
-		public int getType() {
-			return 0;
-		}
-
-		public IWorkspace getWorkspace() {
-			return null;
-		}
-
-		public boolean isAccessible() {
-			return false;
-		}
-
-		public boolean isDerived() {
-			return false;
-		}
-
-		public boolean isLinked() {
-			return false;
-		}
-
-		public boolean isLocal(int depth) {
-			return false;
-		}
-
-		public boolean isPhantom() {
-			return false;
-		}
-
-		public boolean isSynchronized(int depth) {
-			return false;
-		}
-
-		public boolean isTeamPrivateMember() {
-			return false;
-		}
-
-		public void move(
-			IPath destination,
-			boolean force,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void move(
-			IPath destination,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void move(
-			IProjectDescription description,
-			boolean force,
-			boolean keepHistory,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void move(
-			IProjectDescription description,
-			int updateFlags,
-			IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void refreshLocal(int depth, IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setDerived(boolean isDerived) throws CoreException {/*Empty block*/
-		}
-
-		public void setLocal(boolean flag, int depth, IProgressMonitor monitor)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setPersistentProperty(QualifiedName key, String value)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setReadOnly(boolean readOnly) {/*Empty block*/
-		}
-
-		public void setSessionProperty(QualifiedName key, Object value)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void setTeamPrivateMember(boolean isTeamPrivate)
-			throws CoreException {/*Empty block*/
-		}
-
-		public void touch(IProgressMonitor monitor) throws CoreException {/*Empty block*/
-		}
-
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getLocalTimeStamp()
-		 */
-		public long getLocalTimeStamp() {
-			return 0;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setLocalTimeStamp(long)
-		 */
-		public long setLocalTimeStamp(long value) throws CoreException {
-			return 0;
-		}
-
-		/**
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean contains(ISchedulingRule rule) {
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean isConflicting(ISchedulingRule rule) {
-			return false;
-		}
-		
-		public String getCharset() throws CoreException
-		{
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFile#setCharset(java.lang.String)
-		 */
-		public void setCharset(String newCharset)
-			throws CoreException {/*Empty block*/
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IFile#getCharset(boolean)
-		 */
-		public String getCharset(boolean checkImplicit)
-			throws CoreException {
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IFile#getContentDescription()
-		 */
-		public IContentDescription getContentDescription()
-			throws CoreException {
-			return null;
-		}
-
-		public String getCharsetFor(Reader reader) throws CoreException {
-			return null;
-		}
-
-		public ResourceAttributes getResourceAttributes() {
-			return null;
-		}
-
-		public void revertModificationStamp(long value) throws CoreException {
-			/*Empty block*/
-		}
-
-		public void setResourceAttributes(ResourceAttributes attributes) throws CoreException {
-			/*Empty block*/
-		}
-
-		public URI getLocationURI() {
-			return null;
-		}
-
-		public void createLink(URI location, int updateFlags, IProgressMonitor monitor) throws CoreException {
-			/*Empty block*/
-		}
-
-		public URI getRawLocationURI() {
-			return null;
-		}
-
-		public boolean isLinked(int options) {
-			return false;
-		}
-
-		public IResourceProxy createProxy() {
-			return null;
-		}
-
-        public int findMaxProblemSeverity(String type, boolean includeSubtypes,
-                int depth)
-            throws CoreException {
-            return 0;
-        }
-	}
-	
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(FileChangeEventTest.class);
-	}
-
-	public FileChangeEventTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() {/*Empty block*/
-	}
-
-	public void test_deleteFileChangeEvent() {
-		IPath path = new Path("c:\\test.txt"); //$NON-NLS-1$
-		IFile file = new File(path);
-		FileChangeEvent event =
-			new FileChangeEvent(FileChangeEventType.DELETED, file);
-		assertTrue(event.getEventType() == FileChangeEventType.DELETED);
-		assertTrue(event.getFile().equals(file));
-	}
-
-	public void test_changeFileChangeEvent() {
-		IPath oldPath = new Path("c:\\test.txt"); //$NON-NLS-1$
-		IFile file = new File(oldPath);
-		FileChangeEvent event =
-			new FileChangeEvent(FileChangeEventType.CHANGED, file);
-		assertTrue(event.getEventType() == FileChangeEventType.CHANGED);
-		assertTrue(event.getFile().equals(file));
-	}
-	
-	public void test_moveFileChangeEvent() {
-		IPath oldPath = new Path("c:\\folder\\test.txt"); //$NON-NLS-1$
-		IFile oldFile = new File(oldPath);
-		IPath path = new Path("c:\\test.txt"); //$NON-NLS-1$
-		IFile file = new File(path);
-		FileChangeEvent event =
-			new FileChangeEvent(FileChangeEventType.MOVED, oldFile, file);
-		assertTrue(event.getEventType() == FileChangeEventType.MOVED);
-		assertTrue(event.getFile().equals(file));
-		assertTrue(event.getOldFile().equals(oldFile));
-	}
-
-	public void test_renameFileChangeEvent() {
-		IPath oldPath = new Path("c:\\oldtest.txt"); //$NON-NLS-1$
-		IFile oldFile = new File(oldPath);
-		IPath path = new Path("c:\\test.txt"); //$NON-NLS-1$
-		IFile file = new File(path);
-		FileChangeEvent event =
-			new FileChangeEvent(FileChangeEventType.RENAMED, oldFile, file);
-		assertTrue(event.getEventType() == FileChangeEventType.RENAMED);
-		assertTrue(event.getFile().equals(file));
-		assertTrue(event.getOldFile().equals(oldFile));
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileChangeEventTypeTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileChangeEventTypeTest.java
deleted file mode 100644
index 01c9942..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileChangeEventTypeTest.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.resources;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileChangeEventType;
-
-/**
- * 
- * 
- * @author Anthony Hunter 
- * <a href="mailto:ahunter@rational.com">ahunter@rational.com</a>
- */
-public class FileChangeEventTypeTest extends TestCase {
-	
-	protected static class Fixture extends FileChangeEventType {
-
-		private static final long serialVersionUID = 1;
-		
-		protected Fixture() {
-			super("Fixture", 0); //$NON-NLS-1$
-		}
-
-		protected List getValues() {
-			return super.getValues();
-		}
-
-	}
-
-	private Fixture fixture = null;
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(FileChangeEventTypeTest.class);
-	}
-
-	public FileChangeEventTypeTest(String name) {
-		super(name);
-	}
-
-	protected Fixture getFixture() {
-		return fixture;
-	}
-
-	private void setFixture(Fixture fixture) {
-		this.fixture = fixture;
-	}
-
-	protected void setUp() {
-		setFixture(new Fixture());
-	}
-
-	public void test_readResolve() {
-		ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-		ObjectOutput output = null;
-		ObjectInput input = null;
-		try {
-			output = new ObjectOutputStream(stream);
-			for (Iterator i = getFixture().getValues().iterator();
-				i.hasNext();
-				) {
-				output.writeObject(i.next());
-			}
-			output.flush();
-
-			input =
-				new ObjectInputStream(
-					new ByteArrayInputStream(stream.toByteArray()));
-			for (Iterator i = getFixture().getValues().iterator();
-				i.hasNext();
-				) {
-				assertSame(i.next(), input.readObject());
-			}
-		} catch (Exception e) {
-			fail();
-		} finally {
-			try {
-				output.close();
-				input.close();
-			} catch (Exception e) {/*Empty block*/}
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileObserverFilterTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileObserverFilterTest.java
deleted file mode 100644
index 8776b6f..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileObserverFilterTest.java
+++ /dev/null

@@ -1,1220 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.resources;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URI;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFileState;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourceAttributes;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileObserverFilter;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileObserverFilterType;
-
-/**
- * @author Anthony Hunter <a
- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>
- */
-public class FileObserverFilterTest
-	extends TestCase {
-
-	protected class File
-		implements IFile {
-
-		private IPath path;
-
-		public File(IPath path) {
-			this.path = path;
-		}
-
-		public void setCharset(String newCharset, IProgressMonitor monitor)
-			throws CoreException {
-			// blank
-		}
-
-		public void appendContents(InputStream source, boolean force,
-				boolean keepHistory, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void appendContents(InputStream source, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void create(InputStream source, boolean force,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void create(InputStream source, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void createLink(IPath localLocation, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void delete(boolean force, boolean keepHistory,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public InputStream getContents()
-			throws CoreException {
-			return null;
-		}
-
-		public InputStream getContents(boolean force)
-			throws CoreException {
-			return null;
-		}
-
-		public IPath getFullPath() {
-			return path;
-		}
-
-		public IFileState[] getHistory(IProgressMonitor monitor)
-			throws CoreException {
-			return null;
-		}
-
-		public String getName() {
-			return null;
-		}
-
-		public boolean isReadOnly() {
-			return false;
-		}
-
-		public void move(IPath destination, boolean force, boolean keepHistory,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setContents(IFileState source, boolean force,
-				boolean keepHistory, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setContents(IFileState source, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setContents(InputStream source, boolean force,
-				boolean keepHistory, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setContents(InputStream source, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void accept(IResourceProxyVisitor visitor, int memberFlags)
-			throws CoreException {/* Empty block */
-		}
-
-		public void accept(IResourceVisitor visitor, int depth,
-				boolean includePhantoms)
-			throws CoreException {/* Empty block */
-		}
-
-		public void accept(IResourceVisitor visitor, int depth, int memberFlags)
-			throws CoreException {/* Empty block */
-		}
-
-		public void accept(IResourceVisitor visitor)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		public void clearHistory(IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void copy(IPath destination, boolean force,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void copy(IPath destination, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void copy(IProjectDescription description, boolean force,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void copy(IProjectDescription description, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public IMarker createMarker(String type)
-			throws CoreException {
-			return null;
-		}
-
-		public void delete(boolean force, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void delete(int updateFlags, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void deleteMarkers(String type, boolean includeSubtypes,
-				int depth)
-			throws CoreException {/* Empty block */
-		}
-
-		public boolean exists() {
-			return false;
-		}
-
-		public IMarker findMarker(long id)
-			throws CoreException {
-			return null;
-		}
-
-		public IMarker[] findMarkers(String type, boolean includeSubtypes,
-				int depth)
-			throws CoreException {
-			return null;
-		}
-
-		public String getFileExtension() {
-			return null;
-		}
-
-		public IPath getLocation() {
-			return path;
-		}
-
-		public IMarker getMarker(long id) {
-			return null;
-		}
-
-		public long getModificationStamp() {
-			return 0;
-		}
-
-		public IContainer getParent() {
-			return null;
-		}
-
-		public String getPersistentProperty(QualifiedName key)
-			throws CoreException {
-			return null;
-		}
-
-		public IProject getProject() {
-			return null;
-		}
-
-		public IPath getProjectRelativePath() {
-			return null;
-		}
-
-		public IPath getRawLocation() {
-			return null;
-		}
-
-		public Object getSessionProperty(QualifiedName key)
-			throws CoreException {
-			return null;
-		}
-
-		public int getType() {
-			return 0;
-		}
-
-		public IWorkspace getWorkspace() {
-			return null;
-		}
-
-		public boolean isAccessible() {
-			return false;
-		}
-
-		public boolean isDerived() {
-			return false;
-		}
-
-		public boolean isLinked() {
-			return false;
-		}
-
-		public boolean isLocal(int depth) {
-			return false;
-		}
-
-		public boolean isPhantom() {
-			return false;
-		}
-
-		public boolean isSynchronized(int depth) {
-			return false;
-		}
-
-		public boolean isTeamPrivateMember() {
-			return false;
-		}
-
-		public void move(IPath destination, boolean force,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void move(IPath destination, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void move(IProjectDescription description, boolean force,
-				boolean keepHistory, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void move(IProjectDescription description, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void refreshLocal(int depth, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setDerived(boolean isDerived)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		public void setLocal(boolean flag, int depth, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setPersistentProperty(QualifiedName key, String value)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setReadOnly(boolean readOnly) {/* Empty block */
-		}
-
-		public void setSessionProperty(QualifiedName key, Object value)
-			throws CoreException {/* Empty block */
-		}
-
-		public void setTeamPrivateMember(boolean isTeamPrivate)
-			throws CoreException {/* Empty block */
-		}
-
-		public void touch(IProgressMonitor monitor)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getLocalTimeStamp()
-		 */
-		public long getLocalTimeStamp() {
-			return 0;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setLocalTimeStamp(long)
-		 */
-		public long setLocalTimeStamp(long value)
-			throws CoreException {
-			return 0;
-		}
-
-		/**
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean contains(ISchedulingRule rule) {
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean isConflicting(ISchedulingRule rule) {
-			return false;
-		}
-
-		public String getCharset()
-			throws CoreException {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFile#setCharset(java.lang.String)
-		 */
-		public void setCharset(String newCharset)
-			throws CoreException {
-			/* Empty block */}
-
-		/**
-		 * @see org.eclipse.core.resources.IFile#getEncoding()
-		 */
-		public int getEncoding()
-			throws CoreException {
-			// Can't get rid of warning as depricated abstract method
-			// must be implemented
-			return 0;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IFile#getCharset(boolean)
-		 */
-		public String getCharset(boolean checkImplicit)
-			throws CoreException {
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IFile#getContentDescription()
-		 */
-		public IContentDescription getContentDescription()
-			throws CoreException {
-			return null;
-		}
-
-		public String getCharsetFor(Reader reader) throws CoreException {
-			return null;
-		}
-
-		public ResourceAttributes getResourceAttributes() {
-			return null;
-		}
-
-		public void revertModificationStamp(long value) throws CoreException {
-			/*Empty block*/
-		}
-
-		public void setResourceAttributes(ResourceAttributes attributes) throws CoreException {
-			/*Empty block*/
-		}
-
-		public URI getLocationURI() {
-			return null;
-		}
-
-		public void createLink(URI location, int updateFlags, IProgressMonitor monitor) throws CoreException {
-			/*Empty block*/
-		}
-
-		public URI getRawLocationURI() {
-			return null;
-		}
-
-		public boolean isLinked(int options) {
-			return false;
-		}
-
-		public IResourceProxy createProxy() {
-			return null;
-		}
-
-        public int findMaxProblemSeverity(String type, boolean includeSubtypes,
-                int depth)
-            throws CoreException {
-            return 0;
-        }
-	}
-
-	protected class Folder
-		implements IFolder {
-
-		private IPath path;
-
-		public Folder(IPath path) {
-			this.path = path;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IContainer#setDefaultCharset(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void setDefaultCharset(String charset, IProgressMonitor monitor)
-			throws CoreException {
-			// do nothing
-		}
-		/**
-		 * @see org.eclipse.core.resources.IFolder#create(boolean, boolean,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void create(boolean force, boolean local,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFolder#create(int, boolean,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void create(int updateFlags, boolean local,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFolder#createLink(org.eclipse.core.runtime.IPath,
-		 *      int, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void createLink(IPath localLocation, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFolder#delete(boolean, boolean,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void delete(boolean force, boolean keepHistory,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFolder#getFile(java.lang.String)
-		 */
-		public IFile getFile(String name) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFolder#getFolder(java.lang.String)
-		 */
-		public IFolder getFolder(String name) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IFolder#move(org.eclipse.core.runtime.IPath,
-		 *      boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void move(IPath destination, boolean force, boolean keepHistory,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#exists(org.eclipse.core.runtime.IPath)
-		 */
-		public boolean exists(IPath pth) {
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#findDeletedMembersWithHistory(int,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public IFile[] findDeletedMembersWithHistory(int depth,
-				IProgressMonitor monitor)
-			throws CoreException {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#findMember(org.eclipse.core.runtime.IPath,
-		 *      boolean)
-		 */
-		public IResource findMember(IPath pth, boolean includePhantoms) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#findMember(org.eclipse.core.runtime.IPath)
-		 */
-		public IResource findMember(IPath pth) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#findMember(java.lang.String,
-		 *      boolean)
-		 */
-		public IResource findMember(String name, boolean includePhantoms) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#findMember(java.lang.String)
-		 */
-		public IResource findMember(String name) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#getFile(org.eclipse.core.runtime.IPath)
-		 */
-		public IFile getFile(IPath pth) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#getFolder(org.eclipse.core.runtime.IPath)
-		 */
-		public IFolder getFolder(IPath pth) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#members()
-		 */
-		public IResource[] members()
-			throws CoreException {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#members(boolean)
-		 */
-		public IResource[] members(boolean includePhantoms)
-			throws CoreException {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IContainer#members(int)
-		 */
-		public IResource[] members(int memberFlags)
-			throws CoreException {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-		 */
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#accept(org.eclipse.core.resources.IResourceProxyVisitor,
-		 *      int)
-		 */
-		public void accept(IResourceProxyVisitor visitor, int memberFlags)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#accept(org.eclipse.core.resources.IResourceVisitor,
-		 *      int, boolean)
-		 */
-		public void accept(IResourceVisitor visitor, int depth,
-				boolean includePhantoms)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#accept(org.eclipse.core.resources.IResourceVisitor,
-		 *      int, int)
-		 */
-		public void accept(IResourceVisitor visitor, int depth, int memberFlags)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#accept(org.eclipse.core.resources.IResourceVisitor)
-		 */
-		public void accept(IResourceVisitor visitor)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#clearHistory(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void clearHistory(IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.runtime.IPath,
-		 *      boolean, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void copy(IPath destination, boolean force,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.runtime.IPath,
-		 *      int, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void copy(IPath destination, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.resources.IProjectDescription,
-		 *      boolean, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void copy(IProjectDescription description, boolean force,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#copy(org.eclipse.core.resources.IProjectDescription,
-		 *      int, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void copy(IProjectDescription description, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#createMarker(java.lang.String)
-		 */
-		public IMarker createMarker(String type)
-			throws CoreException {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#delete(boolean,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void delete(boolean force, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#delete(int,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void delete(int updateFlags, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#deleteMarkers(java.lang.String,
-		 *      boolean, int)
-		 */
-		public void deleteMarkers(String type, boolean includeSubtypes,
-				int depth)
-			throws CoreException {/* Empty block */
-
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#exists()
-		 */
-		public boolean exists() {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#findMarker(long)
-		 */
-		public IMarker findMarker(long id)
-			throws CoreException {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#findMarkers(java.lang.String,
-		 *      boolean, int)
-		 */
-		public IMarker[] findMarkers(String type, boolean includeSubtypes,
-				int depth)
-			throws CoreException {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getFileExtension()
-		 */
-		public String getFileExtension() {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getFullPath()
-		 */
-		public IPath getFullPath() {
-			return path;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getLocation()
-		 */
-		public IPath getLocation() {
-			return path;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getMarker(long)
-		 */
-		public IMarker getMarker(long id) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getModificationStamp()
-		 */
-		public long getModificationStamp() {
-
-			return 0;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getName()
-		 */
-		public String getName() {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getParent()
-		 */
-		public IContainer getParent() {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getPersistentProperty(org.eclipse.core.runtime.QualifiedName)
-		 */
-		public String getPersistentProperty(QualifiedName key)
-			throws CoreException {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getProject()
-		 */
-		public IProject getProject() {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getProjectRelativePath()
-		 */
-		public IPath getProjectRelativePath() {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getRawLocation()
-		 */
-		public IPath getRawLocation() {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getSessionProperty(org.eclipse.core.runtime.QualifiedName)
-		 */
-		public Object getSessionProperty(QualifiedName key)
-			throws CoreException {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getType()
-		 */
-		public int getType() {
-
-			return 0;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#getWorkspace()
-		 */
-		public IWorkspace getWorkspace() {
-
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isAccessible()
-		 */
-		public boolean isAccessible() {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isDerived()
-		 */
-		public boolean isDerived() {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isLinked()
-		 */
-		public boolean isLinked() {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isLocal(int)
-		 */
-		public boolean isLocal(int depth) {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isPhantom()
-		 */
-		public boolean isPhantom() {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isReadOnly()
-		 */
-		public boolean isReadOnly() {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isSynchronized(int)
-		 */
-		public boolean isSynchronized(int depth) {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#isTeamPrivateMember()
-		 */
-		public boolean isTeamPrivateMember() {
-
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#move(org.eclipse.core.runtime.IPath,
-		 *      boolean, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void move(IPath destination, boolean force,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#move(org.eclipse.core.runtime.IPath,
-		 *      int, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void move(IPath destination, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#move(org.eclipse.core.resources.IProjectDescription,
-		 *      boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void move(IProjectDescription description, boolean force,
-				boolean keepHistory, IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#move(org.eclipse.core.resources.IProjectDescription,
-		 *      int, org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void move(IProjectDescription description, int updateFlags,
-				IProgressMonitor monitor)
-			throws CoreException {/* Empty block */
-
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#refreshLocal(int,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void refreshLocal(int depth, IProgressMonitor monitor)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setDerived(boolean)
-		 */
-		public void setDerived(boolean isDerived)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setLocal(boolean, int,
-		 *      org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void setLocal(boolean flag, int depth, IProgressMonitor monitor)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setPersistentProperty(org.eclipse.core.runtime.QualifiedName,
-		 *      java.lang.String)
-		 */
-		public void setPersistentProperty(QualifiedName key, String value)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setReadOnly(boolean)
-		 */
-		public void setReadOnly(boolean readOnly) {
-			/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setSessionProperty(org.eclipse.core.runtime.QualifiedName,
-		 *      java.lang.Object)
-		 */
-		public void setSessionProperty(QualifiedName key, Object value)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#setTeamPrivateMember(boolean)
-		 */
-		public void setTeamPrivateMember(boolean isTeamPrivate)
-			throws CoreException {/* Empty block */
-		}
-
-		/**
-		 * @see org.eclipse.core.resources.IResource#touch(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public void touch(IProgressMonitor monitor)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IResource#getLocalTimeStamp()
-		 */
-		public long getLocalTimeStamp() {
-			return 0;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IResource#setLocalTimeStamp(long)
-		 */
-		public long setLocalTimeStamp(long value)
-			throws CoreException {
-			return 0;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean contains(ISchedulingRule rule) {
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean isConflicting(ISchedulingRule rule) {
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IContainer#getDefaultCharset()
-		 */
-		public String getDefaultCharset()
-			throws CoreException {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IContainer#setDefaultCharset(java.lang.String)
-		 */
-		public void setDefaultCharset(String charset)
-			throws CoreException {
-			/* Empty block */
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IContainer#getDefaultCharset(boolean)
-		 */
-		public String getDefaultCharset(boolean checkImplicit)
-			throws CoreException {
-			return null;
-		}
-
-		public ResourceAttributes getResourceAttributes() {
-			return null;
-		}
-
-		public void revertModificationStamp(long value) throws CoreException {
-			/*Empty block*/
-		}
-
-		public void setResourceAttributes(ResourceAttributes attributes) throws CoreException {
-			/*Empty block*/
-		}
-
-		public URI getLocationURI() {
-			return null;
-		}
-
-		public void createLink(URI location, int updateFlags, IProgressMonitor monitor) throws CoreException {
-			/*Empty block*/
-		}
-
-		public URI getRawLocationURI() {
-			return null;
-		}
-
-		public boolean isLinked(int options) {
-			return false;
-		}
-
-		public IResourceProxy createProxy() {
-			return null;
-		}
-
-        public int findMaxProblemSeverity(String type, boolean includeSubtypes,
-                int depth)
-            throws CoreException {
-            return 0;
-        }
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(FileObserverFilterTest.class);
-	}
-
-	public FileObserverFilterTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() {
-		/* Empty block */
-	}
-
-	public void test_allFileObserverFilter() {
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.ALL);
-		IPath path = new Path("c:\\test.txt"); //$NON-NLS-1$
-		IFile file = new File(path);
-		assertTrue(filter.matches(file));
-	}
-
-	public void test_extensionFileObserverFilter() {
-		String[] extensions = {"txt"}; //$NON-NLS-1$
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.EXTENSION, extensions);
-		IPath txt = new Path("c:\\test.txt"); //$NON-NLS-1$
-		IFile txtFile = new File(txt);
-		assertTrue(filter.matches(txtFile));
-		IPath mdx = new Path("c:\\test.mdx"); //$NON-NLS-1$
-		IFile mdxFile = new File(mdx);
-		assertFalse(filter.matches(mdxFile));
-	}
-
-	public void test_fileFileObserverFilter() {
-		IPath txt = new Path("c:\\test.txt"); //$NON-NLS-1$
-		IFile txtFile = new File(txt);
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.FILE, txtFile);
-		assertTrue(filter.matches(txtFile));
-		IPath mdx = new Path("c:\\test.mdx"); //$NON-NLS-1$
-		IFile mdxFile = new File(mdx);
-		assertFalse(filter.matches(mdxFile));
-	}
-
-	public void test_pathFileObserverFilter() {
-		IPath path = new Path("c:\\test"); //$NON-NLS-1$
-		IFolder folder = new Folder(path);
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.FOLDER, folder);
-		IPath yes = new Path("c:\\test\\test.txt"); //$NON-NLS-1$
-		IFile yesFile = new File(yes);
-		assertTrue(filter.matches(yesFile));
-		IPath no = new Path("c:\\other\\test.txt"); //$NON-NLS-1$
-		IFile noFile = new File(no);
-		assertFalse(filter.matches(noFile));
-		assertFalse(filter.matches(folder));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileObserverFilterTypeTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileObserverFilterTypeTest.java
deleted file mode 100644
index 415f244..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileObserverFilterTypeTest.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.resources;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileObserverFilterType;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-
-/**
- * 
- * 
- * @author Anthony Hunter 
- * <a href="mailto:ahunter@rational.com">ahunter@rational.com</a>
- */
-public class FileObserverFilterTypeTest extends TestCase {
-	
-	protected static class Fixture extends FileObserverFilterType {
-
-		private static final long serialVersionUID = 1;
-		
-		protected Fixture() {
-			super("Fixture", 0); //$NON-NLS-1$
-		}
-
-		protected List getValues() {
-			return super.getValues();
-		}
-
-	}
-
-	private Fixture fixture = null;
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(FileObserverFilterTypeTest.class);
-	}
-
-	public FileObserverFilterTypeTest(String name) {
-		super(name);
-	}
-
-	protected Fixture getFixture() {
-		return fixture;
-	}
-
-	private void setFixture(Fixture fixture) {
-		this.fixture = fixture;
-	}
-
-	protected void setUp() {
-		setFixture(new Fixture());
-	}
-
-	public void test_readResolve() {
-		ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-		ObjectOutput output = null;
-		ObjectInput input = null;
-		try {
-			output = new ObjectOutputStream(stream);
-			for (Iterator i = getFixture().getValues().iterator();
-				i.hasNext();
-				) {
-				output.writeObject(i.next());
-			}
-			output.flush();
-
-			input =
-				new ObjectInputStream(
-					new ByteArrayInputStream(stream.toByteArray()));
-			for (Iterator i = getFixture().getValues().iterator();
-				i.hasNext();
-				) {
-				assertSame(i.next(), input.readObject());
-			}
-		} catch (Exception e) {
-			fail();
-		} finally {
-			try {
-				output.close();
-				input.close();
-			} catch (Exception e) {
-				/*Empty block*/
-			}
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/ExtendedPropertyDescriptorTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/ExtendedPropertyDescriptorTest.java
deleted file mode 100644
index c5e704b..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/ExtendedPropertyDescriptorTest.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.views.properties.tests;
-
-//import junit.framework.Test;
-import junit.framework.TestCase;
-//import junit.framework.TestSuite;
-
-//import org.eclipse.gmf.runtime.common.ui.services.properties.internal.extended.ExtendedPropertyDescriptor;
-//import org.eclipse.gmf.runtime.common.ui.services.properties.internal.extended.PropertySource;
-
-/**
- * @author Tauseef A. Israr
- * Created on: Sep 15, 2002
- * 
- */
-public class ExtendedPropertyDescriptorTest extends TestCase {
-
-/*    
-    private String id1 = "id1"; //$NON-NLS-1$
-    private String displayName = "Name"; //$NON-NLS-1$
-    private ExtendedPropertyDescriptor propertyDescriptor;
-*/    
-    
-    /**
-     * Constructor for ExtendedPropertyDescriptorTest.
-     * @param name
-     */
-    public ExtendedPropertyDescriptorTest(String name) {
-        super(name);
-    }
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-//       propertyDescriptor = new ExtendedPropertyDescriptor(id1,displayName);
-    }
-    
-    public void testXDEPropertyDescriptor(){
- /*   	
-    	propertyDescriptor.setReadOnly(true);
-    	propertyDescriptor.setDirtyFlag(true);
-    	PropertySource propertySource = new PropertySource();
-    	propertySource.addPropertyDescriptor(propertyDescriptor);
-    	
-    	assertTrue(propertyDescriptor.isReadOnly());
-    	assertTrue(propertyDescriptor.isDirty());
-    	assertEquals(propertySource,propertyDescriptor.getPropertySource());
-    	assertNotNull(propertyDescriptor.getBlank());
-*/    	
-    }
-/*    
-    public static Test suite() {
-    	
-        return new TestSuite(ExtendedPropertyDescriptorTest.class);
-        
-    }    		
-*/
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/ExtendedTextPropertyDescriptorTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/ExtendedTextPropertyDescriptorTest.java
deleted file mode 100644
index 0ad8eeb..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/ExtendedTextPropertyDescriptorTest.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.views.properties.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-//import org.eclipse.gmf.runtime.common.ui.services.properties.internal.extended.ExtendedPropertyDescriptor;
-//import org.eclipse.gmf.runtime.common.ui.services.properties.internal.extended.ExtendedTextPropertyDescriptor;
-
-/**
- * @author Tauseef A. Israr
- * Created on: Sep 15, 2002
- * 
- */
-public class ExtendedTextPropertyDescriptorTest extends TestCase {
-
-//    ExtendedTextPropertyDescriptor propertyDescriptor;
-
-    /**
-     * Constructor for ExtendedTextPropertyDescriptorTest.
-     * @param name
-     */
-    public ExtendedTextPropertyDescriptorTest(String name) {
-        super(name);
-    }
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-//        propertyDescriptor = new ExtendedTextPropertyDescriptor("id1", "name"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    public void testXDETextPropertyDescriptor() {
-//        assertNotNull(propertyDescriptor.getBlank());
-
- //       ExtendedPropertyDescriptor propertyDescriptor1 =
- //           new ExtendedTextPropertyDescriptor("id1", "name"); //$NON-NLS-1$ //$NON-NLS-2$
-
- //       assertTrue(!propertyDescriptor.isCompatibleWith(propertyDescriptor1));
-    }
-
-    public static Test suite() {
-        return new TestSuite(ExtendedTextPropertyDescriptorTest.class);
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/PropertySourceTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/PropertySourceTest.java
deleted file mode 100644
index 3645e0a..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/views/properties/tests/PropertySourceTest.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.internal.views.properties.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-//import org.eclipse.gmf.runtime.common.ui.services.properties.internal.extended.ExtendedPropertyDescriptor;
-//import org.eclipse.gmf.runtime.common.ui.services.properties.internal.extended.PropertySource;
-
-
-/**
- * @author Tauseef A. Israr
- * Created on: Sep 15, 2002
- * 
- */
-public class PropertySourceTest extends TestCase {
-
-//    private PropertySource propertySource;
-    
-    /**
-     * Constructor for PropertySourceTest.
-     * @param name
-     */
-    public PropertySourceTest(String name) {
-        super(name);
-    }
-    
-    public void testEditableValue(){
-    	
-    	//Object editableValue = "editable Value"; //$NON-NLS-1$
- //   	propertySource.setEditableValue(editableValue);
- //   	assertTrue(propertySource.getEditableValue().equals(editableValue));
-		
-		//String id1 = "id1"; //$NON-NLS-1$
-		//String value1 = "value1"; //$NON-NLS-1$
-		
-//		propertySource.addProperty(id1, value1);
-//		ExtendedPropertyDescriptor propertyDescriptor = new ExtendedPropertyDescriptor(id1, "Property1"); //$NON-NLS-1$
-//		propertySource.addPropertyDescriptor(propertyDescriptor);
-				
-//		assertTrue(propertySource.getPropertyValue(id1).equals(value1));
-//		assertTrue(propertySource.getPropertyDescriptors().length==1);
-//		assertTrue(propertySource.isPropertySet(id1));
-		
-//		propertyDescriptor.setDirtyFlag(true);
-//		assertTrue(!propertySource.getPropertyValue(id1).equals(value1));
-//		assertTrue(!propertyDescriptor.isDirty());
-		
-//		propertySource.removeProperty(id1);
-//		assertNull(propertySource.getPropertyValue(id1));
-//		assertTrue(propertySource.getPropertyDescriptors().length==0);
-    }
-		
-	
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-//        propertySource = new PropertySource();
-    }
-    
-    public static Test suite() {
-        return new TestSuite(PropertySourceTest.class);
-    }
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/providers/ProviderPolicyExceptionsTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/providers/ProviderPolicyExceptionsTest.java
deleted file mode 100644
index 513bdd7..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/providers/ProviderPolicyExceptionsTest.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.providers;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies.TestExceptionThrowingIconPolicy;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers.TestExceptionThrowingIconProvider;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.providers.TestExceptionThrowingPolicyIconProvider;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Tests the Service infrastructure when used in conjunction with policies and
- * providers that throw exceptions.
- * 
- * @author wdiu, Wayne Diu
- */
-public class ProviderPolicyExceptionsTest
-	extends TestCase {
-
-	public void testExceptionThrowingProvidersAndPolicies() {
-		// the lowest priority provider should return a valid parser,
-		// even when exceptions were thrown by other higher priority
-		// providers
-		Image icon = IconService.getInstance().getIcon(new TestAdaptable());
-		assertNotNull(icon);
-		icon.dispose();
-
-		// the medium priority provider's policy was executed
-		// but since it throws an exception, the corresponding provider should
-		// not have been considered and so the provider's provides method should
-		// never have been called
-		assertTrue(TestExceptionThrowingIconPolicy.providesExecuted);
-		assertFalse(TestExceptionThrowingPolicyIconProvider.providesExecuted);
-
-		// the low priority provider was executed
-		assertTrue(TestExceptionThrowingIconProvider.providesExecuted);
-	}
-	
-    public static Test suite() {
-        return new TestSuite(ProviderPolicyExceptionsTest.class);
-    }
-	
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/providers/ProviderPolicyTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/providers/ProviderPolicyTest.java
deleted file mode 100644
index f26a59e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/providers/ProviderPolicyTest.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.providers;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.policies.TestParserPolicy;
-import org.eclipse.gmf.tests.runtime.common.ui.services.provider.internal.testClasses.TestAdaptable;
-import org.osgi.framework.Bundle;
-
-/**
- * This test case tests provider polciies using the Parser Service from a UI
- * plugin as the example service.
- * 
- * @author wdiu, Wayne Diu
- */
-public class ProviderPolicyTest
-	extends TestCase {
-
-	final private Bundle TEST_PROVIDER_PLUGIN_BUNDLE = Platform
-		.getBundle("org.eclipse.gmf.tests.runtime.common.ui.services.provider"); //$NON-NLS-1$
-
-	public void testPluginDoesNotLoad() {
-
-		// this test should be run before loading the bundle, otherwise this
-		// test will obviously fail
-		// the ProviderPolicyExceptionsTest will load the bundle.
-
-		IAdaptable adaptable = new IAdaptable() {
-
-			public Object getAdapter(Class adapter) {
-				return null;
-			}
-
-		};
-
-		// make sure the org.eclipse.gmf.tests.runtime.common.core.provider
-		// plug-in has not been loaded
-		assertFalse(TEST_PROVIDER_PLUGIN_BUNDLE.getState() == Bundle.ACTIVE);
-
-		// make sure the provides method has not been called yet
-		assertFalse(TestParserPolicy.providesExecuted);
-
-		// run getParser several times
-		for (int i = 0; i < 4; i++) {
-			ParserService.getInstance().getParser(adaptable);
-
-			// make sure the org.eclipse.gmf.tests.runtime.common.core.provider
-			// plug-in still did not load
-			assertFalse(TEST_PROVIDER_PLUGIN_BUNDLE.getState() == Bundle.ACTIVE);
-
-			assertTrue(TestParserPolicy.providesExecuted);
-		}
-
-	}
-
-	public void testPluginLoad() {
-
-		// make sure the org.eclipse.gmf.tests.runtime.common.core.provider
-		// plug-in still did not load
-		assertFalse(TEST_PROVIDER_PLUGIN_BUNDLE.getState() == Bundle.ACTIVE);
-
-		ParserService.getInstance().getParser(new TestAdaptable());
-
-		// make sure the org.eclipse.gmf.tests.runtime.common.core.provider
-		// plug-in has now been loaded
-		// because the provider provides for the TestAdaptable hint
-		assertTrue(TEST_PROVIDER_PLUGIN_BUNDLE.getState() == Bundle.ACTIVE);
-
-	}
-
-	public static Test suite() {
-		return new TestSuite(ProviderPolicyTest.class);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/util/StatusLineUtilTest.java b/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/util/StatusLineUtilTest.java
deleted file mode 100644
index 92a8e60..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/util/StatusLineUtilTest.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.common.ui.util;
-
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gmf.runtime.common.ui.util.StatusLineUtil;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-public class StatusLineUtilTest
-    extends TestCase {
-
-    public StatusLineUtilTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(StatusLineUtilTest.class,
-            "StatusLineUtil Test Suite"); //$NON-NLS-1$
-    }
-
-    /**
-     * Tests that the status line can be successfully updated from a non-UI
-     * thread.
-     */
-    public void test_statusLineUpdateOnNonUIThread_128868()
-        throws Exception {
-
-        final IWorkbenchPart part = PlatformUI.getWorkbench()
-            .getActiveWorkbenchWindow().getActivePage().getActivePart();
-
-        IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-            public void run(IProgressMonitor monitor)
-                throws InvocationTargetException, InterruptedException {
-                StatusLineUtil.outputErrorMessage(part,
-                    "test_statusLineUpdateOnNonUIThread_128868"); //$NON-NLS-1$
-
-            }
-        };
-
-        try {
-            ModalContext.run(runnable, true, new NullProgressMonitor(), Display
-                .getCurrent());
-
-        } catch (InvocationTargetException ite) {
-            fail("Unexpected exception:" + ite); //$NON-NLS-1$
-
-        } catch (InterruptedException ie) {
-            fail("Unexpected exception:" + ie); //$NON-NLS-1$
-        }
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.common.ui/test.xml b/org.eclipse.gmf.tests.runtime.common.ui/test.xml
deleted file mode 100644
index cd99a1a..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.common.ui"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.common.ui.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/.classpath b/org.eclipse.gmf.tests.runtime.draw2d.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.draw2d.ui/.cvsignore b/org.eclipse.gmf.tests.runtime.draw2d.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/.project b/org.eclipse.gmf.tests.runtime.draw2d.ui/.project
deleted file mode 100644
index 0fb2b79..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.draw2d.ui</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.tests.runtime.draw2d.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.draw2d.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d52c4f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.draw2d.ui
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.draw2d.ui.Activator
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.draw2d.ui;x-internal:=true,
- org.eclipse.gmf.tests.runtime.draw2d.ui.graph;x-internal:=true,
- org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers;x-friends:="org.eclipse.gmf.runtime.diagram.ui"
-Require-Bundle: org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/about.html b/org.eclipse.gmf.tests.runtime.draw2d.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/build.properties b/org.eclipse.gmf.tests.runtime.draw2d.ui/build.properties
deleted file mode 100644
index 483d150..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2006  IBM Corporation and others.                  |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/plugin.properties b/org.eclipse.gmf.tests.runtime.draw2d.ui/plugin.properties
deleted file mode 100644
index 3f570b1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF Draw2d Tests
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/Activator.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/Activator.java
deleted file mode 100644
index 0daef84..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/Activator.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.draw2d.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Anthony Hunter
- */
-public class Activator extends AbstractUIPlugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/AllTests.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/AllTests.java
deleted file mode 100644
index 008d238..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/AllTests.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.draw2d.ui; 
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.draw2d.ui.graph.CompositeGraphLayoutTest;
-import org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers.AvoidObstructionsRoutingTest;
-import org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers.LeftRightForestRouterTest;
-import org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers.RectilinearRouterTest;
-import org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers.TopDownForestRouterTest;
-import org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers.TreeRouterTest;
-
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite( "All Shapes GEF Tests" ); //$NON-NLS-1$
-
-		suite.addTestSuite( MapModeUtilTest.class );
-		suite.addTestSuite( LineSegTest.class );
-		suite.addTestSuite( FigureUtilitiesTest.class );
-		suite.addTestSuite( LeftRightForestRouterTest.class );
-		suite.addTestSuite( TopDownForestRouterTest.class );
-		suite.addTestSuite( TreeRouterTest.class );
-		suite.addTestSuite( RectilinearRouterTest.class );
-        suite.addTestSuite( CompositeGraphLayoutTest.class );
-        suite.addTestSuite( AvoidObstructionsRoutingTest.class );
-		
-        return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/FigureUtilitiesTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/FigureUtilitiesTest.java
deleted file mode 100644
index f60b722..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/FigureUtilitiesTest.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-/*
- * Created on Mar 12, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.gmf.tests.runtime.draw2d.ui;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.geometry.PointList;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-/**
- * @author jschofie
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class FigureUtilitiesTest extends TestCase {
-	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-	
-	public void testNormalizeSegements() {
-		
-		PointList points = new PointList();
-		points.addPoint( 10, 10 );
-
-		// Nominal case - point size <= 1
-		assertFalse( PointListUtilities.normalizeSegments( points, 1 ) );
-		
-		// 2 points - should ignore any tolerance
-		points.addPoint( 11, 11 );
-		assertFalse( PointListUtilities.normalizeSegments( points, 1 ) );
-		
-		// Length less than LENGTH THRESHOLD with another point
-		points.addPoint( 12, 12 );
-		assertTrue( PointListUtilities.normalizeSegments( points, 1 ) );
-		assertEquals( "The point list didn't get flattened", 2, points.size() ); //$NON-NLS-1$
-		
-		points.addPoint( 30, 30 );
-		assertTrue( PointListUtilities.normalizeSegments( points, 1 ) );
-		assertEquals( "The point list didn't get flattened", 2, points.size() ); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/LineSegTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/LineSegTest.java
deleted file mode 100644
index be02eb0..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/LineSegTest.java
+++ /dev/null

@@ -1,306 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.draw2d.ui;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-
-/**
- * @author jschofie
- *
- * This test case is intended to test the LineSeg Class functionality
- */
-public class LineSegTest extends TestCase {
-
-	private LineSeg lineSeg;
-	private LineSeg verticalLine;
-	private LineSeg horizontalLine;
-
-	private Point origin;
-	private Point terminus;
-	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		origin = new Point( 5, 5 );
-		terminus = new Point( 10, 10 );
-		
-		lineSeg = new LineSeg( origin, terminus );
-		
-		verticalLine = new LineSeg( new Point( 0, 5 ), new Point( 0, 105 ) );
-		horizontalLine = new LineSeg( new Point( 0, 5 ), new Point( 100, 5 ) );
-	}
-	
-	/*
-	 * test the equals method
-	 */
-	public void testEqualsObject() {
-		
-		LineSeg seg1 = new LineSeg( new Point( 0, 0 ), new Point( 10, 10 ) );
-		LineSeg seg2 = new LineSeg( new Point( 1, 1 ), new Point( 9, 9 ) );
-		LineSeg seg3 = new LineSeg( new Point( 0, 0 ), new Point( 5, 5 ) );
-		LineSeg seg4 = new LineSeg( new Point( 0, 0 ), new Point( 10, 10 ) );
-
-		// Both line segment points are not equal
-		assertFalse( seg1.equals( seg2 ) );
-		
-		// The origin points are equal but the ends are not
-		assertFalse( seg1.equals( seg3 ) );
-		
-		// Both the origin and end points are equal
-		assertTrue( seg1.equals( seg4 ) );
-	}
-
-	public void testGetOrigin() {
-		assertEquals( origin, lineSeg.getOrigin() );
-	}
-
-	public void testGetTerminus() {
-		assertEquals( terminus, lineSeg.getTerminus() );
-	}
-
-	public void testSetOrigin() {
-		Point p1 = new Point( -5, -5 );
-		
-		lineSeg.setOrigin( p1 );
-		assertEquals( p1, lineSeg.getOrigin() );
-	}
-
-	public void testSetTerminus() {
-		Point p1 = new Point( -5, -5 );
-		
-		lineSeg.setTerminus( p1 );
-		assertEquals( p1, lineSeg.getTerminus() );
-	}
-
-	public void testGetSupremum() {	
-		assertEquals( terminus.x, lineSeg.getSupremum().x );
-		assertEquals( terminus.y, lineSeg.getSupremum().y );
-	}
-
-	public void testGetInfimum() {
-		assertEquals( origin.x, lineSeg.getInfimum().x );
-		assertEquals( origin.y, lineSeg.getInfimum().y );
-	}
-
-	public void testIsHorizontal() {
-		assertFalse( "verticalLine shouldn't be horizontal", verticalLine.isHorizontal() ); //$NON-NLS-1$
-		assertTrue( "horizontalLine should be horizontal", horizontalLine.isHorizontal() ); //$NON-NLS-1$
-	}
-
-	public void testIsVertical() {
-		assertTrue( "verticalLine should be vertical", verticalLine.isVertical() ); //$NON-NLS-1$
-		assertFalse( "horizontalLine shouldn't be vertical", horizontalLine.isVertical() ); //$NON-NLS-1$
-	}
-
-	public void testSlope() {
-	
-		// Line is vertical
-		assertTrue( "The line should be vertical", 9999 == verticalLine.slope() ); //$NON-NLS-1$
-
-		// Line is horizontal
-		assertTrue( "The line should be horizontal", 0.0 == horizontalLine.slope() ); //$NON-NLS-1$
-	}
-
-	public void testPerpSlope() {
-	
-		// Line is vertical
-		assertEquals( "Perp Slope of a vertical line should be horizontal", 0, (int)verticalLine.perpSlope() ); //$NON-NLS-1$
-
-		// Line is horizontal
-		assertEquals( "Perp slope of a horizontal line should be vertical", 9999, (int)horizontalLine.perpSlope() ); //$NON-NLS-1$
-	}
-
-	public void testLength() {
-		
-		// Compute length of the vertical line
-		assertEquals( "Vertical line seg length is not correct", 100, (int)verticalLine.length() ); //$NON-NLS-1$
-		
-		// Compute the length of the horizontal line
-		assertEquals( "Horizontal line seg length is not correct", 100, (int)horizontalLine.length() ); //$NON-NLS-1$
-	}
-
-	public void testContainsPoint() {
-
-		Point isContained  = new Point( 6, 6 );
-		Point notContained = new Point( 3, 3 );
-		
-		assertTrue( lineSeg.containsPoint( isContained, 0 ) );
-		assertFalse( lineSeg.containsPoint( notContained, 0 ) );
-	}
-
-	public void testDistanceAlong() {
-
-		// Test nominal case
-		assertEquals( "The distance has been incorrectly computed", 0, (int)lineSeg.distanceAlong( new Point( 5, 5 ) ) ); //$NON-NLS-1$
-	
-		// Test divide by zero
-		Point p2 = new Point( 10, 10 );
-		LineSeg seg2 = new LineSeg( p2, p2 );
-		assertEquals( -1, (int)seg2.distanceAlong( new Point( 2, 2 ) ) );
-	}
-
-//	public void testIntersect() {
-//	}
-//
-//	public void testDistanceToPoint() {
-//	}
-//
-//	public void testPerpIntersect() {
-//	}
-//
-//	public void testProjection() {
-//	}
-//
-//	public void testPositionRelativeTo() {
-//	}
-//
-//	public void testLocatePoint() {
-//	}
-//
-//	public void testPointOn() {
-//	}
-//
-//	public void testGetTrigValues() {
-//	}
-//
-//	public void testGetParallelLineSegThroughPoint() {
-//	}
-	
-	public void testLineEquation() {
-		// Normal case
-		Point p1 = new Point(1, 0);
-		Point p2 = new Point(2, 1);
-		LineSeg line = new LineSeg(p1,p2);
-		double[] equation = line.getEquation();
-		assertTrue("Equation is incomplete", equation.length == 3); //$NON-NLS-1$
-		assertTrue("Coefficient 'a' is not correct", equation[0] == -1); //$NON-NLS-1$
-		assertTrue("Coefficient 'b' is not correct", equation[1] == 1); //$NON-NLS-1$
-		assertTrue("Coefficient 'c' is not correct", equation[2] == -1); //$NON-NLS-1$
-	}
-
-	public void testFindLineIntersections() {
-		final PointList points = new PointList();
-		points.addPoint(new Point(0, 10));
-		points.addPoint(new Point(10, 0));
-		points.addPoint(new Point(0, -10));
-		points.addPoint(new Point(-10, 0));
-		points.addPoint(new Point(0, 10));
-
-		// Nominal case, i.e. 2 intersection points
-		Point p1 = new Point(-20, 20);
-		Point p2 = new Point(30, -30);
-		LineSeg line = new LineSeg(p1,p2);
-		PointList intersections = line.getLineIntersectionsWithLineSegs(points);
-		assertTrue(
-			"Line passing through " + p1 + " and " + p2 + "must have exactly 2 intersections with the figure", intersections.size() == 2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		Point first = PointListUtilities.pickClosestPoint(intersections, p2);
-		assertTrue(
-			"This is not the closest intersection to " + p2, first.x == 5 && first.y == -5); //$NON-NLS-1$
-		Point second = PointListUtilities.pickFarestPoint(intersections, p2);
-		assertTrue(
-			"This is not the farest intersection to " + p2, second.x == -5 && second.y == 5); //$NON-NLS-1$
-
-		// 1 intersection point
-		p1 = new Point(10, 10);
-		p2 = new Point(10, -10);
-		line = new LineSeg(p1,p2);
-		intersections = line.getLineIntersectionsWithLineSegs(points);
-		assertTrue(
-			"Line passing through " + p1 + " and " + p2 + "must have exactly 1 intersections with the figure", intersections.size() == 2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		first = PointListUtilities.pickClosestPoint(intersections, p2);
-		second = PointListUtilities.pickFarestPoint(intersections, p2);
-		assertTrue(second.x == first.x && second.y == first.y); 
-		assertTrue(
-			"Incorrect value for intersection point", first.x == 10 && first.y == 0); //$NON-NLS-1$
-
-		// 0 intersection points
-		p1 = new Point(20, 20);
-		p2 = new Point(-10, 10);
-		line = new LineSeg(p1,p2);
-		intersections = line.getLineIntersectionsWithLineSegs(points);
-		assertTrue(
-			"Line passing through " + p1 + " and " + p2 + "must have no intersections with the figure", intersections.size() == 0); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		// Infinite number of intersections => must result in the two points
-		// (ends of the linesegment
-		// that lies on the line that passes through p1 and p2)
-		p1 = new Point(20, -10);
-		p2 = new Point(-10, 20);
-		line = new LineSeg(p1,p2);
-		intersections = line.getLineIntersectionsWithLineSegs(points);
-		assertTrue(
-			"Line passing through " + p1 + " and " + p2 + "must have exactly 2 intersections with the figure", intersections.size() == 4); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		first = PointListUtilities.pickClosestPoint(intersections, p2);
-		assertTrue(
-			"This is not the closest intersection to " + p2, first.x == 0 && first.y == 10); //$NON-NLS-1$
-		second = PointListUtilities.pickFarestPoint(intersections, p2);
-		assertTrue(
-			"This is not the farest intersection to " + p2, second.x == 10 && second.y == 0); //$NON-NLS-1$
-	}
-
-	public void testAllLineIntersectionsWithEllipse() {
-		Rectangle oval = new Rectangle(Rectangle.SINGLETON);
-		oval.setLocation(-2, -1);
-		oval.setSize(4, 2);
-
-		// 2 points intersection
-		Point p1 = new Point(0, 0);
-		Point p2 = new Point(3, 0);
-		LineSeg line = new LineSeg(p1,p2);
-		PointList intersections = line.getLineIntersectionsWithEllipse(oval);
-		assertTrue(
-			"Must have 2 intersections with line passing through points " + p1 + " and " + p2, intersections.size() == 2); //$NON-NLS-1$//$NON-NLS-2$
-		Point first = PointListUtilities.pickClosestPoint(intersections, p2);
-		assertTrue(
-			"This is not the closes intersection to " + p2, first.x == 2 && first.y == 0); //$NON-NLS-1$
-		Point second = PointListUtilities.pickFarestPoint(intersections, p2);
-		assertTrue(
-			"This is not the farest intersection to " + p2, second.x == -2 && second.y == 0); //$NON-NLS-1$
-
-		// 1 point intersection
-		p1 = new Point(2, -2);
-		p2 = new Point(2, 2);
-		line = new LineSeg(p1,p2);
-		intersections = line.getLineIntersectionsWithEllipse(oval);
-		assertTrue(
-			"Line passing through " + p1 + " and " + p2 + "must have exactly 1 intersections with the figure", intersections.size() == 2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		first = PointListUtilities.pickClosestPoint(intersections, p2);
-		second = PointListUtilities.pickFarestPoint(intersections, p2);
-		assertTrue(second.x == first.x && second.y == first.y); 
-		assertTrue(
-			"Incorrect value for intersection point", first.x == 2 && first.y == 0); //$NON-NLS-1$
-
-		// no intersections
-		p1 = new Point(3, 0);
-		p2 = new Point(0, 3);
-		line = new LineSeg(p1,p2);
-		intersections = line.getLineIntersectionsWithEllipse(oval);
-		assertTrue(
-			"Line passing through " + p1 + " and " + p2 + "must have no intersections with the figure", intersections.size() == 0); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/MapModeUtilTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/MapModeUtilTest.java
deleted file mode 100644
index 2a2aeb6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/MapModeUtilTest.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.tests.runtime.draw2d.ui;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Translatable;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-
-/**
- * This TestCase is designed to test the functionality of the MapMode
- * translations.  (i.e. HiMetrics)
- *
- * @author jschofie / sshaw
- */
-public class MapModeUtilTest  extends TestCase {
-
-	public void testTranslationDefault() {
-		verifyMapMode(MapModeUtil.getMapMode());
-	}
-
-	public void testTranslationHiMetric() {
-		verifyMapMode(MapModeTypes.HIMETRIC_MM);
-	}
-	
-	public void testTranslationIdentity() {
-		verifyMapMode(MapModeTypes.IDENTITY_MM);
-	}
-	
-	static class MapModeFigure extends Figure implements IMapMode {
-
-		public int DPtoLP(int deviceUnit) {
-			return MapModeTypes.DEFAULT_MM.DPtoLP(deviceUnit);
-		}
-
-		public Translatable DPtoLP(Translatable t) {
-			return MapModeTypes.DEFAULT_MM.DPtoLP(t);
-		}
-
-		public int LPtoDP(int logicalUnit) {
-			return MapModeTypes.DEFAULT_MM.LPtoDP(logicalUnit);
-		}
-
-		public Translatable LPtoDP(Translatable t) {
-			return MapModeTypes.DEFAULT_MM.LPtoDP(t);
-		}
-	}
-	
-	public void testTranslationFromFigure() {
-		MapModeFigure mmFig = new MapModeFigure();
-		verifyMapMode(MapModeUtil.getMapMode(mmFig));
-		
-		Figure fig = new Figure();
-		fig.setParent(mmFig);
-		verifyMapMode(MapModeUtil.getMapMode(fig));
-		
-		verifyMapMode(MapModeUtil.getMapMode(null));
-	}
-	
-	private void verifyMapMode(IMapMode mm) {
-		for( int index = 0; index < 1000; index++ ) {
-			int val1 = index;
-			
-			int val2 = mm.DPtoLP(index);
-			Point ptLP = (Point)mm.DPtoLP(new Point(index, 0));
-			assertEquals(val2, ptLP.x);
-			
-			int val3 = mm.LPtoDP(val2);
-			Point ptDP = (Point)mm.LPtoDP(new Point(val2, 0));
-			assertEquals(val3, ptDP.x);
-			
-			assertTrue(Math.abs(val1 - val3) <= 1);
-		}
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/graph/CompositeGraphLayoutTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/graph/CompositeGraphLayoutTest.java
deleted file mode 100644
index a528181..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/graph/CompositeGraphLayoutTest.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.draw2d.ui.graph;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.graph.CompoundDirectedGraph;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.EdgeList;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.NodeList;
-import org.eclipse.draw2d.graph.Subgraph;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graph.CompositeDirectedGraphLayout;
-
-
-/**
- * @author mmostafa
- *
- */
-public class CompositeGraphLayoutTest
-    extends TestCase {
-    
-    public static Test suite() {
-        return new TestSuite(CompositeGraphLayoutTest.class);
-    }
-    
-    public void testVirtualNodeCreation(){
-        // in this case the order of creating the nodes is very important
-        // so do not change the order in wich we add nodes/edges to the 
-        // edge/node list
-        Node n1,n2,n3,n4;
-        NodeList nodes = new NodeList();
-        EdgeList edges = new EdgeList();
-        
-        nodes.add(n2 = new Node("N2")); //$NON-NLS-1$
-        nodes.add(n1 = new Node("N1")); //$NON-NLS-1$
-        nodes.add(n3 = new Node("N3")); //$NON-NLS-1$
-        nodes.add(n4 = new Node("N4")); //$NON-NLS-1$
-        
-        edges.add(new Edge(n1,n4));
-        edges.add(new Edge(n2,n3));
-        edges.add(new Edge(n1,n2));
-        edges.add(new Edge(n3,n1));
-        
-        int X = n1.x;
-        
-        CompoundDirectedGraph g = new CompoundDirectedGraph();
-        g.nodes = nodes;
-        g.edges = edges;
-        
-        CompositeDirectedGraphLayout layout = new CompositeDirectedGraphLayout();
-        layout.visit(g);
-        assertTrue(n1.x!=X);
-    }
-    
-    public void testVirtualEdgeCreation(){
-        Node n1,n2;
-        Subgraph sg1;
-        NodeList nodes = new NodeList();
-        EdgeList edges = new EdgeList();
-        
-        nodes.add(sg1 = new Subgraph("SubGraph1")); //$NON-NLS-1$
-        nodes.add(n1 = new Node("N1",sg1)); //$NON-NLS-1$
-        nodes.add(n2 = new Node("N3")); //$NON-NLS-1$
-        edges.add(new Edge(n1,n2));
-        CompoundDirectedGraph g = new CompoundDirectedGraph();
-        int X= n1.x;
-        g.nodes = nodes;
-        g.edges = edges;
-        CompositeDirectedGraphLayout layout = new CompositeDirectedGraphLayout();
-        layout.visit(g);
-        assertTrue(n1.x!=X);
-    }
-    
-    
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/AbstractForestRouterTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/AbstractForestRouterTest.java
deleted file mode 100644
index 449d4bd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/AbstractForestRouterTest.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.PointList;
-
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ForestRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ITreeConnection;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.TreeRouter;
-
-/**
- * @author sshaw
- * 
- * Abstract ForestRouter test class.
- */
-abstract public class AbstractForestRouterTest extends TestCase {
-	public AbstractForestRouterTest(String name) {
-		super(name);
-	}
-	
-	public static class TreeConnection extends PolylineConnection
-			implements ITreeConnection {
-		
-		String hint;
-		Orientation orientation;
-		
-		public TreeConnection() {
-			// Empty Constructor
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ITreeConnection#getHint()
-		 */
-		public String getHint() {
-			return hint;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ITreeConnection#getOrientation()
-		 */
-		public Orientation getOrientation() {
-			return orientation;
-		}
-		/**
-		 * @param hint The hint to set.
-		 */
-		public void setHint(String hint) {
-			this.hint = hint;
-		}
-		/**
-		 * @param orient The orient to set.
-		 */
-		public void setOrientation(Orientation orient) {
-			this.orientation = orient;
-		}
-	}
-	
-	private ForestRouter forestRouter;
-	private TreeConnection conn1;
-	private TreeConnection conn2;
-	private TreeConnection conn3;
-	private TreeConnection conn4;
-	
-	protected TreeConnection getConnection1() {
-		return conn1;
-	}
-	protected TreeConnection getConnection2() {
-		return conn2;
-	}
-	protected TreeConnection getConnection3() {
-		return conn3;
-	}
-	protected TreeConnection getConnection4() {
-		return conn4;
-	}
-	protected ForestRouter getForestRouter() {
-		return forestRouter;
-	}
-	
-	protected void setUp() {
-		try {
-			forestRouter = new ForestRouter();
-			RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), node3 = new RectangleFigure();
-			node1.setSize(40, 40);
-			node2.setSize(40, 40);
-			node3.setSize(40, 40);
-			ConnectionAnchor anchor = new ChopboxAnchor(node3);
-			conn1 = new TreeConnection();
-			conn1.setSourceAnchor(new ChopboxAnchor(node1));
-			conn1.setTargetAnchor(anchor);
-			conn1.setHint("tree1"); //$NON-NLS-1$
-			conn1.setConnectionRouter(forestRouter);
-			
-			conn2 = new TreeConnection();
-			conn2.setSourceAnchor(new ChopboxAnchor(node2));
-			conn2.setTargetAnchor(anchor);
-			conn2.setHint("tree1"); //$NON-NLS-1$
-			conn2.setConnectionRouter(forestRouter);
-			
-			RectangleFigure node4 = new RectangleFigure(), node5 = new RectangleFigure();
-			node4.setSize(40, 40);
-			node5.setSize(40, 40);
-			conn3 = new TreeConnection();
-			conn3.setSourceAnchor(new ChopboxAnchor(node4));
-			conn3.setTargetAnchor(anchor);
-			conn3.setHint("tree2"); //$NON-NLS-1$
-			conn3.setConnectionRouter(forestRouter);
-			
-			conn4 = new TreeConnection();
-			conn4.setSourceAnchor(new ChopboxAnchor(node5));
-			conn4.setTargetAnchor(anchor);
-			conn4.setHint("tree2"); //$NON-NLS-1$
-			conn4.setConnectionRouter(forestRouter);
-			
-		} catch (Exception e) {
-			fail("The ForestRouterTest.setUp method caught an exception - " + e); //$NON-NLS-1$
-		}
-	}
-	/**
-	 * @see org.eclipse.draw2d.ConnectionRouter#invalidate(Connection)
-	 */
-	public void testInvalidate() {
-		getForestRouter().invalidate(getConnection1());
-		getForestRouter().invalidate(getConnection2());
-	}
-	public void testRemove() {
-		getForestRouter().route(getConnection1());
-		getForestRouter().remove(getConnection1());
-	}
-	
-	protected void routeConnections(String testDesc) {
-		getForestRouter().route(getConnection1());
-		getForestRouter().route(getConnection2());
-		
-		updateConstraint(getConnection1());
-		updateConstraint(getConnection2());
-		
-		assertTrue(testDesc
-				+ " Connection1 trunk not equal to Connection2 trunk", //$NON-NLS-1$
-				getConnection1().getPoints().getPoint(2).equals(
-						getConnection2().getPoints().getPoint(2)));
-		assertTrue(testDesc
-				+ " Connection1 isOrthogonalTreeBranch", //$NON-NLS-1$
-				isOrthogonalTreeBranch(getConnection1()));
-		assertTrue(testDesc
-				+ " Connection2 isOrthogonalTreeBranch", //$NON-NLS-1$
-				isOrthogonalTreeBranch(getConnection2()));
-	}
-	
-	/**
-	 * 
-	 */
-	private void updateConstraint(Connection conn) {
-		PointList pts = conn.getPoints();
-		List newConstraint = new ArrayList(pts.size());
-		for (int i = 0; i < pts.size(); i++) {
-			Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-			newConstraint.add(abp);
-		}
-		getForestRouter().setConstraint(conn, newConstraint);
-	}
-	
-	/**
-	 * Utility exposed for testing purposes
-	 * 
-	 * @param conn the <code>Connection</code> to check if it's orthogonal or not.
-	 * @return true is tree branch is orthogonal, false otherwise
-	 */
-	static public boolean isOrthogonalTreeBranch(Connection conn) {
-		TreeRouter treeRouter = new TreeRouter();
-		
-		return treeRouter.isOrthogonalTreeBranch(conn, conn.getPoints());
-	}
-	
-	protected void routeMultiTreeConnections(String testDesc) {
-		routeConnections(testDesc);
-		getForestRouter().route(getConnection3());
-		getForestRouter().route(getConnection4());
-		
-		updateConstraint(getConnection1());
-		updateConstraint(getConnection2());
-		
-		assertTrue(testDesc
-				+ " Connection3 trunk not equal to Connection4 trunk", //$NON-NLS-1$
-				getConnection3().getPoints().getPoint(2).equals(
-						getConnection4().getPoints().getPoint(2)));
-		assertTrue(testDesc
-				+ " Connection3 isOrthogonalTreeBranch", //$NON-NLS-1$
-				isOrthogonalTreeBranch(getConnection3()));
-		assertTrue(testDesc
-				+ " Connection4 isOrthogonalTreeBranch", //$NON-NLS-1$
-				isOrthogonalTreeBranch(getConnection4()));
-		
-		assertTrue(testDesc
-				+ " tree1 trunk not equal to tree2 trunk", //$NON-NLS-1$
-				!getConnection1().getPoints().getPoint(2).equals(
-						getConnection3().getPoints().getPoint(2)));
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/AvoidObstructionsRoutingTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/AvoidObstructionsRoutingTest.java
deleted file mode 100644
index 6cf149e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/AvoidObstructionsRoutingTest.java
+++ /dev/null

@@ -1,274 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.RectilinearRouter;
-
-
-/**
- * @author sshaw
- *
- */
-public class AvoidObstructionsRoutingTest extends TestCase {
-	public AvoidObstructionsRoutingTest(String name) {
-		super(name);
-	}
-	
-	private ObliqueRouter obliqueRouter;
-    private RectilinearRouter rectilinearRouter;
-
-	protected ObliqueRouter getObliqueRouter() {
-		if (obliqueRouter == null)
-            obliqueRouter = new ObliqueRouter();
-		return obliqueRouter;
-	}
-    
-    protected RectilinearRouter getRectilinearRouter() {
-        if (rectilinearRouter == null)
-            rectilinearRouter = new RectilinearRouter();
-        return rectilinearRouter;
-    }
-	
-	protected void setUp() {
-		try {
-			super.setUp();
-		} catch (Exception e) {
-			fail("The AvoidObstructionsRoutingTest.setUp method caught an exception - " + e); //$NON-NLS-1$
-		}
-	}
-	
-	public boolean isConnectionObstructed(Connection conn, Rectangle obstruction) {
-		PointList rectPoints = PointListUtilities.createPointsFromRect(obstruction);
-        
-        PointList intersections = new PointList();
-        PointList distances = new PointList();
-        return PointListUtilities.findIntersections(conn.getPoints(), rectPoints, intersections, distances);
-	}
-	
-	private void testSameContainerObstruction(boolean horizontal, BendpointConnectionRouter router) {
-		RectangleFigure topNode = new RectangleFigure();
-        topNode.setLayoutManager(new FreeformLayout());
-        topNode.setBounds(new Rectangle(0, 0, 400, 400));
-        
-        RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), node3 = new RectangleFigure();
-		node1.setSize(40, 40);
-		node1.setLocation(new Point(100, 100));
-			
-		node2.setSize(40, 40);
-		node2.setLocation(horizontal ? new Point(200, 100) : new Point(100, 200));
-			
-		node3.setSize(40, 40);
-		node3.setLocation(horizontal ? new Point(300, 100) : new Point(100, 300));
-		
-        topNode.add(node1);
-        topNode.add(node2);
-        topNode.add(node3);
-        
-        verifyObstructionIsCleared(topNode, node1, node3, node2, router);
-	}
-    
-    private void testDifferentSourceContainerObstruction(boolean horizontal, BendpointConnectionRouter router) {
-        RectangleFigure topNode = new RectangleFigure();
-        topNode.setLayoutManager(new FreeformLayout());
-        topNode.setBounds(new Rectangle(0, 0, 400, 400));
-        
-        RectangleFigure subNode = new RectangleFigure() {
-            protected boolean useLocalCoordinates() {
-                return true;
-            }
-        };
-        subNode.setSize(60, 60);
-        subNode.setLayoutManager(new XYLayout());
-        topNode.add(subNode);
-        subNode.setLocation(new Point(100, 100));
-        
-        RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), node3 = new RectangleFigure();
-        node1.setSize(40, 40);
-        subNode.add(node1);
-        node1.setLocation(new Point(10, 10));
-        
-        node2.setSize(40, 40);
-        node2.setLocation(horizontal ? new Point(200, 100) : new Point(100, 200));
-            
-        node3.setSize(40, 40);
-        node3.setLocation(horizontal ? new Point(300, 100) : new Point(100, 300));
-        
-        topNode.add(node2);
-        topNode.add(node3);
-        
-        verifyObstructionIsCleared(topNode, node1, node3, node2, router);
-    }
-    
-    private void testDifferentTargetContainerObstruction(boolean horizontal, BendpointConnectionRouter router) {
-        RectangleFigure topNode = new RectangleFigure();
-        topNode.setLayoutManager(new FreeformLayout());
-        topNode.setBounds(new Rectangle(0, 0, 400, 400));
-        
-        RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), node3 = new RectangleFigure();
-        
-        node1.setSize(40, 40);
-        node1.setLocation(new Point(100, 100));
-        
-        node2.setSize(40, 40);
-        node2.setLocation(horizontal ? new Point(200, 100) : new Point(100, 200));
-        
-        RectangleFigure subNode = new RectangleFigure() {
-            protected boolean useLocalCoordinates() {
-                return true;
-            }
-        };
-        subNode.setSize(60, 60);
-        subNode.setLayoutManager(new XYLayout());
-        topNode.add(subNode);
-        subNode.setLocation(horizontal ? new Point(300, 100) : new Point(100, 300));
-        
-        node3.setSize(40, 40);
-        subNode.add(node3);
-        node3.setLocation(new Point(10, 10));
-        
-        topNode.add(node1);
-        topNode.add(node2);
-        
-        verifyObstructionIsCleared(topNode, node1, node3, node2, router);
-    }
-    
-    private void testDifferentSourceAndTargetContainerObstruction(boolean horizontal, BendpointConnectionRouter router) {
-        RectangleFigure topNode = new RectangleFigure();
-        topNode.setLayoutManager(new FreeformLayout());
-        topNode.setBounds(new Rectangle(0, 0, 400, 400));
-        
-        RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), node3 = new RectangleFigure();
-        
-        RectangleFigure subNode = new RectangleFigure() {
-            protected boolean useLocalCoordinates() {
-                return true;
-            }
-        };
-        subNode.setSize(60, 60);
-        subNode.setLayoutManager(new XYLayout());
-        topNode.add(subNode);
-        subNode.setLocation(new Point(100, 100));
-        
-        node1.setSize(40, 40);
-        subNode.add(node1);
-        node1.setLocation(new Point(10, 10));
-        
-        node2.setSize(40, 40);
-        node2.setLocation(horizontal ? new Point(200, 100) : new Point(100, 200));
-        
-        RectangleFigure subNode2 = new RectangleFigure() {
-            protected boolean useLocalCoordinates() {
-                return true;
-            }
-        };
-        subNode2.setSize(60, 60);
-        subNode2.setLayoutManager(new XYLayout());
-        topNode.add(subNode2);
-        subNode2.setLocation(horizontal ? new Point(300, 100) : new Point(100, 300));
-        
-        node3.setSize(40, 40);
-        subNode2.add(node3);
-        node3.setLocation(new Point(10, 10));
-        
-        topNode.add(node2);
-        
-        verifyObstructionIsCleared(topNode, node1, node3, node2, router);
-    }
-    
-    public void testSameContainerObstruction_horizontal() {
-        testSameContainerObstruction(true, getObliqueRouter());
-        
-        testSameContainerObstruction(true, getRectilinearRouter());
-    }
-    
-    public void testDifferentSourceContainerObstruction_horizontal() {
-        testDifferentSourceContainerObstruction(true, getObliqueRouter());
-        
-        testDifferentSourceContainerObstruction(true, getRectilinearRouter());
-    }
-    
-    public void testDifferentTargetContainerObstruction_horizontal() {
-        testDifferentTargetContainerObstruction(true, getObliqueRouter());
-        
-        testDifferentTargetContainerObstruction(true, getRectilinearRouter());
-    }
-    
-    public void testDifferentSourceAndTargetContainerObstruction_horizontal() {
-        testDifferentSourceAndTargetContainerObstruction(true, getObliqueRouter());
-        
-        testDifferentSourceAndTargetContainerObstruction(true, getRectilinearRouter());
-    }
-    
-    public void testSameContainerObstruction_vertical() {
-        testSameContainerObstruction(false, getObliqueRouter());
-        
-        testSameContainerObstruction(false, getRectilinearRouter());
-    }
-    
-    public void testDifferentSourceContainerObstruction_vertical() {
-        testDifferentSourceContainerObstruction(false, getObliqueRouter());
-        
-        testDifferentSourceContainerObstruction(false, getRectilinearRouter());
-    }
-    
-    public void testDifferentTargetContainerObstruction_vertical() {
-        testDifferentTargetContainerObstruction(false, getObliqueRouter());
-        
-        testDifferentTargetContainerObstruction(false, getRectilinearRouter());
-    }
-    
-    public void testDifferentSourceAndTargetContainerObstruction_vertical() {
-        testDifferentSourceAndTargetContainerObstruction(false, getObliqueRouter());
-    
-        testDifferentSourceAndTargetContainerObstruction(false, getRectilinearRouter());
-    }
-	
-    private void verifyObstructionIsCleared(IFigure topNode, IFigure node1, IFigure node3, IFigure obstruction, BendpointConnectionRouter router) {
-        PolylineConnectionEx conn1 = new PolylineConnectionEx();
-        conn1.setSourceAnchor(new ChopboxAnchor(node1));
-        conn1.setTargetAnchor(new ChopboxAnchor(node3));
-        conn1.setConnectionRouter(router);
-        PointList points = new PointList();
-        
-        Point pt1 = node1.getBounds().getCenter();
-        node1.translateToAbsolute(pt1);
-        conn1.translateToRelative(pt1);
-        points.addPoint(pt1);
-        
-        Point pt2 = node3.getBounds().getCenter();
-        node3.translateToAbsolute(pt2);
-        conn1.translateToRelative(pt2);
-        points.addPoint(pt2);
-        conn1.setPoints(points);
-        
-        assertTrue(isConnectionObstructed(conn1, obstruction.getBounds().getCopy()));
-        
-        conn1.setRoutingStyles(true, true);
-        getObliqueRouter().route(conn1);
-        
-        assertFalse(isConnectionObstructed(conn1, obstruction.getBounds().getCopy()));
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/LeftRightForestRouterTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/LeftRightForestRouterTest.java
deleted file mode 100644
index 4274f7c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/LeftRightForestRouterTest.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-/*
- * Created on Feb 20, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ITreeConnection;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.OrthogonalRouterUtilities;
-
-/**
- * @author sshaw
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class LeftRightForestRouterTest extends AbstractForestRouterTest {
-	
-	public LeftRightForestRouterTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() {
-		super.setUp();
-		
-		try {
-			getConnection1().getSourceAnchor().getOwner().setLocation(new Point(200, 100));
-			getConnection2().getSourceAnchor().getOwner().setLocation(new Point(200, 200));
-			getConnection1().getTargetAnchor().getOwner().setLocation(new Point(50, 150));
-			
-			getConnection3().getSourceAnchor().getOwner().setLocation(new Point(300, 100));
-			getConnection4().getSourceAnchor().getOwner().setLocation(new Point(300, 200));
-			
-			getConnection1().setOrientation(ITreeConnection.Orientation.HORIZONTAL);
-			getConnection2().setOrientation(ITreeConnection.Orientation.HORIZONTAL);
-			getConnection3().setOrientation(ITreeConnection.Orientation.HORIZONTAL);
-			getConnection4().setOrientation(ITreeConnection.Orientation.HORIZONTAL);
-			
-		} catch (Exception e) {
-			fail("The ForestRouterTest.setUp method caught an exception - " + e); //$NON-NLS-1$
-		}
-	}
-	
-	public void testRouteLeftRight() {
-		// test default routing - no constraint set
-		routeConnections("LeftRight:no constraint"); //$NON-NLS-1$
-		
-		// now set constraint and change it simulating user gesture
-		List newConstraint = new ArrayList(getConnection1().getPoints().size());
-		PointList pts = PointListUtilities
-				.copyPoints(getConnection1().getPoints());
-		OrthogonalRouterUtilities.resetEndPointsToCenter(getConnection1(), pts);
-		
-		// test 1 change trunk end
-		pts.setPoint(pts.getPoint(2).getTranslated(0, 10), 2);
-		pts.setPoint(pts.getPoint(3).getTranslated(0, 10), 3);
-		for (int i = 0; i < pts.size(); i++) {
-			Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-			newConstraint.add(abp);
-		}
-		getForestRouter().setConstraint(getConnection1(), newConstraint);
-		routeConnections("LeftRight:change trunk end"); //$NON-NLS-1$
-		
-		// test 2 change trunk shoulder
-		pts.setPoint(pts.getPoint(1).getTranslated(10, 0), 1);
-		pts.setPoint(pts.getPoint(2).getTranslated(10, 0), 2);
-		newConstraint = new ArrayList(getConnection1().getPoints().size());
-		for (int i = 0; i < pts.size(); i++) {
-			Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-			newConstraint.add(abp);
-		}
-		getForestRouter().setConstraint(getConnection1(), newConstraint);
-		routeConnections("LeftRight:change trunk shoulder"); //$NON-NLS-1$
-		
-		// test 3 change branch
-		pts.setPoint(pts.getPoint(0).getTranslated(0, 10), 0);
-		pts.setPoint(pts.getPoint(1).getTranslated(0, 10), 1);
-		newConstraint = new ArrayList(getConnection1().getPoints().size());
-		for (int i = 0; i < pts.size(); i++) {
-			Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-			newConstraint.add(abp);
-		}
-		getForestRouter().setConstraint(getConnection1(), newConstraint);
-		routeConnections("LeftRight:change branch"); //$NON-NLS-1$
-	}
-	
-	public void testMultiTrees() {
-		//	test default routing - no constraint set
-		routeMultiTreeConnections("LeftRight:no constraint"); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/RectilinearRouterTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/RectilinearRouterTest.java
deleted file mode 100644
index b3cf621..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/RectilinearRouterTest.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.RectilinearRouter;
-
-
-public class RectilinearRouterTest extends TestCase {
-	public RectilinearRouterTest(String name) {
-		super(name);
-	}
-	
-	private RectilinearRouter rectilinearRouter;
-
-	protected RectilinearRouter getRectilinearRouter() {
-		if (rectilinearRouter == null)
-			rectilinearRouter = new RectilinearRouter();
-		return rectilinearRouter;
-	}
-	
-	static private class FixedPointConnectionAnchor extends AbstractConnectionAnchor {
-
-		RectangleFigure rf;
-		
-		public FixedPointConnectionAnchor(RectangleFigure rf) {
-			super(rf);
-			this.rf = rf;
-		}
-		
-		public Point getLocation(Point reference) {
-			return rf.getBounds().getBottomRight();
-		}
-		
-	}
-	
-	protected void setUp() {
-		try {
-			super.setUp();
-		} catch (Exception e) {
-			fail("The RectilinearRouterTest.setUp method caught an exception - " + e); //$NON-NLS-1$
-		}
-	}
-	
-	public void verifyConnection(Connection conn) {
-		List lineSegs = PointListUtilities.getLineSegments(conn.getPoints());
-		ListIterator li = lineSegs.listIterator();
-		while (li.hasNext()) {
-			LineSeg line = (LineSeg)li.next();
-			assertTrue(line.isHorizontal() || line.isVertical());
-		}
-		
-		assertTrue(conn.getPoints().size() >= 2);
-		
-		// make sure the router is still respecting the end anchor points
-		assertTrue(conn.getPoints().getFirstPoint().equals(conn.getSourceAnchor().getLocation(conn.getPoints().getFirstPoint())));
-		assertTrue(conn.getPoints().getLastPoint().equals(conn.getTargetAnchor().getLocation(conn.getPoints().getLastPoint())));
-	}
-	
-	public void testRouteConnectionAttachedToConnection() {
-		PolylineConnectionEx conn1;
-		PolylineConnectionEx conn2;
-		
-		RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), node3 = new RectangleFigure();
-		node1.setSize(40, 40);
-		node1.setLocation(new Point(100, 100));
-			
-		node2.setSize(40, 40);
-		node2.setLocation(new Point(400, 100));
-			
-		node3.setSize(40, 40);
-		node3.setLocation(new Point(250, 300));
-		
-		conn1 = new PolylineConnectionEx();
-		conn1.setSourceAnchor(new ChopboxAnchor(node1));
-		conn1.setTargetAnchor(new ChopboxAnchor(node2));
-		conn1.setConnectionRouter(new ObliqueRouter());
-		PointList points = new PointList();
-		points.addPoint(new Point(node1.getBounds().getCenter()));
-		points.addPoint(new Point(200, node1.getBounds().getCenter().y));
-		points.addPoint(new Point(300, 200));
-		points.addPoint(new Point(node2.getBounds().getCenter()));
-		conn1.setPoints(points);
-		
-		ConnectionAnchor anchor = new BaseSlidableAnchor(conn1);
-		conn2 = new PolylineConnectionEx();
-		conn2.setSourceAnchor(new ChopboxAnchor(node3));
-		conn2.setTargetAnchor(anchor);
-		
-		getRectilinearRouter().route(conn2);
-		verifyConnection(conn2);
-	}
-	
-	public void testRouteConnections() {
-		Connection conn1;
-		Connection conn2;
-		Connection conn3;
-		Connection conn4;
-		
-		RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), node3 = new RectangleFigure();
-		node1.setSize(40, 40);
-		node1.setLocation(new Point(100, 200));
-			
-		node2.setSize(40, 40);
-		node2.setLocation(new Point(200, 200));
-			
-		node3.setSize(40, 40);
-		node3.setLocation(new Point(150, 50));
-			
-		ConnectionAnchor anchor = new FixedPointConnectionAnchor(node3);
-		conn1 = new PolylineConnection();
-		conn1.setSourceAnchor(new ChopboxAnchor(node1));
-		conn1.setTargetAnchor(anchor);
-		conn1.setConnectionRouter(getRectilinearRouter());
-		PointList points = new PointList();
-		points.addPoint(new Point(node1.getBounds().getCenter()));
-		points.addPoint(new Point(node1.getBounds().getCenter().x, 150));
-		points.addPoint(new Point(node3.getBounds().getCenter()));
-		conn1.setPoints(points);
-			
-		conn2 = new PolylineConnection();
-		conn2.setSourceAnchor(new ChopboxAnchor(node2));
-		conn2.setTargetAnchor(anchor);
-		conn2.setConnectionRouter(getRectilinearRouter());
-		points = new PointList();
-		points.addPoint(new Point(node1.getBounds().getCenter()));
-		points.addPoint(new Point(node3.getBounds().getCenter()));
-		conn2.setPoints(points);
-			
-		RectangleFigure node4 = new RectangleFigure(), node5 = new RectangleFigure();
-		node4.setSize(40, 40);
-		node4.setLocation(new Point(100, 300));
-			
-		node5.setSize(40, 40);
-		node5.setLocation(new Point(200, 300));
-			
-		conn3 = new PolylineConnection();
-		conn3.setSourceAnchor(new ChopboxAnchor(node4));
-		conn3.setTargetAnchor(anchor);
-		conn3.setConnectionRouter(getRectilinearRouter());
-		points = new PointList();
-		points.addPoint(new Point(node4.getBounds().getCenter()));
-		points.addPoint(new Point(200, 250));
-		points.addPoint(new Point(50, 150));
-		points.addPoint(new Point(node3.getBounds().getCenter()));
-		conn3.setPoints(points);
-			
-		conn4 = new PolylineConnection();
-		conn4.setSourceAnchor(new ChopboxAnchor(node5));
-		conn4.setTargetAnchor(anchor);
-		conn4.setConnectionRouter(getRectilinearRouter());
-		points = new PointList();
-		points.addPoint(new Point(node4.getBounds().getCenter()));
-		points.addPoint(new Point(node4.getBounds().getCenter().x, node3.getBounds().getCenter().y));
-		points.addPoint(new Point(node3.getBounds().getCenter()));
-		conn4.setPoints(points);
-		
-		getRectilinearRouter().route(conn1);
-		getRectilinearRouter().route(conn2);
-		getRectilinearRouter().route(conn3);
-		getRectilinearRouter().route(conn4);
-		
-		verifyConnection(conn1);
-		verifyConnection(conn2);
-		verifyConnection(conn3);
-		verifyConnection(conn4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/TopDownForestRouterTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/TopDownForestRouterTest.java
deleted file mode 100644
index 134b0ed..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/TopDownForestRouterTest.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ITreeConnection;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.OrthogonalRouterUtilities;
-/**
- * @author sshaw
- * 
- * ForestRouter test class.
- */
-public class TopDownForestRouterTest extends AbstractForestRouterTest {
-	public TopDownForestRouterTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() {
-		super.setUp();
-		
-		try {
-			getConnection1().getSourceAnchor().getOwner().setLocation(new Point(100, 200));
-			getConnection2().getSourceAnchor().getOwner().setLocation(new Point(200, 200));
-			getConnection1().getTargetAnchor().getOwner().setLocation(new Point(150, 50));
-			
-			getConnection3().getSourceAnchor().getOwner().setLocation(new Point(100, 300));
-			getConnection4().getSourceAnchor().getOwner().setLocation(new Point(200, 300));
-			
-			getConnection1().setOrientation(ITreeConnection.Orientation.VERTICAL);
-			getConnection2().setOrientation(ITreeConnection.Orientation.VERTICAL);
-			getConnection3().setOrientation(ITreeConnection.Orientation.VERTICAL);
-			getConnection4().setOrientation(ITreeConnection.Orientation.VERTICAL);
-			
-		} catch (Exception e) {
-			fail("The ForestRouterTest.setUp method caught an exception - " + e); //$NON-NLS-1$
-		}
-	}
-	
-	public void testRouteTopDown() {
-		// test default routing - no constraint set
-		routeConnections("TopDown:no constraint"); //$NON-NLS-1$
-		
-		// now set constraint and change it simulating user gesture
-		List newConstraint = new ArrayList(getConnection1().getPoints().size());
-		PointList pts = PointListUtilities
-				.copyPoints(getConnection1().getPoints());
-		OrthogonalRouterUtilities.resetEndPointsToCenter(getConnection1(), pts);
-		// test 1 change trunk end
-		pts.setPoint(pts.getPoint(2).getTranslated(10, 0), 2);
-		pts.setPoint(pts.getPoint(3).getTranslated(10, 0), 3);
-		for (int i = 0; i < pts.size(); i++) {
-			Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-			newConstraint.add(abp);
-		}
-		getForestRouter().setConstraint(getConnection1(), newConstraint);
-		routeConnections("TopDown:change trunk end"); //$NON-NLS-1$
-		// test 2 change trunk shoulder
-		pts.setPoint(pts.getPoint(1).getTranslated(0, 10), 1);
-		pts.setPoint(pts.getPoint(2).getTranslated(0, 10), 2);
-		newConstraint = new ArrayList(getConnection1().getPoints().size());
-		for (int i = 0; i < pts.size(); i++) {
-			Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-			newConstraint.add(abp);
-		}
-		getForestRouter().setConstraint(getConnection1(), newConstraint);
-		routeConnections("TopDown:change trunk shoulder"); //$NON-NLS-1$
-		// test 3 change branch
-		pts.setPoint(pts.getPoint(0).getTranslated(10, 0), 0);
-		pts.setPoint(pts.getPoint(1).getTranslated(10, 0), 1);
-		newConstraint = new ArrayList(getConnection1().getPoints().size());
-		for (int i = 0; i < pts.size(); i++) {
-			Bendpoint abp = new AbsoluteBendpoint(pts.getPoint(i));
-			newConstraint.add(abp);
-		}
-		getForestRouter().setConstraint(getConnection1(), newConstraint);
-		routeConnections("TopDown:change branch"); //$NON-NLS-1$
-	}
-	
-	public void testMultiTrees() {
-		//	test default routing - no constraint set
-		routeMultiTreeConnections("TopDown:no constraint"); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/TreeRouterTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/TreeRouterTest.java
deleted file mode 100644
index 740c71f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/src/org/eclipse/gmf/tests/runtime/draw2d/ui/internal/routers/TreeRouterTest.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.RelativeBendpoint;
-import org.eclipse.draw2d.XYAnchor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ITreeConnection;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.TreeRouter;
-import org.eclipse.gmf.tests.runtime.draw2d.ui.internal.routers.AbstractForestRouterTest.TreeConnection;
-/**
- * @author sshaw
- * 
- * Abstract BranchRouter test class.
- */
-public class TreeRouterTest extends TestCase {
-	public TreeRouterTest(String name) { 
-		super(name);
-	}
-	
-	private TreeRouter treeRouter;
-	private TreeConnection conn1;
-	private TreeConnection conn2;
-	
-	protected TreeConnection getConnection1() {
-		return conn1;
-	}
-
-	protected TreeConnection getConnection2() {
-		return conn2;
-	}
-	
-	protected TreeRouter getTreeRouter() {
-		return treeRouter;
-	}
-	
-	protected void setUp() {
-		try {
-			treeRouter = new TreeRouter();
-			RectangleFigure node1 = new RectangleFigure(), node2 = new RectangleFigure(), 
-							node3 = new RectangleFigure();
-			ConnectionAnchor anchor = new ChopboxAnchor(node2);
-			conn1 = new TreeConnection();
-			conn1.setSourceAnchor(new ChopboxAnchor(node1));
-			conn1.setTargetAnchor(anchor);
-			conn1.setHint("tree1"); //$NON-NLS-1$
-			conn1.setConnectionRouter(treeRouter);
-			
-			conn2 = new TreeConnection();
-			conn2.setSourceAnchor(new ChopboxAnchor(node3));
-			conn2.setTargetAnchor(anchor);
-			conn2.setHint("tree1"); //$NON-NLS-1$
-			conn2.setConnectionRouter(treeRouter);
-			
-			getConnection1().setOrientation(ITreeConnection.Orientation.VERTICAL);
-			getConnection2().setOrientation(ITreeConnection.Orientation.VERTICAL);
-			
-		} catch (Exception e) {
-			fail("The ForestRouterTest.setUp method caught an exception - " + e); //$NON-NLS-1$
-		}
-	}
-	
-	Rectangle test1Other = new Rectangle(3900, 4906, 2200, 1300);
-	Rectangle test1Start = new Rectangle(9986, 5250, 2200, 1300);
-	Rectangle test1End = new Rectangle(6440, 831, 2200, 1300);
-	Dimension[] test1 = { new Dimension(-265, -635), new Dimension(3281, 3784),
-						  new Dimension(-265, -2196), new Dimension(3281, 2223),
-						  new Dimension(-3440, -2196), new Dimension(106, 2223),
-						  new Dimension(-3440, -3784), new Dimension(106, 635)
-	};
-	
-	Rectangle test2Start = new Rectangle(3995, 4974, 2593, 1246);
-	Rectangle test2End = new Rectangle(6535, 899, 2169, 1246);
-	Rectangle test2Other = new Rectangle(9986, 5250, 2200, 1300);
-	Dimension[] test2 = { new Dimension(-238, -635), new Dimension(-2778, 3440),
-						  new Dimension(-238, -1852), new Dimension(-2778, 2223),
-						  new Dimension(2434, -1852), new Dimension(-106, 2223),
-						  new Dimension(2434, -3440), new Dimension(-106, 635)
-	};
-	
-	public void testOrthogonalConstraint() {
-		List newConstraint = initializeConstraint(test1, test1Start, test1End, test1Other);
-		
-		validateConstraint(newConstraint);
-	}
-	
-	public void testRATLC00531806() {
-		List newConstraint = initializeConstraint(test2, test2Start, test2End, test2Other);
-		
-		validateConstraint(newConstraint);
-	}
-	
-	// test reorient of source 
-	public void testRATLC00534189() {
-		List newConstraint = initializeConstraint(test1, test1Start, test1End, test1Other);
-		
-		getConnection1().setSourceAnchor(new XYAnchor(new Point(100, 100)));
-		
-		getTreeRouter().setConstraint(getConnection1(), newConstraint);
-		getTreeRouter().route(getConnection2());
-		getTreeRouter().route(getConnection1());
-		
-		getTreeRouter().invalidate(getConnection1());
-		getTreeRouter().invalidate(getConnection2());
-	}
-	
-	public void testMoveShape() {
-		List newConstraint = initializeConstraint(test1, test1Start, test1End, test1Other);
-		
-		getTreeRouter().setConstraint(getConnection1(), newConstraint);
-		getTreeRouter().route(getConnection2());
-		getTreeRouter().route(getConnection1());
-		
-		Rectangle newBounds = new Rectangle(test1Start);
-		newBounds.translate(4000, 4000);
-		getConnection1().getSourceAnchor().getOwner().setBounds(newBounds);
-		getTreeRouter().route(getConnection1());
-		
-		getConnection2().validate();
-		
-		PointList c1Pts = getConnection1().getPoints();
-		PointList c2Pts = getConnection2().getPoints();
-		assertTrue("Trunk values don't match after tree routing", 	//$NON-NLS-1$
-			c1Pts.getPoint(2).equals(c2Pts.getPoint(2)));
-	}
-
-	/**
-	 * @param newConstraint
-	 */
-	private void validateConstraint(List newConstraint) {
-		getTreeRouter().setConstraint(getConnection1(), newConstraint);
-		PointList ptl1 = getTreeRouter().getPointsFromConstraint(getConnection1());
-		
-		getTreeRouter().route(getConnection2());
-		getTreeRouter().route(getConnection1());
-	
-		assertTrue("Connection1 points aren't orthogonal",			//$NON-NLS-1$
-			getTreeRouter().isOrthogonalTreeBranch(getConnection1(), ptl1));
-		
-		PointList c1Pts = getConnection1().getPoints();
-		PointList c2Pts = getConnection2().getPoints();
-		assertTrue("Connection2 points aren't orthogonal",			//$NON-NLS-1$
-			getTreeRouter().isOrthogonalTreeBranch(getConnection2(), c2Pts));
-		assertTrue("Trunk values don't match after tree routing", 	//$NON-NLS-1$
-			c1Pts.getPoint(2).equals(c2Pts.getPoint(2)));
-	}
-
-	/**
-	 * @param newConstraint
-	 * @param dim
-	 * @param pt1
-	 * @param pt2
-	 * @param pt3
-	 */
-	private List initializeConstraint(Dimension[] testData, Rectangle start, Rectangle end, Rectangle other) {
-		List newConstraint = new ArrayList(getConnection1().getPoints().size());
-		
-		getConnection1().getSourceAnchor().getOwner().setBounds(start);
-		getConnection1().getTargetAnchor().getOwner().setBounds(end);
-		getConnection2().getSourceAnchor().getOwner().setBounds(other);
-		
-		RelativeBendpoint rbp1 =
-			new RelativeBendpoint(getConnection1());
-		rbp1.setRelativeDimensions(
-			testData[0], testData[1]);
-		rbp1.setWeight(1 / ((float) 5));
-		newConstraint.add(rbp1);
-		
-		RelativeBendpoint rbp2 =
-			new RelativeBendpoint(getConnection1());
-		rbp2.setRelativeDimensions(
-			testData[2], testData[3]);
-		rbp2.setWeight(2 / ((float) 5));
-		newConstraint.add(rbp2);
-		
-		RelativeBendpoint rbp3 =
-			new RelativeBendpoint(getConnection1());
-		rbp3.setRelativeDimensions(
-			testData[4], testData[5]);
-		rbp3.setWeight(3 / ((float) 5));
-		newConstraint.add(rbp3);
-		
-		RelativeBendpoint rbp4 =
-			new RelativeBendpoint(getConnection1());
-		rbp4.setRelativeDimensions(
-			testData[6], testData[7]);
-		rbp4.setWeight(4 / ((float) 5));
-		newConstraint.add(rbp4);
-		
-		return newConstraint;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/test.xml b/org.eclipse.gmf.tests.runtime.draw2d.ui/test.xml
deleted file mode 100644
index a772e23..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.draw2d.ui"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.draw2d.ui.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-	
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.classpath b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.cvsignore b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.project b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.project
deleted file mode 100644
index 097fa5c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.emf.clipboard.core</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/org.eclipse.gmf.tests.runtime.emf.clipboard.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 2715be9..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.emf.clipboard.core
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.emf.clipboard.core.Activator
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.emf.clipboard.core;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.clipboard.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.examples.library;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/about.html b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/build.properties b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/build.properties
deleted file mode 100644
index fecedb4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               test_models/,\
-               plugin.properties,\
-               about.html
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/plugin.properties b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/plugin.properties
deleted file mode 100644
index 00a708f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/plugin.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Clipboard Tests
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/Activator.java b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/Activator.java
deleted file mode 100644
index 7a2f57a..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/Activator.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.clipboard.core;
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Linda Damus
- */
-public class Activator extends Plugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/AllTests.java b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/AllTests.java
deleted file mode 100644
index b7559ae..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/AllTests.java
+++ /dev/null

@@ -1,40 +0,0 @@
-package org.eclipse.gmf.tests.runtime.emf.clipboard.core;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * 
- * @author Christian Vogt (cvogt)
- */
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		
-		suite.addTest(RegressionTest.suite());
-		//suite.addTest(ClipboardUtilTest.suite());
-
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java
deleted file mode 100644
index 77c36c6..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java
+++ /dev/null

@@ -1,317 +0,0 @@
-package org.eclipse.gmf.tests.runtime.emf.clipboard.core;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.examples.extlibrary.Book;
-import org.eclipse.emf.examples.extlibrary.Library;
-import org.eclipse.emf.examples.extlibrary.Writer;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.osgi.framework.Bundle;
-
-/**
- * Sets up a test framework for clipboard tests.
- * 
- * @author Christian Vogt (cvogt)
- */
-public abstract class BaseClipboardTest extends TestCase {
-
-	static final Bundle CLIPBOARD_TESTS_BUNDLE =
-		Platform.getBundle("org.eclipse.gmf.tests.runtime.emf.clipboard.core"); //$NON-NLS-1$
-
-	protected static final String PROJECT_NAME = "clipboardTests"; //$NON-NLS-1$
-	protected static final String RESOURCE_NAME = "/" + PROJECT_NAME + "/logres.extlibrary";  //$NON-NLS-1$//$NON-NLS-2$
-
-	private Transaction tx;
-	
-	private ChangeDescription lastChange;
-	
-	protected TransactionalEditingDomain domain;
-
-	protected IProject project;
-
-	protected Resource testResource;
-
-	//
-	// Model structure created by setUp():
-	//
-	// Library root1                     (== root1)
-	//  +- Writer level1 writer          (== level1writer)
-	//  +- Book level1 book              (== level1book)
-	//  +- Library level1                (== level1)
-	//  |   +- Writer level1-2 writer    (== level12writer)
-	//  |   +- Book level1-2 book        (== level12book)
-	//  |   +- Library level1-2          (== level12)
-	// Library root2                     (== root2)
-	//  +- Writer level2 writer          (== level2writer)
-	//  +- Book level2 book              (== level2book)
-	// Library root3                     (== root3) 
-	//
-	protected Library root1;
-	protected Writer level1writer;
-	protected Book level1book;
-	protected Library level1;
-	protected Writer level12writer;
-	protected Book level12book;
-	protected Library level12;
-	protected Library root2;
-	protected Writer level2writer;
-	protected Book level2book;
-	protected Library root3;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param name
-	 */
-	public BaseClipboardTest(String name) {
-		super(name);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-
-		project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
-		if (!project.exists()) {
-			project.create(null);
-		}
-		
-		project.open(null);
-	
-		domain = GMFEditingDomainFactory.getInstance().createEditingDomain();
-		
-		tx = ((InternalTransactionalEditingDomain) domain).startTransaction(false, null);
-		
-		try {
-			Resource originalRes = domain.getResourceSet().getResource(
-					URI.createURI(
-							CLIPBOARD_TESTS_BUNDLE.getEntry(
-								"/test_models/clipboard_test.extlibrary") //$NON-NLS-1$
-					.toString()), true);
-			originalRes.setURI(URI.createPlatformResourceURI(RESOURCE_NAME));
-			originalRes.save(Collections.EMPTY_MAP);
-			testResource = originalRes;
-
-			// see above for model info
-			root1 = (Library)testResource.getContents().get(0);
-			level1writer = (Writer)root1.getWriters().get(0);
-			level1book = (Book)root1.getBooks().get(0);
-			level1 = (Library)root1.getBranches().get(0);
-			
-			level12writer = (Writer)level1.getWriters().get(0);
-			level12book = (Book)level1.getBooks().get(0);
-			level12 = (Library)level1.getBranches().get(0);
-			
-			root2 = (Library)testResource.getContents().get(1);
-			level2writer = (Writer)root2.getWriters().get(0);
-			level2book = (Book)root2.getBooks().get(0);
-			
-			root3 = (Library)testResource.getContents().get(2);
-		} catch (IOException e) {
-			fail("Failed to load test model: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		root1 = null;
-		level1writer = null;
-		level1book = null;
-		level1 = null;
-		level12writer = null;
-		level12book = null;
-		level12 = null;
-		root2 = null;
-		level2writer = null;
-		level2book = null;
-		root3 = null;
-
-		if (testResource != null) {
-			if (testResource.isLoaded()) {
-				testResource.unload();
-			}
-			
-			if (testResource.getResourceSet() != null) {
-				testResource.getResourceSet().getResources().remove(testResource);
-			}
-			testResource = null;
-		}
-		
-		if ((project != null) && project.exists()) {
-			project.delete(true, true, null);
-		}
-		
-		project = null;
-		domain = null;
-	}
-
-	/**
-	 * Copy elements to a the clipboard.
-	 * 
-	 * @param eObjects a collection of {@link EObject}s to be serialized
-	 * @param hints a mapping of hints (defined as constants on this class), or
-	 *     <code>null</code> to provide no hints
-	 * 
-	 * @return the serial form of the <code>eObjects</code>
-	 */
-	protected String copy(Collection objects, Map hints) {
-		try {
-			return ClipboardUtil.copyElementsToString(
-				objects, hints, new NullProgressMonitor());
-		} catch (Exception ex) {
-			fail("Failed to copy elements to string."); //$NON-NLS-1$
-		}
-		return null;
-	}
-	
-	/**
-	 * Deerializes elements from a string (obtained from the system clipboard)
-	 * and pastes them into the specified target element.
-	 *
-	 * @param string the string containing the elements to be pasted
-	 * @param target the element into which the new elements are to be
-	 *     pasted (must be of type EObject or Resource)
-	 * @param hints a mapping of hints (defined as constants on this class), or
-	 *     <code>null</code> to provide no hints
-	 * 
-	 * @return the newly pasted {@link EObject}s
-	 */
-	protected Collection paste(final String str, final Object target, final Map hints) {
-		assert (target instanceof Resource || target instanceof EObject);
-
-		Collection result = null;
-		Transaction pasteTx = null;
-		
-		try {
-			pasteTx = ((InternalTransactionalEditingDomain) domain).startTransaction(false, null);
-		} catch (Exception e) {
-			fail("Failed to paste elements from string: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		
-		try {
-			if (target instanceof Resource) {
-				result = ClipboardUtil.pasteElementsFromString(
-					str, (Resource)target, hints, new NullProgressMonitor());
-			} else {
-				// else it must be an EObject
-				result =  ClipboardUtil.pasteElementsFromString(
-					str, (EObject)target, hints, new NullProgressMonitor());
-			}
-		} catch (Exception ex) {
-			fail("Failed to paste elements from string."); //$NON-NLS-1$
-		} finally {
-			try {
-				pasteTx.commit();
-			} catch (RollbackException e) {
-				fail("Failed to paste elements from string: " + e.getLocalizedMessage()); //$NON-NLS-1$
-			}
-		}
-
-		return result;
-	}
-	
-	/**
-	 * Must be called first in every test method that needs to run in a write
-	 * action.  If we are not in a write action, we return <code>false</code>.
-	 * However, in this case, we do also re-execute the original test method
-	 * inside of a new write action, in which nested execution this method will
-	 * return <code>true</code>.  Therefore, the entire test method should be
-	 * in an <code>if</code> block conditional on this result.  Following this
-	 * <code>if</code> block, it is safe to access the undo interval created
-	 * during the test via the {@link #getLastUndo()} method in an
-	 * <code>else</code> block.
-	 * <p>
-	 * Example:
-	 * </p>
-	 * <pre>
-	 *     if (writing()) {
-	 *        // ... do stuff in a write action ...
-	 *     }
-	 * </pre>
-	 * 
-	 * @return whether we are in a write action or not
-	 * 
-	 * @see #getLastUndo()
-	 */
-	protected boolean writing() {
-		boolean result = (tx != null);
-		
-		if (!result) {
-			try {
-				tx = ((InternalTransactionalEditingDomain) domain).startTransaction(false, null);
-			} catch (Exception e) {
-				fail("Could not start transaction: " + e.getLocalizedMessage()); //$NON-NLS-1$
-			}
-			
-			try {
-				runTest();
-			} catch (AssertionFailedError e) {
-				tx.rollback();
-				throw e;
-			} catch (Exception e) {
-				tx.rollback();
-				e.printStackTrace();
-				fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-			} catch (Throwable t) {
-				tx.rollback();
-				throw (Error) t;
-			} finally {
-				if (tx.isActive()) {
-					try {
-						tx.commit();
-					} catch (RollbackException e) {
-						fail("Transaction rolled back: " + e.getLocalizedMessage()); //$NON-NLS-1$
-					}
-				}
-			}
-				
-			lastChange = tx.getChangeDescription();
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Gets the change description created by the test within its
-	 * <pre>
-	 *     if (writing()) {
-	 *        // ... do stuff in a write action ...
-	 *     } else {
-	 *         ChangeDescription change = getLastChange();
-	 *         
-	 *         // ... do stuff with the change description ...
-	 *     }
-	 * </pre>
-	 * block.
-	 * 
-	 * @return the test's change description
-	 * 
-	 * @see #writing()
-	 */
-	protected ChangeDescription getLastChange() {
-		return lastChange;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/RegressionTest.java b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/RegressionTest.java
deleted file mode 100644
index d365345..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/RegressionTest.java
+++ /dev/null

@@ -1,274 +0,0 @@
-package org.eclipse.gmf.tests.runtime.emf.clipboard.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;
-import org.eclipse.emf.examples.extlibrary.Library;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Tests for regressions in defects.
- * 
- * @author Christian Vogt (cvogt)
- */
-public class RegressionTest	extends BaseClipboardTest {
-
-	public RegressionTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new TestSuite(RegressionTest.class, "Clipboard Regression Tests"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Tests copying root elements to the clipboard.
-	 */
-	public void test_copyRoot_bugzilla107880() {
-		if (writing()) {
-			List objects = new ArrayList();
-			
-			// copy root1
-			objects.add(root1);
-			String result = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(result);
-			assertFalse(result.length() == 0);
-			
-			int length = result.length();
-			
-			// copy root2
-			objects.add(root2);
-			result = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(result);
-			assertTrue(result.length() > length);
-		}
-	}
-	
-	/**
-	 * Tests copying a root element to the clipboard and pasting
-	 * this element into another element.
-	 */
-	public void test_copyPasteRoot_bugzilla107880() {
-		if (writing()) {
-			List objects = new ArrayList();
-	
-			// level12 has no branches
-			assertTrue(level12.getBranches().size() == 0);
-	
-			// copy root3
-			objects.add(root3);
-			String copyStr = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(copyStr);
-			assertFalse(copyStr.length() == 0);
-			
-			// paste into level1
-			Collection eObjects = paste(copyStr, level12, Collections.EMPTY_MAP);
-			assertEquals(eObjects.size(), objects.size());
-	
-			// check that the library was copied into the branches containment list
-			assertTrue(level12.getBranches().size() == 1);
-		}
-	}
-
-	/**
-	 * Tests copying a root element to the clipboard and pasting a copy
-	 * to itself.
-	 */
-	public void test_copyPasteRootToItself_bugzilla107880() {
-		if (writing()) {
-			List objects = new ArrayList();
-	
-			// root3 has no branches
-			assertEquals(root3.getBranches().size(), 0);
-	
-			// copy root3
-			objects.add(root3);
-			String copyStr = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(copyStr);
-			assertFalse(copyStr.length() == 0);
-			
-			// paste into root3
-			Collection eObjects = paste(copyStr, root3, Collections.EMPTY_MAP);
-			assertTrue(eObjects.size() == objects.size());
-	
-			// check that the library was copied into the branches containment list
-			assertTrue(root3.getBranches().size() == 1);
-		}
-	}
-	
-	/**
-	 * Tests copying multiple roots and non-roots to the clipboard at the same time
-	 * and pasting them into and element.
-	 */
-	public void test_copyPasteMultipleRoots_bugzilla107880() {
-		if (writing()) {
-			List objects = new ArrayList();
-	
-			// root3 has no branches
-			assertTrue(root3.getBranches().size() == 0);
-	
-			// copy root1, level2writer, level2book, and root3
-			objects.add(root1);
-			objects.add(level2writer);
-			objects.add(level2book);
-			objects.add(root3);
-			String copyStr = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(copyStr);
-			assertFalse(copyStr.length() == 0);
-			
-			// paste into root3
-			Collection eObjects = paste(copyStr, root3, Collections.EMPTY_MAP);
-			assertTrue(eObjects.size() == objects.size());
-	
-			// check that the items were copied into acceptable containment features
-			assertTrue(root3.getWriters().size() == 1);
-			assertTrue(root3.getBooks().size() == 1);
-			assertTrue(root3.getBranches().size() == 2);
-		}
-	}
-	
-	/**
-	 * Tests copying a root element to the clipboard and pasting into
-	 * an invalid target element (a target element which does not have
-	 * a feature capable of containing the copied element).
-	 */
-	public void test_pasteRootToInvalidTarget_bugzilla107880() {
-		if (writing()) {
-			List objects = new ArrayList();
-	
-			// copy root3
-			objects.add(root3);
-			String copyStr = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(copyStr);
-			assertFalse(copyStr.length() == 0);
-			
-			// paste into level1writer
-			Collection eObjects = paste(copyStr, level1writer, Collections.EMPTY_MAP);
-			assertTrue(eObjects.size() == 0);
-		}
-	}
-	
-	/**
-	 * Tests pasting elements into the resource.
-	 */
-	public void test_pasteToResource_bugzilla107880() {
-		if (writing()) {
-			List objects = new ArrayList();
-	
-			// testResource has 3 contents
-			assertTrue(testResource.getContents().size() == 3);
-	
-			// copy root3 and level1book
-			objects.add(root3);
-			objects.add(level1book);
-			String copyStr = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(copyStr);
-			assertFalse(copyStr.length() == 0);
-			
-			// paste into testResource
-			Collection eObjects = paste(copyStr, testResource, Collections.EMPTY_MAP);
-			assertEquals(eObjects.size(), objects.size());
-	
-			// check that the library and book were copied into the resource
-			assertTrue(testResource.getContents().size() == 5);
-		}
-	}
-	
-	/**
-	 * Tests copying an element to the clipboard and pasting into
-	 * a target which has a non-containment feature which can reference
-	 * the type of the copied element.
-	 */
-	public void test_pasteIntoNonContainmentFeature() {
-		if (writing()) {
-			List objects = new ArrayList();
-	
-			// level2book has no author
-			assertNull(level2book.getAuthor());
-	
-			// copy level2writer
-			objects.add(level2writer);
-			String copyStr = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(copyStr);
-			assertFalse(copyStr.length() == 0);
-			
-			// paste into level2book
-			Collection eObjects = paste(copyStr, level2book, Collections.EMPTY_MAP);
-			assertTrue(eObjects.size() == 0);
-			
-			// level2book has no author
-			assertNull(level2book.getAuthor());
-		}
-	}
-	
-	/**
-	 * Check that we ignore container features as well as containments when
-	 * "resolving" features on paste.
-	 */
-	public void test_resolvingContainerFeature_129046() {
-		if (writing()) {
-			List objects = new ArrayList();
-
-			// create a few branches in level1 (we already have one, level1-2)
-			Library level1a = EXTLibraryFactory.eINSTANCE.createLibrary();
-			level1a.setName("level1a"); //$NON-NLS-1$
-			level1.getBranches().add(level1a);
-			Library level1b = EXTLibraryFactory.eINSTANCE.createLibrary();
-			level1b.setName("level1b"); //$NON-NLS-1$
-			level1.getBranches().add(level1b);
-			Library level1c = EXTLibraryFactory.eINSTANCE.createLibrary();
-			level1c.setName("level1c"); //$NON-NLS-1$
-			level1.getBranches().add(level1c);
-
-			XMLResource xml = (XMLResource) testResource;
-			if (xml.getID(level1a) == null) {
-				// create some IDs because our resource impl didn't do it for us
-				xml.setID(level1a, EcoreUtil.generateUUID());
-				xml.setID(level1b, EcoreUtil.generateUUID());
-				xml.setID(level1c, EcoreUtil.generateUUID());
-			}
-			
-			// verify that they know their parent branch
-			assertSame(level1, level1a.getParentBranch());
-			assertSame(level1, level1b.getParentBranch());
-			assertSame(level1, level1c.getParentBranch());
-			
-			// copy level1
-			objects.add(level1);
-			String copyStr = copy(objects, Collections.EMPTY_MAP);
-			assertNotNull(copyStr);
-			assertFalse(copyStr.length() == 0);
-			
-			// paste level1 copy into root3
-			Collection eObjects = paste(copyStr, root3, Collections.EMPTY_MAP);
-			assertEquals(1, eObjects.size());
-			
-			Object pasted = eObjects.iterator().next();
-			assertTrue(pasted instanceof Library);
-			
-			// verify that the pasted library knows its container
-			Library pastedLibrary = (Library) pasted;
-			assertSame(root3, pastedLibrary.getParentBranch());
-			
-			// get its branches and verify them
-			assertEquals(4, pastedLibrary.getBranches().size());
-			assertSame(pastedLibrary, ((Library) pastedLibrary.getBranches().get(0)).getParentBranch());
-			assertSame(pastedLibrary, ((Library) pastedLibrary.getBranches().get(1)).getParentBranch());
-			assertSame(pastedLibrary, ((Library) pastedLibrary.getBranches().get(2)).getParentBranch());
-			assertSame(pastedLibrary, ((Library) pastedLibrary.getBranches().get(3)).getParentBranch());
-			
-			// make sure that the original level1 branches are unchanged
-			assertSame(level1, level1a.getParentBranch());
-			assertSame(level1, level1b.getParentBranch());
-			assertSame(level1, level1c.getParentBranch());
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/test.xml b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/test.xml
deleted file mode 100644
index 9689b17..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.emf.clipboard.core"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.emf.clipboard.core.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/test_models/clipboard_test.extlibrary b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/test_models/clipboard_test.extlibrary
deleted file mode 100644
index 092949a..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/test_models/clipboard_test.extlibrary
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:extlib="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0">
-  <extlib:Library xmi:id="__PdYcDwREdqsreH7ZEkn1Q" name="root1">
-    <stock xmi:type="extlib:Book" xmi:id="_aR_fwDwUEdqsreH7ZEkn1Q" title="level1-1 book" author="_Z6mTcDwUEdqsreH7ZEkn1Q"/>
-    <branches xmi:id="_bqgK0DwUEdqsreH7ZEkn1Q" name="level1-1">
-      <stock xmi:type="extlib:Book" xmi:id="_caonQDwUEdqsreH7ZEkn1Q" title="level1-2 book" author="_cFxKgDwUEdqsreH7ZEkn1Q"/>
-      <branches xmi:id="_T_70UDzvEdqXBNGtrOlkUA" name="level1-2"/>
-      <writers xmi:id="_cFxKgDwUEdqsreH7ZEkn1Q" firstName="level1-2" lastName="writer" books="_caonQDwUEdqsreH7ZEkn1Q"/>
-    </branches>
-    <writers xmi:id="_Z6mTcDwUEdqsreH7ZEkn1Q" firstName="level1-1" lastName="writer" books="_aR_fwDwUEdqsreH7ZEkn1Q"/>
-  </extlib:Library>
-  <extlib:Library xmi:id="_LjV6ADwUEdqsreH7ZEkn1Q" name="root2">
-    <stock xmi:type="extlib:Book" xmi:id="_bJH8EDwUEdqsreH7ZEkn1Q" title="level2-1 book"/>
-    <writers xmi:id="_a0aQUDwUEdqsreH7ZEkn1Q" firstName="level2-1" lastName="writer"/>
-  </extlib:Library>
-  <extlib:Library xmi:id="_NqhzgDwVEdqsreH7ZEkn1Q" name="root3"/>
-</xmi:XMI>

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/.classpath b/org.eclipse.gmf.tests.runtime.emf.commands.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.emf.commands.core/.cvsignore b/org.eclipse.gmf.tests.runtime.emf.commands.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/.project b/org.eclipse.gmf.tests.runtime.emf.commands.core/.project
deleted file mode 100644
index 0bf991b..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.emf.commands.core</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/org.eclipse.gmf.tests.runtime.emf.commands.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.emf.commands.core/META-INF/MANIFEST.MF
deleted file mode 100644
index d54daf3..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.emf.commands.core
-Bundle-Version: 1.0.3.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.emf.commands.core.Activator
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.emf.commands.core;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.commands.core.command;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.tests.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.pde.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.examples.runtime.diagram.logic.model;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/about.html b/org.eclipse.gmf.tests.runtime.emf.commands.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/build.properties b/org.eclipse.gmf.tests.runtime.emf.commands.core/build.properties
deleted file mode 100644
index 3272503..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/plugin.properties b/org.eclipse.gmf.tests.runtime.emf.commands.core/plugin.properties
deleted file mode 100644
index 98c60ea..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/plugin.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF EMF MSL Commands Tests
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/Activator.java b/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/Activator.java
deleted file mode 100644
index 67650a2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/Activator.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.commands.core;
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Linda Damus
- */
-public class Activator extends Plugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/AllTests.java b/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/AllTests.java
deleted file mode 100644
index 7d9c880..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/AllTests.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.commands.core;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.emf.commands.core.command.AbstractTransactionalCommandTest;
-import org.eclipse.gmf.tests.runtime.emf.commands.core.command.CompositeTransactionalCommandTest;
-
-/**
- * @author gvaradar
- *
- */
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		
-        suite.addTest(AbstractTransactionalCommandTest.suite());
-        suite.addTest(CompositeTransactionalCommandTest.suite());
-
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/command/AbstractTransactionalCommandTest.java b/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/command/AbstractTransactionalCommandTest.java
deleted file mode 100644
index 44338e2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/command/AbstractTransactionalCommandTest.java
+++ /dev/null

@@ -1,315 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.commands.core.command;
-
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.ObjectUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListenerImpl;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-
-/**
- * Tests the {@link AbstractTransactionalCommand}.
- * 
- * @author ldamus
- */
-public class AbstractTransactionalCommandTest
-    extends TestCase {
-
-    private IOperationHistory history;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(AbstractTransactionalCommandTest.class);
-    }
-
-    public AbstractTransactionalCommandTest(String name) {
-        super(name);
-    }
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-        history = OperationHistoryFactory.getOperationHistory();
-    }
-
-    private List getFiles(String str) {
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        IFile[] files = workspaceRoot.findFilesForLocationURI(java.net.URI.create(str));
-        return Arrays.asList(files);
-    }
-
-    /**
-     * Tests that commands can be executed, undone and redone through the
-     * operation history.
-     */
-    public void test_execute_undo_redo() {
-        String name = "test_execute_undo_redo"; //$NON-NLS-1$
-        TestCommand c = new TestCommand(name, null);
-        IUndoContext ctx = new ObjectUndoContext(this);
-
-        try {
-            c.addContext(ctx);
-            history.execute(c, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        c.assertExecuted();
-
-        try {
-            assertTrue(history.canUndo(ctx));
-            history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        c.assertUndone();
-
-        try {
-            assertTrue(history.canRedo(ctx));
-            history.redo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        c.assertRedone();
-    }
-
-    /**
-     * Tests that composing two commands results in a command that combines the
-     * contexts and affected files from both children.
-     */
-    public void test_compose() {
-        String name = "test_compose"; //$NON-NLS-1$
-
-        IUndoContext ctx1 = new UndoContext();
-        IUndoContext ctx2 = new UndoContext();
-
-        ICommand c1 = new TestCommand(name, getFiles("null:/compose1")); //$NON-NLS-1$
-        c1.addContext(ctx1);
-
-        ICommand c2 = new TestCommand(name, getFiles("null:/compose2")); //$NON-NLS-1$
-        c2.addContext(ctx2);
-
-        ICommand composition = c1.compose(c2);
-
-        List affectedFiles = composition.getAffectedFiles();
-        assertTrue(affectedFiles.containsAll(c1.getAffectedFiles()));
-        assertTrue(affectedFiles.containsAll(c2.getAffectedFiles()));
-        assertEquals(c1.getAffectedFiles().size()
-            + c2.getAffectedFiles().size(), affectedFiles.size());
-
-        List contexts = Arrays.asList(composition.getContexts());
-        assertTrue(contexts.contains(ctx1));
-        assertTrue(contexts.contains(ctx2));
-    }
-
-    /**
-     * Tests that the reduction of an AbstractCommand returns itself.
-     */
-    public void test_reduce() {
-        String name = "test_reduce"; //$NON-NLS-1$
-
-        ICommand c = new TestCommand(name, null);
-        ICommand reduction = c.reduce();
-
-        assertSame(c, reduction);
-    }
-
-    /**
-     * Tests that the affected files set in the command constructor are
-     * available through the getAffectedFiles() method.
-     */
-    public void test_getAffectedFiles() {
-        String fixtureName = "test_getAffectedFiles"; //$NON-NLS-1$
-
-        // no affected files
-        ICommand c = new TestCommand(fixtureName, null);
-        assertTrue(c.getAffectedFiles().isEmpty());
-
-        // an affected file
-        List affectedFiles = getFiles("null:/AbstractTransactionalCommandTest"); //$NON-NLS-1$
-
-        c = new TestCommand(fixtureName, affectedFiles);
-
-        assertEquals(affectedFiles.size(), c.getAffectedFiles().size());
-        assertTrue(c.getAffectedFiles().containsAll(affectedFiles));
-    }
-    
-    /**
-	 * Verifies the when a precommit listener throws a rollback exception, the
-	 * command result status reflects this fact.
-	 */
-    public void test_statusOnRollback_142025() {
-
-		String name = "test_statusOnRollback_142025"; //$NON-NLS-1$
-
-		TestCommand c = new TestCommand(name, null) {
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor progressMonitor, IAdaptable info)
-					throws ExecutionException {
-
-				// do something that causes notifications to be sent to
-				// precommit listeners
-				CommandResult result = super.doExecuteWithResult(
-						progressMonitor, info);
-				EFactory logicFactory = SemanticPackage.eINSTANCE
-						.getEFactoryInstance();
-				EObject circuit = logicFactory
-						.create(SemanticPackage.eINSTANCE.getCircuit());
-				Resource resource = getEditingDomain()
-						.getResourceSet()
-						.createResource(
-								URI
-										.createURI("null://org.eclipse.gmf.tests.runtime.emf.commands.core")); //$NON-NLS-1$
-				resource.getContents().add(circuit);
-				return result;
-			}
-		};
-
-		// Execute the command with no precommit listeners installed; verify
-		// that the result is OK
-		IUndoContext ctx = new ObjectUndoContext(this);
-		IStatus status = null;
-
-		try {
-			c.addContext(ctx);
-			status = history.execute(c, new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-
-		// Check that the command result is OK and is the same as the execution
-		// status
-		CommandResult result = c.getCommandResult();
-		assertSame(status, result.getStatus());
-		assertTrue(result.getStatus().isOK());
-
-		// Add a listeners on the editing domain that throws a roll back
-		// exception
-		ResourceSetListenerImpl listener = new ResourceSetListenerImpl() {
-			public Command transactionAboutToCommit(ResourceSetChangeEvent event)
-					throws RollbackException {
-				throw new RollbackException(Status.CANCEL_STATUS);
-			}
-		};
-		TransactionalEditingDomain domain = c.getEditingDomain();
-		domain.addResourceSetListener(listener);
-
-		// Execute the command with failing precommit listener installed; verify
-		// that the result is not OK
-		ctx = new ObjectUndoContext(this);
-		status = null;
-
-		try {
-			c.addContext(ctx);
-			status = history.execute(c, new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-
-		// Check that the command result is CANCEL and is the same as the
-		// execution status
-		result = c.getCommandResult();
-		assertSame(status, result.getStatus());
-		assertEquals(Status.CANCEL, result.getStatus().getSeverity());
-	}
-
-    // 
-    // TEST FIXTURES
-    //
-
-    protected static class TestCommand
-        extends AbstractTransactionalCommand {
-
-        private static final String EXECUTED = "executed"; //$NON-NLS-1$
-
-        private boolean executed;
-
-        private boolean undone;
-
-        private boolean redone;
-
-        public TestCommand(String label, List affectedFiles) {
-            super(TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(), label, affectedFiles);
-        }
-
-        protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = true;
-            undone = false;
-            redone = false;
-            return CommandResult.newOKCommandResult(EXECUTED);
-        }
-
-        public void assertExecuted() {
-            assertTrue(executed);
-            assertFalse(undone);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(EXECUTED, getCommandResult().getReturnValue());
-        }
-
-        public void assertUndone() {
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertNull(getCommandResult().getReturnValue());
-        }
-
-        public void assertRedone() {
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertNull(getCommandResult().getReturnValue());
-        }
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/command/CompositeTransactionalCommandTest.java b/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/command/CompositeTransactionalCommandTest.java
deleted file mode 100644
index f1452ee..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/src/org/eclipse/gmf/tests/runtime/emf/commands/core/command/CompositeTransactionalCommandTest.java
+++ /dev/null

@@ -1,389 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.commands.core.command;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-
-/**
- * Tests the {@link CompositeTransactionalCommand}.
- * 
- * @author ldamus
- */
-public class CompositeTransactionalCommandTest
-    extends TestCase {
-
-    private IOperationHistory history;
-    private IProject project;
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(CompositeTransactionalCommandTest.class);
-    }
-
-    public CompositeTransactionalCommandTest(String name) {
-        super(name);
-    }
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-
-        history = OperationHistoryFactory.getOperationHistory();
-
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        project = root.getProject("AbstractCommandTest"); //$NON-NLS-1$
-        project.create(null);
-        project.open(null);
-    }
-
-    protected void tearDown()
-        throws Exception {
-        super.tearDown();
-
-        project.close(new NullProgressMonitor());
-        project.delete(true, true, new NullProgressMonitor());
-        project = null;
-        history = null;
-    }
-
-    private List getFiles(String str) {
-        IFile file = project.getFile(str);
-        return Collections.singletonList(file);
-    }
-
-    /**
-     * Tests that commands can be executed, undone and redone through the
-     * operation history.
-     */
-    public void test_execute_undo_redo() {
-
-        TransactionalEditingDomain domain = TransactionalEditingDomain.Factory.INSTANCE
-            .createEditingDomain();
-
-        // create a resource to modify
-        Resource res = new ResourceImpl(org.eclipse.emf.common.util.URI.createURI("file:/foo")); //$NON-NLS-1$
-        domain.getResourceSet().getResources().add(res);
-        
-        TransactionalTestCommand child1 = new TransactionalTestCommand(domain, res);
-        TestCommand child2 = new TestCommand();
-        TransactionalTestCommand child3 = new TransactionalTestCommand(domain, res);
-
-        IUndoContext ctx = new UndoContext();
-
-        CompositeTransactionalCommand c = new CompositeTransactionalCommand(
-            domain, "test_execute_undo_redo"); //$NON-NLS-1$
-
-        c.add(child1);
-        c.add(child2);
-        c.add(child3);
-
-        try {
-            c.addContext(ctx);
-            history.execute(c, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        child1.assertExecuted();
-        child2.assertExecuted();
-        child3.assertExecuted();
-
-        try {
-            assertTrue(history.canUndo(ctx));
-            history.undo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        child1.assertUndone();
-        child2.assertUndone();
-        child3.assertUndone();
-
-        try {
-            assertTrue(history.canRedo(ctx));
-            history.redo(ctx, new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-        child1.assertRedone();
-        child2.assertRedone();
-        child3.assertRedone();
-    }
-
-    /**
-     * Tests that composing results in the same command that combines the
-     * contexts and affected files from both children.
-     */
-    public void test_compose() {
-
-        TransactionalEditingDomain domain = TransactionalEditingDomain.Factory.INSTANCE
-            .createEditingDomain();
-
-        CompositeTransactionalCommand c = new CompositeTransactionalCommand(
-            domain, "test_compose"); //$NON-NLS-1$
-
-        IUndoContext ctx1 = new UndoContext();
-        IUndoContext ctx2 = new UndoContext();
-
-        ICommand child1 = new TestCommand("child1", getFiles("compose1")); //$NON-NLS-1$ //$NON-NLS-2$
-        child1.addContext(ctx1);
-
-        ICommand child2 = new TestCommand("child2", getFiles("compose1")); //$NON-NLS-1$ //$NON-NLS-2$
-        child1.addContext(ctx2);
-
-        ICommand composition = c.compose(child1);
-        composition = composition.compose(child2);
-
-        assertSame(c, composition);
-
-        List affectedFiles = composition.getAffectedFiles();
-        assertTrue(affectedFiles.containsAll(child1.getAffectedFiles()));
-        assertTrue(affectedFiles.containsAll(child2.getAffectedFiles()));
-        
-        // should be no duplicates
-        assertEquals(1, affectedFiles.size());
-
-        List contexts = Arrays.asList(composition.getContexts());
-        assertTrue(contexts.contains(ctx1));
-        assertTrue(contexts.contains(ctx2));
-    }
-
-    /**
-     * Tests that the reduction of a CompositeTransactionalCommand returns its
-     * single child if that child is an EMF Operation. Otherwise it returns the
-     * composite itself.
-     */
-    public void test_reduce() {
-        TransactionalEditingDomain domain = TransactionalEditingDomain.Factory.INSTANCE
-            .createEditingDomain();
-
-        CompositeTransactionalCommand composite = new CompositeTransactionalCommand(
-            domain, "test_reduce"); //$NON-NLS-1$
-
-        ICommand child = new TestCommand();
-        composite.compose(child);
-        ICommand reduction = composite.reduce();
-
-        assertSame(composite, reduction);
-
-        composite.remove(child);
-
-        child = new TransactionalTestCommand(domain, null);
-        composite.compose(child);
-        reduction = composite.reduce();
-
-        assertSame(child, reduction);
-    }
-
-    // 
-    // TEST FIXTURES
-    //
-
-    protected static class TransactionalTestCommand
-        extends AbstractTransactionalCommand {
-
-        private static final String EXECUTED = "executed"; //$NON-NLS-1$
-
-        private final Resource resource;
-        private EObject testObject;
-        
-        private boolean executed;
-
-        private boolean undone;
-
-        private boolean redone;
-
-        public TransactionalTestCommand(TransactionalEditingDomain domain, Resource resource) {
-            super(domain, "CompositeTransactionalCommandTest", //$NON-NLS-1$
-                null);
-            this.resource = resource;
-        }
-
-        public TransactionalTestCommand(List affectedFiles) {
-            super(TransactionalEditingDomain.Factory.INSTANCE
-                .createEditingDomain(), "CompositeTransactionalCommandTest", //$NON-NLS-1$
-                affectedFiles);
-            this.resource = null;
-        }
-
-        protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-        	
-        	if (resource != null) {
-	        	// change my resource
-	        	testObject = EcoreFactory.eINSTANCE.createEPackage();
-	        	resource.getContents().add(testObject);
-        	}
-        	
-            executed = true;
-            undone = false;
-            redone = false;
-            
-            return CommandResult.newOKCommandResult(EXECUTED);
-        }
-
-        public void assertExecuted() {
-            assertTrue(executed);
-            assertFalse(undone);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(EXECUTED, getCommandResult().getReturnValue());
-            
-            if (resource != null) {
-            	// check that the model change was committed
-            	assertTrue(resource.getContents().contains(testObject));
-            }
-        }
-
-        public void assertUndone() {
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            
-            if (resource != null) {
-            	// check that the model change was undone
-            	assertFalse(resource.getContents().contains(testObject));
-            } else {
-            	assertNull(getCommandResult().getReturnValue());
-            }
-        }
-
-        public void assertRedone() {
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            
-            if (resource != null) {
-            	// check that the model change was redone
-            	assertTrue(resource.getContents().contains(testObject));
-            } else {
-            	assertNull(getCommandResult().getReturnValue());
-            }
-        }
-    }
-
-    protected static class TestCommand
-        extends AbstractCommand {
-
-        private static final String EXECUTED = "executed"; //$NON-NLS-1$
-
-        private static final String UNDONE = "undone"; //$NON-NLS-1$
-
-        private static final String REDONE = "redone"; //$NON-NLS-1$
-
-        private boolean executed;
-
-        private boolean undone;
-
-        private boolean redone;
-
-        public TestCommand() {
-            super("Test Command", null); //$NON-NLS-1$
-        }
-
-        public TestCommand(String label, List affectedFiles) {
-            super(label, affectedFiles);
-        }
-
-        protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = true;
-            undone = false;
-            redone = false;
-            return CommandResult.newOKCommandResult(EXECUTED);
-        }
-
-        protected CommandResult doRedoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = false;
-            redone = true;
-            return CommandResult.newOKCommandResult(REDONE);
-        }
-
-        protected CommandResult doUndoWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            executed = false;
-            undone = true;
-            redone = false;
-            return CommandResult.newOKCommandResult(UNDONE);
-        }
-
-        public void assertExecuted() {
-            assertTrue(executed);
-            assertFalse(undone);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(EXECUTED, getCommandResult().getReturnValue());
-        }
-
-        public void assertUndone() {
-            assertTrue(undone);
-            assertFalse(executed);
-            assertFalse(redone);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(UNDONE, getCommandResult().getReturnValue());
-        }
-
-        public void assertRedone() {
-            assertTrue(redone);
-            assertFalse(undone);
-            assertFalse(executed);
-            assertEquals(IStatus.OK, getCommandResult().getStatus()
-                .getSeverity());
-            assertSame(REDONE, getCommandResult().getReturnValue());
-        }
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/test.xml b/org.eclipse.gmf.tests.runtime.emf.commands.core/test.xml
deleted file mode 100644
index a5c2b24..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.emf.commands.core"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.emf.commands.core.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/.classpath b/org.eclipse.gmf.tests.runtime.emf.type.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/.cvsignore b/org.eclipse.gmf.tests.runtime.emf.type.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/.project b/org.eclipse.gmf.tests.runtime.emf.type.core/.project
deleted file mode 100644
index 33680cc..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.emf.type.core</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/org.eclipse.gmf.tests.runtime.emf.type.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.emf.type.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0171503..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.emf.type.core; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.emf.type.core.TestPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.emf.type.core;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.type.core.commands;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.type.core.employee;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.type.core.employee.util;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.type.core.internal;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/about.html b/org.eclipse.gmf.tests.runtime.emf.type.core/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/build.properties b/org.eclipse.gmf.tests.runtime.emf.type.core/build.properties
deleted file mode 100644
index 2766edd..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               model/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/model/Employee.ecore b/org.eclipse.gmf.tests.runtime.emf.type.core/model/Employee.ecore
deleted file mode 100644
index 616bd81..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/model/Employee.ecore
+++ /dev/null

@@ -1,65 +0,0 @@
-<?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="employee"
-    nsURI="http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore" nsPrefix="Employee">
-  <eClassifiers xsi:type="ecore:EClass" name="Employee" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="salary" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" lowerBound="1" eType="#//Band"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="securityClearance" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="department" lowerBound="1"
-        eType="#//Department" eOpposite="#//Department/members"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullTime" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="office" lowerBound="1"
-        eType="#//Office" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Band">
-    <eLiterals name="junior"/>
-    <eLiterals name="senior" value="1"/>
-    <eLiterals name="manager" value="2"/>
-    <eLiterals name="director" value="3"/>
-    <eLiterals name="executive" value="4"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Department" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="number" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1"
-        eType="#//Employee" containment="true" eOpposite="#//Employee/department"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="manager" lowerBound="1"
-        eType="#//Employee" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Office" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="numberOfWindows" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hasDoor" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Student" eSuperTypes="#//Employee">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="coop" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Location" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Client" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="represents" eType="#//Customer"
-        eOpposite="#//Customer/representatives"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Customer" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="representatives" upperBound="-1"
-        eType="#//Client" containment="true" eOpposite="#//Client/represents"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subsidiaries" upperBound="-1"
-        eType="#//Customer" containment="true" eOpposite="#//Customer/parent"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//Customer"
-        eOpposite="#//Customer/subsidiaries"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HighSchoolStudent" eSuperTypes="#//Student"/>
-</ecore:EPackage>

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/model/employee.genmodel b/org.eclipse.gmf.tests.runtime.emf.type.core/model/employee.genmodel
deleted file mode 100644
index b14ebc2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/model/employee.genmodel
+++ /dev/null

@@ -1,57 +0,0 @@
-<?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.tests.runtime.emf.type.core/src"
-    editDirectory="/org.eclipse.gmf.tests.runtime.emf.type.core.edit/src" editorDirectory="/org.eclipse.gmf.tests.runtime.emf.type.core.editor/src"
-    modelPluginID="org.eclipse.gmf.tests.runtime.emf.type.core" runtimeJar="true"
-    modelName="Employee" editPluginClass="Employee.provider.EmployeeEditPlugin" editorPluginClass="Employee.presentation.EmployeeEditorPlugin"
-    nonNLSMarkers="true" testsDirectory="/org.eclipse.gmf.tests.runtime.emf.type.core/src"
-    testSuiteClass="org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeeAllTests"
-    booleanFlagsField="eFlags" booleanFlagsReservedBits="8" importerID="org.eclipse.emf.importer.ecore">
-  <foreignModel>Employee.ecore</foreignModel>
-  <genPackages prefix="Employee" basePackage="org.eclipse.gmf.tests.runtime.emf.type.core"
-      ecorePackage="Employee.ecore#/">
-    <genEnums ecoreEnum="Employee.ecore#//Band">
-      <genEnumLiterals ecoreEnumLiteral="Employee.ecore#//Band/junior"/>
-      <genEnumLiterals ecoreEnumLiteral="Employee.ecore#//Band/senior"/>
-      <genEnumLiterals ecoreEnumLiteral="Employee.ecore#//Band/manager"/>
-      <genEnumLiterals ecoreEnumLiteral="Employee.ecore#//Band/director"/>
-      <genEnumLiterals ecoreEnumLiteral="Employee.ecore#//Band/executive"/>
-    </genEnums>
-    <genClasses ecoreClass="Employee.ecore#//Employee">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Employee/salary"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Employee/band"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Employee/number"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Employee/securityClearance"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference Employee.ecore#//Employee/department"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Employee/fullTime"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference Employee.ecore#//Employee/office"/>
-    </genClasses>
-    <genClasses ecoreClass="Employee.ecore#//Department">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Department/number"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Department/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference Employee.ecore#//Department/members"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference Employee.ecore#//Department/manager"/>
-    </genClasses>
-    <genClasses ecoreClass="Employee.ecore#//Office">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Office/numberOfWindows"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Office/hasDoor"/>
-    </genClasses>
-    <genClasses ecoreClass="Employee.ecore#//Student">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Student/coop"/>
-    </genClasses>
-    <genClasses ecoreClass="Employee.ecore#//Location"/>
-    <genClasses ecoreClass="Employee.ecore#//Client">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Client/firstName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Client/lastName"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Employee.ecore#//Client/represents"/>
-    </genClasses>
-    <genClasses ecoreClass="Employee.ecore#//Customer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Customer/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Employee.ecore#//Customer/address"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Employee.ecore#//Customer/representatives"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Employee.ecore#//Customer/subsidiaries"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Employee.ecore#//Customer/parent"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/plugin.properties b/org.eclipse.gmf.tests.runtime.emf.type.core/plugin.properties
deleted file mode 100644
index c01044c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF EMF Type Tests
-Plugin.providerName = Eclipse.org
-# ====================================================================
-

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/plugin.xml b/org.eclipse.gmf.tests.runtime.emf.type.core/plugin.xml
deleted file mode 100644
index 05f1f3c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/plugin.xml
+++ /dev/null

@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package 
-         uri = "http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore" 
-         class = "org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage" />
-   </extension>
-  
-  
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-   
-      <!-- client context that is bound to a set of element types and advice -->
-      <clientContext id="org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext1">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.gmf.tests.runtime.emf.type.core.EditingDomain"/>
-            <test
-               property="org.eclipse.gmf.tests.runtime.emf.type.core.resourceURI"
-               value="null://org.eclipse.gmf.tests.runtime.emf.type.core.context"/>
-         </enablement>
-      </clientContext> 
-      
-      <binding 
-            context="org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext1">
-         <elementType pattern="org.eclipse.gmf.tests.runtime.emf.type.core.context.*"/>
-         <advice pattern="org.eclipse.gmf.tests.runtime.emf.type.core.context.*"/>
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding>
-      
-      <!-- another client context that is bound to a set of element types and advice -->
-      <clientContext id="org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext2">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.gmf.tests.runtime.emf.type.core.EditingDomain"/>
-            <test
-               property="org.eclipse.gmf.tests.runtime.emf.type.core.resourceURI"
-               value="null://org.eclipse.gmf.tests.runtime.emf.type.core.context"/>
-         </enablement>
-      </clientContext> 
-      
-      <binding 
-            context="org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext2">
-         <elementType pattern="org.eclipse.gmf.tests.runtime.emf.type.core.context.*"/>
-         <advice pattern="org.eclipse.gmf.tests.runtime.emf.type.core.context.*"/>
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding> 
-      
-      <!-- client context that is not bound to any element types or advice -->
-      <clientContext id="org.eclipse.gmf.tests.runtime.emf.type.core.UnboundClientContext">
-         <matcher
-            class="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher">
-         </matcher>
-      </clientContext> 
-   </extension>
-
-   <!-- Types and advice contributed in this extension are NOT bound to a client context -->
-   <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-  
-         <!-- Test custom element type factory -->
-         <elementTypeFactory
-               factory="org.eclipse.gmf.tests.runtime.emf.type.core.internal.SecurityClearedElementTypeFactory"
-               kind = "org.eclipse.gmf.tests.runtime.emf.type.core.internal.ISecurityCleared"
-               params = "securityClearance">
-         </elementTypeFactory>
-         
-         <!-- Test metamodel -->
-         <metamodel
-                nsURI="http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore">
-                
-           <!-- Test metamodel types -->
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.department"     
-                   name="Department"
-                   eclass="Department"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.DepartmentEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.employee"     
-                   name="Employee"
-                   eclass="Employee"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.student"     
-                   name="Student"
-                   eclass="Student"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.StudentEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.highSchoolStudent"     
-                   name="High School Student"
-                   eclass="HighSchoolStudent"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.office"     
-                   name="Office"
-                   eclass="Office"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.OfficeEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.customer"     
-                   name="Customer"
-                   eclass="Customer"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.CustomerEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.client"     
-                   name="Client"
-                   eclass="Client"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ClientEditHelper"> 
-           </metamodelType>
-
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.secretDepartment"
-                   name="Secret Department"
-                   kind="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ISecurityCleared"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.department"/>
-               <matcher class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.SecretDepartmentMatcher"/>
-           </specializationType>
-           
-           <!-- Test specialization type with eContainer and matcher -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.manager"
-                   name="Manager"
-                   edithelperadvice="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ManagerEditHelperAdvice"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.employee"/>
-               <eContainer>
-                  <eContainmentFeature qname="Department.manager"/>
-               </eContainer>
-               <matcher class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ManagerMatcher"/>
-           </specializationType>
-           
-           <!-- Test specialization type with enablement -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.executive"
-                   name="Executive"
-                   edithelperadvice="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ExecutiveEditHelperAdvice"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.manager"/>
-               <enablement>
-                  <test property="org.eclipse.gmf.tests.runtime.emf.type.core.officeHasDoor" value="true"/>
-               </enablement>
-           </specializationType>
-           
-           <!-- Test custom specialization type -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.topSecret"
-                   name="TopSecret"
-               	   kind="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ISecurityCleared">
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.employee"/>
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.manager"/>
-               <param name="securityClearance" value = "topSecret"/>
-           </specializationType>
-
-           <!-- Test advice binding with eContainer -->
-           <adviceBinding
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.financeEmployee"
-                typeId="org.eclipse.gmf.tests.runtime.emf.type.core.employee"
-                class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.FinanceEditHelperAdvice"
-                inheritance="all"> 
-                <eContainer>
-                   <enablement>
-                      <test property="org.eclipse.gmf.tests.runtime.emf.type.core.departmentName" value="Finance"/>
-                   </enablement>
-                </eContainer>
-           </adviceBinding> 
-           <adviceBinding
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.notInheritedEmployeeAdvice"
-                typeId="org.eclipse.gmf.tests.runtime.emf.type.core.employee"
-                class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.NotInheritedEditHelperAdvice"> 
-           </adviceBinding>    
-           
-           <!-- Test duplicate metamodel type ID -->
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.employee" 
-                   name="DuplicateEmployee"
-                   eclass="Employee"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeEditHelper"> 
-           </metamodelType>
-           
-           <!-- Test specializing more than one metamodel type -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.multipleMetamodelTypes"
-                   name="MultipleMetamodelTypes"
-                   edithelperadvice="org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.student"/>
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.department"/>
-           </specializationType>
-           
-           <!-- Test specializing non-existent type -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.SpecializesNoSuchType"
-                   name="NoSuchType"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.noSuchType"/>
-           </specializationType>
-           
-           <!-- Advice for dependents of Clients -->
-           <adviceBinding
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.clientDependentsAdvice"
-                typeId="org.eclipse.gmf.tests.runtime.emf.type.core.client"
-                class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ClientDependentsAdvice"> 
-           </adviceBinding>   
-           
-           <!-- Advice for destruction of Customers -->
-           <adviceBinding
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.destroyCustomerAdvice"
-                typeId="*"
-                class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.DestroyCustomerAdvice"> 
-           </adviceBinding>   
-        </metamodel>
-        
-        <!-- Test metamodel that doesn't exist -->
-        <metamodel nsURI="http:///org.eclipse.gmf.tests.runtime.emf.type.core/Does.not.exist">
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.noMetamodel"     
-                   name="NoMetamodel"
-                   eclass="None"
-                   edithelper="org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice"> 
-           </metamodelType>
-        </metamodel>
-        
-        <!-- Text specialization that doesn't need a metamodel -->
-        <specializationType
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.nullSpecialization"     
-                name="NullSpecialization"
-                 edithelperadvice = "org.eclipse.gmf.tests.runtime.emf.type.core.internal.NullElementTypeAdvice">
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-        </specializationType>
-   </extension>
-   
-   
-   <!-- Types and advice contributed in this extension ARE bound to a client context -->
-   <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-         
-         <!-- Test metamodel -->
-         <metamodel
-                nsURI="http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore">
-                
-           <!-- Test metamodel types -->
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.department"     
-                   name="Department"
-                   eclass="Department"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.DepartmentEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"     
-                   name="Employee"
-                   eclass="Employee"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.student"     
-                   name="Student"
-                   eclass="Student"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.StudentEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.office"     
-                   name="Office"
-                   eclass="Office"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.OfficeEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.customer"     
-                   name="Customer"
-                   eclass="Customer"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.CustomerEditHelper"> 
-           </metamodelType>
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.client"     
-                   name="Client"
-                   eclass="Client"
-                   edithelper="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ClientEditHelper"> 
-           </metamodelType>
-
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.secretDepartment"
-                   name="Secret Department"
-                   kind="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ISecurityCleared"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.context.department"/>
-               <matcher class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.SecretDepartmentMatcher"/>
-           </specializationType>
-           
-           <!-- Test specialization type with eContainer and matcher -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.manager"
-                   name="Manager"
-                   edithelperadvice="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ManagerEditHelperAdvice"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"/>
-               <eContainer>
-                  <eContainmentFeature qname="Department.manager"/>
-               </eContainer>
-               <matcher class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ManagerMatcher"/>
-           </specializationType>
-           
-           <!-- Test specialization type with enablement -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.executive"
-                   name="Executive"
-                   edithelperadvice="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ExecutiveEditHelperAdvice"> 
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.context.manager"/>
-               <enablement>
-                  <test property="org.eclipse.gmf.tests.runtime.emf.type.core.officeHasDoor" value="true"/>
-               </enablement>
-           </specializationType>
-           
-           <!-- Test custom specialization type -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.context.topSecret"
-                   name="TopSecret"
-               	   kind="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ISecurityCleared">
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"/>
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.context.manager"/>
-               <param name="securityClearance" value = "topSecret"/>
-           </specializationType>
-
-           <!-- Test advice binding with eContainer -->
-           <adviceBinding
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.context.financeEmployee"
-                typeId="org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"
-                class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.FinanceEditHelperAdvice"
-                inheritance="all"> 
-                <eContainer>
-                   <enablement>
-                      <test property="org.eclipse.gmf.tests.runtime.emf.type.core.departmentName" value="FinanceWithContext"/>
-                   </enablement>
-                </eContainer>
-           </adviceBinding> 
-           <adviceBinding
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.context.notInheritedEmployeeAdvice"
-                typeId="org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"
-                class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.NotInheritedEditHelperAdvice"> 
-           </adviceBinding>    
-           
-           <!-- Advice for dependents of Clients -->
-           <adviceBinding
-                id="org.eclipse.gmf.tests.runtime.emf.type.core.context.clientDependentsAdvice"
-                typeId="org.eclipse.gmf.tests.runtime.emf.type.core.context.client"
-                class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ClientDependentsAdvice"> 
-           </adviceBinding>  
-           
-           <!-- Specialization types with IDs that doesn't match the client context patterns -->
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.example1.employee"
-                   name="Example1Employee">
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"/>
-           </specializationType>  
-           <specializationType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.example2.employee"
-                   name="Example2Employee">
-               <specializes id="org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"/>
-           </specializationType>  
-        </metamodel>
-   </extension>
-   
-   <!-- Employee type for testing bugzilla 157788 -->
-   <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-         <metamodel
-                nsURI="http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore">
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.157788.employee"     
-                   name="Employee"
-                   eclass="Employee"> 
-           </metamodelType>
-         </metamodel>
-   </extension> 
-   
-   <!-- client context that is bound to the employee type for bugzilla 157788 -->
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-      <clientContext id="org.eclipse.gmf.tests.runtime.emf.type.core.157788_context">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.gmf.tests.runtime.emf.type.core.EditingDomain"/>
-            <test
-               property="org.eclipse.gmf.tests.runtime.emf.type.core.resourceURI"
-               value="null://org.eclipse.gmf.tests.runtime.emf.type.core.157788"/>
-         </enablement>
-      </clientContext> 
-
-      <binding 
-            context="org.eclipse.gmf.tests.runtime.emf.type.core.157788_context">
-         <elementType ref="org.eclipse.gmf.tests.runtime.emf.type.core.157788.employee"/>
-      </binding> 
-   </extension>
-      
-   <extension point="org.eclipse.core.expressions.propertyTesters">
-       <propertyTester
-           id="org.eclipse.gmf.tests.runtime.emf.type.core.OfficeTester"
-           type="org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee"
-           namespace="org.eclipse.gmf.tests.runtime.emf.type.core"
-           properties="officeHasDoor, officeWindowCount"
-           class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.OfficeTester">
-       </propertyTester>
-       <propertyTester
-           id="org.eclipse.gmf.tests.runtime.emf.type.core.DepartmentTester"
-           type="org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department"
-           namespace="org.eclipse.gmf.tests.runtime.emf.type.core"
-           properties="departmentName"
-           class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.DepartmentTester">
-        </propertyTester>
-       <propertyTester
-           id="org.eclipse.gmf.tests.runtime.emf.type.core.internal.resourceTester"
-           type="org.eclipse.emf.ecore.EObject"
-           namespace="org.eclipse.gmf.tests.runtime.emf.type.core"
-           properties="resourceURI"
-           class="org.eclipse.gmf.tests.runtime.emf.type.core.internal.ResourceTester">
-        </propertyTester>
-   </extension>
-</plugin>

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEMFTypeTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEMFTypeTest.java
deleted file mode 100644
index 262d103..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEMFTypeTest.java
+++ /dev/null

@@ -1,232 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.TransactionalCommandStack;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IEditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeeFactory;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-public class AbstractEMFTypeTest
-    extends TestCase {
-
-    private TransactionalEditingDomain editingDomain;
-
-    private Resource defaultResource;
-    
-    private Resource resourceWithContext;
-
-    private EmployeePackage employeePkg;
-
-    private EmployeeFactory employeeFactory;
-
-    protected AbstractEMFTypeTest(String name) {
-        super(name);
-    }
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-
-        employeePkg = EmployeePackage.eINSTANCE;
-        employeeFactory = (EmployeeFactory) employeePkg.getEFactoryInstance();
-
-        editingDomain = GMFEditingDomainFactory.getInstance().createEditingDomain();
-        TransactionalEditingDomain.Registry.INSTANCE
-				.add(
-						"org.eclipse.gmf.tests.runtime.emf.type.core.EditingDomain", editingDomain); //$NON-NLS-1$
-        
-        defaultResource = editingDomain
-            .getResourceSet()
-            .createResource(
-                URI
-                    .createURI("null://org.eclipse.gmf.tests.runtime.emf.type.core")); //$NON-NLS-1$
-        
-        resourceWithContext = editingDomain
-        .getResourceSet()
-        .createResource(
-            URI
-                .createURI("null://org.eclipse.gmf.tests.runtime.emf.type.core.context")); //$NON-NLS-1$
-    
-        RecordingCommand command = new RecordingCommand(editingDomain) {
-
-            protected void doExecute() {
-                doModelSetup(defaultResource);
-                doModelSetupWithContext(resourceWithContext);
-            };
-        };
-
-        try {
-            ((TransactionalCommandStack) editingDomain.getCommandStack()).execute(command,
-                null);
-
-        } catch (RollbackException e) {
-            fail("setUp() failed:" + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-    }
-
-    protected void tearDown()
-        throws Exception {
-        super.tearDown();
-        
-        employeeFactory = null;
-        employeePkg = null;
-        defaultResource.unload();
-        resourceWithContext.unload();
-        editingDomain.dispose();
-    }
-
-    protected void doModelSetup(Resource resource) {
-        // Do nothing.
-    }
-    
-    protected void doModelSetupWithContext(Resource resource) {
-        // Do nothing.
-    }
-
-    protected TransactionalEditingDomain getEditingDomain() {
-        return editingDomain;
-    }
-
-    protected EmployeePackage getEmployeePackage() {
-        return employeePkg;
-    }
-
-    protected Resource getResource() {
-        return defaultResource;
-    }
-    
-    protected Resource getResourceWithContext() {
-        return resourceWithContext;
-    }
-
-    protected EmployeeFactory getEmployeeFactory() {
-        return employeeFactory;
-    }
-    
-    protected IStatus execute(ICommand command) {
-    	assertTrue(command.canExecute());
-    	
-    	try {
-    		IStatus result = command.execute(new NullProgressMonitor(), null);
-    		assertTrue(result.isOK());
-    		return result;
-    	} catch (Exception e) {
-    		fail("Command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-    		return Status.CANCEL_STATUS;  // won't get past fail() call
-    	}
-    }
-    
-    protected IStatus undo(ICommand command) {
-    	assertTrue(command.canUndo());
-    	
-    	try {
-    		IStatus result = command.undo(new NullProgressMonitor(), null);
-    		assertTrue(result.isOK());
-    		return result;
-    	} catch (Exception e) {
-    		fail("Command undo failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-    		return Status.CANCEL_STATUS;  // won't get past fail() call
-    	}
-    }
-    
-    protected IStatus redo(ICommand command) {
-    	assertTrue(command.canRedo());
-    	
-    	try {
-    		IStatus result = command.redo(new NullProgressMonitor(), null);
-    		assertTrue(result.isOK());
-    		return result;
-    	} catch (Exception e) {
-    		fail("Command redo failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-    		return Status.CANCEL_STATUS;  // won't get past fail() call
-    	}
-    }
-    
-	protected IEditHelperAdvice[] getWildcardAdvice(IClientContext clientContext) {
-		// get wildcard advices by finding advices on the default element type
-		//     (which can only have wildcard advice)
-		IElementType dflt = ElementTypeRegistry.getInstance().getType(
-				"org.eclipse.gmf.runtime.emf.type.core.default"); //$NON-NLS-1$
-		assertNotNull(dflt);
-		return ElementTypeRegistry.getInstance().getEditHelperAdvice(dflt, clientContext);
-	}
-	
-	protected IEditHelperAdvice[] getNonWildcardAdvice(IElementType type) {
-		IClientContext context = ClientContextManager.getInstance().getBinding(
-				type);
-		return getNonWildcardAdvice(type, context);
-	}
-	
-	protected IEditHelperAdvice[] getNonWildcardAdvice(IElementType type, IClientContext context) {
-		
-		LinkedHashSet result = new LinkedHashSet();
-		
-		result.addAll(Arrays.asList(ElementTypeRegistry.getInstance()
-				.getEditHelperAdvice(type, context)));
-		result.removeAll(Arrays.asList(getWildcardAdvice(context)));
-
-		return (IEditHelperAdvice[]) result
-				.toArray(new IEditHelperAdvice[result.size()]);
-	}
-	
-	protected IEditHelperAdvice[] getNonWildcardAdvice(IEditHelperContext context) {
-		
-		LinkedHashSet result = new LinkedHashSet();
-		
-		result.addAll(Arrays.asList(ElementTypeRegistry.getInstance()
-				.getEditHelperAdvice(context)));
-		result.removeAll(Arrays.asList(getWildcardAdvice(context.getClientContext())));
-
-		return (IEditHelperAdvice[]) result
-				.toArray(new IEditHelperAdvice[result.size()]);
-	}
-
-	protected IEditHelperAdvice[] getNonWildcardAdvice(EObject element) {
-		IClientContext context = ClientContextManager.getInstance()
-				.getClientContextFor(element);
-		return getNonWildcardAdvice(element, context);
-	}
-	
-	protected IEditHelperAdvice[] getNonWildcardAdvice(EObject element, IClientContext context) {
-		
-		LinkedHashSet result = new LinkedHashSet();
-		
-		result.addAll(Arrays.asList(ElementTypeRegistry.getInstance()
-				.getEditHelperAdvice(element, context)));
-		result.removeAll(Arrays.asList(getWildcardAdvice(context)));
-
-		return (IEditHelperAdvice[]) result
-				.toArray(new IEditHelperAdvice[result.size()]);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEditHelperAdviceTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEditHelperAdviceTest.java
deleted file mode 100644
index c354bb2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEditHelperAdviceTest.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-public class AbstractEditHelperAdviceTest
-    extends AbstractEMFTypeTest {
-
-    private Department department;
-    
-    private Employee financeEmployee;
-
-    public AbstractEditHelperAdviceTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(AbstractEditHelperAdviceTest.class,
-            "AbstractEditHelperAdvice Test Suite"); //$NON-NLS-1$
-    }
-
-    protected void doModelSetup(Resource resource) {
-
-        department = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department.setName("Finance"); //$NON-NLS-1$
-
-        resource.getContents().add(department);
-        
-        financeEmployee = (Employee) getEmployeeFactory().create(
-            getEmployeePackage().getEmployee());
-        
-        department.getMembers().add(financeEmployee);
-    }
-    
-    /**
-     * Tests that edit helper advice is consulted to approve edit requests.
-     */
-    public void test_approveRequest_133160() {
-        
-        // Request is approved by the FinanceEditHelperAdvice
-        SetRequest setRequest = new SetRequest(financeEmployee,
-            getEmployeePackage().getEmployee_Band(), Band.SENIOR_LITERAL);
-        
-        boolean canEdit = EmployeeType.EMPLOYEE.getEditHelper().canEdit(setRequest);
-        assertTrue(canEdit);
-        Object parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.TRUE, parameter);
-        
-        // reset the parameter
-        setRequest.setParameter("approved", null); //$NON-NLS-1$
-        
-        ICommand command = EmployeeType.EMPLOYEE.getEditHelper().getEditCommand(setRequest);
-        assertNotNull(command);
-        assertTrue(command.canExecute());
-        parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.TRUE, parameter);
-        
-        
-        // Request is not approved by the FinanceEditHelperAdvice
-        setRequest = new SetRequest(financeEmployee,
-            getEmployeePackage().getEmployee_Band(), Band.DIRECTOR_LITERAL);
-        
-        canEdit = EmployeeType.EMPLOYEE.getEditHelper().canEdit(setRequest);
-        assertFalse(canEdit);
-        parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.FALSE, parameter);
-        
-        // reset the parameter
-        setRequest.setParameter("approved", null); //$NON-NLS-1$
-        
-        command = EmployeeType.EMPLOYEE.getEditHelper().getEditCommand(setRequest);
-        assertNull(command);
-        parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.FALSE, parameter);
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEditHelperTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEditHelperTest.java
deleted file mode 100644
index 10d24bc..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AbstractEditHelperTest.java
+++ /dev/null

@@ -1,172 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-public class AbstractEditHelperTest
-    extends AbstractEMFTypeTest {
-
-    private Department department;
-
-    public AbstractEditHelperTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(AbstractEditHelperTest.class);
-    }
-
-    protected void doModelSetup(Resource resource) {
-
-        department = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department.setName("Department"); //$NON-NLS-1$
-
-        resource.getContents().add(department);
-
-    }
-
-    public void test_defaultContainmentFeature() {
-        // Verifies that if a containment feature is specified in the element
-        // type XML, it is used as the default
-
-        CreateElementRequest request = new CreateElementRequest(
-            getEditingDomain(), department, EmployeeType.MANAGER);
-        EmployeeType.DEPARTMENT.getEditCommand(request);
-        assertSame(getEmployeePackage().getDepartment_Manager(), request
-            .getContainmentFeature());
-    }
-
-    public void test_replaceDefaultEditCommand() {
-
-        CreateElementRequest request = new CreateElementRequest(
-            getEditingDomain(), department, EmployeeType.MANAGER);
-
-        // Get the default command
-        ICommand command = EmployeeType.DEPARTMENT.getEditCommand(request);
-        assertNotNull(command);
-
-        // Replace the default command
-        request.setParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND,
-            Boolean.TRUE);
-        command = EmployeeType.DEPARTMENT.getEditCommand(request);
-        assertNull(command);
-    }
-    
-    /**
-     * Tests that the command returned by an edit helper to create a new
-     * relationship is executable if the source or target has not yet been
-     * specified.
-     */
-    public void test_incompleteCreateRelationshipRequest_117922() {
-
-        // no target
-        CreateRelationshipRequest request = new CreateRelationshipRequest(
-            getEditingDomain(), department, department, null,
-            EmployeeType.MANAGER);
-
-        ICommand command = EmployeeType.DEPARTMENT.getEditCommand(request);
-        assertNotNull(command);
-        assertTrue(command.canExecute());
-        
-        // no source AND no target
-        request = new CreateRelationshipRequest(
-            getEditingDomain(), department, null, null,
-            EmployeeType.MANAGER);
-
-        command = EmployeeType.DEPARTMENT.getEditCommand(request);
-        assertTrue(command == null || !command.canExecute());
-    }
-    
-    /**
-     * Tests the canEdit() method on an edit helper.
-     */
-    public void test_canEdit_122771() {
-        
-        // allowed to create a manager in a department
-        CreateElementRequest request = new CreateElementRequest(
-            getEditingDomain(), department, EmployeeType.MANAGER);
-
-        boolean canEdit = EmployeeType.DEPARTMENT.getEditHelper().canEdit(request);
-        assertTrue(canEdit);
-        
-        canEdit = EmployeeType.DEPARTMENT.canEdit(request);
-        assertTrue(canEdit);
-
-        // not allowed to create an office in a department
-        request = new CreateElementRequest(
-            getEditingDomain(), department, EmployeeType.OFFICE);
-
-        canEdit = EmployeeType.DEPARTMENT.getEditHelper().canEdit(request);
-        assertFalse(canEdit);
-        
-        canEdit = EmployeeType.DEPARTMENT.canEdit(request);
-        assertFalse(canEdit);
-    }
-    
-    /**
-     * Tests that the edit helper is consulted to approve edit requests.
-     */
-    public void test_approveRequest_133160() {
-        
-        // Request is approved by the DepartmentEditHelper
-        SetRequest setRequest = new SetRequest(department,
-            getEmployeePackage().getDepartment_Number(), new Integer(123456));
-        
-        boolean canEdit = EmployeeType.DEPARTMENT.getEditHelper().canEdit(setRequest);
-        assertTrue(canEdit);
-        Object parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.TRUE, parameter);
-        
-        // reset the parameter
-        setRequest.setParameter("approved", null); //$NON-NLS-1$
-        
-        ICommand command = EmployeeType.DEPARTMENT.getEditHelper().getEditCommand(setRequest);
-        assertNotNull(command);
-        assertTrue(command.canExecute());
-        parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.TRUE, parameter);
-        
-        // Request is not approved by the DepartmentEditHelper
-        setRequest = new SetRequest(department,
-            getEmployeePackage().getDepartment_Number(), new Integer(0));
-        
-        canEdit = EmployeeType.DEPARTMENT.getEditHelper().canEdit(setRequest);
-        assertFalse(canEdit);
-        parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.FALSE, parameter);
-        
-        // reset the parameter
-        setRequest.setParameter("approved", null); //$NON-NLS-1$
-        
-        command = EmployeeType.DEPARTMENT.getEditHelper().getEditCommand(setRequest);
-        assertNull(command);
-        parameter = setRequest.getParameter("approved"); //$NON-NLS-1$
-        assertSame(Boolean.FALSE, parameter);
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AllTests.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AllTests.java
deleted file mode 100644
index 6372009..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AllTests.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.emf.type.core.commands.CreateElementCommandTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.commands.DeferredSetValueCommandTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.commands.DestroyElementCommandTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.commands.SetValueCommandTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.requests.SetRequestTest;
-
-public class AllTests
-	extends TestCase
-	implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-        suite.addTest(AbstractEditHelperAdviceTest.suite());
-		suite.addTest(AbstractEditHelperTest.suite());
-		suite.addTest(ElementTypeRegistryTest.suite());
-		suite.addTest(ClientContextManagerTest.suite());
-		suite.addTest(CreateElementCommandTest.suite());
-		suite.addTest(CreateElementRequestTest.suite());
-		suite.addTest(DeferredSetValueCommandTest.suite());
-		suite.addTest(DestroyElementCommandTest.suite());
-		suite.addTest(MetamodelTypeDescriptorTest.suite());
-		suite.addTest(MoveRequestTest.suite());
-		suite.addTest(MultiClientContextTest.suite());
-        suite.addTest(SetRequestTest.suite());
-        suite.addTest(SetValueCommandTest.suite());
-		suite.addTest(SpecializationTypeDescriptorTest.suite());
-        suite.addTest(SpecializationTypeTest.suite());
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args)
-		throws Exception {
-		TestRunner.run(suite());
-		return Arrays
-			.asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/ClientContextManagerTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/ClientContextManagerTest.java
deleted file mode 100644
index ede020c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/ClientContextManagerTest.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-public class ClientContextManagerTest extends AbstractEMFTypeTest {
-
-	private IClientContext clientContext1;
-
-	private IClientContext clientContext2;
-
-	private IClientContext unboundClientContext;
-
-	private Department department;
-
-	private Employee employee;
-
-	public ClientContextManagerTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ClientContextManagerTest.class,
-				"ClientContextManager Test Suite"); //$NON-NLS-1$
-	}
-
-	protected void doModelSetupWithContext(Resource resource) {
-		department = (Department) getEmployeeFactory().create(
-				getEmployeePackage().getDepartment());
-		department.setName("Department"); //$NON-NLS-1$
-		resource.getContents().add(department);
-
-		employee = (Employee) getEmployeeFactory().create(
-				getEmployeePackage().getEmployee());
-		employee.setNumber(1);
-		department.getMembers().add(employee);
-	}
-
-	protected IClientContext getClientContext1() {
-		if (clientContext1 == null) {
-			clientContext1 = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext1"); //$NON-NLS-1$
-		}
-		return clientContext1;
-	}
-
-	protected IClientContext getClientContext2() {
-		if (clientContext2 == null) {
-			clientContext2 = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext2"); //$NON-NLS-1$
-		}
-		return clientContext2;
-	}
-
-	protected IClientContext getUnboundClientContext() {
-		if (unboundClientContext == null) {
-			unboundClientContext = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.UnboundClientContext"); //$NON-NLS-1$
-		}
-		return unboundClientContext;
-	}
-
-	public void test_getBinding_type() {
-
-		IClientContext context = ClientContextManager.getInstance().getBinding(
-				EmployeeType.CONTEXT_EMPLOYEE);
-
-		assertTrue(context.isMultiClientContext());
-		assertEquals(2, context.getChildren().size());
-		assertTrue(context.getChildren().contains(getClientContext1()));
-		assertTrue(context.getChildren().contains(getClientContext2()));
-	}
-
-	public void test_getClientContext() {
-
-		String unboundID = "org.eclipse.gmf.tests.runtime.emf.type.core.UnboundClientContext"; //$NON-NLS-1$
-
-		IClientContext context = ClientContextManager.getInstance()
-				.getClientContext(unboundID);
-
-		assertNotNull(context);
-		assertTrue(context.getId().equals(unboundID));
-		assertTrue(context.getMatcher() instanceof NullElementMatcher);
-	}
-
-	public void test_getClientContextFor() {
-
-		IClientContext context = ClientContextManager.getInstance()
-				.getClientContextFor(employee);
-
-		assertTrue(context.isMultiClientContext());
-		assertEquals(2, context.getChildren().size());
-		assertTrue(context.getChildren().contains(getClientContext1()));
-		assertTrue(context.getChildren().contains(getClientContext2()));
-	}
-
-	public void test_getClientContexts() {
-
-		Set contexts = ClientContextManager.getInstance().getClientContexts();
-
-		assertTrue(contexts.contains(getClientContext1()));
-		assertTrue(contexts.contains(getClientContext2()));
-		assertTrue(contexts.contains(getUnboundClientContext()));
-
-	}
-
-	public void test_registerClientContext() {
-
-		IClientContext newContext = new ClientContext(
-				"ClientContextManagerTest.context", new NullElementMatcher()); //$NON-NLS-1$
-
-		ClientContextManager.getInstance().registerClientContext(newContext);
-
-		IClientContext contextFromManager = ClientContextManager.getInstance()
-				.getClientContext("ClientContextManagerTest.context"); //$NON-NLS-1$
-
-		assertSame(newContext, contextFromManager);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/CreateElementRequestTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/CreateElementRequestTest.java
deleted file mode 100644
index 05d78bb..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/CreateElementRequestTest.java
+++ /dev/null

@@ -1,231 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-public class CreateElementRequestTest
-    extends AbstractEMFTypeTest {
-
-    private CreateElementRequest fixture;
-
-    private Department department;
-    private Department department2;
-
-    private Employee employee;
-
-    public CreateElementRequestTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(CreateElementRequestTest.class);
-    }
-
-    protected void doModelSetup(Resource resource) {
-
-        department = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department.setName("Department"); //$NON-NLS-1$
-        resource.getContents().add(department);
-        
-        department2 = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department2.setName("Department2"); //$NON-NLS-1$
-        resource.getContents().add(department2);
-
-        employee = (Employee) getEmployeeFactory().create(
-            getEmployeePackage().getEmployee());
-        resource.getContents().add(employee);
-    }
-
-    protected CreateElementRequest getFixture() {
-        return fixture;
-    }
-
-    protected void setFixture(CreateElementRequest fixture) {
-        this.fixture = fixture;
-    }
-
-    public void test_getEditHelperContext_eObject() {
-        // Verifies that the container of a create element request is used
-        // by default as the edit helper context, when no overrides are
-        // implemented.
-
-        setFixture(new CreateElementRequest(getEditingDomain(), department,
-            EmployeeType.EMPLOYEE));
-        Object editHelperContext = getFixture().getEditHelperContext();
-        assertEquals(department, editHelperContext);
-    }
-
-    public void test_getEditHelperContext_elementType() {
-        // Verifies that the edit helper context can be customized by clients
-
-        setFixture(new CreateElementRequest(getEditingDomain(), department,
-            EmployeeType.TOP_SECRET));
-        Object editHelperContext = getFixture().getEditHelperContext();
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(editHelperContext);
-
-        // Edit helper for security cleared employees returns the secret
-        // department element type as is edit helper context.
-        assertEquals(EmployeeType.SECRET_DEPARTMENT, elementType);
-
-        // Get the edit command and execute it
-        ICommand command = elementType.getEditCommand(getFixture());
-        assertNotNull(command);
-        assertTrue(command.canExecute());
-
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-        CommandResult result = command.getCommandResult();
-        assertEquals(IStatus.OK, result.getStatus().getCode());
-
-        Employee topSecretEmployee = null;
-
-        topSecretEmployee = (Employee) result.getReturnValue();
-
-        // Verify that the edit helper override set the correct security
-        // clearance value
-        assertNotNull(topSecretEmployee);
-        assertTrue(topSecretEmployee.isSecurityClearance());
-    }
-
-    public void test_invalidateEditHelperContext() {
-        // Verifies that the edit helper context request is invalidated when the
-        // container is changed
-
-        CreateElementRequest request = new CreateElementRequest(
-            getEditingDomain(), department, EmployeeType.EMPLOYEE);
-        setFixture(request);
-        Object departmentContext = getFixture().getEditHelperContext();
-        assertEquals(department, departmentContext);
-
-        request.setContainer(employee);
-        Object employeeContext = getFixture().getEditHelperContext();
-        assertNotSame(departmentContext, employeeContext);
-    }
-    
-    /**
-     * Verifies that getting the editing domain from a request in which neither
-     * the editing domain nor the container have been specified returns 'null'.
-     */
-    public void test_getEditingDomain_noContainer_131766() {
-        CreateElementRequest request = new CreateElementRequest(
-            EmployeeType.DEPARTMENT);
-        TransactionalEditingDomain domain = request.getEditingDomain();
-        assertNull(domain);
-    }
-    
-    /**
-     * Verifies that setting the container on a CreateElementRequest
-     * does not result in the creation of a new GetElementContextRequest.
-     */
-    public void test_noNewRequestWhenSetContainer_132253() {
-
-        final GetEditContextRequest[] contextRequestArray = new GetEditContextRequest[] {null};
-        ElementTypeRegistry.getInstance().register(
-            new SpecializationType("132253", null, "132253", //$NON-NLS-1$ //$NON-NLS-2$
-                new IElementType[] {EmployeeType.MANAGER}, null, null,
-                new AbstractEditHelperAdvice() {
-
-                    protected ICommand getBeforeEditContextCommand(
-                            GetEditContextRequest request) {
-                        contextRequestArray[0] = request;
-                        return null;
-                    };
-                }));
-
-        CreateElementRequest request = new CreateElementRequest(department,
-            EmployeeType.MANAGER);
-
-        request.getEditHelperContext();
-        GetEditContextRequest contextRequest1 = contextRequestArray[0];
-        contextRequestArray[0] = null;
-
-        request.setContainer(department2);
-
-        request.getEditHelperContext();
-        GetEditContextRequest contextRequest2 = contextRequestArray[0];
-        contextRequestArray[0] = null;
-
-        assertSame(contextRequest1, contextRequest2);
-    }
-    
-    /**
-     * Verifies that setting the container or containment feature during the
-     * request to get the edit context does not clear the edit context request,
-     * causing the request to be made again the next time we look for the edit
-     * helper context.
-     */
-    public void test_singleGetEditContextRequest_129582() {
-
-        final GetEditContextRequest[] contextRequestArray = new GetEditContextRequest[] {null};
-        ElementTypeRegistry.getInstance().register(
-            new SpecializationType("132253", null, "132253", //$NON-NLS-1$ //$NON-NLS-2$
-                new IElementType[] {EmployeeType.MANAGER}, null, null,
-                new AbstractEditHelperAdvice() {
-
-                    protected ICommand getBeforeEditContextCommand(
-                            GetEditContextRequest request) {
-                        contextRequestArray[0] = request;
-                        CreateElementRequest createRequest = (CreateElementRequest) request
-                            .getEditCommandRequest();
-                        createRequest
-                            .setContainmentFeature(getEmployeePackage()
-                                .getDepartment_Manager());
-                        return null;
-                    };
-                }));
-
-        CreateElementRequest request = new CreateElementRequest(department,
-            EmployeeType.MANAGER);
-
-        request.getEditHelperContext();
-        GetEditContextRequest contextRequest1 = contextRequestArray[0];
-        contextRequestArray[0] = null;
-
-        request.setContainer(department2);
-
-        request.getEditHelperContext();
-        GetEditContextRequest contextRequest2 = contextRequestArray[0];
-        contextRequestArray[0] = null;
-
-        assertSame(contextRequest1, contextRequest2);
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/ElementTypeRegistryTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/ElementTypeRegistryTest.java
deleted file mode 100644
index f6b2765..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/ElementTypeRegistryTest.java
+++ /dev/null

@@ -1,1328 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.TransactionalCommandStack;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.EditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeAddedEvent;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IEditHelperContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeRegistryListener;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.DefaultElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.DefaultMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.HighSchoolStudent;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.ExecutiveEditHelperAdvice;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.FinanceEditHelperAdvice;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.ManagerEditHelperAdvice;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.NotInheritedEditHelperAdvice;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.SecurityClearedElementTypeFactory;
-
-/**
- * @author ldamus
- */
-public class ElementTypeRegistryTest
-	extends AbstractEMFTypeTest {
-	
-	private class MySpecializationAdvice extends AbstractEditHelperAdvice {
-		public MySpecializationAdvice() {
-			super();
-		}
-		protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-			return super.getBeforeCreateCommand(request);
-		}
-	}
-
-	private ElementTypeRegistry fixture = null;
-
-    private IClientContext clientContext;
-    
-    private IClientContext unboundClientContext;
-
-	// Model elements
-	private Department department;
-
-	private Department executiveDepartment;
-
-	private Department financeDepartment;
-
-	private Employee employee;
-
-	private Employee financeEmployee;
-
-	private Employee financeManager;
-
-	private Student student;
-	
-	private HighSchoolStudent highSchoolStudent;
-
-	private Office employeeOffice;
-
-	private Office studentOffice;
-
-	private Employee manager;
-
-	private Office managerOffice;
-
-	private Employee executive;
-
-	private Office executiveOffice;
-	
-	// Model elements in resource with context
-	private Department cDepartment;
-
-	private Department cExecutiveDepartment;
-
-	private Department cFinanceDepartment;
-
-	private Employee cEmployee;
-
-	private Employee cFinanceEmployee;
-
-	private Employee cFinanceManager;
-
-	private Student cStudent;
-
-	private Office cEmployeeOffice;
-
-	private Office cStudentOffice;
-
-	private Employee cManager;
-
-	private Office cManagerOffice;
-
-	private Employee cExecutive;
-
-	private Office cExecutiveOffice;
-	
-
-	/**
-	 * Constructor for CreateDiagramCommandTest.
-	 * 
-	 * @param name
-	 */
-	public ElementTypeRegistryTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ElementTypeRegistryTest.class);
-	}
-
-    protected void doModelSetup(Resource resource) {
-		setFixture(ElementTypeRegistry.getInstance());
-
-		department = (Department) getEmployeeFactory().create(getEmployeePackage()
-			.getDepartment());
-		department.setName("Department"); //$NON-NLS-1$
-		resource.getContents().add(department);
-
-		executiveDepartment = (Department) getEmployeeFactory().create(getEmployeePackage()
-			.getDepartment());
-		executiveDepartment.setName("ExecutiveDepartment"); //$NON-NLS-1$
-		resource.getContents().add(executiveDepartment);
-
-		financeDepartment = (Department) getEmployeeFactory().create(getEmployeePackage()
-			.getDepartment());
-		financeDepartment.setName("Finance"); //$NON-NLS-1$
-		resource.getContents().add(financeDepartment);
-
-		employee = (Employee) getEmployeeFactory().create(getEmployeePackage().getEmployee());
-		employee.setNumber(1);
-		department.getMembers().add(employee);
-
-		employeeOffice = (Office) getEmployeeFactory().create(getEmployeePackage()
-			.getOffice());
-		employee.setOffice(employeeOffice);
-
-		financeEmployee = (Employee) getEmployeeFactory().create(getEmployeePackage()
-			.getEmployee());
-		financeEmployee.setDepartment(financeDepartment);
-
-		financeManager = (Employee) getEmployeeFactory().create(getEmployeePackage()
-			.getEmployee());
-		financeDepartment.setManager(financeManager);
-
-		Office financeManagerOffice = (Office) getEmployeeFactory()
-			.create(getEmployeePackage().getOffice());
-		financeManagerOffice.setNumberOfWindows(1);
-		financeManagerOffice.setHasDoor(false);
-		financeManager.setOffice(financeManagerOffice);
-
-		student = (Student) getEmployeeFactory().create(getEmployeePackage().getStudent());
-		student.setNumber(2);
-		department.getMembers().add(student);
-		
-		
-		studentOffice = (Office) getEmployeeFactory()
-			.create(getEmployeePackage().getOffice());
-		student.setOffice(studentOffice);
-
-		manager = (Employee) getEmployeeFactory().create(getEmployeePackage().getEmployee());
-		department.setManager(manager);
-
-		managerOffice = (Office) getEmployeeFactory()
-			.create(getEmployeePackage().getOffice());
-		managerOffice.setNumberOfWindows(1);
-		managerOffice.setHasDoor(false);
-		manager.setOffice(managerOffice);
-
-		executive = (Employee) getEmployeeFactory()
-			.create(getEmployeePackage().getEmployee());
-		executiveDepartment.setManager(executive);
-
-		executiveOffice = (Office) getEmployeeFactory().create(getEmployeePackage()
-			.getOffice());
-		executiveOffice.setNumberOfWindows(1);
-		executiveOffice.setHasDoor(true);
-		executive.setOffice(executiveOffice);
-		
-		highSchoolStudent = (HighSchoolStudent) getEmployeeFactory().create(
-				getEmployeePackage().getHighSchoolStudent());
-
-	}
-    
-    protected void doModelSetupWithContext(Resource resource) {
-		setFixture(ElementTypeRegistry.getInstance());
-
-		cDepartment = (Department) getEmployeeFactory().create(getEmployeePackage()
-			.getDepartment());
-		cDepartment.setName("DepartmentWithContext"); //$NON-NLS-1$
-		resource.getContents().add(cDepartment);
-
-		cExecutiveDepartment = (Department) getEmployeeFactory().create(getEmployeePackage()
-			.getDepartment());
-		cExecutiveDepartment.setName("ExecutiveDepartmentWithContext"); //$NON-NLS-1$
-		resource.getContents().add(cExecutiveDepartment);
-
-		cFinanceDepartment = (Department) getEmployeeFactory().create(getEmployeePackage()
-			.getDepartment());
-		cFinanceDepartment.setName("FinanceWithContext"); //$NON-NLS-1$
-		resource.getContents().add(cFinanceDepartment);
-
-		cEmployee = (Employee) getEmployeeFactory().create(getEmployeePackage().getEmployee());
-		cEmployee.setNumber(1);
-		cDepartment.getMembers().add(cEmployee);
-
-		cEmployeeOffice = (Office) getEmployeeFactory().create(getEmployeePackage()
-			.getOffice());
-		cEmployee.setOffice(cEmployeeOffice);
-
-		cFinanceEmployee = (Employee) getEmployeeFactory().create(getEmployeePackage()
-			.getEmployee());
-		cFinanceEmployee.setDepartment(cFinanceDepartment);
-
-		cFinanceManager = (Employee) getEmployeeFactory().create(getEmployeePackage()
-			.getEmployee());
-		cFinanceDepartment.setManager(cFinanceManager);
-
-		Office financeManagerOffice = (Office) getEmployeeFactory()
-			.create(getEmployeePackage().getOffice());
-		financeManagerOffice.setNumberOfWindows(1);
-		financeManagerOffice.setHasDoor(false);
-		cFinanceManager.setOffice(financeManagerOffice);
-
-		cStudent = (Student) getEmployeeFactory().create(getEmployeePackage().getStudent());
-		cStudent.setNumber(2);
-		cDepartment.getMembers().add(cStudent);
-
-		cStudentOffice = (Office) getEmployeeFactory()
-			.create(getEmployeePackage().getOffice());
-		cStudent.setOffice(cStudentOffice);
-
-		cManager = (Employee) getEmployeeFactory().create(getEmployeePackage().getEmployee());
-		cDepartment.setManager(cManager);
-
-		cManagerOffice = (Office) getEmployeeFactory()
-			.create(getEmployeePackage().getOffice());
-		cManagerOffice.setNumberOfWindows(1);
-		cManagerOffice.setHasDoor(false);
-		cManager.setOffice(cManagerOffice);
-
-		cExecutive = (Employee) getEmployeeFactory()
-			.create(getEmployeePackage().getEmployee());
-		cExecutiveDepartment.setManager(cExecutive);
-
-		cExecutiveOffice = (Office) getEmployeeFactory().create(getEmployeePackage()
-			.getOffice());
-		cExecutiveOffice.setNumberOfWindows(1);
-		cExecutiveOffice.setHasDoor(true);
-		cExecutive.setOffice(cExecutiveOffice);
-		
-	}
-    
-    protected ElementTypeRegistry getFixture() {
-		return fixture;
-	}
-
-	protected void setFixture(ElementTypeRegistry fixture) {
-		this.fixture = fixture;
-	}
-	
-	protected IClientContext getClientContext() {
-		if (clientContext == null) {
-			clientContext = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext1"); //$NON-NLS-1$
-		}
-		return clientContext;
-	}
-	
-	protected IClientContext getUnboundClientContext() {
-		if (unboundClientContext == null) {
-			unboundClientContext = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.UnboundClientContext"); //$NON-NLS-1$
-		}
-		return unboundClientContext;
-	}
-
-	
-	/**
-	 * Verifies that the #getSpecializationsOf API returns the correct
-	 * specializations.
-	 */
-	public void test_getSpecializationsOf_151097() {
-
-		ISpecializationType[] specializations = ElementTypeRegistry
-				.getInstance().getSpecializationsOf(
-						"org.eclipse.gmf.tests.runtime.emf.type.core.employee"); //$NON-NLS-1$
-
-		assertEquals(3, specializations.length);
-		for (int i = 0; i < specializations.length; i++) {
-			if (specializations[i].getId().equals("org.eclipse.gmf.tests.runtime.emf.type.core.manager") //$NON-NLS-1$
-				&& specializations[i].getClass().equals("org.eclipse.gmf.tests.runtime.emf.type.core.topSecret") //$NON-NLS-1$
-				&& specializations[i].getClass().equals("org.eclipse.gmf.tests.runtime.emf.type.core.executive")) { //$NON-NLS-1$
-				fail("expected manager, top-secret and executive specializations"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void test_getAllTypesMatching_eObject_metamodel() {
-
-		IElementType[] officeMatches = getFixture().getAllTypesMatching(
-			employeeOffice);
-		assertTrue(officeMatches.length == 1);
-		assertTrue(officeMatches[0] == EmployeeType.OFFICE);
-	}
-	
-	public void test_getAllTypesMatching_eObject_metamodel_withContext() {
-
-		// context inferred
-		IElementType[] officeMatches = getFixture().getAllTypesMatching(
-			cEmployeeOffice);
-		assertTrue(officeMatches.length == 1);
-		assertTrue(officeMatches[0] == EmployeeType.CONTEXT_OFFICE);
-		
-		// context explicit
-		officeMatches = getFixture().getAllTypesMatching(
-				cEmployeeOffice, getClientContext());
-		assertTrue(officeMatches.length == 1);
-		assertTrue(officeMatches[0] == EmployeeType.CONTEXT_OFFICE);
-	}
-	
-	public void test_getAllTypesMatching_eObject_metamodel_unboundContext() {
-
-		IElementType[] officeMatches = getFixture().getAllTypesMatching(
-				cEmployeeOffice, getUnboundClientContext());
-		assertTrue(officeMatches.length == 1);
-		assertTrue(officeMatches[0] == DefaultMetamodelType.getInstance());
-	}
-
-	public void test_getAllTypesMatching_eObject_metamodelAndSpecializations() {
-
-		IElementType[] managerMatches = getFixture().getAllTypesMatching(
-			manager);
-		assertEquals(3, managerMatches.length);
-		List managerMatchList = Arrays.asList(managerMatches);
-		assertTrue(managerMatchList.contains(EmployeeType.MANAGER));
-		assertTrue(managerMatchList.contains(EmployeeType.TOP_SECRET));
-		// The metamodel type should be last.
-		assertEquals(EmployeeType.EMPLOYEE, managerMatches[2]);
-	}
-
-	public void test_getAllTypesMatching_eObject_metamodelAndSpecializations_withContext() {
-
-		// context inferred
-		IElementType[] managerMatches = getFixture().getAllTypesMatching(
-			cManager);
-		assertEquals(3, managerMatches.length);
-		List managerMatchList = Arrays.asList(managerMatches);
-		assertTrue(managerMatchList.contains(EmployeeType.CONTEXT_MANAGER));
-		assertTrue(managerMatchList.contains(EmployeeType.CONTEXT_TOP_SECRET));
-		// The metamodel type should be last.
-		assertEquals(EmployeeType.CONTEXT_EMPLOYEE, managerMatches[2]);
-		
-		// context explicit
-		managerMatches = getFixture().getAllTypesMatching(
-			cManager, getClientContext());
-		assertEquals(3, managerMatches.length);
-		managerMatchList = Arrays.asList(managerMatches);
-		assertTrue(managerMatchList.contains(EmployeeType.CONTEXT_MANAGER));
-		assertTrue(managerMatchList.contains(EmployeeType.CONTEXT_TOP_SECRET));
-		// The metamodel type should be last.
-		assertEquals(EmployeeType.CONTEXT_EMPLOYEE, managerMatches[2]);
-	}
-
-	public void test_getAllTypesMatching_eObject_metamodelAndSpecializations_unboundContext() {
-
-		IElementType[] managerMatches = getFixture().getAllTypesMatching(
-			cManager, getUnboundClientContext());
-		assertEquals(1, managerMatches.length);
-		assertTrue(managerMatches[0] == DefaultMetamodelType.getInstance());
-	}
-
-	public void test_getElementType_eObject_eClass() {
-
-		MetamodelType eClassType = new MetamodelType(
-				"dynamic.org.eclipse.gmf.tests.runtime.emf.type.core.eclass", null, null, //$NON-NLS-1$
-				EcorePackage.eINSTANCE.getEClass(), null);
-
-		IClientContext context = ClientContextManager.getInstance()
-			.getClientContext(
-				"org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext2"); //$NON-NLS-1$
-		
-		// EClass type conflicts with the one in the ECore example editor
-		context.bindId(
-				"dynamic.org.eclipse.gmf.tests.runtime.emf.type.core.eclass"); //$NON-NLS-1$
-
-		boolean wasRegistered = getFixture().register(eClassType);
-		EObject myEClassInstance = EcoreFactory.eINSTANCE.createEClass();
-
-		IElementType metamodelType = getFixture().getElementType(
-				myEClassInstance, context);
-		assertNotNull(metamodelType);
-
-		if (wasRegistered) {
-			assertSame(eClassType, metamodelType);
-		}
-	}
-	
-	/**
-	 * Verifies that the metamodel types bound to a specified context can be
-	 * retrieved from the registry.
-	 */
-	public void test_getMetamodelTypes_155601() {
-
-		IMetamodelType[] metamodelTypes = ElementTypeRegistry.getInstance()
-				.getMetamodelTypes(getClientContext());
-
-		assertEquals(EmployeeType.METAMODEL_TYPES_WITH_CONTEXT.length,
-				metamodelTypes.length);
-
-		for (int i = 0; i < metamodelTypes.length; i++) {
-			boolean match = false;
-			for (int j = 0; j < EmployeeType.METAMODEL_TYPES_WITH_CONTEXT.length; j++) {
-				if (metamodelTypes[i] == EmployeeType.METAMODEL_TYPES_WITH_CONTEXT[j]) {
-					match = true;
-					break;
-				}
-			}
-			assertTrue("missing metamodel type", match); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Verifies that the specialization types bound to a specified context can be
-	 * retrieved from the registry.
-	 */
-	public void test_getSpecializationTypes_155601() {
-		
-		ISpecializationType[] specializationTypes = ElementTypeRegistry
-				.getInstance().getSpecializationTypes(getClientContext());
-
-		assertEquals(EmployeeType.SPECIALIZATION_TYPES_WITH_CONTEXT.length,
-				specializationTypes.length);
-
-		for (int i = 0; i < specializationTypes.length; i++) {
-			boolean match = false;
-			for (int j = 0; j < EmployeeType.SPECIALIZATION_TYPES_WITH_CONTEXT.length; j++) {
-				if (specializationTypes[i] == EmployeeType.SPECIALIZATION_TYPES_WITH_CONTEXT[j]) {
-					match = true;
-					break;
-				}
-			}
-			assertTrue("missing specialization type", match); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Verifies that the element types bound to a specified context can be
-	 * retrieved from the registry.
-	 */
-	public void test_getElementTypes_155601() {
-
-		IElementType[] elementTypes = ElementTypeRegistry.getInstance()
-				.getElementTypes(getClientContext());
-
-		assertEquals(EmployeeType.METAMODEL_TYPES_WITH_CONTEXT.length
-				+ EmployeeType.SPECIALIZATION_TYPES_WITH_CONTEXT.length,
-				elementTypes.length);
-		
-		for (int i = 0; i < elementTypes.length; i++) {
-			boolean match = false;
-			for (int j = 0; j < EmployeeType.METAMODEL_TYPES_WITH_CONTEXT.length; j++) {
-				if (elementTypes[i] == EmployeeType.METAMODEL_TYPES_WITH_CONTEXT[j]) {
-					match = true;
-					break;
-				}
-			}
-			if (!match) {
-				for (int j = 0; j < EmployeeType.SPECIALIZATION_TYPES_WITH_CONTEXT.length; j++) {
-					if (elementTypes[i] == EmployeeType.SPECIALIZATION_TYPES_WITH_CONTEXT[j]) {
-						match = true;
-						break;
-					}
-				}
-			}
-			assertTrue("missing element type", match); //$NON-NLS-1$
-		}
-	}
-
-	public void test_getContainedTypes_metamodel() {
-
-		IElementType[] officeMatches = getFixture().getContainedTypes(employee,
-			EmployeePackage.eINSTANCE.getEmployee_Office());
-		assertEquals(1, officeMatches.length);
-		List officeMatchList = Arrays.asList(officeMatches);
-		assertTrue(officeMatchList.contains(EmployeeType.OFFICE));
-	}
-	
-	public void test_getContainedTypes_metamodel_withContext() {
-
-		// context inferred
-		IElementType[] officeMatches = getFixture().getContainedTypes(cEmployee,
-			EmployeePackage.eINSTANCE.getEmployee_Office());
-		assertEquals(1, officeMatches.length);
-		List officeMatchList = Arrays.asList(officeMatches);
-		assertTrue(officeMatchList.contains(EmployeeType.CONTEXT_OFFICE));
-		
-		// context explicit
-		officeMatches = getFixture().getContainedTypes(cEmployee,
-				EmployeePackage.eINSTANCE.getEmployee_Office(), getClientContext());
-		assertEquals(1, officeMatches.length);
-		officeMatchList = Arrays.asList(officeMatches);
-		assertTrue(officeMatchList.contains(EmployeeType.CONTEXT_OFFICE));
-	}
-	
-	public void test_getContainedTypes_metamodel_unboundContext() {
-
-		IElementType[] officeMatches = getFixture().getContainedTypes(cEmployee,
-			EmployeePackage.eINSTANCE.getEmployee_Office(), getUnboundClientContext());
-		assertEquals(0, officeMatches.length);
-	}
-
-	public void test_getContainedTypes_metamodelAndSpecializations_departmentMembers() {
-
-		IElementType[] memberMatches = getFixture().getContainedTypes(
-			department, EmployeePackage.eINSTANCE.getDepartment_Members());
-		List memberMatchList = Arrays.asList(memberMatches);
-		List expected = Arrays.asList(new Object[] {EmployeeType.EMPLOYEE,
-			EmployeeType.STUDENT, EmployeeType.HIGH_SCHOOL_STUDENT, EmployeeType.TOP_SECRET});
-
-		assertEquals(expected.size(), memberMatches.length);
-		assertTrue(memberMatchList.containsAll(expected));
-	}
-	
-	public void test_getContainedTypes_metamodelAndSpecializations_departmentMembers_withContext() {
-
-		// context inferred
-		IElementType[] memberMatches = getFixture().getContainedTypes(
-			cDepartment, EmployeePackage.eINSTANCE.getDepartment_Members());
-		List memberMatchList = Arrays.asList(memberMatches);
-		List expected = Arrays.asList(new Object[] {EmployeeType.CONTEXT_EMPLOYEE,
-			EmployeeType.CONTEXT_STUDENT, EmployeeType.CONTEXT_TOP_SECRET});
-
-		assertEquals(expected.size(), memberMatches.length);
-		assertTrue(memberMatchList.containsAll(expected));
-		
-		// context explicit
-		memberMatches = getFixture().getContainedTypes(
-			cDepartment, EmployeePackage.eINSTANCE.getDepartment_Members(), getClientContext());
-		memberMatchList = Arrays.asList(memberMatches);
-		expected = Arrays.asList(new Object[] {EmployeeType.CONTEXT_EMPLOYEE,
-			EmployeeType.CONTEXT_STUDENT, EmployeeType.CONTEXT_TOP_SECRET});
-
-		assertEquals(expected.size(), memberMatches.length);
-		assertTrue(memberMatchList.containsAll(expected));
-	}
-	
-	public void test_getContainedTypes_metamodelAndSpecializations_departmentMembers_unboundContext() {
-
-		IElementType[] memberMatches = getFixture().getContainedTypes(
-			cDepartment, EmployeePackage.eINSTANCE.getDepartment_Members(), getUnboundClientContext());
-		
-		assertEquals(0, memberMatches.length);
-	}
-
-	public void test_getContainedTypes_metamodelAndSpecializations_departmentManager() {
-
-		IElementType[] managerMatches = getFixture().getContainedTypes(
-			department, EmployeePackage.eINSTANCE.getDepartment_Manager());
-		List managerMatchList = Arrays.asList(managerMatches);
-		List expected = Arrays.asList(new Object[] {EmployeeType.EMPLOYEE,
-			EmployeeType.STUDENT, EmployeeType.HIGH_SCHOOL_STUDENT, EmployeeType.MANAGER, EmployeeType.EXECUTIVE,
-			EmployeeType.TOP_SECRET});
-
-		assertEquals(expected.size(), managerMatches.length);
-		assertTrue(managerMatchList.containsAll(expected));
-	}
-	
-	public void test_getContainedTypes_metamodelAndSpecializations_departmentManager_withContext() {
-
-		// context inferred
-		IElementType[] managerMatches = getFixture().getContainedTypes(
-			cDepartment, EmployeePackage.eINSTANCE.getDepartment_Manager());
-		List managerMatchList = Arrays.asList(managerMatches);
-		List expected = Arrays.asList(new Object[] {EmployeeType.CONTEXT_EMPLOYEE,
-			EmployeeType.CONTEXT_STUDENT, EmployeeType.CONTEXT_MANAGER, EmployeeType.CONTEXT_EXECUTIVE,
-			EmployeeType.CONTEXT_TOP_SECRET});
-
-		assertEquals(expected.size(), managerMatches.length);
-		assertTrue(managerMatchList.containsAll(expected));
-		
-		// context explicit
-		managerMatches = getFixture().getContainedTypes(
-			cDepartment, EmployeePackage.eINSTANCE.getDepartment_Manager(), getClientContext());
-		managerMatchList = Arrays.asList(managerMatches);
-		expected = Arrays.asList(new Object[] {EmployeeType.CONTEXT_EMPLOYEE,
-			EmployeeType.CONTEXT_STUDENT, EmployeeType.CONTEXT_MANAGER, EmployeeType.CONTEXT_EXECUTIVE,
-			EmployeeType.CONTEXT_TOP_SECRET});
-
-		assertEquals(expected.size(), managerMatches.length);
-		assertTrue(managerMatchList.containsAll(expected));	
-	}
-	
-	public void test_getContainedTypes_metamodelAndSpecializations_departmentManager_unboundContext() {
-
-		IElementType[] managerMatches = getFixture().getContainedTypes(
-			cDepartment, EmployeePackage.eINSTANCE.getDepartment_Manager(), getUnboundClientContext());
-
-		assertEquals(0, managerMatches.length);
-	}
-
-	public void test_getEditHelperAdvice_noAdvice() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(studentOffice);
-		assertEquals(0, advice.length);
-	}
-	
-	public void test_getEditHelperAdvice_noAdvice_withContext() {
-
-		// context inferred
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(cStudentOffice);
-		assertEquals(0, advice.length);
-		
-		// context explicit
-		advice = getNonWildcardAdvice(cStudentOffice, getClientContext());
-		assertEquals(0, advice.length);
-	}
-	
-	public void test_getEditHelperAdvice_noAdvice_unboundContext() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(cStudentOffice, getUnboundClientContext());
-		assertEquals(0, advice.length);
-	}
-
-	public void test_getEditHelperAdvice_eObject_directAdvice() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(financeEmployee);
-		assertEquals(2, advice.length);
-
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance and not inherited helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_eObject_directAdvice_withContext() {
-
-		// context inferred
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(cFinanceEmployee);
-		assertEquals(2, advice.length);
-
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance and not inherited helper advice"); //$NON-NLS-1$
-			}
-		}
-		
-		// context explicit
-		advice = getNonWildcardAdvice(cFinanceEmployee, getClientContext());
-		assertEquals(2, advice.length);
-
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance and not inherited helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_eObject_directAdvice_unboundContext() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(cFinanceEmployee, getUnboundClientContext());
-		assertEquals(0, advice.length);
-	}
-
-	public void test_getEditHelperAdvice_eObject_indirectAdvice() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(financeManager);
-		assertEquals(3, advice.length);
-
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager and not inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_eObject_indirectAdvice_withContext() {
-
-		// context inferred
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(cFinanceManager);
-		assertEquals(3, advice.length);
-
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager and not inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-		
-		// context explicit
-		advice = getNonWildcardAdvice(cFinanceManager, getClientContext());
-		assertEquals(3, advice.length);
-
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager and not inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_eObject_indirectAdvice_unboundContext() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(cFinanceManager, getUnboundClientContext());
-		assertEquals(0, advice.length);
-	}
-
-	public void test_getEditHelperAdvice_elementType_directMatch() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.EMPLOYEE);
-		assertEquals(2, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance and notInherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_elementType_directMatch_withContext() {
-
-		// context inferred
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.CONTEXT_EMPLOYEE);
-		assertEquals(2, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance and notInherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-		
-		// context explicit
-		advice = getNonWildcardAdvice(EmployeeType.CONTEXT_EMPLOYEE, getClientContext());
-		assertEquals(2, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance and notInherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_elementType_directMatch_unboundContext() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.CONTEXT_EMPLOYEE, getUnboundClientContext());
-		assertEquals(0, advice.length);
-	}
-
-	public void test_getEditHelperAdvice_elementType_inheritedMatches() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.EXECUTIVE);
-		assertEquals(4, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != ExecutiveEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager, executive and not-inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_elementType_inheritedMatches_withContext() {
-
-		// context inferred
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.CONTEXT_EXECUTIVE);
-		assertEquals(4, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != ExecutiveEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager, executive and not-inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-		
-		// context explicit
-		advice = getNonWildcardAdvice(EmployeeType.CONTEXT_EXECUTIVE, getClientContext());
-		assertEquals(4, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != ExecutiveEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager, executive and not-inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_elementType_inheritedMatches_unboundContext() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.CONTEXT_EXECUTIVE, getUnboundClientContext());
-		assertEquals(0, advice.length);
-	}
-
-	public void test_getEditHelperAdvice_elementType_noInheritedMatches() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.STUDENT);
-		assertEquals(1, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class) {
-				fail("expected finance edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_elementType_noInheritedMatches_withContext() {
-
-		// context inferred
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.CONTEXT_STUDENT);
-		assertEquals(1, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class) {
-				fail("expected finance edit helper advice"); //$NON-NLS-1$
-			}
-		}
-		
-		// context explicit
-		advice = getNonWildcardAdvice(EmployeeType.CONTEXT_STUDENT, getClientContext());
-		assertEquals(1, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class) {
-				fail("expected finance edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_elementType_noInheritedMatches_unboundContext() {
-
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(EmployeeType.CONTEXT_STUDENT, getUnboundClientContext());
-		assertEquals(0, advice.length);
-	}
-
-
-	public void test_getEditHelperAdvice_editHelperContext_withEObject() {
-		
-		IEditHelperContext context = new EditHelperContext(cFinanceManager,
-				getClientContext());
-		
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(context);
-		assertEquals(3, advice.length);
-
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager and not inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_editHelperContext_withElementType() {
-		IEditHelperContext context = new EditHelperContext(
-				EmployeeType.CONTEXT_EXECUTIVE, getClientContext());
-		
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(context);
-		assertEquals(4, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != ExecutiveEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager, executive and not-inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	public void test_getEditHelperAdvice_editHelperContext_noClientContext() {
-		IEditHelperContext context = new EditHelperContext(
-				EmployeeType.CONTEXT_EXECUTIVE, null);
-		
-		IEditHelperAdvice[] advice = getNonWildcardAdvice(context);
-		assertEquals(4, advice.length);
-		for (int i = 0; i < advice.length; i++) {
-			if (advice[i].getClass() != FinanceEditHelperAdvice.class
-				&& advice[i].getClass() != ManagerEditHelperAdvice.class
-				&& advice[i].getClass() != ExecutiveEditHelperAdvice.class
-				&& advice[i].getClass() != NotInheritedEditHelperAdvice.class) {
-				fail("expected finance, manager, executive and not-inherited edit helper advice"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void test_getElementTypeFactory_none() {
-
-		IElementTypeFactory factory = getFixture().getElementTypeFactory(
-			"noName"); //$NON-NLS-1$
-		assertNull(factory);
-	}
-
-	public void test_getElementTypeFactory_default() {
-		IElementTypeFactory factory = getFixture().getElementTypeFactory(
-			"org.eclipse.gmf.runtime.emf.type.core.IElementType"); //$NON-NLS-1$
-		assertNotNull(factory);
-		assertEquals(DefaultElementTypeFactory.class, factory.getClass());
-	}
-
-	public void test_getElementTypeFactory_custom() {
-		IElementTypeFactory factory = getFixture().getElementTypeFactory(
-			"org.eclipse.gmf.tests.runtime.emf.type.core.internal.ISecurityCleared"); //$NON-NLS-1$
-		assertNotNull(factory);
-		assertEquals(SecurityClearedElementTypeFactory.class, factory
-			.getClass());
-	}
-
-	public void test_getElementType_eClass() {
-		
-		IElementType metamodelType = getFixture().getElementType(
-			getEmployeePackage().getDepartment());
-		
-		assertNotNull(metamodelType);
-		assertEquals(EmployeeType.DEPARTMENT, metamodelType);
-	}
-	
-	public void test_getElementType_eClass_withContext() {
-		
-		// context explicit
-		IElementType metamodelType = getFixture().getElementType(
-			getEmployeePackage().getDepartment(), getClientContext());
-		
-		assertNotNull(metamodelType);
-		assertEquals(EmployeeType.CONTEXT_DEPARTMENT, metamodelType);
-	}
-	
-	public void test_getElementType_eClass_unboundContext() {
-		
-		IElementType metamodelType = getFixture().getElementType(
-			getEmployeePackage().getDepartment(), getUnboundClientContext());
-		
-		assertSame(DefaultMetamodelType.getInstance(), metamodelType);
-	}
-
-	public void test_getElementType_eObject() {
-		
-		IElementType metamodelType = getFixture().getElementType(
-			financeManager);
-		
-		assertNotNull(metamodelType);
-		assertEquals(EmployeeType.EMPLOYEE, metamodelType);
-	}
-	
-	public void test_getElementType_eObject_withContext() {
-		
-		// context inferred
-		IElementType metamodelType = getFixture().getElementType(
-			cFinanceManager);
-		
-		assertNotNull(metamodelType);
-		assertEquals(EmployeeType.CONTEXT_EMPLOYEE, metamodelType);
-		
-		// context explicit
-		metamodelType = getFixture().getElementType(
-			cFinanceManager, getClientContext());
-		
-		assertNotNull(metamodelType);
-		assertEquals(EmployeeType.CONTEXT_EMPLOYEE, metamodelType);
-	}
-	
-	public void test_getElementType_eObject_unboundContext() {
-		
-		IElementType metamodelType = getFixture().getElementType(
-			cFinanceManager, getUnboundClientContext());
-		
-		assertSame(DefaultMetamodelType.getInstance(), metamodelType);
-	}
-	
-	public void test_getElementType_overridesEditHelper() {
-
-		IElementType elementType = getFixture().getElementType(
-				EmployeeType.TOP_SECRET);
-		assertNotNull(elementType);
-		assertEquals(EmployeeType.TOP_SECRET, elementType);
-
-		assertTrue(elementType.getEditHelper() instanceof SecurityClearedElementTypeFactory.SecurityClearedEditHelper);
-	}
-	
-	public void test_getElementType_overridesEditHelper_withContext() {
-
-		IElementType elementType = getFixture().getElementType(
-				EmployeeType.CONTEXT_TOP_SECRET);
-		assertNotNull(elementType);
-		assertEquals(EmployeeType.CONTEXT_TOP_SECRET, elementType);
-
-		assertTrue(elementType.getEditHelper() instanceof SecurityClearedElementTypeFactory.SecurityClearedEditHelper);
-	}
-	
-
-	public void test_getElementType_metamodelType() {
-		IElementType metamodelType = getFixture().getElementType(EmployeeType.STUDENT);
-		assertNotNull(metamodelType);
-		assertEquals(EmployeeType.STUDENT, metamodelType);
-	}
-	
-	public void test_getElementType_metamodelType_withContext() {
-		IElementType metamodelType = getFixture().getElementType(EmployeeType.CONTEXT_STUDENT);
-		assertNotNull(metamodelType);
-		assertEquals(EmployeeType.CONTEXT_STUDENT, metamodelType);
-	}
-
-	public void test_getElementType_specializationType() {
-		IElementType specializationType = getFixture()
-				.getElementType(EmployeeType.MANAGER);
-		assertNotNull(specializationType);
-		assertEquals(EmployeeType.MANAGER, specializationType);
-	}
-
-	public void test_getElementType_specializationType_withContext() {
-		IElementType specializationType = getFixture()
-				.getElementType(EmployeeType.CONTEXT_MANAGER);
-		assertNotNull(specializationType);
-		assertEquals(EmployeeType.CONTEXT_MANAGER, specializationType);
-	}
-
-	public void test_getElementType_editHelperContext_withEObject() {
-		
-		IEditHelperContext context = new EditHelperContext(cFinanceManager,
-				getClientContext());
-		
-		IElementType type = getFixture().getElementType(context);
-		assertNotNull(type);
-		assertEquals(EmployeeType.CONTEXT_EMPLOYEE, type);
-	}
-	
-	/**
-	 * Verifies that the element type in the IEditHelperContext will be used
-	 * regardless of the client context specified in the IEditHelperContext.
-	 */
-	public void test_getElementType_editHelperContext_withElementType() {
-		IEditHelperContext context = new EditHelperContext(
-				EmployeeType.CONTEXT_STUDENT, ClientContextManager.getDefaultClientContext());
-		IElementType type = getFixture().getElementType(context);
-		assertNotNull(type);
-		assertEquals(EmployeeType.CONTEXT_STUDENT, type);
-	}
-	
-	public void test_getElementType_editHelperContext_noClientContext() {
-		IEditHelperContext context = new EditHelperContext(financeManager, null);
-		
-		IElementType type = getFixture().getElementType(context);
-		assertNotNull(type);
-		assertEquals(EmployeeType.EMPLOYEE, type);
-	}
-
-	public void test_getType_metamodel() {
-		IElementType studentType = getFixture().getType(
-			EmployeeType.STUDENT.getId());
-		assertNotNull(studentType);
-		assertEquals(EmployeeType.STUDENT.getId(), studentType.getId());
-	}
-
-	public void test_getType_specialization() {
-		IElementType managerType = getFixture().getType(
-			EmployeeType.MANAGER.getId());
-		assertNotNull(managerType);
-		assertEquals(EmployeeType.MANAGER.getId(), managerType.getId());
-	}
-
-	public void test_duplicateId_notRegistered() {
-		IElementType employeeType = getFixture().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.core.employee"); //$NON-NLS-1$
-		assertFalse(employeeType.getDisplayName().equals("DuplicateEmployee")); //$NON-NLS-1$
-	}
-
-	public void test_duplicateEClass_notRegistered() {
-		IElementType employeeType = getFixture().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.ui.employee2"); //$NON-NLS-1$
-		assertNull(employeeType);
-	}
-
-	public void test_multipleMetatmodelTypes_notRegistered() {
-		IElementType employeeType = getFixture().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.ui.multipleMetamodelTypes"); //$NON-NLS-1$
-		assertNull(employeeType);
-	}
-
-	public void test_noSuchType_notRegistered() {
-		IElementType employeeType = getFixture().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.ui.SpecializesNoSuchType"); //$NON-NLS-1$
-		assertNull(employeeType);
-	}
-
-	public void test_invalidMetatmodel_notRegistered() {
-		IElementType employeeType = getFixture().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.ui.noMetamodel"); //$NON-NLS-1$
-		assertNull(employeeType);
-	}
-	
-	public void test_register_specializationType() {
-
-		IEditHelperAdvice specialAdvice = new MySpecializationAdvice();
-		
-		String id = "dynamic.specialization.type"; //$NON-NLS-1$
-		final ISpecializationType dynamicSpecializationType = new SpecializationType(id, null, id,
-			new IElementType[] {EmployeeType.EMPLOYEE}, null, null, specialAdvice);
-		
-		final boolean[] listenerNotified = new boolean[] {false};
-		IElementTypeRegistryListener listener = new IElementTypeRegistryListener() {
-
-			public void elementTypeAdded(
-					ElementTypeAddedEvent elementTypeAddedEvent) {
-				listenerNotified[0] = true;
-				assertEquals(dynamicSpecializationType.getId(), elementTypeAddedEvent
-					.getElementTypeId());
-			}
-		};
-		
-		ElementTypeRegistry.getInstance().addElementTypeRegistryListener(listener);
-		 
-		boolean result = ElementTypeRegistry.getInstance().register(dynamicSpecializationType);
-		
-		// Check that the element type was registered
-		assertTrue(result);
-		assertTrue(listenerNotified[0]);
-		assertSame(dynamicSpecializationType, getFixture().getType(id));
-		
-		// Check that the advice can be retrieved
-		IEditHelperAdvice[] advice = getFixture().getEditHelperAdvice(
-			dynamicSpecializationType);
-		assertTrue(Arrays.asList(advice).contains(specialAdvice));
-		
-		ElementTypeRegistry.getInstance().removeElementTypeRegistryListener(listener);
-	}
-	
-
-	
-	public void test_register_metamodelType() {
-		
-		String id = "dynamic.metamodel.type"; //$NON-NLS-1$
-		final IMetamodelType dynamicMetamodelType = new MetamodelType(id, null, id, EmployeePackage.eINSTANCE.getLocation(), null);
-		
-		final boolean[] listenerNotified = new boolean[] {false};
-		IElementTypeRegistryListener listener = new IElementTypeRegistryListener() {
-
-			public void elementTypeAdded(
-					ElementTypeAddedEvent elementTypeAddedEvent) {
-				listenerNotified[0] = true;
-				assertEquals(dynamicMetamodelType.getId(), elementTypeAddedEvent
-					.getElementTypeId());
-			}
-		};
-		
-		ElementTypeRegistry.getInstance().addElementTypeRegistryListener(listener);
-		
-		boolean result = ElementTypeRegistry.getInstance().register(dynamicMetamodelType);
-		
-		assertTrue(result);
-		assertTrue(listenerNotified[0]);
-		assertSame(dynamicMetamodelType, ElementTypeRegistry.getInstance().getType(id));
-		
-		ElementTypeRegistry.getInstance().removeElementTypeRegistryListener(listener);
-	}
-	
-	public void test_nullElementType_specialization() {
-		IElementType nullSpecialization = getFixture().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.core.nullSpecialization"); //$NON-NLS-1$
-		assertNotNull(nullSpecialization);
-		
-        RecordingCommand recordingCommand = new RecordingCommand(getEditingDomain()) {
-            protected void doExecute() {
-                department.setManager(null);
-            };
-        };
-        
-        try {
-            ((TransactionalCommandStack) getEditingDomain().getCommandStack()).execute(recordingCommand,
-                null);
-
-        } catch (RollbackException re) {
-            fail("setUp() failed:" + re.getLocalizedMessage()); //$NON-NLS-1$
-        } catch (InterruptedException ie) {
-            fail("setUp() failed:" + ie.getLocalizedMessage()); //$NON-NLS-1$
-        }
-		
-		assertNull(department.getManager());
-		
-		CreateElementRequest createRequest = new CreateElementRequest(getEditingDomain(),
-			department, nullSpecialization);
-		
-		createRequest.setParameter("MANAGER", manager); //$NON-NLS-1$
-		
-		IElementType elementType = ElementTypeRegistry.getInstance()
-			.getElementType(createRequest.getEditHelperContext());
-		
-		ICommand command = elementType.getEditCommand(createRequest);
-		
-		assertNotNull(command);
-		assertTrue(command.canExecute());
-		
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-		assertSame(manager, department.getManager());
-		
-		assertNull(command.getCommandResult().getReturnValue());
-	}
-	
-	/**
-	 * Verifies that the original metamodel type array is not reversed by the
-	 * #getAllTypesMatching method.
-	 */
-	public void test_getAllTypesMatching_146097() {
-
-		IElementType[] superTypes = EmployeeType.HIGH_SCHOOL_STUDENT
-				.getAllSuperTypes();
-		assertEquals(2, superTypes.length);
-		assertEquals(superTypes[0], EmployeeType.EMPLOYEE);
-		assertEquals(superTypes[1], EmployeeType.STUDENT);
-
-		IElementType[] highSchoolStudentMatches = getFixture()
-				.getAllTypesMatching(highSchoolStudent);
-		assertTrue(highSchoolStudentMatches.length == 3);
-		assertTrue(highSchoolStudentMatches[0] == EmployeeType.HIGH_SCHOOL_STUDENT);
-		assertTrue(highSchoolStudentMatches[1] == EmployeeType.STUDENT);
-		assertTrue(highSchoolStudentMatches[2] == EmployeeType.EMPLOYEE);
-
-		// check that the super types array was not reversed by the call to
-		// #getAllSuperTypes
-		assertEquals(superTypes[0], EmployeeType.EMPLOYEE);
-		assertEquals(superTypes[1], EmployeeType.STUDENT);
-	}
-	
-	/**
-	 * Tests that when finding the nearest metamodel type that matches a given
-	 * model object (when there is no type registered specifically against its
-	 * EClass in current client context), the ElementTypeRegistry finds the type
-	 * for the nearest supertype EClass in the current client context.
-	 */
-	public void test_getMetamodelType_157788() {
-
-		final Resource r = getEditingDomain()
-				.getResourceSet()
-				.createResource(
-						URI
-								.createURI("null://org.eclipse.gmf.tests.runtime.emf.type.core.157788")); //$NON-NLS-1$
-
-		final Student[] s = new Student[1];
-		
-		RecordingCommand command = new RecordingCommand(getEditingDomain()) {
-
-            protected void doExecute() {
-            	Department d = (Department) getEmployeeFactory().create(
-        				getEmployeePackage().getDepartment());
-        		d.setName("Department_157788"); //$NON-NLS-1$
-        		r.getContents().add(d);
-
-        		s[0] = (Student) getEmployeeFactory().create(
-        				getEmployeePackage().getStudent());
-        		s[0].setNumber(157788);
-        		d.getMembers().add(s[0]);
-            };
-        };
-
-        try {
-            ((TransactionalCommandStack) getEditingDomain().getCommandStack()).execute(command,
-                null);
-
-        } catch (RollbackException re) {
-            fail("test_getMetamodelType_157788 setup failed:" + re.getLocalizedMessage()); //$NON-NLS-1$
-        } catch (InterruptedException ie) {
-        	fail("test_getMetamodelType_157788 setup failed:" + ie.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		IElementType type = ElementTypeRegistry.getInstance().getElementType(s[0]);
-		assertNotNull(type);
-		assertEquals(
-				"org.eclipse.gmf.tests.runtime.emf.type.core.157788.employee", type.getId()); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MetamodelTypeDescriptorTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MetamodelTypeDescriptorTest.java
deleted file mode 100644
index 6a2baea..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MetamodelTypeDescriptorTest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.MetamodelTypeDescriptor;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-
-public class MetamodelTypeDescriptorTest extends TestCase {
-
-	private MetamodelTypeDescriptor fixture;
-
-	public MetamodelTypeDescriptorTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(MetamodelTypeDescriptorTest.class);
-	}
-
-	protected MetamodelTypeDescriptor getFixture() {
-		return fixture;
-	}
-
-	protected void setFixture(MetamodelTypeDescriptor fixture) {
-		this.fixture = fixture;
-	}
-
-	public void test_metamodelTypeConstructor() {
-
-		setFixture(new MetamodelTypeDescriptor((IMetamodelType) EmployeeType.STUDENT));
-		
-		assertEquals(EmployeeType.STUDENT.getDisplayName(), getFixture().getName());
-		assertEquals(EmployeeType.STUDENT.getId(), getFixture().getId());
-		assertEquals(EmployeeType.STUDENT.getIconURL(), getFixture().getIconURL());
-		assertEquals(EmployeeType.STUDENT.getEClass(), getFixture().getEClass());
-		assertEquals(EmployeeType.STUDENT.getEditHelper(), getFixture().getEditHelper());
-		assertEquals(EmployeeType.STUDENT, getFixture().getElementType());
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MoveRequestTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MoveRequestTest.java
deleted file mode 100644
index e747e1f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MoveRequestTest.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-
-public class MoveRequestTest
-    extends AbstractEMFTypeTest {
-
-    private MoveRequest fixture;
-
-    private Department department1;
-
-    private Department department2;
-
-    private Employee employee1;
-
-    private Employee employee2;
-
-    private Employee manager;
-
-    public MoveRequestTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(MoveRequestTest.class);
-    }
-
-    protected void doModelSetup(Resource resource) {
-
-        department1 = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department1.setName("Department1"); //$NON-NLS-1$
-        resource.getContents().add(department1);
-
-        department2 = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department2.setName("Department2"); //$NON-NLS-1$
-        resource.getContents().add(department2);
-
-        employee1 = (Employee) getEmployeeFactory().create(
-            getEmployeePackage().getEmployee());
-        department1.getMembers().add(employee1);
-
-        employee2 = (Employee) getEmployeeFactory().create(
-            getEmployeePackage().getEmployee());
-        department1.getMembers().add(employee2);
-
-        manager = (Employee) getEmployeeFactory().create(
-            getEmployeePackage().getEmployee());
-        department1.setManager(manager);
-    }
-
-    protected MoveRequest getFixture() {
-        return fixture;
-    }
-
-    protected void setFixture(MoveRequest fixture) {
-        this.fixture = fixture;
-    }
-
-    public void test_move_singleElement_noFeature() {
-
-        assertSame(department1, employee1.eContainer());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-
-        setFixture(new MoveRequest(getEditingDomain(), department2, employee1));
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(getFixture().getEditHelperContext());
-
-        ICommand command = elementType.getEditCommand(getFixture());
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-
-        assertSame(department2, employee1.eContainer());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-    }
-
-    public void test_move_singleElement_differentFeatureInSameContainer() {
-
-        assertSame(department1, employee1.eContainer());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-
-        setFixture(new MoveRequest(getEditingDomain(), department1,
-            getEmployeePackage().getDepartment_Manager(), employee1));
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(getFixture().getEditHelperContext());
-
-        ICommand command = elementType.getEditCommand(getFixture());
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-
-        assertSame(department1, employee1.eContainer());
-        assertSame(getEmployeePackage().getDepartment_Manager(), employee1
-            .eContainmentFeature());
-    }
-
-    public void test_move_singleElement_featureInNewContainer() {
-
-        assertSame(department1, employee1.eContainer());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-
-        setFixture(new MoveRequest(getEditingDomain(), department2,
-            getEmployeePackage().getDepartment_Manager(), employee1));
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(getFixture().getEditHelperContext());
-
-        ICommand command = elementType.getEditCommand(getFixture());
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-
-        assertSame(department2, employee1.eContainer());
-        assertSame(getEmployeePackage().getDepartment_Manager(), employee1
-            .eContainmentFeature());
-    }
-
-    public void test_move_manyElements_noFeatures() {
-
-        assertSame(department1, employee1.eContainer());
-        assertSame(department1, employee2.eContainer());
-        assertSame(department1, manager.eContainer());
-
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee2
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Manager(), manager
-            .eContainmentFeature());
-
-        List elementsToMove = new ArrayList();
-        elementsToMove.add(employee1);
-        elementsToMove.add(employee2);
-        elementsToMove.add(manager);
-
-        setFixture(new MoveRequest(getEditingDomain(), department2,
-            elementsToMove));
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(getFixture().getEditHelperContext());
-
-        ICommand command = elementType.getEditCommand(getFixture());
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-
-        assertSame(department2, employee1.eContainer());
-        assertSame(department2, employee2.eContainer());
-        assertSame(department2, manager.eContainer());
-
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee2
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Manager(), manager
-            .eContainmentFeature());
-    }
-
-    public void test_move_manyElements_someFeatures() {
-
-        assertSame(department1, employee1.eContainer());
-        assertSame(department1, employee2.eContainer());
-        assertSame(department1, manager.eContainer());
-
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee2
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Manager(), manager
-            .eContainmentFeature());
-
-        Map elementsToMove = new HashMap();
-        elementsToMove.put(employee1, getEmployeePackage()
-            .getDepartment_Manager());
-        elementsToMove.put(employee2, null);
-        elementsToMove.put(manager, getEmployeePackage()
-            .getDepartment_Members());
-
-        setFixture(new MoveRequest(getEditingDomain(), department2,
-            elementsToMove));
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(getFixture().getEditHelperContext());
-
-        ICommand command = elementType.getEditCommand(getFixture());
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-
-        assertSame(department2, employee1.eContainer());
-        assertSame(department2, employee2.eContainer());
-        assertSame(department2, manager.eContainer());
-
-        assertSame(getEmployeePackage().getDepartment_Manager(), employee1
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee2
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), manager
-            .eContainmentFeature());
-    }
-
-    public void test_move_manyElements_featuresInNewContainer() {
-
-        assertSame(department1, employee1.eContainer());
-        assertSame(department1, employee2.eContainer());
-        assertSame(department1, manager.eContainer());
-
-        assertSame(getEmployeePackage().getDepartment_Members(), employee1
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee2
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Manager(), manager
-            .eContainmentFeature());
-
-        Map elementsToMove = new HashMap();
-        elementsToMove.put(employee1, getEmployeePackage()
-            .getDepartment_Manager());
-        elementsToMove.put(employee2, getEmployeePackage()
-            .getDepartment_Members());
-        elementsToMove.put(manager, getEmployeePackage()
-            .getDepartment_Members());
-
-        setFixture(new MoveRequest(getEditingDomain(), department2,
-            elementsToMove));
-
-        IElementType elementType = ElementTypeRegistry.getInstance()
-            .getElementType(getFixture().getEditHelperContext());
-
-        ICommand command = elementType.getEditCommand(getFixture());
-        try {
-            command.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-
-        assertSame(department2, employee1.eContainer());
-        assertSame(department2, employee2.eContainer());
-        assertSame(department2, manager.eContainer());
-
-        assertSame(getEmployeePackage().getDepartment_Manager(), employee1
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), employee2
-            .eContainmentFeature());
-        assertSame(getEmployeePackage().getDepartment_Members(), manager
-            .eContainmentFeature());
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MultiClientContextTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MultiClientContextTest.java
deleted file mode 100644
index 1011023..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MultiClientContextTest.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.regex.Pattern;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.MultiClientContext;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-
-public class MultiClientContextTest extends AbstractEMFTypeTest {
-
-	private MultiClientContext multiContext;
-
-	private IClientContext childContext1;
-
-	private IClientContext childContext2;
-
-	private IClientContext clientContext1;
-
-	private IClientContext clientContext2;
-
-	private IClientContext unboundClientContext;
-
-	private Department department;
-
-	private Employee employee_101;
-
-	private Employee employee_102;
-
-	public MultiClientContextTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(MultiClientContextTest.class,
-				"MultiClientContext Test Suit"); //$NON-NLS-1$
-	}
-
-	protected void doModelSetupWithContext(Resource resource) {
-		department = (Department) getEmployeeFactory().create(
-				getEmployeePackage().getDepartment());
-		department.setName("MultiClientContextDepartment"); //$NON-NLS-1$
-		resource.getContents().add(department);
-
-		employee_101 = (Employee) getEmployeeFactory().create(
-				getEmployeePackage().getEmployee());
-		employee_101.setNumber(101);
-		department.getMembers().add(employee_101);
-
-		employee_102 = (Employee) getEmployeeFactory().create(
-				getEmployeePackage().getEmployee());
-		employee_102.setNumber(102);
-		department.getMembers().add(employee_102);
-
-		childContext1 = new ClientContext("childContext1", //$NON-NLS-1$
-				new IElementMatcher() {
-					public boolean matches(EObject eObject) {
-						EObject container = eObject.eContainer();
-
-						return container instanceof Department
-								&& ((Department) container).getName().equals(
-										"MultiClientContextDepartment"); //$NON-NLS-1$
-					};
-				});
-
-		childContext2 = new ClientContext(
-				"childContext2", new IElementMatcher() { //$NON-NLS-1$
-					public boolean matches(EObject eObject) {
-						return eObject instanceof Employee
-								&& ((Employee) eObject).getNumber() == 101;
-					};
-				});
-
-		multiContext = new MultiClientContext(Collections.singletonList(childContext1));
-	}
-
-	protected IClientContext getClientContext1() {
-		if (clientContext1 == null) {
-			clientContext1 = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext1"); //$NON-NLS-1$
-		}
-		return clientContext1;
-	}
-
-	protected IClientContext getClientContext2() {
-		if (clientContext2 == null) {
-			clientContext2 = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.ClientContext2"); //$NON-NLS-1$
-		}
-		return clientContext2;
-	}
-
-	protected IClientContext getUnboundClientContext() {
-		if (unboundClientContext == null) {
-			unboundClientContext = ClientContextManager
-					.getInstance()
-					.getClientContext(
-							"org.eclipse.gmf.tests.runtime.emf.type.core.UnboundClientContext"); //$NON-NLS-1$
-		}
-		return unboundClientContext;
-	}
-
-	public void test_bindId() {
-
-		String typeID = "org.eclipse.gmf.tests.runtime.emf.type.example1.employee"; //$NON-NLS-1$
-		IElementType type = ElementTypeRegistry.getInstance().getType(typeID);
-
-		assertFalse(multiContext.includes(type));
-
-		multiContext.bindId(typeID);
-
-		assertTrue(multiContext.includes(type));
-	}
-
-	public void test_bindPattern() {
-
-		String typeID = "org.eclipse.gmf.tests.runtime.emf.type.example2.employee"; //$NON-NLS-1$
-		IElementType type = ElementTypeRegistry.getInstance().getType(typeID);
-
-		assertFalse(multiContext.includes(type));
-
-		Pattern pattern = Pattern
-				.compile("org.eclipse.gmf.tests.runtime.emf.type.example2.*"); //$NON-NLS-1$
-
-		multiContext.bindPattern(pattern);
-
-		assertTrue(multiContext.includes(type));
-	}
-
-	public void test_getMatcher() {
-
-		assertTrue(multiContext.getMatcher().matches(employee_101));
-		assertTrue(multiContext.getMatcher().matches(employee_102));
-
-		Collection children = multiContext.getChildren();
-		assertEquals(1, children.size());
-
-		multiContext.add(childContext2);
-
-		children = multiContext.getChildren();
-		assertEquals(2, children.size());
-		assertTrue(children.contains(childContext1));
-		assertTrue(children.contains(childContext2));
-
-		assertTrue(multiContext.getMatcher().matches(employee_101));
-		assertFalse(multiContext.getMatcher().matches(employee_102));
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/SpecializationTypeDescriptorTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/SpecializationTypeDescriptorTest.java
deleted file mode 100644
index fab1e8d..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/SpecializationTypeDescriptorTest.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.SpecializationTypeDescriptor;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-
-public class SpecializationTypeDescriptorTest extends TestCase {
-
-	private SpecializationTypeDescriptor fixture;
-
-	public SpecializationTypeDescriptorTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(SpecializationTypeDescriptorTest.class);
-	}
-
-	protected SpecializationTypeDescriptor getFixture() {
-		return fixture;
-	}
-
-	protected void setFixture(SpecializationTypeDescriptor fixture) {
-		this.fixture = fixture;
-	}
-
-	public void test_specializationTypeConstructor() {
-
-		setFixture(new SpecializationTypeDescriptor(EmployeeType.MANAGER));
-		
-		assertEquals(EmployeeType.MANAGER.getDisplayName(), getFixture().getName());
-		assertEquals(EmployeeType.MANAGER.getId(), getFixture().getId());
-		assertEquals(EmployeeType.MANAGER.getIconURL(), getFixture().getIconURL());
-		assertEquals(EmployeeType.MANAGER.getEContainerDescriptor(), getFixture().getContainerDescriptor());
-		assertEquals(EmployeeType.MANAGER.getEditHelperAdvice(), getFixture().getEditHelperAdviceDescriptor().getEditHelperAdvice());
-		assertEquals(EmployeeType.MANAGER.getEditHelperAdvice(), getFixture().getEditHelperAdvice());
-		assertEquals(EmployeeType.MANAGER, getFixture().getElementType());
-		assertEquals(EmployeeType.MANAGER.getMatcher(), getFixture().getMatcher());
-		assertEquals(EmployeeType.MANAGER.getSpecializedTypeIds(), getFixture().getSpecializationTypeIds());
-		assertEquals(EmployeeType.MANAGER.getSpecializedTypes(), getFixture().getSpecializedTypes());
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/SpecializationTypeTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/SpecializationTypeTest.java
deleted file mode 100644
index 01f5d7e..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/SpecializationTypeTest.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-
-public class SpecializationTypeTest extends TestCase {
-
-	public SpecializationTypeTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(SpecializationTypeTest.class);
-	}
-
-    /**
-     * Tests that isSpecializationOf() does not throw a null pointer exception.
-     */
-    public void test_isSpecializationOf_120765() {
-
-        assertTrue(EmployeeType.MANAGER.isSpecializationOf(EmployeeType.EMPLOYEE));
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/TestPlugin.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/TestPlugin.java
deleted file mode 100644
index f1d457f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/TestPlugin.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.tests.runtime.emf.type.core;
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * Plug-in lifecycle class, required for correct bundle activation.
- *
- * @author Linda Damus
- */
-public class TestPlugin
-	extends Plugin {
-
-	/**
-	 * Initializes me.
-	 */
-	public TestPlugin() {
-		super();
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/CreateElementCommandTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/CreateElementCommandTest.java
deleted file mode 100644
index 0d84158..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/CreateElementCommandTest.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core.commands;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.AbstractEMFTypeTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.EmployeeType;
-
-/**
- * @author ldamus
- */
-public class CreateElementCommandTest
-    extends AbstractEMFTypeTest {
-
-    private Department department;
-
-    private CreateElementCommand fixture;
-
-    public CreateElementCommandTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(CreateElementCommandTest.class, "CreateElementCommand Test Suite"); //$NON-NLS-1$
-    }
-
-    protected void doModelSetup(Resource resource) {
-        department = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department.setName("Department"); //$NON-NLS-1$
-        resource.getContents().add(department);
-    }
-
-    protected CreateElementCommand getFixture() {
-        return fixture;
-    }
-
-    protected void setFixture(CreateElementCommand fixture) {
-        this.fixture = fixture;
-    }
-
-    public void test_isExecutable_noEClassToEdit() {
-
-        CreateElementRequest request = new CreateElementRequest(
-            getEditingDomain(), null, EmployeeType.EMPLOYEE,
-            EmployeePackage.eINSTANCE.getDepartment_Members());
-        setFixture(new CreateElementCommand(request));
-
-        assertFalse(getFixture().canExecute());
-    }
-    
-    /**
-	 * Verifies that the status from configuring the new element is reported in
-	 * the command result of the create element command.
-	 */
-    public void test_configureStatusPropagated_139736() {
-
-		// First create an executive with no configuration failure
-		CreateElementRequest request = new CreateElementRequest(
-				getEditingDomain(), department, EmployeeType.EXECUTIVE,
-				EmployeePackage.eINSTANCE.getDepartment_Members());
-
-		CreateElementCommand command = new CreateElementCommand(request);
-
-		IStatus status = null;
-
-		try {
-			status = command.execute(new NullProgressMonitor(), null);
-
-		} catch (ExecutionException e) {
-			fail("Command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-
-		assertEquals(IStatus.OK, command.getCommandResult().getStatus()
-				.getSeverity());
-		assertEquals(IStatus.OK, status.getSeverity());
-
-		// Now create an executive whose configuration returns a warning status
-		request = new CreateElementRequest(getEditingDomain(), department,
-				EmployeeType.EXECUTIVE, EmployeePackage.eINSTANCE
-						.getDepartment_Members());
-
-		request.setParameter("fail_configuration", Boolean.TRUE); //$NON-NLS-1$
-
-		command = new CreateElementCommand(request);
-		status = null;
-
-		try {
-			status = command.execute(new NullProgressMonitor(), null);
-
-		} catch (ExecutionException e) {
-			fail("Command execution failed: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-
-		assertEquals(IStatus.WARNING, command.getCommandResult().getStatus()
-				.getSeverity());
-		assertEquals(IStatus.WARNING, status.getSeverity());
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/DeferredSetValueCommandTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/DeferredSetValueCommandTest.java
deleted file mode 100644
index 31f2ba3..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/DeferredSetValueCommandTest.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core.commands;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DeferredSetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.AbstractEMFTypeTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * Tests the DeferredSetValueCommand.
- * 
- * @author ldamus
- */
-public class DeferredSetValueCommandTest extends AbstractEMFTypeTest {
-
-	private Department department;
-
-	private Employee manager;
-
-	private Office managerOffice;
-
-	public DeferredSetValueCommandTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new TestSuite(DeferredSetValueCommandTest.class);
-	}
-
-	protected void doModelSetup(Resource resource) {
-		department = (Department) getEmployeeFactory().create(
-				getEmployeePackage().getDepartment());
-		department.setName("Department"); //$NON-NLS-1$
-		resource.getContents().add(department);
-
-		manager = (Employee) getEmployeeFactory().create(
-				getEmployeePackage().getEmployee());
-
-		managerOffice = (Office) getEmployeeFactory().create(
-				getEmployeePackage().getOffice());
-	}
-
-	/**
-	 * Tests that a DeferredSetValueCommand is executable when it has no
-	 * elementToEdit.
-	 */
-	public void test_isExecutable() {
-
-		// command is executable when no elementToEdit in the request
-		SetRequest request = new SetRequest(getEditingDomain(), null,
-				EmployeePackage.eINSTANCE.getDepartment_Manager(), manager);
-
-		TestDeferredSetValueCommand command = new TestDeferredSetValueCommand(
-				request);
-		assertTrue(command.canExecute());
-
-		// command is not executable with invalid elementToEdit
-		command.setOwner(managerOffice);
-		assertFalse(command.canExecute());
-
-		// command is executable with valid elementToEdit
-		command.setOwner(department);
-		assertTrue(command.canExecute());
-
-		// execute the command
-		try {
-			assertNull(department.getManager());
-			command.execute(new NullProgressMonitor(), null);
-			assertSame(manager, department.getManager());
-
-		} catch (ExecutionException e) {
-			fail("unexpected execution exception"); //$NON-NLS-1$
-		}
-	}
-
-	// Test fixtures
-
-	private class TestDeferredSetValueCommand extends DeferredSetValueCommand {
-
-		private EObject owner;
-
-		public TestDeferredSetValueCommand(SetRequest request) {
-			super(request);
-		}
-
-		protected EObject getElementToEdit() {
-			return owner;
-		}
-
-		public void setOwner(EObject owner) {
-			this.owner = owner;
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/DestroyElementCommandTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/DestroyElementCommandTest.java
deleted file mode 100644
index f9208e7..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/DestroyElementCommandTest.java
+++ /dev/null

@@ -1,421 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core.commands;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.AbstractEMFTypeTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeeFactory;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.ClientDependentsAdvice;
-import org.eclipse.gmf.tests.runtime.emf.type.core.internal.DestroyCustomerAdvice;
-
-/**
- * Tests the extensible {@link DestroyElementCommand}.
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class DestroyElementCommandTest
-    extends AbstractEMFTypeTest {
-
-	static final String ANNOTATION_SOURCE = "org.eclipse.gmf.tests.runtime.emf.type.core"; //$NON-NLS-1$
-	
-    private Customer parentCompany;
-    private Customer customer;
-    private Client billieJo;
-    private Client jimBob;
-    
-    private EAnnotation billieJoAnnotation;
-    private EAnnotation jimBobAnnotation;
-
-    public DestroyElementCommandTest(String name) {
-        super(name);
-    }
-
-    public static Test suite() {
-        return new TestSuite(DestroyElementCommandTest.class, "DestroyElementCommand Tests"); //$NON-NLS-1$
-    }
-
-    /**
-     * Tests just the functionality of the destroy command, itself.
-     */
-    public void test_destroyCommand_basic() {
-    	DestroyElementCommand cmd = new DestroyElementCommand(
-    			new DestroyElementRequest(billieJo, false));
-    	
-    	execute(cmd);
-    	
-    	assertDestroyed(billieJo);
-    	
-    	// annotation was not destroyed
-    	assertSame(billieJoAnnotation.eContainer(), customer);
-    	
-    	// but reference to Billie Jo was cleared
-    	assertEquals(0, billieJoAnnotation.getReferences().size());
-    	
-    	undo(cmd);
-    	
-    	assertSame(customer, billieJo.eContainer());
-    	assertSame(billieJoAnnotation.eContainer(), customer);
-    	assertTrue(billieJoAnnotation.getReferences().contains(billieJo));
-    	
-    	redo(cmd);
-    	
-    	assertDestroyed(billieJo);
-    	assertSame(billieJoAnnotation.eContainer(), customer);
-    	assertEquals(0, billieJoAnnotation.getReferences().size());
-   }
-
-    /**
-     * Tests that we cannot destroy detached elements.
-     */
-    public void test_destroyCommand_detached() {
-    	Client detachedClient = getEmployeeFactory().createClient();
-    	
-    	DestroyElementRequest req = new DestroyElementRequest(detachedClient, false);
-    	
-    	assertNull(req.getEditHelperContext());
-    	
-    	DestroyElementCommand cmd = new DestroyElementCommand(req);
-    	
-    	assertFalse(cmd.canExecute());
-   }
-    
-    /**
-     * Tests that dependents are correctly destroyed, as well.
-     */
-    public void test_destroyCommand_withDependents() {
-    	DestroyElementRequest req = new DestroyElementRequest(billieJo, false);
-    	IElementType type = ElementTypeRegistry.getInstance().getElementType(
-    			req.getEditHelperContext());
-    	
-    	assertNotNull(type);
-    	
-    	ICommand cmd = type.getEditCommand(req);
-    	
-    	assertNotNull(cmd);
-    	assertNoDuplicates(cmd);
-    	
-    	execute(cmd);
-    	
-    	assertDestroyed(billieJo);
-    	assertDestroyed(billieJoAnnotation);
-    	
-    	undo(cmd);
-    	
-    	assertSame(customer, billieJo.eContainer());
-    	assertSame(billieJoAnnotation.eContainer(), customer);
-    	assertTrue(billieJoAnnotation.getReferences().contains(billieJo));
-    	
-    	redo(cmd);
-    	
-    	assertDestroyed(billieJo);
-    	assertDestroyed(billieJoAnnotation);
-   }
-    
-    /**
-     * Tests that all contents (recursively) are correctly destroyed, as well.
-     * Incidentally tests the destruction of resource roots.
-     */
-    public void test_destroyCommand_withContainment() {
-    	// destroy the parent company (resource root)
-    	DestroyElementRequest req = new DestroyElementRequest(parentCompany, false);
-    	IElementType type = ElementTypeRegistry.getInstance().getElementType(
-    			req.getEditHelperContext());
-    	
-    	assertNotNull(type);
-    	
-    	ICommand cmd = type.getEditCommand(req);
-    	
-    	assertNotNull(cmd);
-    	assertNoDuplicates(cmd);
-    	
-    	execute(cmd);
-    	
-    	assertDestroyed(parentCompany);
-    	assertDestroyed(customer);
-    	assertDestroyed(billieJo);
-    	assertDestroyed(billieJoAnnotation);
-    	assertDestroyed(jimBob);
-    	assertDestroyed(jimBobAnnotation);
-    	
-    	undo(cmd);
-    	
-    	assertSame(getResource(), parentCompany.eResource());
-    	assertSame(parentCompany, customer.eContainer());
-    	assertSame(customer, billieJo.eContainer());
-    	assertSame(billieJoAnnotation.eContainer(), customer);
-    	assertTrue(billieJoAnnotation.getReferences().contains(billieJo));
-    	assertSame(customer, jimBob.eContainer());
-    	assertSame(jimBobAnnotation.eContainer(), customer);
-    	assertTrue(jimBobAnnotation.getReferences().contains(jimBob));
-    	
-    	redo(cmd);
-    	
-    	assertDestroyed(parentCompany);
-    	assertDestroyed(customer);
-    	assertDestroyed(billieJo);
-    	assertDestroyed(billieJoAnnotation);
-    	assertDestroyed(jimBob);
-    	assertDestroyed(jimBobAnnotation);
-    }
-
-    /**
-	 * Tests that we completely destroy cross-resource-contained objects, also
-	 * (removing them from their resource).
-	 */
-    public void test_destroy_crossResourceContained_136738() {
-    	// use the Ecore metamodel because EXTLibrary does not have any
-    	//    cross-resource containment support
-    	
-    	// create a couple of resources
-    	final Resource res1 = getEditingDomain().getResourceSet().createResource(
-    			URI.createURI("null://res1.ecore")); //$NON-NLS-1$
-    	final Resource res2 = getEditingDomain().getResourceSet().createResource(
-    			URI.createURI("null://res2.ecore")); //$NON-NLS-1$
-    	
-    	// the Ecore model
-    	final EPackage pkg1 = EcoreFactory.eINSTANCE.createEPackage();
-    	pkg1.setName("package1"); //$NON-NLS-1$
-    	final EClass class1 = EcoreFactory.eINSTANCE.createEClass();
-    	class1.setName("Class1"); //$NON-NLS-1$
-    	final EClass class2 = EcoreFactory.eINSTANCE.createEClass();
-    	class2.setName("Class2"); //$NON-NLS-1$
-    	
-    	// establish cross-resource containment
-        RecordingCommand command = new RecordingCommand(getEditingDomain()) {
-            protected void doExecute() {
-                res1.getContents().add(pkg1);
-                pkg1.getEClassifiers().add(class1);
-                pkg1.getEClassifiers().add(class2);
-                class2.getESuperTypes().add(class1);  // set a reference feature
-                
-                res2.getContents().add(class2);
-            }};
-        getEditingDomain().getCommandStack().execute(command);
-    	
-        // check that we have cross-resource containment
-        assertSame(pkg1, class2.eContainer());
-        assertSame(res2, class2.eResource());
-        
-    	DestroyElementRequest req = new DestroyElementRequest(class2, false);
-    	IElementType type = ElementTypeRegistry.getInstance().getElementType(
-    			req.getEditHelperContext());
-    	
-    	assertNotNull(type);
-    	
-    	ICommand cmd = type.getEditCommand(req);
-    	
-    	assertNotNull(cmd);
-    	assertNoDuplicates(cmd);
-    	
-    	execute(cmd);
-    	
-    	assertDestroyed(class2);
-    	assertNull(class2.eResource());
-    	
-    	undo(cmd);
-    	
-    	assertSame(pkg1, class2.eContainer());
-    	assertSame(res2, class2.eResource());
-    	assertTrue(class2.getESuperTypes().contains(class1));  // check the reference
-    	
-    	redo(cmd);
-    	
-    	assertDestroyed(class2);
-    	assertNull(class2.eResource());
-   }
-    
-    /**
-	 * Tests that the element to destroy in a DestroyRequest is the same in the
-	 * before advice as it is in the after advice.
-	 */
-    public void test_preserveElementToDestroy_142561() {
-
-		DestroyElementRequest req = new DestroyElementRequest(parentCompany,
-				false);
-		IElementType type = ElementTypeRegistry.getInstance().getElementType(
-				req.getEditHelperContext());
-
-		req.setParameter(DestroyCustomerAdvice.BEFORE, new ArrayList());
-		req.setParameter(DestroyCustomerAdvice.AFTER, new ArrayList());
-
-		assertNotNull(type);
-
-		ICommand cmd = type.getEditCommand(req);
-
-		assertNotNull(cmd);
-		assertNoDuplicates(cmd);
-
-		execute(cmd);
-
-		assertDestroyed(parentCompany);
-
-		// verify that the after advice sees the same elements to destroy in the reverse order
-		List before = (List) req.getParameter(DestroyCustomerAdvice.BEFORE);
-		List after = (List) req.getParameter(DestroyCustomerAdvice.AFTER);
-
-		Collections.reverse(after);
-		assertEquals(before, after);
-	}
-    
-    /**
-	 * Verifies the advice on the DestroyDependentsRequest (e.g.,
-	 * ClientDependentsAdvice) can access the initial element that was requested
-	 * to be destroyed.
-	 */
-    public void test_initialElementToBeDestroyed_146559() {
-    	DestroyElementRequest req = new DestroyElementRequest(parentCompany,
-				false);
-		IElementType type = ElementTypeRegistry.getInstance().getElementType(
-				req.getEditHelperContext());
-		
-		assertNotNull(type);
-
-		ICommand cmd = type.getEditCommand(req);
-
-		assertNotNull(cmd);
-		assertNoDuplicates(cmd);
-
-		execute(cmd);
-
-		assertDestroyed(parentCompany);
-
-		// verify that the dependents advice sees the same initial element to destroy
-		DestroyDependentsRequest dependentsRequest = (DestroyDependentsRequest) req
-				.getParameter(DestroyElementRequest.DESTROY_DEPENDENTS_REQUEST_PARAMETER);
-		Object initial = dependentsRequest
-				.getParameter(ClientDependentsAdvice.INITIAL);
-		
-		assertEquals(parentCompany, initial);
-    }
-    
-    //
-    // Test framework methods
-    //
-    
-    protected void doModelSetup(Resource resource) {
-        parentCompany = getEmployeeFactory().createCustomer();
-        parentCompany.setName("GlobalMega"); //$NON-NLS-1$
-        resource.getContents().add(parentCompany);
-        
-        customer = getEmployeeFactory().createCustomer();
-        customer.setName("Acme"); //$NON-NLS-1$
-        parentCompany.getSubsidiaries().add(customer);
-        
-        billieJo = createClient("Billie Jo", "Swanson", customer); //$NON-NLS-1$ //$NON-NLS-2$
-        billieJoAnnotation = createAnnotation(billieJo);
-        jimBob = createClient("Jim Bob", "Jones", customer); //$NON-NLS-1$ //$NON-NLS-2$
-        jimBobAnnotation = createAnnotation(jimBob);
-    }
-    
-    protected Client createClient(String firstName, String lastName, Customer _customer) {
-    	Client result = EmployeeFactory.eINSTANCE.createClient();
-        result.setFirstName(firstName);
-        result.setLastName(lastName);
-        _customer.getRepresentatives().add(result);
-        
-        return result;
-    }
-    
-    protected EAnnotation createAnnotation(Client client) {
-    	EAnnotation result = EcoreFactory.eINSTANCE.createEAnnotation();
-    	
-    	result.setSource(ANNOTATION_SOURCE);
-    	result.getReferences().add(client);
-    	client.getRepresents().getEAnnotations().add(result);
-    	
-    	return result;
-    }
-    
-    protected void assertDestroyed(EObject eObject) {
-    	assertTrue((eObject.eContainer() == null)
-    			|| (eObject.eContainer() instanceof ChangeDescription));
-    	
-    	// no references exist to any other object.  Note that there should not
-    	//    be a container reference of type ChangeDescription  :-)
-    	for (Iterator iter = eObject.eClass().getEAllReferences().iterator(); iter.hasNext();) {
-    		EReference next = (EReference) iter.next();
-    		
-    		assertFalse(eObject.eIsSet(next));
-    	}
-    	
-    	// in case it was a root object
-    	assertFalse(getResource().getContents().contains(eObject));
-    }
-    
-    /**
-	 * Tests that there are no duplicate commands to destroy the same element in
-	 * <code>cmd</code>. Used to verify Bugzilla 145763.
-	 * 
-	 * @param cmd
-	 *            the command to test
-	 */
-	private void assertNoDuplicates(ICommand cmd) {
-		assertNoDuplicatesImpl(cmd, new ArrayList());
-	}
-
-	private void assertNoDuplicatesImpl(ICommand cmd, List toDestroy) {
-
-		if (cmd instanceof DestroyElementCommand) {
-			try {
-				Method getElementToDestroy = DestroyElementCommand.class
-						.getDeclaredMethod("getElementToDestroy", null); //$NON-NLS-1$
-				getElementToDestroy.setAccessible(true);
-				EObject element = (EObject) getElementToDestroy.invoke(
-						cmd, null);
-
-				if (toDestroy.contains(element)) {
-					fail("Duplicate destroy command for: " + element); //$NON-NLS-1$
-				}
-				toDestroy.add(element);
-			} catch (NoSuchMethodException nsme) {
-				fail("Unexpected exception: " + nsme); //$NON-NLS-1$
-			} catch (IllegalAccessException iae) {
-				fail("Unexpected exception: " + iae); //$NON-NLS-1$
-			} catch (InvocationTargetException ite) {
-				fail("Unexpected exception: " + ite); //$NON-NLS-1$
-			}
-
-		} else if (cmd instanceof ICompositeCommand) {
-			for (Iterator i = ((ICompositeCommand) cmd).iterator(); i.hasNext();) {
-				ICommand next = (ICommand) i.next();
-				assertNoDuplicatesImpl(next, toDestroy);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/SetValueCommandTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/SetValueCommandTest.java
deleted file mode 100644
index dfcc190..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/commands/SetValueCommandTest.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006,2007 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core.commands;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.AbstractEMFTypeTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeeFactory;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * Tests the SetValueCommand.
- * 
- * @author ldamus, mmostafa
- */
-public class SetValueCommandTest
-    extends AbstractEMFTypeTest {
-
-    private Department department;
-
-    private Employee manager;
-
-    private Office managerOffice;
-
-    public SetValueCommandTest(String name) {
-        super(name);
-    }
-
-    public static Test suite() {
-        return new TestSuite(SetValueCommandTest.class);
-    }
-
-    protected void doModelSetup(Resource resource) {
-        department = (Department) getEmployeeFactory().create(
-            getEmployeePackage().getDepartment());
-        department.setName("Department"); //$NON-NLS-1$
-        resource.getContents().add(department);
-
-        manager = (Employee) getEmployeeFactory().create(
-            getEmployeePackage().getEmployee());
-
-        managerOffice = (Office) getEmployeeFactory().create(
-            getEmployeePackage().getOffice());
-    }
-
-    /**
-     * Tests that a SetValueCommand is not exectable if the element, feature and
-     * new value are not compatible with each other.
-     */
-    public void test_isExecutable() {
-
-        // correct type for feature
-        SetRequest request = new SetRequest(getEditingDomain(), department,
-            EmployeePackage.eINSTANCE.getDepartment_Manager(), manager);
-
-        SetValueCommand command = new SetValueCommand(request);
-        assertTrue(command.canExecute());
-
-        // null value in simple feature
-        request = new SetRequest(getEditingDomain(), department,
-            EmployeePackage.eINSTANCE.getDepartment_Manager(), null);
-
-        command = new SetValueCommand(request);
-        assertTrue(command.canExecute());
-
-        // incorrect type for feature
-        request = new SetRequest(getEditingDomain(), department,
-            EmployeePackage.eINSTANCE.getDepartment_Manager(), managerOffice);
-
-        command = new SetValueCommand(request);
-        assertFalse(command.canExecute());
-
-        // incorrect feature for element
-        request = new SetRequest(getEditingDomain(), department,
-            EmployeePackage.eINSTANCE.getEmployee_Office(), manager);
-
-        command = new SetValueCommand(request);
-        assertFalse(command.canExecute());
-
-        // null value in many feature
-        request = new SetRequest(getEditingDomain(), department,
-            EmployeePackage.eINSTANCE.getDepartment_Members(), null);
-
-        command = new SetValueCommand(request);
-        assertFalse(command.canExecute());
-
-        // null value in simple feature, but feature does not belong to element
-        request = new SetRequest(getEditingDomain(), manager,
-            EmployeePackage.eINSTANCE.getDepartment_Manager(), null);
-
-        command = new SetValueCommand(request);
-        assertFalse(command.canExecute());
-
-        // non-changeable feature
-        EReference managerFeature = EmployeePackage.eINSTANCE
-            .getDepartment_Manager();
-        managerFeature.setChangeable(false);
-
-        request = new SetRequest(getEditingDomain(), department,
-            managerFeature, manager);
-
-        command = new SetValueCommand(request);
-        assertFalse(command.canExecute());
-    }
-    
-    /**
-     * Most probably the problem is in the SetValueCommand#canExecute, line 89
-     * @see SetValueCommand
-     */
-    public void testSetValueCommandForManyFeatureUsingList(){
-        EStructuralFeature members = EmployeePackage.eINSTANCE.getDepartment_Members();
-        Employee e1 = EmployeeFactory.eINSTANCE.createEmployee();
-        Employee e2 = EmployeeFactory.eINSTANCE.createEmployee();
-        List list = new LinkedList(Arrays.asList(new Employee[] {e1, e2}));
-        SetRequest usingNewListInstance = new SetRequest(department, members, list);
-        SetValueCommand cmd = new SetValueCommand(usingNewListInstance);
-        verifyExecution(cmd,list);
-    }
-    
-    /**
-     * Most probably the problem is in the SetValueCommand#canExecute, line 89
-     * @see SetValueCommand
-     */
-    public void testSetValueCommandForManyFeatureUsingEmptyList(){
-        EStructuralFeature members = EmployeePackage.eINSTANCE.getDepartment_Members();
-        Employee e1 = EmployeeFactory.eINSTANCE.createEmployee();
-        Employee e2 = EmployeeFactory.eINSTANCE.createEmployee();
-        List list = new LinkedList(Arrays.asList(new Employee[] {e1, e2}));
-        SetRequest usingNewListInstance = new SetRequest(department, members, list);
-        SetValueCommand cmd = new SetValueCommand(usingNewListInstance);
-        verifyExecution(cmd,list);
-        List list2 = new ArrayList();
-        SetRequest usingNewEmptyListInstance = new SetRequest(department, members, list2);
-        SetValueCommand cmd2 = new SetValueCommand(usingNewEmptyListInstance);
-        verifyExecution(cmd2,list2);
-    }
-    
-    /**
-     * Most probably the problem is in the SetValueCommand#canExecute, line 89
-     * @see SetValueCommand
-     */
-    public void testSetValueCommandForManyFeatureUsingList_VerifyOldValuesRemoved(){
-        EStructuralFeature members = EmployeePackage.eINSTANCE.getDepartment_Members();
-        Employee e1 = EmployeeFactory.eINSTANCE.createEmployee();
-        Employee e2 = EmployeeFactory.eINSTANCE.createEmployee();
-        List list = new LinkedList(Arrays.asList(new Employee[] {e1, e2}));
-        SetRequest usingNewListInstance = new SetRequest(department, members, list);
-        SetValueCommand cmd = new SetValueCommand(usingNewListInstance);
-        verifyExecution(cmd,list);
-        Employee e3 = EmployeeFactory.eINSTANCE.createEmployee();
-        Employee e4 = EmployeeFactory.eINSTANCE.createEmployee();
-        List list2 = new LinkedList(Arrays.asList(new Employee[] {e3, e4}));
-        SetRequest usingNewEmptyListInstance = new SetRequest(department, members, list2);
-        SetValueCommand cmd2 = new SetValueCommand(usingNewEmptyListInstance);
-        verifyExecution(cmd2,list2);
-    }
- 
-    /**
-     * Most probably the problem is in the SetValueCommand#canExecute, line 89
-     * @see SetValueCommand
-     */
-    public void testSetValueCommandForManyFeatureUsingSingleValue(){
-        EStructuralFeature members = EmployeePackage.eINSTANCE.getDepartment_Members();
-        Employee e1 = EmployeeFactory.eINSTANCE.createEmployee();
-        Employee e2 = EmployeeFactory.eINSTANCE.createEmployee();
-        SetRequest usingSingleValue1 = new SetRequest(department, members, e1);
-        SetValueCommand cmd1 = new SetValueCommand(usingSingleValue1);
-        verifyExecution(cmd1,e1,1);
-        SetRequest usingSingleValue2 = new SetRequest(department, members, e2);
-        SetValueCommand cmd2 = new SetValueCommand(usingSingleValue2);
-        verifyExecution(cmd2,e2,2);
-        
-    }
-    
-    private void verifyExecution(SetValueCommand cmd, List list) {
-        try {
-            assertTrue("Cannot Execute command",cmd.canExecute()); //$NON-NLS-1$
-            cmd.execute(new NullProgressMonitor(), null);
-            List list2 = department.getMembers();
-            assertTrue("UnexpectedSize", list2.size()==list.size()); //$NON-NLS-1$
-            for (Iterator itr = list.iterator(); itr.hasNext();) {
-                Object element = itr.next();
-                assertTrue("Element not added", list2.contains(element)); //$NON-NLS-1$
-            }
-        } catch (ExecutionException e) {
-            assertTrue("failed to exectue the command",false); //$NON-NLS-1$
-            e.printStackTrace();
-        }
-    }
-    
-    private void verifyExecution(SetValueCommand cmd, Object object,int size) {
-        try {
-            assertTrue("Cannot Execute command",cmd.canExecute()); //$NON-NLS-1$
-            cmd.execute(new NullProgressMonitor(), null);
-            List list2 = department.getMembers();
-            assertTrue("UnexpectedSize", list2.size()==size); //$NON-NLS-1$
-            assertTrue("Element not added", list2.contains(object)); //$NON-NLS-1$
-        } catch (ExecutionException e) {
-            assertTrue("failed to exectue the command",false); //$NON-NLS-1$
-            e.printStackTrace();
-        }
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Band.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Band.java
deleted file mode 100644
index 69fe1d1..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Band.java
+++ /dev/null

@@ -1,237 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-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>Band</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getBand()
- * @model
- * @generated
- */
-public final class Band extends AbstractEnumerator {
-	/**
-	 * The '<em><b>Junior</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JUNIOR_LITERAL
-	 * @model name="junior"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JUNIOR = 0;
-
-	/**
-	 * The '<em><b>Senior</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SENIOR_LITERAL
-	 * @model name="senior"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SENIOR = 1;
-
-	/**
-	 * The '<em><b>Manager</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MANAGER_LITERAL
-	 * @model name="manager"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MANAGER = 2;
-
-	/**
-	 * The '<em><b>Director</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DIRECTOR_LITERAL
-	 * @model name="director"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DIRECTOR = 3;
-
-	/**
-	 * The '<em><b>Executive</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXECUTIVE_LITERAL
-	 * @model name="executive"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXECUTIVE = 4;
-
-	/**
-	 * The '<em><b>Junior</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Junior</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JUNIOR
-	 * @generated
-	 * @ordered
-	 */
-	public static final Band JUNIOR_LITERAL = new Band(JUNIOR, "junior", "junior"); //$NON-NLS-1$//$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Senior</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Senior</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SENIOR
-	 * @generated
-	 * @ordered
-	 */
-	public static final Band SENIOR_LITERAL = new Band(SENIOR, "senior", "senior"); //$NON-NLS-1$//$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Manager</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Manager</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANAGER
-	 * @generated
-	 * @ordered
-	 */
-	public static final Band MANAGER_LITERAL = new Band(MANAGER, "manager", "manager"); //$NON-NLS-1$//$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Director</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Director</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DIRECTOR
-	 * @generated
-	 * @ordered
-	 */
-	public static final Band DIRECTOR_LITERAL = new Band(DIRECTOR, "director", "director"); //$NON-NLS-1$//$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Executive</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Executive</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXECUTIVE
-	 * @generated
-	 * @ordered
-	 */
-	public static final Band EXECUTIVE_LITERAL = new Band(EXECUTIVE, "executive", "executive"); //$NON-NLS-1$//$NON-NLS-2$
-
-	/**
-	 * An array of all the '<em><b>Band</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Band[] VALUES_ARRAY =
-		new Band[] {
-			JUNIOR_LITERAL,
-			SENIOR_LITERAL,
-			MANAGER_LITERAL,
-			DIRECTOR_LITERAL,
-			EXECUTIVE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Band</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>Band</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Band get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Band result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Band</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Band getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Band result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Band</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Band get(int value) {
-		switch (value) {
-			case JUNIOR: return JUNIOR_LITERAL;
-			case SENIOR: return SENIOR_LITERAL;
-			case MANAGER: return MANAGER_LITERAL;
-			case DIRECTOR: return DIRECTOR_LITERAL;
-			case EXECUTIVE: return EXECUTIVE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Band(int value, String name, String literal) {
-		super(value, name, literal);
-	}
-
-} //Band

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Client.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Client.java
deleted file mode 100644
index b58affe..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Client.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Client.java,v 1.1 2006/03/07 02:40:36 ldamus Exp $
- */
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Client</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getFirstName <em>First Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getLastName <em>Last Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getRepresents <em>Represents</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getClient()
- * @model
- * @generated
- */
-public interface Client extends EObject, EModelElement {
-	/**
-	 * Returns the value of the '<em><b>First Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First 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>First Name</em>' attribute.
-	 * @see #setFirstName(String)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getClient_FirstName()
-	 * @model
-	 * @generated
-	 */
-	String getFirstName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getFirstName <em>First Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First Name</em>' attribute.
-	 * @see #getFirstName()
-	 * @generated
-	 */
-	void setFirstName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Last Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Last 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>Last Name</em>' attribute.
-	 * @see #setLastName(String)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getClient_LastName()
-	 * @model
-	 * @generated
-	 */
-	String getLastName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getLastName <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Last Name</em>' attribute.
-	 * @see #getLastName()
-	 * @generated
-	 */
-	void setLastName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Represents</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getRepresentatives <em>Representatives</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Represents</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Represents</em>' container reference.
-	 * @see #setRepresents(Customer)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getClient_Represents()
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getRepresentatives
-	 * @model opposite="representatives"
-	 * @generated
-	 */
-	Customer getRepresents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getRepresents <em>Represents</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Represents</em>' container reference.
-	 * @see #getRepresents()
-	 * @generated
-	 */
-	void setRepresents(Customer value);
-
-} // Client

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Customer.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Customer.java
deleted file mode 100644
index bf81c96..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Customer.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Customer.java,v 1.1 2006/03/07 02:40:36 ldamus Exp $
- */
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Customer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getRepresentatives <em>Representatives</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getSubsidiaries <em>Subsidiaries</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getParent <em>Parent</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getCustomer()
- * @model
- * @generated
- */
-public interface Customer extends EObject, EModelElement {
-	/**
-	 * 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.tests.runtime.emf.type.core.employee.EmployeePackage#getCustomer_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#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);
-
-	/**
-	 * Returns the value of the '<em><b>Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Address</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Address</em>' attribute.
-	 * @see #setAddress(String)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getCustomer_Address()
-	 * @model
-	 * @generated
-	 */
-	String getAddress();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getAddress <em>Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Address</em>' attribute.
-	 * @see #getAddress()
-	 * @generated
-	 */
-	void setAddress(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Representatives</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getRepresents <em>Represents</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Representatives</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>Representatives</em>' containment reference list.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getCustomer_Representatives()
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getRepresents
-	 * @model type="org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client" opposite="represents" containment="true"
-	 * @generated
-	 */
-	EList getRepresentatives();
-
-	/**
-	 * Returns the value of the '<em><b>Subsidiaries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getParent <em>Parent</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Subsidiaries</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>Subsidiaries</em>' containment reference list.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getCustomer_Subsidiaries()
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getParent
-	 * @model type="org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer" opposite="parent" containment="true"
-	 * @generated
-	 */
-	EList getSubsidiaries();
-
-	/**
-	 * Returns the value of the '<em><b>Parent</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getSubsidiaries <em>Subsidiaries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent</em>' container reference.
-	 * @see #setParent(Customer)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getCustomer_Parent()
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getSubsidiaries
-	 * @model opposite="subsidiaries"
-	 * @generated
-	 */
-	Customer getParent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getParent <em>Parent</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent</em>' container reference.
-	 * @see #getParent()
-	 * @generated
-	 */
-	void setParent(Customer value);
-
-} // Customer

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Department.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Department.java
deleted file mode 100644
index 12bc672..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Department.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Department</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getMembers <em>Members</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getManager <em>Manager</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getDepartment()
- * @model
- * @generated
- */
-public interface Department extends EObject, EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Number</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Number</em>' attribute.
-	 * @see #setNumber(int)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getDepartment_Number()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getNumber();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getNumber <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Number</em>' attribute.
-	 * @see #getNumber()
-	 * @generated
-	 */
-	void setNumber(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- 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.tests.runtime.emf.type.core.employee.EmployeePackage#getDepartment_Name()
-	 * @model default="" required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#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);
-
-	/**
-	 * Returns the value of the '<em><b>Members</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getDepartment <em>Department</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Members</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Members</em>' containment reference list.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getDepartment_Members()
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getDepartment
-	 * @model type="org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee" opposite="department" containment="true"
-	 * @generated
-	 */
-	EList getMembers();
-
-	/**
-	 * Returns the value of the '<em><b>Manager</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Manager</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Manager</em>' containment reference.
-	 * @see #setManager(Employee)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getDepartment_Manager()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Employee getManager();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getManager <em>Manager</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Manager</em>' containment reference.
-	 * @see #getManager()
-	 * @generated
-	 */
-	void setManager(Employee value);
-
-} // Department

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Employee.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Employee.java
deleted file mode 100644
index 024593d..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Employee.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Employee</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getSalary <em>Salary</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getBand <em>Band</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isSecurityClearance <em>Security Clearance</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getDepartment <em>Department</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isFullTime <em>Full Time</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getOffice <em>Office</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee()
- * @model
- * @generated
- */
-public interface Employee extends EObject, EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Salary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Salary</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Salary</em>' attribute.
-	 * @see #setSalary(int)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee_Salary()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getSalary();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getSalary <em>Salary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Salary</em>' attribute.
-	 * @see #getSalary()
-	 * @generated
-	 */
-	void setSalary(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Band</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Band</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Band</em>' attribute.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band
-	 * @see #setBand(Band)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee_Band()
-	 * @model required="true"
-	 * @generated
-	 */
-	Band getBand();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getBand <em>Band</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Band</em>' attribute.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band
-	 * @see #getBand()
-	 * @generated
-	 */
-	void setBand(Band value);
-
-	/**
-	 * Returns the value of the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Number</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Number</em>' attribute.
-	 * @see #setNumber(int)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee_Number()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getNumber();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getNumber <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Number</em>' attribute.
-	 * @see #getNumber()
-	 * @generated
-	 */
-	void setNumber(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Office</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Office</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Office</em>' containment reference.
-	 * @see #setOffice(Office)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee_Office()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Office getOffice();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getOffice <em>Office</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Office</em>' containment reference.
-	 * @see #getOffice()
-	 * @generated
-	 */
-	void setOffice(Office value);
-
-	/**
-	 * Returns the value of the '<em><b>Security Clearance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Security Clearance</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Security Clearance</em>' attribute.
-	 * @see #setSecurityClearance(boolean)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee_SecurityClearance()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isSecurityClearance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isSecurityClearance <em>Security Clearance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Security Clearance</em>' attribute.
-	 * @see #isSecurityClearance()
-	 * @generated
-	 */
-	void setSecurityClearance(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Department</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getMembers <em>Members</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Department</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Department</em>' container reference.
-	 * @see #setDepartment(Department)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee_Department()
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getMembers
-	 * @model opposite="members" required="true"
-	 * @generated
-	 */
-	Department getDepartment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getDepartment <em>Department</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Department</em>' container reference.
-	 * @see #getDepartment()
-	 * @generated
-	 */
-	void setDepartment(Department value);
-
-	/**
-	 * Returns the value of the '<em><b>Full Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Full Time</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Full Time</em>' attribute.
-	 * @see #setFullTime(boolean)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getEmployee_FullTime()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isFullTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isFullTime <em>Full Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Full Time</em>' attribute.
-	 * @see #isFullTime()
-	 * @generated
-	 */
-	void setFullTime(boolean value);
-
-} // Employee

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/EmployeeFactory.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/EmployeeFactory.java
deleted file mode 100644
index 4ef5949..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/EmployeeFactory.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-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.tests.runtime.emf.type.core.employee.EmployeePackage
- * @generated
- */
-public interface EmployeeFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EmployeeFactory eINSTANCE = org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Employee</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Employee</em>'.
-	 * @generated
-	 */
-	Employee createEmployee();
-
-	/**
-	 * Returns a new object of class '<em>Office</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Office</em>'.
-	 * @generated
-	 */
-	Office createOffice();
-
-	/**
-	 * Returns a new object of class '<em>Department</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Department</em>'.
-	 * @generated
-	 */
-	Department createDepartment();
-
-	/**
-	 * Returns a new object of class '<em>Student</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Student</em>'.
-	 * @generated
-	 */
-	Student createStudent();
-
-	/**
-	 * Returns a new object of class '<em>Location</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Location</em>'.
-	 * @generated
-	 */
-	Location createLocation();
-
-	/**
-	 * Returns a new object of class '<em>Client</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Client</em>'.
-	 * @generated
-	 */
-	Client createClient();
-
-	/**
-	 * Returns a new object of class '<em>Customer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Customer</em>'.
-	 * @generated
-	 */
-	Customer createCustomer();
-
-	/**
-	 * Returns a new object of class '<em>High School Student</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>High School Student</em>'.
-	 * @generated
-	 */
-	HighSchoolStudent createHighSchoolStudent();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	EmployeePackage getEmployeePackage();
-
-} //EmployeeFactory

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/EmployeePackage.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/EmployeePackage.java
deleted file mode 100644
index 0fee9f3..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/EmployeePackage.java
+++ /dev/null

@@ -1,1260 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-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.EcorePackage;
-
-/**
- * <!-- 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.tests.runtime.emf.type.core.employee.EmployeeFactory
- * @model kind="package"
- * @generated
- */
-public interface EmployeePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "employee"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "Employee"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EmployeePackage eINSTANCE = org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl <em>Employee</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getEmployee()
-	 * @generated
-	 */
-	int EMPLOYEE = 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Salary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__SALARY = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Band</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__BAND = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__NUMBER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Security Clearance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__SECURITY_CLEARANCE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Department</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__DEPARTMENT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Full Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__FULL_TIME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Office</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE__OFFICE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Employee</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMPLOYEE_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.OfficeImpl <em>Office</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.OfficeImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getOffice()
-	 * @generated
-	 */
-	int OFFICE = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl <em>Department</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getDepartment()
-	 * @generated
-	 */
-	int DEPARTMENT = 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPARTMENT__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPARTMENT__NUMBER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPARTMENT__NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Members</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPARTMENT__MEMBERS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Manager</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPARTMENT__MANAGER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Department</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPARTMENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OFFICE__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Number Of Windows</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OFFICE__NUMBER_OF_WINDOWS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Has Door</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OFFICE__HAS_DOOR = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Office</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OFFICE_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.StudentImpl <em>Student</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.StudentImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getStudent()
-	 * @generated
-	 */
-	int STUDENT = 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__EANNOTATIONS = EMPLOYEE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Salary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__SALARY = EMPLOYEE__SALARY;
-
-	/**
-	 * The feature id for the '<em><b>Band</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__BAND = EMPLOYEE__BAND;
-
-	/**
-	 * The feature id for the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__NUMBER = EMPLOYEE__NUMBER;
-
-	/**
-	 * The feature id for the '<em><b>Security Clearance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__SECURITY_CLEARANCE = EMPLOYEE__SECURITY_CLEARANCE;
-
-	/**
-	 * The feature id for the '<em><b>Department</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__DEPARTMENT = EMPLOYEE__DEPARTMENT;
-
-	/**
-	 * The feature id for the '<em><b>Full Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__FULL_TIME = EMPLOYEE__FULL_TIME;
-
-	/**
-	 * The feature id for the '<em><b>Office</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__OFFICE = EMPLOYEE__OFFICE;
-
-	/**
-	 * The feature id for the '<em><b>Coop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT__COOP = EMPLOYEE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Student</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STUDENT_FEATURE_COUNT = EMPLOYEE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.LocationImpl <em>Location</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.LocationImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getLocation()
-	 * @generated
-	 */
-	int LOCATION = 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The number of structural features of the '<em>Location</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.ClientImpl <em>Client</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.ClientImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getClient()
-	 * @generated
-	 */
-	int CLIENT = 5;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>First Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT__FIRST_NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Last Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT__LAST_NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Represents</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT__REPRESENTS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Client</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLIENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl <em>Customer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getCustomer()
-	 * @generated
-	 */
-	int CUSTOMER = 6;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOMER__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOMER__NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOMER__ADDRESS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Representatives</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOMER__REPRESENTATIVES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Subsidiaries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOMER__SUBSIDIARIES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Parent</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOMER__PARENT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Customer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOMER_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.HighSchoolStudentImpl <em>High School Student</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.HighSchoolStudentImpl
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getHighSchoolStudent()
-	 * @generated
-	 */
-	int HIGH_SCHOOL_STUDENT = 7;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__EANNOTATIONS = STUDENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Salary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__SALARY = STUDENT__SALARY;
-
-	/**
-	 * The feature id for the '<em><b>Band</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__BAND = STUDENT__BAND;
-
-	/**
-	 * The feature id for the '<em><b>Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__NUMBER = STUDENT__NUMBER;
-
-	/**
-	 * The feature id for the '<em><b>Security Clearance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__SECURITY_CLEARANCE = STUDENT__SECURITY_CLEARANCE;
-
-	/**
-	 * The feature id for the '<em><b>Department</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__DEPARTMENT = STUDENT__DEPARTMENT;
-
-	/**
-	 * The feature id for the '<em><b>Full Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__FULL_TIME = STUDENT__FULL_TIME;
-
-	/**
-	 * The feature id for the '<em><b>Office</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__OFFICE = STUDENT__OFFICE;
-
-	/**
-	 * The feature id for the '<em><b>Coop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT__COOP = STUDENT__COOP;
-
-	/**
-	 * The number of structural features of the '<em>High School Student</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HIGH_SCHOOL_STUDENT_FEATURE_COUNT = STUDENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band <em>Band</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getBand()
-	 * @generated
-	 */
-	int BAND = 8;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee <em>Employee</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Employee</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee
-	 * @generated
-	 */
-	EClass getEmployee();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getSalary <em>Salary</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Salary</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getSalary()
-	 * @see #getEmployee()
-	 * @generated
-	 */
-	EAttribute getEmployee_Salary();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getBand <em>Band</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Band</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getBand()
-	 * @see #getEmployee()
-	 * @generated
-	 */
-	EAttribute getEmployee_Band();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getNumber <em>Number</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Number</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getNumber()
-	 * @see #getEmployee()
-	 * @generated
-	 */
-	EAttribute getEmployee_Number();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getOffice <em>Office</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Office</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getOffice()
-	 * @see #getEmployee()
-	 * @generated
-	 */
-	EReference getEmployee_Office();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isSecurityClearance <em>Security Clearance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Security Clearance</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isSecurityClearance()
-	 * @see #getEmployee()
-	 * @generated
-	 */
-	EAttribute getEmployee_SecurityClearance();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getDepartment <em>Department</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Department</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#getDepartment()
-	 * @see #getEmployee()
-	 * @generated
-	 */
-	EReference getEmployee_Department();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isFullTime <em>Full Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Full Time</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee#isFullTime()
-	 * @see #getEmployee()
-	 * @generated
-	 */
-	EAttribute getEmployee_FullTime();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office <em>Office</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Office</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office
-	 * @generated
-	 */
-	EClass getOffice();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#getNumberOfWindows <em>Number Of Windows</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Number Of Windows</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#getNumberOfWindows()
-	 * @see #getOffice()
-	 * @generated
-	 */
-	EAttribute getOffice_NumberOfWindows();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#isHasDoor <em>Has Door</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Door</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#isHasDoor()
-	 * @see #getOffice()
-	 * @generated
-	 */
-	EAttribute getOffice_HasDoor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department <em>Department</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Department</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department
-	 * @generated
-	 */
-	EClass getDepartment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getNumber <em>Number</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Number</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getNumber()
-	 * @see #getDepartment()
-	 * @generated
-	 */
-	EAttribute getDepartment_Number();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getName()
-	 * @see #getDepartment()
-	 * @generated
-	 */
-	EAttribute getDepartment_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getMembers <em>Members</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Members</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getMembers()
-	 * @see #getDepartment()
-	 * @generated
-	 */
-	EReference getDepartment_Members();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getManager <em>Manager</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Manager</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department#getManager()
-	 * @see #getDepartment()
-	 * @generated
-	 */
-	EReference getDepartment_Manager();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student <em>Student</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Student</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student
-	 * @generated
-	 */
-	EClass getStudent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student#isCoop <em>Coop</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Coop</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student#isCoop()
-	 * @see #getStudent()
-	 * @generated
-	 */
-	EAttribute getStudent_Coop();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Location <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Location</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Location
-	 * @generated
-	 */
-	EClass getLocation();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client <em>Client</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Client</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client
-	 * @generated
-	 */
-	EClass getClient();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getFirstName <em>First Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>First Name</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getFirstName()
-	 * @see #getClient()
-	 * @generated
-	 */
-	EAttribute getClient_FirstName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getLastName <em>Last Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Last Name</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getLastName()
-	 * @see #getClient()
-	 * @generated
-	 */
-	EAttribute getClient_LastName();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getRepresents <em>Represents</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Represents</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client#getRepresents()
-	 * @see #getClient()
-	 * @generated
-	 */
-	EReference getClient_Represents();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer <em>Customer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Customer</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer
-	 * @generated
-	 */
-	EClass getCustomer();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getName()
-	 * @see #getCustomer()
-	 * @generated
-	 */
-	EAttribute getCustomer_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Address</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getAddress()
-	 * @see #getCustomer()
-	 * @generated
-	 */
-	EAttribute getCustomer_Address();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getRepresentatives <em>Representatives</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Representatives</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getRepresentatives()
-	 * @see #getCustomer()
-	 * @generated
-	 */
-	EReference getCustomer_Representatives();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getSubsidiaries <em>Subsidiaries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Subsidiaries</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getSubsidiaries()
-	 * @see #getCustomer()
-	 * @generated
-	 */
-	EReference getCustomer_Subsidiaries();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getParent <em>Parent</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Parent</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer#getParent()
-	 * @see #getCustomer()
-	 * @generated
-	 */
-	EReference getCustomer_Parent();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.HighSchoolStudent <em>High School Student</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>High School Student</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.HighSchoolStudent
-	 * @generated
-	 */
-	EClass getHighSchoolStudent();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band <em>Band</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Band</em>'.
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band
-	 * @generated
-	 */
-	EEnum getBand();
-
-	/**
-	 * 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
-	 */
-	EmployeeFactory getEmployeeFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that 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 -->
-	 * @generated
-	 */
-	interface Literals  {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl <em>Employee</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getEmployee()
-		 * @generated
-		 */
-		EClass EMPLOYEE = eINSTANCE.getEmployee();
-
-		/**
-		 * The meta object literal for the '<em><b>Salary</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EMPLOYEE__SALARY = eINSTANCE.getEmployee_Salary();
-
-		/**
-		 * The meta object literal for the '<em><b>Band</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EMPLOYEE__BAND = eINSTANCE.getEmployee_Band();
-
-		/**
-		 * The meta object literal for the '<em><b>Number</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EMPLOYEE__NUMBER = eINSTANCE.getEmployee_Number();
-
-		/**
-		 * The meta object literal for the '<em><b>Security Clearance</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EMPLOYEE__SECURITY_CLEARANCE = eINSTANCE.getEmployee_SecurityClearance();
-
-		/**
-		 * The meta object literal for the '<em><b>Department</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EMPLOYEE__DEPARTMENT = eINSTANCE.getEmployee_Department();
-
-		/**
-		 * The meta object literal for the '<em><b>Full Time</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute EMPLOYEE__FULL_TIME = eINSTANCE.getEmployee_FullTime();
-
-		/**
-		 * The meta object literal for the '<em><b>Office</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EMPLOYEE__OFFICE = eINSTANCE.getEmployee_Office();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl <em>Department</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getDepartment()
-		 * @generated
-		 */
-		EClass DEPARTMENT = eINSTANCE.getDepartment();
-
-		/**
-		 * The meta object literal for the '<em><b>Number</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DEPARTMENT__NUMBER = eINSTANCE.getDepartment_Number();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DEPARTMENT__NAME = eINSTANCE.getDepartment_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Members</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEPARTMENT__MEMBERS = eINSTANCE.getDepartment_Members();
-
-		/**
-		 * The meta object literal for the '<em><b>Manager</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEPARTMENT__MANAGER = eINSTANCE.getDepartment_Manager();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.OfficeImpl <em>Office</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.OfficeImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getOffice()
-		 * @generated
-		 */
-		EClass OFFICE = eINSTANCE.getOffice();
-
-		/**
-		 * The meta object literal for the '<em><b>Number Of Windows</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OFFICE__NUMBER_OF_WINDOWS = eINSTANCE.getOffice_NumberOfWindows();
-
-		/**
-		 * The meta object literal for the '<em><b>Has Door</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OFFICE__HAS_DOOR = eINSTANCE.getOffice_HasDoor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.StudentImpl <em>Student</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.StudentImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getStudent()
-		 * @generated
-		 */
-		EClass STUDENT = eINSTANCE.getStudent();
-
-		/**
-		 * The meta object literal for the '<em><b>Coop</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute STUDENT__COOP = eINSTANCE.getStudent_Coop();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.LocationImpl <em>Location</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.LocationImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getLocation()
-		 * @generated
-		 */
-		EClass LOCATION = eINSTANCE.getLocation();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.ClientImpl <em>Client</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.ClientImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getClient()
-		 * @generated
-		 */
-		EClass CLIENT = eINSTANCE.getClient();
-
-		/**
-		 * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CLIENT__FIRST_NAME = eINSTANCE.getClient_FirstName();
-
-		/**
-		 * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CLIENT__LAST_NAME = eINSTANCE.getClient_LastName();
-
-		/**
-		 * The meta object literal for the '<em><b>Represents</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CLIENT__REPRESENTS = eINSTANCE.getClient_Represents();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl <em>Customer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getCustomer()
-		 * @generated
-		 */
-		EClass CUSTOMER = eINSTANCE.getCustomer();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CUSTOMER__NAME = eINSTANCE.getCustomer_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Address</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CUSTOMER__ADDRESS = eINSTANCE.getCustomer_Address();
-
-		/**
-		 * The meta object literal for the '<em><b>Representatives</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CUSTOMER__REPRESENTATIVES = eINSTANCE.getCustomer_Representatives();
-
-		/**
-		 * The meta object literal for the '<em><b>Subsidiaries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CUSTOMER__SUBSIDIARIES = eINSTANCE.getCustomer_Subsidiaries();
-
-		/**
-		 * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CUSTOMER__PARENT = eINSTANCE.getCustomer_Parent();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.HighSchoolStudentImpl <em>High School Student</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.HighSchoolStudentImpl
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getHighSchoolStudent()
-		 * @generated
-		 */
-		EClass HIGH_SCHOOL_STUDENT = eINSTANCE.getHighSchoolStudent();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band <em>Band</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band
-		 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeePackageImpl#getBand()
-		 * @generated
-		 */
-		EEnum BAND = eINSTANCE.getBand();
-
-	}
-
-} //EmployeePackage

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/HighSchoolStudent.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/HighSchoolStudent.java
deleted file mode 100644
index b7222fe..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/HighSchoolStudent.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: HighSchoolStudent.java,v 1.2 2006/10/03 15:09:33 ahunter Exp $
- */
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>High School Student</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getHighSchoolStudent()
- * @model
- * @generated
- */
-public interface HighSchoolStudent extends Student {
-} // HighSchoolStudent
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Location.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Location.java
deleted file mode 100644
index e37954c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Location.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Location</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getLocation()
- * @model
- * @generated
- */
-public interface Location extends EObject, EModelElement {
-// do nothing
-} // Location

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Office.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Office.java
deleted file mode 100644
index b79e731..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Office.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Office</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#getNumberOfWindows <em>Number Of Windows</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#isHasDoor <em>Has Door</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getOffice()
- * @model
- * @generated
- */
-public interface Office extends EObject, EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Number Of Windows</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Number Of Windows</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Number Of Windows</em>' attribute.
-	 * @see #setNumberOfWindows(int)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getOffice_NumberOfWindows()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getNumberOfWindows();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#getNumberOfWindows <em>Number Of Windows</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Number Of Windows</em>' attribute.
-	 * @see #getNumberOfWindows()
-	 * @generated
-	 */
-	void setNumberOfWindows(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Has Door</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Has Door</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Has Door</em>' attribute.
-	 * @see #setHasDoor(boolean)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getOffice_HasDoor()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isHasDoor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office#isHasDoor <em>Has Door</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Door</em>' attribute.
-	 * @see #isHasDoor()
-	 * @generated
-	 */
-	void setHasDoor(boolean value);
-
-} // Office

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Student.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Student.java
deleted file mode 100644
index ecc6d74..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/Student.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Student</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student#isCoop <em>Coop</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getStudent()
- * @model
- * @generated
- */
-public interface Student extends Employee{
-	/**
-	 * Returns the value of the '<em><b>Coop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Coop</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Coop</em>' attribute.
-	 * @see #setCoop(boolean)
-	 * @see org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage#getStudent_Coop()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isCoop();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student#isCoop <em>Coop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Coop</em>' attribute.
-	 * @see #isCoop()
-	 * @generated
-	 */
-	void setCoop(boolean value);
-
-} // Student

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/ClientImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/ClientImpl.java
deleted file mode 100644
index 432965c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/ClientImpl.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ClientImpl.java,v 1.2 2006/05/25 21:36:05 ldamus Exp $
- */
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;
-
-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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Client</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.ClientImpl#getFirstName <em>First Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.ClientImpl#getLastName <em>Last Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.ClientImpl#getRepresents <em>Represents</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ClientImpl extends EModelElementImpl implements Client {
-	/**
-	 * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFirstName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIRST_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFirstName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String firstName = FIRST_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLastName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LAST_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLastName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lastName = LAST_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ClientImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.CLIENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFirstName() {
-		return firstName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFirstName(String newFirstName) {
-		String oldFirstName = firstName;
-		firstName = newFirstName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.CLIENT__FIRST_NAME, oldFirstName, firstName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLastName() {
-		return lastName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLastName(String newLastName) {
-		String oldLastName = lastName;
-		lastName = newLastName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.CLIENT__LAST_NAME, oldLastName, lastName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Customer getRepresents() {
-		if (eContainerFeatureID != EmployeePackage.CLIENT__REPRESENTS) return null;
-		return (Customer)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRepresents(Customer newRepresents, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newRepresents, EmployeePackage.CLIENT__REPRESENTS, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRepresents(Customer newRepresents) {
-		if (newRepresents != eInternalContainer() || (eContainerFeatureID != EmployeePackage.CLIENT__REPRESENTS && newRepresents != null)) {
-			if (EcoreUtil.isAncestor(this, newRepresents))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRepresents != null)
-				msgs = ((InternalEObject)newRepresents).eInverseAdd(this, EmployeePackage.CUSTOMER__REPRESENTATIVES, Customer.class, msgs);
-			msgs = basicSetRepresents(newRepresents, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.CLIENT__REPRESENTS, newRepresents, newRepresents));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.CLIENT__REPRESENTS:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetRepresents((Customer)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.CLIENT__REPRESENTS:
-				return basicSetRepresents(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EmployeePackage.CLIENT__REPRESENTS:
-				return eInternalContainer().eInverseRemove(this, EmployeePackage.CUSTOMER__REPRESENTATIVES, Customer.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EmployeePackage.CLIENT__FIRST_NAME:
-				return getFirstName();
-			case EmployeePackage.CLIENT__LAST_NAME:
-				return getLastName();
-			case EmployeePackage.CLIENT__REPRESENTS:
-				return getRepresents();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EmployeePackage.CLIENT__FIRST_NAME:
-				setFirstName((String)newValue);
-				return;
-			case EmployeePackage.CLIENT__LAST_NAME:
-				setLastName((String)newValue);
-				return;
-			case EmployeePackage.CLIENT__REPRESENTS:
-				setRepresents((Customer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.CLIENT__FIRST_NAME:
-				setFirstName(FIRST_NAME_EDEFAULT);
-				return;
-			case EmployeePackage.CLIENT__LAST_NAME:
-				setLastName(LAST_NAME_EDEFAULT);
-				return;
-			case EmployeePackage.CLIENT__REPRESENTS:
-				setRepresents((Customer)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.CLIENT__FIRST_NAME:
-				return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName);
-			case EmployeePackage.CLIENT__LAST_NAME:
-				return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
-			case EmployeePackage.CLIENT__REPRESENTS:
-				return getRepresents() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (firstName: "); //$NON-NLS-1$
-		result.append(firstName);
-		result.append(", lastName: "); //$NON-NLS-1$
-		result.append(lastName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ClientImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/CustomerImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/CustomerImpl.java
deleted file mode 100644
index bfe87bf..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/CustomerImpl.java
+++ /dev/null

@@ -1,395 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CustomerImpl.java,v 1.2 2006/05/25 21:36:05 ldamus Exp $
- */
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Customer</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl#getAddress <em>Address</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl#getRepresentatives <em>Representatives</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl#getSubsidiaries <em>Subsidiaries</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.CustomerImpl#getParent <em>Parent</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomerImpl extends EModelElementImpl implements Customer {
-	/**
-	 * 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;
-
-	/**
-	 * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String address = ADDRESS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRepresentatives() <em>Representatives</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepresentatives()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList representatives = null;
-
-	/**
-	 * The cached value of the '{@link #getSubsidiaries() <em>Subsidiaries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubsidiaries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList subsidiaries = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.CUSTOMER;
-	}
-
-	/**
-	 * <!-- 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, EmployeePackage.CUSTOMER__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAddress() {
-		return address;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAddress(String newAddress) {
-		String oldAddress = address;
-		address = newAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.CUSTOMER__ADDRESS, oldAddress, address));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRepresentatives() {
-		if (representatives == null) {
-			representatives = new EObjectContainmentWithInverseEList(Client.class, this, EmployeePackage.CUSTOMER__REPRESENTATIVES, EmployeePackage.CLIENT__REPRESENTS);
-		}
-		return representatives;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSubsidiaries() {
-		if (subsidiaries == null) {
-			subsidiaries = new EObjectContainmentWithInverseEList(Customer.class, this, EmployeePackage.CUSTOMER__SUBSIDIARIES, EmployeePackage.CUSTOMER__PARENT);
-		}
-		return subsidiaries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Customer getParent() {
-		if (eContainerFeatureID != EmployeePackage.CUSTOMER__PARENT) return null;
-		return (Customer)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetParent(Customer newParent, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newParent, EmployeePackage.CUSTOMER__PARENT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParent(Customer newParent) {
-		if (newParent != eInternalContainer() || (eContainerFeatureID != EmployeePackage.CUSTOMER__PARENT && newParent != null)) {
-			if (EcoreUtil.isAncestor(this, newParent))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newParent != null)
-				msgs = ((InternalEObject)newParent).eInverseAdd(this, EmployeePackage.CUSTOMER__SUBSIDIARIES, Customer.class, msgs);
-			msgs = basicSetParent(newParent, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.CUSTOMER__PARENT, newParent, newParent));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.CUSTOMER__REPRESENTATIVES:
-				return ((InternalEList)getRepresentatives()).basicAdd(otherEnd, msgs);
-			case EmployeePackage.CUSTOMER__SUBSIDIARIES:
-				return ((InternalEList)getSubsidiaries()).basicAdd(otherEnd, msgs);
-			case EmployeePackage.CUSTOMER__PARENT:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetParent((Customer)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.CUSTOMER__REPRESENTATIVES:
-				return ((InternalEList)getRepresentatives()).basicRemove(otherEnd, msgs);
-			case EmployeePackage.CUSTOMER__SUBSIDIARIES:
-				return ((InternalEList)getSubsidiaries()).basicRemove(otherEnd, msgs);
-			case EmployeePackage.CUSTOMER__PARENT:
-				return basicSetParent(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EmployeePackage.CUSTOMER__PARENT:
-				return eInternalContainer().eInverseRemove(this, EmployeePackage.CUSTOMER__SUBSIDIARIES, Customer.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EmployeePackage.CUSTOMER__NAME:
-				return getName();
-			case EmployeePackage.CUSTOMER__ADDRESS:
-				return getAddress();
-			case EmployeePackage.CUSTOMER__REPRESENTATIVES:
-				return getRepresentatives();
-			case EmployeePackage.CUSTOMER__SUBSIDIARIES:
-				return getSubsidiaries();
-			case EmployeePackage.CUSTOMER__PARENT:
-				return getParent();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EmployeePackage.CUSTOMER__NAME:
-				setName((String)newValue);
-				return;
-			case EmployeePackage.CUSTOMER__ADDRESS:
-				setAddress((String)newValue);
-				return;
-			case EmployeePackage.CUSTOMER__REPRESENTATIVES:
-				getRepresentatives().clear();
-				getRepresentatives().addAll((Collection)newValue);
-				return;
-			case EmployeePackage.CUSTOMER__SUBSIDIARIES:
-				getSubsidiaries().clear();
-				getSubsidiaries().addAll((Collection)newValue);
-				return;
-			case EmployeePackage.CUSTOMER__PARENT:
-				setParent((Customer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.CUSTOMER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EmployeePackage.CUSTOMER__ADDRESS:
-				setAddress(ADDRESS_EDEFAULT);
-				return;
-			case EmployeePackage.CUSTOMER__REPRESENTATIVES:
-				getRepresentatives().clear();
-				return;
-			case EmployeePackage.CUSTOMER__SUBSIDIARIES:
-				getSubsidiaries().clear();
-				return;
-			case EmployeePackage.CUSTOMER__PARENT:
-				setParent((Customer)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.CUSTOMER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EmployeePackage.CUSTOMER__ADDRESS:
-				return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
-			case EmployeePackage.CUSTOMER__REPRESENTATIVES:
-				return representatives != null && !representatives.isEmpty();
-			case EmployeePackage.CUSTOMER__SUBSIDIARIES:
-				return subsidiaries != null && !subsidiaries.isEmpty();
-			case EmployeePackage.CUSTOMER__PARENT:
-				return getParent() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", address: "); //$NON-NLS-1$
-		result.append(address);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomerImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/DepartmentImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/DepartmentImpl.java
deleted file mode 100644
index 8835363..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/DepartmentImpl.java
+++ /dev/null

@@ -1,351 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.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.InternalEObject;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Department</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl#getMembers <em>Members</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.DepartmentImpl#getManager <em>Manager</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DepartmentImpl extends EModelElementImpl implements Department {
-	/**
-	 * The default value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int NUMBER_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected int number = NUMBER_EDEFAULT;
-
-	/**
-	 * 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 = ""; //$NON-NLS-1$
-
-	/**
-	 * 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;
-
-	/**
-	 * The cached value of the '{@link #getMembers() <em>Members</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMembers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList members = null;
-
-	/**
-	 * The cached value of the '{@link #getManager() <em>Manager</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManager()
-	 * @generated
-	 * @ordered
-	 */
-	protected Employee manager = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DepartmentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.DEPARTMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getNumber() {
-		return number;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNumber(int newNumber) {
-		int oldNumber = number;
-		number = newNumber;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.DEPARTMENT__NUMBER, oldNumber, number));
-	}
-
-	/**
-	 * <!-- 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, EmployeePackage.DEPARTMENT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMembers() {
-		if (members == null) {
-			members = new EObjectContainmentWithInverseEList(Employee.class, this, EmployeePackage.DEPARTMENT__MEMBERS, EmployeePackage.EMPLOYEE__DEPARTMENT);
-		}
-		return members;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Employee getManager() {
-		return manager;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetManager(Employee newManager, NotificationChain msgs) {
-		Employee oldManager = manager;
-		manager = newManager;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmployeePackage.DEPARTMENT__MANAGER, oldManager, newManager);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setManager(Employee newManager) {
-		if (newManager != manager) {
-			NotificationChain msgs = null;
-			if (manager != null)
-				msgs = ((InternalEObject)manager).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmployeePackage.DEPARTMENT__MANAGER, null, msgs);
-			if (newManager != null)
-				msgs = ((InternalEObject)newManager).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EmployeePackage.DEPARTMENT__MANAGER, null, msgs);
-			msgs = basicSetManager(newManager, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.DEPARTMENT__MANAGER, newManager, newManager));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.DEPARTMENT__MEMBERS:
-				return ((InternalEList)getMembers()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.DEPARTMENT__MEMBERS:
-				return ((InternalEList)getMembers()).basicRemove(otherEnd, msgs);
-			case EmployeePackage.DEPARTMENT__MANAGER:
-				return basicSetManager(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EmployeePackage.DEPARTMENT__NUMBER:
-				return new Integer(getNumber());
-			case EmployeePackage.DEPARTMENT__NAME:
-				return getName();
-			case EmployeePackage.DEPARTMENT__MEMBERS:
-				return getMembers();
-			case EmployeePackage.DEPARTMENT__MANAGER:
-				return getManager();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EmployeePackage.DEPARTMENT__NUMBER:
-				setNumber(((Integer)newValue).intValue());
-				return;
-			case EmployeePackage.DEPARTMENT__NAME:
-				setName((String)newValue);
-				return;
-			case EmployeePackage.DEPARTMENT__MEMBERS:
-				getMembers().clear();
-				getMembers().addAll((Collection)newValue);
-				return;
-			case EmployeePackage.DEPARTMENT__MANAGER:
-				setManager((Employee)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.DEPARTMENT__NUMBER:
-				setNumber(NUMBER_EDEFAULT);
-				return;
-			case EmployeePackage.DEPARTMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EmployeePackage.DEPARTMENT__MEMBERS:
-				getMembers().clear();
-				return;
-			case EmployeePackage.DEPARTMENT__MANAGER:
-				setManager((Employee)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.DEPARTMENT__NUMBER:
-				return number != NUMBER_EDEFAULT;
-			case EmployeePackage.DEPARTMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EmployeePackage.DEPARTMENT__MEMBERS:
-				return members != null && !members.isEmpty();
-			case EmployeePackage.DEPARTMENT__MANAGER:
-				return manager != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (number: "); //$NON-NLS-1$
-		result.append(number);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DepartmentImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeeFactoryImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeeFactoryImpl.java
deleted file mode 100644
index 1bce050..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeeFactoryImpl.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.*;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeeFactory;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Location;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EmployeeFactoryImpl extends EFactoryImpl implements EmployeeFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EmployeeFactory init() {
-		try {
-			EmployeeFactory theEmployeeFactory = (EmployeeFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore"); //$NON-NLS-1$ 
-			if (theEmployeeFactory != null) {
-				return theEmployeeFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EmployeeFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmployeeFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case EmployeePackage.EMPLOYEE: return createEmployee();
-			case EmployeePackage.DEPARTMENT: return createDepartment();
-			case EmployeePackage.OFFICE: return createOffice();
-			case EmployeePackage.STUDENT: return createStudent();
-			case EmployeePackage.LOCATION: return createLocation();
-			case EmployeePackage.CLIENT: return createClient();
-			case EmployeePackage.CUSTOMER: return createCustomer();
-			case EmployeePackage.HIGH_SCHOOL_STUDENT: return createHighSchoolStudent();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case EmployeePackage.BAND:
-				return createBandFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case EmployeePackage.BAND:
-				return convertBandToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Employee createEmployee() {
-		EmployeeImpl employee = new EmployeeImpl();
-		return employee;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Office createOffice() {
-		OfficeImpl office = new OfficeImpl();
-		return office;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Department createDepartment() {
-		DepartmentImpl department = new DepartmentImpl();
-		return department;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Student createStudent() {
-		StudentImpl student = new StudentImpl();
-		return student;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Location createLocation() {
-		LocationImpl location = new LocationImpl();
-		return location;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Client createClient() {
-		ClientImpl client = new ClientImpl();
-		return client;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Customer createCustomer() {
-		CustomerImpl customer = new CustomerImpl();
-		return customer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HighSchoolStudent createHighSchoolStudent() {
-		HighSchoolStudentImpl highSchoolStudent = new HighSchoolStudentImpl();
-		return highSchoolStudent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Band createBandFromString(EDataType eDataType, String initialValue) {
-		Band result = Band.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBandToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmployeePackage getEmployeePackage() {
-		return (EmployeePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static EmployeePackage getPackage() {
-		return EmployeePackage.eINSTANCE;
-	}
-
-} //EmployeeFactoryImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeeImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeeImpl.java
deleted file mode 100644
index 94f95ec..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeeImpl.java
+++ /dev/null

@@ -1,544 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;
-
-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.InternalEObject;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Employee</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl#getSalary <em>Salary</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl#getBand <em>Band</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl#getNumber <em>Number</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl#isSecurityClearance <em>Security Clearance</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl#getDepartment <em>Department</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl#isFullTime <em>Full Time</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.EmployeeImpl#getOffice <em>Office</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EmployeeImpl extends EModelElementImpl implements Employee {
-	/**
-	 * The default value of the '{@link #getSalary() <em>Salary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSalary()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SALARY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getSalary() <em>Salary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSalary()
-	 * @generated
-	 * @ordered
-	 */
-	protected int salary = SALARY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBand() <em>Band</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBand()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Band BAND_EDEFAULT = Band.JUNIOR_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getBand() <em>Band</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBand()
-	 * @generated
-	 * @ordered
-	 */
-	protected Band band = BAND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int NUMBER_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getNumber() <em>Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected int number = NUMBER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isSecurityClearance() <em>Security Clearance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSecurityClearance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SECURITY_CLEARANCE_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isSecurityClearance() <em>Security Clearance</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSecurityClearance()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SECURITY_CLEARANCE_EFLAG = 1 << 8;
-
-	/**
-	 * The default value of the '{@link #isFullTime() <em>Full Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFullTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FULL_TIME_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isFullTime() <em>Full Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFullTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int FULL_TIME_EFLAG = 1 << 9;
-
-	/**
-	 * The cached value of the '{@link #getOffice() <em>Office</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOffice()
-	 * @generated
-	 * @ordered
-	 */
-	protected Office office = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EmployeeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.EMPLOYEE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getSalary() {
-		return salary;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSalary(int newSalary) {
-		int oldSalary = salary;
-		salary = newSalary;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__SALARY, oldSalary, salary));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Band getBand() {
-		return band;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBand(Band newBand) {
-		Band oldBand = band;
-		band = newBand == null ? BAND_EDEFAULT : newBand;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__BAND, oldBand, band));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getNumber() {
-		return number;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNumber(int newNumber) {
-		int oldNumber = number;
-		number = newNumber;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__NUMBER, oldNumber, number));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Office getOffice() {
-		return office;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOffice(Office newOffice, NotificationChain msgs) {
-		Office oldOffice = office;
-		office = newOffice;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__OFFICE, oldOffice, newOffice);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOffice(Office newOffice) {
-		if (newOffice != office) {
-			NotificationChain msgs = null;
-			if (office != null)
-				msgs = ((InternalEObject)office).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EmployeePackage.EMPLOYEE__OFFICE, null, msgs);
-			if (newOffice != null)
-				msgs = ((InternalEObject)newOffice).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EmployeePackage.EMPLOYEE__OFFICE, null, msgs);
-			msgs = basicSetOffice(newOffice, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__OFFICE, newOffice, newOffice));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.EMPLOYEE__DEPARTMENT:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetDepartment((Department)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case EmployeePackage.EMPLOYEE__DEPARTMENT:
-				return basicSetDepartment(null, msgs);
-			case EmployeePackage.EMPLOYEE__OFFICE:
-				return basicSetOffice(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID) {
-			case EmployeePackage.EMPLOYEE__DEPARTMENT:
-				return eInternalContainer().eInverseRemove(this, EmployeePackage.DEPARTMENT__MEMBERS, Department.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EmployeePackage.EMPLOYEE__SALARY:
-				return new Integer(getSalary());
-			case EmployeePackage.EMPLOYEE__BAND:
-				return getBand();
-			case EmployeePackage.EMPLOYEE__NUMBER:
-				return new Integer(getNumber());
-			case EmployeePackage.EMPLOYEE__SECURITY_CLEARANCE:
-				return isSecurityClearance() ? Boolean.TRUE : Boolean.FALSE;
-			case EmployeePackage.EMPLOYEE__DEPARTMENT:
-				return getDepartment();
-			case EmployeePackage.EMPLOYEE__FULL_TIME:
-				return isFullTime() ? Boolean.TRUE : Boolean.FALSE;
-			case EmployeePackage.EMPLOYEE__OFFICE:
-				return getOffice();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EmployeePackage.EMPLOYEE__SALARY:
-				setSalary(((Integer)newValue).intValue());
-				return;
-			case EmployeePackage.EMPLOYEE__BAND:
-				setBand((Band)newValue);
-				return;
-			case EmployeePackage.EMPLOYEE__NUMBER:
-				setNumber(((Integer)newValue).intValue());
-				return;
-			case EmployeePackage.EMPLOYEE__SECURITY_CLEARANCE:
-				setSecurityClearance(((Boolean)newValue).booleanValue());
-				return;
-			case EmployeePackage.EMPLOYEE__DEPARTMENT:
-				setDepartment((Department)newValue);
-				return;
-			case EmployeePackage.EMPLOYEE__FULL_TIME:
-				setFullTime(((Boolean)newValue).booleanValue());
-				return;
-			case EmployeePackage.EMPLOYEE__OFFICE:
-				setOffice((Office)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.EMPLOYEE__SALARY:
-				setSalary(SALARY_EDEFAULT);
-				return;
-			case EmployeePackage.EMPLOYEE__BAND:
-				setBand(BAND_EDEFAULT);
-				return;
-			case EmployeePackage.EMPLOYEE__NUMBER:
-				setNumber(NUMBER_EDEFAULT);
-				return;
-			case EmployeePackage.EMPLOYEE__SECURITY_CLEARANCE:
-				setSecurityClearance(SECURITY_CLEARANCE_EDEFAULT);
-				return;
-			case EmployeePackage.EMPLOYEE__DEPARTMENT:
-				setDepartment((Department)null);
-				return;
-			case EmployeePackage.EMPLOYEE__FULL_TIME:
-				setFullTime(FULL_TIME_EDEFAULT);
-				return;
-			case EmployeePackage.EMPLOYEE__OFFICE:
-				setOffice((Office)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.EMPLOYEE__SALARY:
-				return salary != SALARY_EDEFAULT;
-			case EmployeePackage.EMPLOYEE__BAND:
-				return band != BAND_EDEFAULT;
-			case EmployeePackage.EMPLOYEE__NUMBER:
-				return number != NUMBER_EDEFAULT;
-			case EmployeePackage.EMPLOYEE__SECURITY_CLEARANCE:
-				return ((eFlags & SECURITY_CLEARANCE_EFLAG) != 0) != SECURITY_CLEARANCE_EDEFAULT;
-			case EmployeePackage.EMPLOYEE__DEPARTMENT:
-				return getDepartment() != null;
-			case EmployeePackage.EMPLOYEE__FULL_TIME:
-				return ((eFlags & FULL_TIME_EFLAG) != 0) != FULL_TIME_EDEFAULT;
-			case EmployeePackage.EMPLOYEE__OFFICE:
-				return office != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSecurityClearance() {
-		return (eFlags & SECURITY_CLEARANCE_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSecurityClearance(boolean newSecurityClearance) {
-		boolean oldSecurityClearance = (eFlags & SECURITY_CLEARANCE_EFLAG) != 0;
-		if (newSecurityClearance) eFlags |= SECURITY_CLEARANCE_EFLAG; else eFlags &= ~SECURITY_CLEARANCE_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__SECURITY_CLEARANCE, oldSecurityClearance, newSecurityClearance));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Department getDepartment() {
-		if (eContainerFeatureID != EmployeePackage.EMPLOYEE__DEPARTMENT) return null;
-		return (Department)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDepartment(Department newDepartment, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newDepartment, EmployeePackage.EMPLOYEE__DEPARTMENT, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDepartment(Department newDepartment) {
-		if (newDepartment != eInternalContainer() || (eContainerFeatureID != EmployeePackage.EMPLOYEE__DEPARTMENT && newDepartment != null)) {
-			if (EcoreUtil.isAncestor(this, newDepartment))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newDepartment != null)
-				msgs = ((InternalEObject)newDepartment).eInverseAdd(this, EmployeePackage.DEPARTMENT__MEMBERS, Department.class, msgs);
-			msgs = basicSetDepartment(newDepartment, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__DEPARTMENT, newDepartment, newDepartment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFullTime() {
-		return (eFlags & FULL_TIME_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFullTime(boolean newFullTime) {
-		boolean oldFullTime = (eFlags & FULL_TIME_EFLAG) != 0;
-		if (newFullTime) eFlags |= FULL_TIME_EFLAG; else eFlags &= ~FULL_TIME_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.EMPLOYEE__FULL_TIME, oldFullTime, newFullTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (salary: "); //$NON-NLS-1$
-		result.append(salary);
-		result.append(", band: "); //$NON-NLS-1$
-		result.append(band);
-		result.append(", number: "); //$NON-NLS-1$
-		result.append(number);
-		result.append(", securityClearance: "); //$NON-NLS-1$
-		result.append((eFlags & SECURITY_CLEARANCE_EFLAG) != 0);
-		result.append(", fullTime: "); //$NON-NLS-1$
-		result.append((eFlags & FULL_TIME_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EmployeeImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeePackageImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeePackageImpl.java
deleted file mode 100644
index 0eefd6e..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/EmployeePackageImpl.java
+++ /dev/null

@@ -1,603 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.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.tests.runtime.emf.type.core.employee.Band;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeeFactory;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.HighSchoolStudent;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Location;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EmployeePackageImpl extends EPackageImpl implements EmployeePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass employeeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass officeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass departmentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass studentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass locationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass clientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass highSchoolStudentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum bandEEnum = 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.tests.runtime.emf.type.core.employee.EmployeePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EmployeePackageImpl() {
-		super(eNS_URI, EmployeeFactory.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 EmployeePackage init() {
-		if (isInited) return (EmployeePackage)EPackage.Registry.INSTANCE.getEPackage(EmployeePackage.eNS_URI);
-
-		// Obtain or create and register package
-		EmployeePackageImpl theEmployeePackage = (EmployeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EmployeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EmployeePackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theEmployeePackage.createPackageContents();
-
-		// Initialize created meta-data
-		theEmployeePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEmployeePackage.freeze();
-
-		return theEmployeePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEmployee() {
-		return employeeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEmployee_Salary() {
-		return (EAttribute)employeeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEmployee_Band() {
-		return (EAttribute)employeeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEmployee_Number() {
-		return (EAttribute)employeeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEmployee_Office() {
-		return (EReference)employeeEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEmployee_SecurityClearance() {
-		return (EAttribute)employeeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEmployee_Department() {
-		return (EReference)employeeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEmployee_FullTime() {
-		return (EAttribute)employeeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOffice() {
-		return officeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOffice_NumberOfWindows() {
-		return (EAttribute)officeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOffice_HasDoor() {
-		return (EAttribute)officeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDepartment() {
-		return departmentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDepartment_Number() {
-		return (EAttribute)departmentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDepartment_Name() {
-		return (EAttribute)departmentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDepartment_Members() {
-		return (EReference)departmentEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDepartment_Manager() {
-		return (EReference)departmentEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStudent() {
-		return studentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getStudent_Coop() {
-		return (EAttribute)studentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocation() {
-		return locationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getClient() {
-		return clientEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getClient_FirstName() {
-		return (EAttribute)clientEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getClient_LastName() {
-		return (EAttribute)clientEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getClient_Represents() {
-		return (EReference)clientEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomer() {
-		return customerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomer_Name() {
-		return (EAttribute)customerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomer_Address() {
-		return (EAttribute)customerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomer_Representatives() {
-		return (EReference)customerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomer_Subsidiaries() {
-		return (EReference)customerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomer_Parent() {
-		return (EReference)customerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHighSchoolStudent() {
-		return highSchoolStudentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getBand() {
-		return bandEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmployeeFactory getEmployeeFactory() {
-		return (EmployeeFactory)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
-		employeeEClass = createEClass(EMPLOYEE);
-		createEAttribute(employeeEClass, EMPLOYEE__SALARY);
-		createEAttribute(employeeEClass, EMPLOYEE__BAND);
-		createEAttribute(employeeEClass, EMPLOYEE__NUMBER);
-		createEAttribute(employeeEClass, EMPLOYEE__SECURITY_CLEARANCE);
-		createEReference(employeeEClass, EMPLOYEE__DEPARTMENT);
-		createEAttribute(employeeEClass, EMPLOYEE__FULL_TIME);
-		createEReference(employeeEClass, EMPLOYEE__OFFICE);
-
-		departmentEClass = createEClass(DEPARTMENT);
-		createEAttribute(departmentEClass, DEPARTMENT__NUMBER);
-		createEAttribute(departmentEClass, DEPARTMENT__NAME);
-		createEReference(departmentEClass, DEPARTMENT__MEMBERS);
-		createEReference(departmentEClass, DEPARTMENT__MANAGER);
-
-		officeEClass = createEClass(OFFICE);
-		createEAttribute(officeEClass, OFFICE__NUMBER_OF_WINDOWS);
-		createEAttribute(officeEClass, OFFICE__HAS_DOOR);
-
-		studentEClass = createEClass(STUDENT);
-		createEAttribute(studentEClass, STUDENT__COOP);
-
-		locationEClass = createEClass(LOCATION);
-
-		clientEClass = createEClass(CLIENT);
-		createEAttribute(clientEClass, CLIENT__FIRST_NAME);
-		createEAttribute(clientEClass, CLIENT__LAST_NAME);
-		createEReference(clientEClass, CLIENT__REPRESENTS);
-
-		customerEClass = createEClass(CUSTOMER);
-		createEAttribute(customerEClass, CUSTOMER__NAME);
-		createEAttribute(customerEClass, CUSTOMER__ADDRESS);
-		createEReference(customerEClass, CUSTOMER__REPRESENTATIVES);
-		createEReference(customerEClass, CUSTOMER__SUBSIDIARIES);
-		createEReference(customerEClass, CUSTOMER__PARENT);
-
-		highSchoolStudentEClass = createEClass(HIGH_SCHOOL_STUDENT);
-
-		// Create enums
-		bandEEnum = createEEnum(BAND);
-	}
-
-	/**
-	 * <!-- 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
-		employeeEClass.getESuperTypes().add(ecorePackage.getEModelElement());
-		departmentEClass.getESuperTypes().add(ecorePackage.getEModelElement());
-		officeEClass.getESuperTypes().add(ecorePackage.getEModelElement());
-		studentEClass.getESuperTypes().add(this.getEmployee());
-		locationEClass.getESuperTypes().add(ecorePackage.getEModelElement());
-		clientEClass.getESuperTypes().add(ecorePackage.getEModelElement());
-		customerEClass.getESuperTypes().add(ecorePackage.getEModelElement());
-		highSchoolStudentEClass.getESuperTypes().add(this.getStudent());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getEmployee_Salary(), ecorePackage.getEInt(), "salary", null, 1, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEmployee_Band(), this.getBand(), "band", null, 1, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEmployee_Number(), ecorePackage.getEInt(), "number", null, 1, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEmployee_SecurityClearance(), ecorePackage.getEBoolean(), "securityClearance", null, 1, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEmployee_Department(), this.getDepartment(), this.getDepartment_Members(), "department", null, 1, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getEmployee_FullTime(), ecorePackage.getEBoolean(), "fullTime", null, 1, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getEmployee_Office(), this.getOffice(), null, "office", null, 1, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDepartment_Number(), ecorePackage.getEInt(), "number", null, 1, 1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getDepartment_Name(), ecorePackage.getEString(), "name", "", 1, 1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getDepartment_Members(), this.getEmployee(), this.getEmployee_Department(), "members", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getDepartment_Manager(), this.getEmployee(), null, "manager", null, 1, 1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(officeEClass, Office.class, "Office", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getOffice_NumberOfWindows(), ecorePackage.getEInt(), "numberOfWindows", null, 1, 1, Office.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getOffice_HasDoor(), ecorePackage.getEBoolean(), "hasDoor", null, 1, 1, Office.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(studentEClass, Student.class, "Student", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getStudent_Coop(), ecorePackage.getEBoolean(), "coop", null, 1, 1, Student.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(locationEClass, Location.class, "Location", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(clientEClass, Client.class, "Client", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getClient_FirstName(), ecorePackage.getEString(), "firstName", null, 0, 1, Client.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getClient_LastName(), ecorePackage.getEString(), "lastName", null, 0, 1, Client.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getClient_Represents(), this.getCustomer(), this.getCustomer_Representatives(), "represents", null, 0, 1, Client.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getCustomer_Name(), ecorePackage.getEString(), "name", null, 0, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getCustomer_Address(), ecorePackage.getEString(), "address", null, 0, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getCustomer_Representatives(), this.getClient(), this.getClient_Represents(), "representatives", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getCustomer_Subsidiaries(), this.getCustomer(), this.getCustomer_Parent(), "subsidiaries", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getCustomer_Parent(), this.getCustomer(), this.getCustomer_Subsidiaries(), "parent", null, 0, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(highSchoolStudentEClass, HighSchoolStudent.class, "HighSchoolStudent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(bandEEnum, Band.class, "Band"); //$NON-NLS-1$
-		addEEnumLiteral(bandEEnum, Band.JUNIOR_LITERAL);
-		addEEnumLiteral(bandEEnum, Band.SENIOR_LITERAL);
-		addEEnumLiteral(bandEEnum, Band.MANAGER_LITERAL);
-		addEEnumLiteral(bandEEnum, Band.DIRECTOR_LITERAL);
-		addEEnumLiteral(bandEEnum, Band.EXECUTIVE_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //EmployeePackageImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/HighSchoolStudentImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/HighSchoolStudentImpl.java
deleted file mode 100644
index c169e9c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/HighSchoolStudentImpl.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: HighSchoolStudentImpl.java,v 1.2 2006/10/03 15:09:33 ahunter Exp $
- */
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.HighSchoolStudent;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>High School Student</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class HighSchoolStudentImpl extends StudentImpl implements HighSchoolStudent {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HighSchoolStudentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.HIGH_SCHOOL_STUDENT;
-	}
-
-} //HighSchoolStudentImpl
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/LocationImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/LocationImpl.java
deleted file mode 100644
index ff084f5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/LocationImpl.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Location;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Location</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class LocationImpl extends EModelElementImpl implements Location {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.LOCATION;
-	}
-
-} //LocationImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/OfficeImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/OfficeImpl.java
deleted file mode 100644
index 312f523..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/OfficeImpl.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Office</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.OfficeImpl#getNumberOfWindows <em>Number Of Windows</em>}</li>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.OfficeImpl#isHasDoor <em>Has Door</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OfficeImpl extends EModelElementImpl implements Office {
-	/**
-	 * The default value of the '{@link #getNumberOfWindows() <em>Number Of Windows</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumberOfWindows()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int NUMBER_OF_WINDOWS_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getNumberOfWindows() <em>Number Of Windows</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumberOfWindows()
-	 * @generated
-	 * @ordered
-	 */
-	protected int numberOfWindows = NUMBER_OF_WINDOWS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isHasDoor() <em>Has Door</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasDoor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HAS_DOOR_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isHasDoor() <em>Has Door</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasDoor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HAS_DOOR_EFLAG = 1 << 8;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OfficeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.OFFICE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getNumberOfWindows() {
-		return numberOfWindows;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNumberOfWindows(int newNumberOfWindows) {
-		int oldNumberOfWindows = numberOfWindows;
-		numberOfWindows = newNumberOfWindows;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.OFFICE__NUMBER_OF_WINDOWS, oldNumberOfWindows, numberOfWindows));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHasDoor() {
-		return (eFlags & HAS_DOOR_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasDoor(boolean newHasDoor) {
-		boolean oldHasDoor = (eFlags & HAS_DOOR_EFLAG) != 0;
-		if (newHasDoor) eFlags |= HAS_DOOR_EFLAG; else eFlags &= ~HAS_DOOR_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.OFFICE__HAS_DOOR, oldHasDoor, newHasDoor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EmployeePackage.OFFICE__NUMBER_OF_WINDOWS:
-				return new Integer(getNumberOfWindows());
-			case EmployeePackage.OFFICE__HAS_DOOR:
-				return isHasDoor() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EmployeePackage.OFFICE__NUMBER_OF_WINDOWS:
-				setNumberOfWindows(((Integer)newValue).intValue());
-				return;
-			case EmployeePackage.OFFICE__HAS_DOOR:
-				setHasDoor(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.OFFICE__NUMBER_OF_WINDOWS:
-				setNumberOfWindows(NUMBER_OF_WINDOWS_EDEFAULT);
-				return;
-			case EmployeePackage.OFFICE__HAS_DOOR:
-				setHasDoor(HAS_DOOR_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.OFFICE__NUMBER_OF_WINDOWS:
-				return numberOfWindows != NUMBER_OF_WINDOWS_EDEFAULT;
-			case EmployeePackage.OFFICE__HAS_DOOR:
-				return ((eFlags & HAS_DOOR_EFLAG) != 0) != HAS_DOOR_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (numberOfWindows: "); //$NON-NLS-1$
-		result.append(numberOfWindows);
-		result.append(", hasDoor: "); //$NON-NLS-1$
-		result.append((eFlags & HAS_DOOR_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-} //OfficeImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/StudentImpl.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/StudentImpl.java
deleted file mode 100644
index 2a292c9..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/impl/StudentImpl.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Student</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.impl.StudentImpl#isCoop <em>Coop</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StudentImpl extends EmployeeImpl implements Student {
-	/**
-	 * The default value of the '{@link #isCoop() <em>Coop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCoop()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean COOP_EDEFAULT = false;
-
-	/**
-	 * The flag representing the value of the '{@link #isCoop() <em>Coop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCoop()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int COOP_EFLAG = 1 << 10;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StudentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EmployeePackage.Literals.STUDENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isCoop() {
-		return (eFlags & COOP_EFLAG) != 0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCoop(boolean newCoop) {
-		boolean oldCoop = (eFlags & COOP_EFLAG) != 0;
-		if (newCoop) eFlags |= COOP_EFLAG; else eFlags &= ~COOP_EFLAG;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EmployeePackage.STUDENT__COOP, oldCoop, newCoop));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EmployeePackage.STUDENT__COOP:
-				return isCoop() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EmployeePackage.STUDENT__COOP:
-				setCoop(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.STUDENT__COOP:
-				setCoop(COOP_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EmployeePackage.STUDENT__COOP:
-				return ((eFlags & COOP_EFLAG) != 0) != COOP_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (coop: "); //$NON-NLS-1$
-		result.append((eFlags & COOP_EFLAG) != 0);
-		result.append(')');
-		return result.toString();
-	}
-
-} //StudentImpl

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/util/EmployeeAdapterFactory.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/util/EmployeeAdapterFactory.java
deleted file mode 100644
index 8474976..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/util/EmployeeAdapterFactory.java
+++ /dev/null

@@ -1,262 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.util;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.*;
-
-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.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- 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.tests.runtime.emf.type.core.employee.EmployeePackage
- * @generated
- */
-public class EmployeeAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EmployeePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmployeeAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = EmployeePackage.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 EmployeeSwitch modelSwitch =
-		new EmployeeSwitch() {
-			public Object caseEmployee(Employee object) {
-				return createEmployeeAdapter();
-			}
-			public Object caseDepartment(Department object) {
-				return createDepartmentAdapter();
-			}
-			public Object caseOffice(Office object) {
-				return createOfficeAdapter();
-			}
-			public Object caseStudent(Student object) {
-				return createStudentAdapter();
-			}
-			public Object caseLocation(Location object) {
-				return createLocationAdapter();
-			}
-			public Object caseClient(Client object) {
-				return createClientAdapter();
-			}
-			public Object caseCustomer(Customer object) {
-				return createCustomerAdapter();
-			}
-			public Object caseHighSchoolStudent(HighSchoolStudent object) {
-				return createHighSchoolStudentAdapter();
-			}
-			public Object caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			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.tests.runtime.emf.type.core.employee.Employee <em>Employee</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.tests.runtime.emf.type.core.employee.Employee
-	 * @generated
-	 */
-	public Adapter createEmployeeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office <em>Office</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.tests.runtime.emf.type.core.employee.Office
-	 * @generated
-	 */
-	public Adapter createOfficeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department <em>Department</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.tests.runtime.emf.type.core.employee.Department
-	 * @generated
-	 */
-	public Adapter createDepartmentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Student <em>Student</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.tests.runtime.emf.type.core.employee.Student
-	 * @generated
-	 */
-	public Adapter createStudentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Location <em>Location</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.tests.runtime.emf.type.core.employee.Location
-	 * @generated
-	 */
-	public Adapter createLocationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client <em>Client</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.tests.runtime.emf.type.core.employee.Client
-	 * @generated
-	 */
-	public Adapter createClientAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer <em>Customer</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.tests.runtime.emf.type.core.employee.Customer
-	 * @generated
-	 */
-	public Adapter createCustomerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.tests.runtime.emf.type.core.employee.HighSchoolStudent <em>High School Student</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.tests.runtime.emf.type.core.employee.HighSchoolStudent
-	 * @generated
-	 */
-	public Adapter createHighSchoolStudentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel 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.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		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;
-	}
-
-} //EmployeeAdapterFactory

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/util/EmployeeSwitch.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/util/EmployeeSwitch.java
deleted file mode 100644
index 5047793..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/employee/util/EmployeeSwitch.java
+++ /dev/null

@@ -1,309 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.employee.util;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.*;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- 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.tests.runtime.emf.type.core.employee.EmployeePackage
- * @generated
- */
-public class EmployeeSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EmployeePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmployeeSwitch() {
-		if (modelPackage == null) {
-			modelPackage = EmployeePackage.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 EmployeePackage.EMPLOYEE: {
-				Employee employee = (Employee)theEObject;
-				Object result = caseEmployee(employee);
-				if (result == null) result = caseEModelElement(employee);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EmployeePackage.DEPARTMENT: {
-				Department department = (Department)theEObject;
-				Object result = caseDepartment(department);
-				if (result == null) result = caseEModelElement(department);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EmployeePackage.OFFICE: {
-				Office office = (Office)theEObject;
-				Object result = caseOffice(office);
-				if (result == null) result = caseEModelElement(office);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EmployeePackage.STUDENT: {
-				Student student = (Student)theEObject;
-				Object result = caseStudent(student);
-				if (result == null) result = caseEmployee(student);
-				if (result == null) result = caseEModelElement(student);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EmployeePackage.LOCATION: {
-				Location location = (Location)theEObject;
-				Object result = caseLocation(location);
-				if (result == null) result = caseEModelElement(location);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EmployeePackage.CLIENT: {
-				Client client = (Client)theEObject;
-				Object result = caseClient(client);
-				if (result == null) result = caseEModelElement(client);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EmployeePackage.CUSTOMER: {
-				Customer customer = (Customer)theEObject;
-				Object result = caseCustomer(customer);
-				if (result == null) result = caseEModelElement(customer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case EmployeePackage.HIGH_SCHOOL_STUDENT: {
-				HighSchoolStudent highSchoolStudent = (HighSchoolStudent)theEObject;
-				Object result = caseHighSchoolStudent(highSchoolStudent);
-				if (result == null) result = caseStudent(highSchoolStudent);
-				if (result == null) result = caseEmployee(highSchoolStudent);
-				if (result == null) result = caseEModelElement(highSchoolStudent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Employee</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>Employee</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEmployee(Employee object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Office</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>Office</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOffice(Office object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Department</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>Department</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDepartment(Department object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Student</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>Student</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseStudent(Student object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Location</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>Location</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLocation(Location object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Client</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>Client</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseClient(Client object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Customer</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>Customer</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCustomer(Customer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>High School Student</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>High School Student</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHighSchoolStudent(HighSchoolStudent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EModel 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>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEModelElement(EModelElement 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;
-	}
-
-} //EmployeeSwitch

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ClientDependentsAdvice.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ClientDependentsAdvice.java
deleted file mode 100644
index 62f984c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ClientDependentsAdvice.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-
-/**
- * Advice that includes the client's dependent annotations in the destruction
- * of a client.
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class ClientDependentsAdvice
-	extends AbstractEditHelperAdvice {
-	
-	public static String INITIAL = "org.eclipse.gmf.tests.runtime.emf.type.core.initial"; //$NON-NLS-1$
-
-	private static EReference[] ANNOTATION_REFERENCES = new EReference[] {
-		EcorePackage.Literals.EANNOTATION__REFERENCES};
-	
-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
-		ICommand result = null;
-		
-		Collection referencers = EMFCoreUtil.getReferencers(
-				request.getElementToDestroy(),
-				ANNOTATION_REFERENCES);
-		
-		for (Iterator iter = referencers.iterator(); iter.hasNext();) {
-			EAnnotation ann = (EAnnotation) iter.next();
-			
-			// could return a null command if the element is already being destroyed
-			ICommand command = request.getDestroyDependentCommand(ann);
-			
-			if (command != null) {
-				if (result == null) {
-					result = command;
-				} else {
-					result = result.compose(command);
-				}
-			}
-		}
-		
-		// store the initial element to destroy in the INITIAL parameter to verify that
-		// the correct initial element was found in the advice
-		Object initial = request.getParameter(INITIAL);
-		if (initial == null) {
-			request.setParameter(INITIAL,
-					request.getParameter(DestroyElementRequest.INITIAL_ELEMENT_TO_DESTROY_PARAMETER));
-		}
-			
-		
-		return result;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ClientEditHelper.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ClientEditHelper.java
deleted file mode 100644
index d1f3a79..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ClientEditHelper.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Client;
-
-/**
- * Empty implementation of a concrete edit helper for {@link Client}s.
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class ClientEditHelper
-	extends AbstractEditHelper {
-
-	public ClientEditHelper() {
-		super();
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/CustomerEditHelper.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/CustomerEditHelper.java
deleted file mode 100644
index e8933d6..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/CustomerEditHelper.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer;
-
-/**
- * Empty implementation of a concrete edit helper for {@link Customer}s.
- * 
- * @author Christian W. Damus (cdamus)
- */
-public class CustomerEditHelper
-	extends AbstractEditHelper {
-
-	public CustomerEditHelper() {
-		super();
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DepartmentEditHelper.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DepartmentEditHelper.java
deleted file mode 100644
index d92c0f3..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DepartmentEditHelper.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * @author ldamus
- */
-public class DepartmentEditHelper
-	extends AbstractEditHelper {
-
-	public static class DepartmentCreateCommand
-		extends CreateElementCommand {
-
-		public DepartmentCreateCommand(CreateElementRequest req) {
-			super(req);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getCreateCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.CreateElementRequest)
-	 */
-	protected ICommand getCreateCommand(CreateElementRequest req) {
-		return new DepartmentCreateCommand(req);
-	}
-    
-    protected boolean approveRequest(IEditCommandRequest req) {
-        if (req instanceof SetRequest) {
-            SetRequest setRequest = (SetRequest) req;
-            EStructuralFeature feature = setRequest.getFeature();
-            
-            if (feature == EmployeePackage.eINSTANCE.getDepartment_Number()) {
-                Object value = setRequest.getValue();
-                
-                if (value instanceof Integer) {
-                    if (((Integer) value).intValue() == 0) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return super.approveRequest(req);
-    }
-    
-    protected void configureRequest(IEditCommandRequest req) {
-        if (req instanceof SetRequest) {
-            SetRequest setRequest = (SetRequest) req;
-            EStructuralFeature feature = setRequest.getFeature();
-            
-            if (feature == EmployeePackage.eINSTANCE.getDepartment_Number()) {
-                Object value = setRequest.getValue();
-                
-                if (value instanceof Integer) {
-                    if (((Integer) value).intValue() == 0) {
-                        // set a parameter
-                        req.setParameter("approved", Boolean.FALSE); //$NON-NLS-1$
-                        return;
-                    }
-                }
-            }
-        }
-        req.setParameter("approved", Boolean.TRUE); //$NON-NLS-1$
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DepartmentTester.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DepartmentTester.java
deleted file mode 100644
index b8604fc..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DepartmentTester.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.expressions.PropertyTester;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-
-
-/**
- * @author ldamus
- */
-public class DepartmentTester
-	extends PropertyTester {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
-	 */
-	public boolean test(Object receiver, String property, Object[] args,
-			Object expectedValue) {
-		
-		if (receiver instanceof Department) {
-			Department department = (Department) receiver;
-			
-			if (property.equals("departmentName")) { //$NON-NLS-1$
-				return department.getName().equals(expectedValue);
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DestroyCustomerAdvice.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DestroyCustomerAdvice.java
deleted file mode 100644
index 6d030e0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/DestroyCustomerAdvice.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Customer;
-
-public class DestroyCustomerAdvice extends AbstractEditHelperAdvice {
-
-	public static String BEFORE = "org.eclipse.gmf.tests.runtime.emf.type.core.before"; //$NON-NLS-1$
-
-	public static String AFTER = "org.eclipse.gmf.tests.runtime.emf.type.core.after"; //$NON-NLS-1$
-
-	protected ICommand getBeforeDestroyElementCommand(
-			DestroyElementRequest request) {
-
-		List before = (List) request.getParameter(BEFORE);
-		
-		if (before != null && request.getElementToDestroy() instanceof Customer) {
-			before.add(request.getElementToDestroy());
-		}
-
-		return null;
-	}
-
-	protected ICommand getAfterDestroyElementCommand(
-			DestroyElementRequest request) {
-
-		List after = (List) request.getParameter(AFTER);
-		
-		if (after != null && request.getElementToDestroy() instanceof Customer) {
-			after.add(request.getElementToDestroy());
-		}
-
-		return null;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/EmployeeEditHelper.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/EmployeeEditHelper.java
deleted file mode 100644
index 439bc9e..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/EmployeeEditHelper.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * @author ldamus
- */
-public class EmployeeEditHelper
-	extends AbstractEditHelper {
-
-	public static class EmployeeConfigureCommand
-		extends ConfigureElementCommand {
-
-		public EmployeeConfigureCommand(ConfigureRequest req) {
-			super(req);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-			return null;
-		}
-	}
-	
-	public static Office createOffice(TransactionalEditingDomain editingDomain, Employee employee,
-			IProgressMonitor progressMonitor) throws ExecutionException {
-		
-		Office office = null;
-		CreateElementRequest request = new CreateElementRequest(editingDomain, employee,
-			EmployeeType.OFFICE);
-		IElementType type = ElementTypeRegistry.getInstance()
-			.getElementType(employee);
-		ICommand command = type.getEditCommand(request);
-		
-		if (command != null && command.canExecute()) {
-		    command.execute(progressMonitor, null);
-		}
-
-		CommandResult officeResult = command.getCommandResult();
-
-		if (officeResult.getStatus().getCode() == IStatus.OK) {
-
-			Object returnValue = officeResult.getReturnValue();
-			
-			if (returnValue instanceof List && ((List) returnValue).size() > 0) {
-				office = (Office) ((List) returnValue).get(0);
-				
-			} else {
-				office = (Office) returnValue;
-			}
-		}
-		return office;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getConfigureCommand(ConfigureRequest req) {
-		return new EmployeeConfigureCommand(req);
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/EmployeeType.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/EmployeeType.java
deleted file mode 100644
index 1491eb2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/EmployeeType.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-
-
-/**
- * @author ldamus
- */
-public class EmployeeType
-	extends AbstractElementTypeEnumerator {
-
-	// These types have no client context bound to them
-	public static final IMetamodelType DEPARTMENT = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.department"); //$NON-NLS-1$
-
-	public static final IMetamodelType EMPLOYEE = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.employee"); //$NON-NLS-1$
-
-	public static final IMetamodelType STUDENT = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.student"); //$NON-NLS-1$
-	
-	public static final IMetamodelType HIGH_SCHOOL_STUDENT = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.highSchoolStudent"); //$NON-NLS-1$
-	
-	public static final IMetamodelType OFFICE = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.office"); //$NON-NLS-1$
-	
-	public static final IMetamodelType CUSTOMER = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.customer"); //$NON-NLS-1$
-	
-	public static final IMetamodelType CLIENT = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.client"); //$NON-NLS-1$
-
-	public static final ISpecializationType MANAGER = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.manager"); //$NON-NLS-1$
-
-	public static final ISpecializationType EXECUTIVE = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.executive"); //$NON-NLS-1$
-	
-	public static final ISpecializationType TOP_SECRET = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.topSecret"); //$NON-NLS-1$
-	
-	public static final ISpecializationType SECRET_DEPARTMENT = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.secretDepartment"); //$NON-NLS-1$
-
-	// These types have a client context bound to them
-	public static final IMetamodelType CONTEXT_DEPARTMENT = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.department"); //$NON-NLS-1$
-
-	public static final IMetamodelType CONTEXT_EMPLOYEE = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.employee"); //$NON-NLS-1$
-
-	public static final IMetamodelType CONTEXT_STUDENT = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.student"); //$NON-NLS-1$
-	
-	public static final IMetamodelType CONTEXT_OFFICE = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.office"); //$NON-NLS-1$
-
-	public static final IMetamodelType CONTEXT_CUSTOMER = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.customer"); //$NON-NLS-1$
-
-	public static final IMetamodelType CONTEXT_CLIENT = (IMetamodelType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.client"); //$NON-NLS-1$
-
-	public static final ISpecializationType CONTEXT_MANAGER = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.manager"); //$NON-NLS-1$
-
-	public static final ISpecializationType CONTEXT_EXECUTIVE = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.executive"); //$NON-NLS-1$
-	
-	public static final ISpecializationType CONTEXT_TOP_SECRET = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.topSecret"); //$NON-NLS-1$
-	
-	public static final ISpecializationType CONTEXT_SECRET_DEPARTMENT = (ISpecializationType) getElementType("org.eclipse.gmf.tests.runtime.emf.type.core.context.secretDepartment"); //$NON-NLS-1$
-
-	
-	public static IMetamodelType[] METAMODEL_TYPES = new IMetamodelType[] {
-			DEPARTMENT, EMPLOYEE, STUDENT, HIGH_SCHOOL_STUDENT, OFFICE,
-			CUSTOMER, CLIENT };
-
-	public static IMetamodelType[] METAMODEL_TYPES_WITH_CONTEXT = new IMetamodelType[] {
-			CONTEXT_DEPARTMENT, CONTEXT_EMPLOYEE, CONTEXT_STUDENT,
-			CONTEXT_OFFICE, CONTEXT_CUSTOMER, CONTEXT_CLIENT };
-
-	public static ISpecializationType[] SPECIALIZATION_TYPES = new ISpecializationType[] {
-			MANAGER, EXECUTIVE, TOP_SECRET, SECRET_DEPARTMENT };
-
-	public static ISpecializationType[] SPECIALIZATION_TYPES_WITH_CONTEXT = new ISpecializationType[] {
-			CONTEXT_MANAGER, CONTEXT_EXECUTIVE, CONTEXT_TOP_SECRET,
-			CONTEXT_SECRET_DEPARTMENT };
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ExecutiveEditHelperAdvice.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ExecutiveEditHelperAdvice.java
deleted file mode 100644
index 98c6ca2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ExecutiveEditHelperAdvice.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * @author ldamus
- */
-public class ExecutiveEditHelperAdvice
-	extends ManagerEditHelperAdvice {
-
-	public static class BeforeExecutiveConfigureCommand
-		extends ConfigureElementCommand {
-
-		public BeforeExecutiveConfigureCommand(ConfigureRequest req) {
-			super(req);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-			
-			if (getRequest().getParameter("fail_configuration") != null) { //$NON-NLS-1$
-				return CommandResult
-						.newWarningCommandResult("configuration failed", null); //$NON-NLS-1$
-			}
-			
-			return null;
-		}
-	}
-
-	public static class AfterExecutiveConfigureCommand
-		extends ConfigureElementCommand {
-
-		public AfterExecutiveConfigureCommand(ConfigureRequest req) {
-			super(req);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-            
-			Employee employee = (Employee) ((ConfigureRequest) getRequest()).getElementToConfigure();
-			
-			Office office = employee.getOffice();
-			office.setHasDoor(true);
-			
-			return null;
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return new BeforeExecutiveConfigureCommand(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		return new AfterExecutiveConfigureCommand(request);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/FinanceEditHelperAdvice.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/FinanceEditHelperAdvice.java
deleted file mode 100644
index f81f5b2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/FinanceEditHelperAdvice.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Band;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * @author ldamus
- */
-public class FinanceEditHelperAdvice
-	extends AbstractEditHelperAdvice {
-
-	public static class BeforeFinanceConfigureCommand
-		extends ConfigureElementCommand {
-
-		public BeforeFinanceConfigureCommand(ConfigureRequest req) {
-			super(req);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-
-			return null;
-		}
-	}
-
-	public static class AfterFinanceConfigureCommand
-		extends ConfigureElementCommand {
-
-		public AfterFinanceConfigureCommand(ConfigureRequest req) {
-			super(req);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-
-			Employee employee = (Employee) getElementToEdit();
-			employee.getDepartment().setName("Finance"); //$NON-NLS-1$
-			return null;
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return new BeforeFinanceConfigureCommand(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		return new AfterFinanceConfigureCommand(request);
-	}
-    
-    public boolean approveRequest(IEditCommandRequest request) {
-
-        if (request instanceof SetRequest) {
-            SetRequest setRequest = (SetRequest) request;
-            EStructuralFeature feature = setRequest.getFeature();
-            
-            if (feature == EmployeePackage.eINSTANCE.getEmployee_Band()
-                && setRequest.getValue() == Band.DIRECTOR_LITERAL) {
-                // arbitrarily no directors in finance
-                return false;
-            }
-        }
-        return super.approveRequest(request);
-    }
-    
-    public void configureRequest(IEditCommandRequest request) {
-
-        if (request instanceof SetRequest) {
-            SetRequest setRequest = (SetRequest) request;
-            EStructuralFeature feature = setRequest.getFeature();
-            
-            if (feature == EmployeePackage.eINSTANCE.getEmployee_Band()
-                && setRequest.getValue() == Band.DIRECTOR_LITERAL) {
-                // set a parameter
-                request.setParameter("approved", Boolean.FALSE); //$NON-NLS-1$
-                return;
-            }
-        }
-        request.setParameter("approved", Boolean.TRUE); //$NON-NLS-1$
-    }
-    
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ISecurityCleared.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ISecurityCleared.java
deleted file mode 100644
index 4054b0b..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ISecurityCleared.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-
-/**
- * @author ldamus
- */
-public interface ISecurityCleared
-	extends IElementType {
-	
-	public static final String TOP_SECRET = "topSecret"; //$NON-NLS-1$
-
-	public abstract String getSecurityClearance();
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ManagerEditHelperAdvice.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ManagerEditHelperAdvice.java
deleted file mode 100644
index 7c19722..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ManagerEditHelperAdvice.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * @author ldamus
- */
-public class ManagerEditHelperAdvice
-	extends AbstractEditHelperAdvice {
-
-	public static class ManagerBeforeConfigureCommand
-		extends ConfigureElementCommand {
-
-		public ManagerBeforeConfigureCommand(ConfigureRequest request) {
-			super(request);
-		}
-
-        protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-            throws ExecutionException {
-
-			return null;
-		}
-	}
-
-	public static class ManagerAfterConfigureCommand
-		extends ConfigureElementCommand {
-
-		public ManagerAfterConfigureCommand(ConfigureRequest request) {
-			super(request);
-		}
-
-
-        protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-                IAdaptable info)
-            throws ExecutionException {
-
-            Employee employee = (Employee) getElementToEdit();
-
-            Office office = EmployeeEditHelper.createOffice(getEditingDomain(),
-                employee, monitor);
-            office.setHasDoor(false);
-            office.setNumberOfWindows(1);
-            return null;
-        }
-	}
-
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return new ManagerBeforeConfigureCommand(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		return new ManagerAfterConfigureCommand(request);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ManagerMatcher.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ManagerMatcher.java
deleted file mode 100644
index 4fc0871..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ManagerMatcher.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-
-/**
- * @author ldamus
- */
-public class ManagerMatcher
-	implements IElementMatcher {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean matches(EObject eObject) {
-		
-		if (eObject instanceof Employee) {
-			Employee employee = (Employee) eObject;
-			
-			if (employee.getOffice().getNumberOfWindows() == 1
-				&& employee.getOffice().isHasDoor() == false) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/NotInheritedEditHelperAdvice.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/NotInheritedEditHelperAdvice.java
deleted file mode 100644
index 13c868d..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/NotInheritedEditHelperAdvice.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Office;
-
-/**
- * @author ldamus
- */
-public class NotInheritedEditHelperAdvice
-	extends AbstractEditHelperAdvice {
-
-	public static class NotInheritedBeforeConfigureCommand
-		extends ConfigureElementCommand {
-
-		public NotInheritedBeforeConfigureCommand(ConfigureRequest request) {
-			super(request);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-
-			return null;
-		}
-	}
-
-	public static class NotInheritedAfterConfigureCommand
-		extends ConfigureElementCommand {
-
-		public NotInheritedAfterConfigureCommand(final ConfigureRequest request) {
-			super(request);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-                IAdaptable info)
-            throws ExecutionException {
-            Employee employee = (Employee) getElementToEdit();
-
-            Office office = EmployeeEditHelper.createOffice(getEditingDomain(),
-                employee, monitor);
-            office.setHasDoor(false);
-            office.setNumberOfWindows(1);
-            return null;
-        }
-	}
-
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return new NotInheritedBeforeConfigureCommand(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		return new NotInheritedAfterConfigureCommand(request);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/NullElementTypeAdvice.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/NullElementTypeAdvice.java
deleted file mode 100644
index c13b2df..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/NullElementTypeAdvice.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * @author ldamus
- */
-public class NullElementTypeAdvice
-	extends AbstractEditHelperAdvice {
-
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-		EObject manager = (EObject) request.getParameter("MANAGER"); //$NON-NLS-1$
-        
-		SetRequest setRequest = new SetRequest(request.getEditingDomain(), request.getContainer(),
-			EmployeePackage.eINSTANCE.getDepartment_Manager(), manager);
-		return new SetValueCommand(setRequest);
-	}
-
-	protected ICommand getBeforeEditContextCommand(GetEditContextRequest request) {
-		IElementType nullSpecialization = ElementTypeRegistry
-			.getInstance()
-			.getType(
-				"org.eclipse.gmf.tests.runtime.emf.type.core.nullSpecialization"); //$NON-NLS-1$
-
-		GetEditContextCommand result = new GetEditContextCommand(request);
-		result.setEditContext(nullSpecialization);
-		return result;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/OfficeEditHelper.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/OfficeEditHelper.java
deleted file mode 100644
index 3006417..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/OfficeEditHelper.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-
-
-/**
- * @author ldamus
- */
-public class OfficeEditHelper
-	extends AbstractEditHelper {
-
-	public static class OfficeConfigureCommand
-		extends ConfigureElementCommand {
-
-		public OfficeConfigureCommand(ConfigureRequest req) {
-			super(req);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getConfigureCommand(ConfigureRequest req) {
-		return new OfficeConfigureCommand(req);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/OfficeTester.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/OfficeTester.java
deleted file mode 100644
index 6c4334f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/OfficeTester.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.expressions.PropertyTester;
-
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-
-/**
- * @author ldamus
- */
-public class OfficeTester
-	extends PropertyTester {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object,
-	 *      java.lang.String, java.lang.Object[], java.lang.Object)
-	 */
-	public boolean test(Object receiver, String property, Object[] args,
-			Object expectedValue) {
-
-		if (receiver instanceof Employee) {
-			Employee employee = (Employee) receiver;
-
-			if (property.equals("officeHasDoor")) { //$NON-NLS-1$
-				if (employee.getOffice() != null && employee.getOffice().isHasDoor()) {
-					return expectedValue.equals("true"); //$NON-NLS-1$
-				}
-
-			} else if (property.equals("officeWindowCount")) { //$NON-NLS-1$
-				return employee.getOffice() != null && employee.getOffice().getNumberOfWindows() == (Integer
-					.getInteger((String) expectedValue)).intValue();
-			}
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ResourceTester.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ResourceTester.java
deleted file mode 100644
index afee9b0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/ResourceTester.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * Property tester for {@link EObject}s. Currently supported properties are
- * <dl>
- * <dt>resourceURI</dt>
- * <dd>string-valued property denoting the URI of the resource in which the
- * EObjec is found.</dd>
- * </dl>
- * 
- * @author ldamus
- */
-public class ResourceTester extends PropertyTester {
-
-	private static final String RESOURCE_URI_PROPERTY = "resourceURI"; //$NON-NLS-1$
-
-	public boolean test(Object receiver, String property, Object[] args,
-			Object expectedValue) {
-
-		EObject eObject = (EObject) receiver;
-
-		if (property.equals(RESOURCE_URI_PROPERTY)) {
-			Resource resource = eObject.eResource();
-
-			if (resource != null) {
-				URI uri = resource.getURI();
-				return uri.toString().equals(expectedValue);
-			}
-		}
-
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/SecretDepartmentMatcher.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/SecretDepartmentMatcher.java
deleted file mode 100644
index 2d0aeef..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/SecretDepartmentMatcher.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-public class SecretDepartmentMatcher implements IElementMatcher {
-
-	public boolean matches(EObject eObject) {
-		return false;
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/SecurityClearedElementTypeFactory.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/SecurityClearedElementTypeFactory.java
deleted file mode 100644
index d6d27ab..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/SecurityClearedElementTypeFactory.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeFactory;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Employee;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * @author ldamus
- */
-public class SecurityClearedElementTypeFactory
-	extends AbstractElementTypeFactory {
-
-	private static final String SECURITY_CLEARANCE_PARAM_NAME = "securityClearance"; //$NON-NLS-1$
-	
-	public static final class CreateSecretEmployeeCommand extends CreateElementCommand {
-		
-		public CreateSecretEmployeeCommand(CreateElementRequest req) {
-			super(req);
-		}
-		
-		protected EObject doDefaultElementCreation() {
-			Employee result = (Employee) super.doDefaultElementCreation();
-			result.setSecurityClearance(true);
-			return result;
-		}
-	}
-	
-	public static final class SecurityClearedEditHelper extends AbstractEditHelper {
-		public SecurityClearedEditHelper() {
-			super();
-		}
-		
-		protected ICommand getEditContextCommand(GetEditContextRequest req) {
-			GetEditContextCommand result = null;
-			
-			if (req.getEditCommandRequest() instanceof CreateElementRequest) {
-				CreateElementRequest createRequest = (CreateElementRequest) req.getEditCommandRequest();
-				
-				if (createRequest.getElementType() == EmployeeType.TOP_SECRET) {
-					result = new GetEditContextCommand(req);
-					result.setEditContext(EmployeeType.SECRET_DEPARTMENT);
-				}
-			}
-			return result;
-		}
-		
-		protected ICommand getCreateCommand(CreateElementRequest req) {
-			
-			if (req.getElementType() == EmployeeType.TOP_SECRET) {
-				req.setContainmentFeature(EmployeePackage.eINSTANCE.getDepartment_Members());
-				return new CreateSecretEmployeeCommand(req);
-			}
-			return super.getCreateCommand(req);
-		}
-	}
-	
-	private static final class SecurityClearedSpecializationType
-		extends SpecializationType
-		implements ISecurityCleared {
-
-		private final String securityClearance;
-		
-		private final IEditHelper editHelper = new SecurityClearedEditHelper();
-
-		public SecurityClearedSpecializationType(ISpecializationTypeDescriptor descriptor, String securityClearance) {
-
-			super(descriptor);
-			this.securityClearance = securityClearance;
-		}
-
-		public String getSecurityClearance() {
-			return securityClearance;
-		}
-		
-		public IEditHelper getEditHelper() {
-			return editHelper;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeFactory#createSpecializationType(org.eclipse.gmf.runtime.emf.type.core.internal.impl.SpecializationTypeDescriptor)
-	 */
-	public ISpecializationType createSpecializationType(
-			ISpecializationTypeDescriptor descriptor) {
-
-		return new SecurityClearedSpecializationType(descriptor,
-			descriptor.getParamValue(SECURITY_CLEARANCE_PARAM_NAME));
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/StudentEditHelper.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/StudentEditHelper.java
deleted file mode 100644
index 3680143..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/internal/StudentEditHelper.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.core.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-
-/**
- * @author ldamus
- */
-public class StudentEditHelper
-	extends AbstractEditHelper {
-
-	public static class StudentConfigureCommand
-		extends ConfigureElementCommand {
-
-		public StudentConfigureCommand(ConfigureRequest req) {
-			super(req);
-		}
-
-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-		    throws ExecutionException {
-
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.edithelper.ConfigureRequest)
-	 */
-	protected ICommand getConfigureCommand(ConfigureRequest req) {
-		return new StudentConfigureCommand(req);
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/requests/SetRequestTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/requests/SetRequestTest.java
deleted file mode 100644
index 7e5f462..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/requests/SetRequestTest.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.core.requests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.AbstractEMFTypeTest;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.Department;
-import org.eclipse.gmf.tests.runtime.emf.type.core.employee.EmployeePackage;
-
-/**
- * Tests the SetRequest.
- * 
- * @author ldamus
- */
-public class SetRequestTest extends AbstractEMFTypeTest {
-
-	private Department department;
-
-	public SetRequestTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new TestSuite(SetRequestTest.class);
-	}
-
-	protected void doModelSetup(Resource resource) {
-		department = (Department) getEmployeeFactory().create(
-				getEmployeePackage().getDepartment());
-		resource.getContents().add(department);
-	}
-
-	/**
-	 * Tests that a SetValueCommand can be instantiated with a SetRequest whose
-	 * elementToEdit is null.
-	 */
-	public void test_deferredElementToEdit_152302() {
-
-		SetRequest request = new SetRequest(getEditingDomain(), null,
-				EmployeePackage.eINSTANCE.getDepartment_Name(),
-				"test_deferredElementToEdit_152302"); //$NON-NLS-1$
-
-		try {
-			SetValueCommand command = new SetValueCommand(request);
-			assertFalse(command.canExecute());
-
-		} catch (Exception e) {
-			fail("expected to be able to instantiate the SetValueCommand without an elementToEdit"); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.core/test.xml b/org.eclipse.gmf.tests.runtime.emf.type.core/test.xml
deleted file mode 100644
index 1463c5c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.emf.type.core"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.emf.type.core.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/.classpath b/org.eclipse.gmf.tests.runtime.emf.type.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.emf.type.ui/.cvsignore b/org.eclipse.gmf.tests.runtime.emf.type.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/.project b/org.eclipse.gmf.tests.runtime.emf.type.ui/.project
deleted file mode 100644
index a2f8cec..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.emf.type.ui</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/org.eclipse.gmf.tests.runtime.emf.type.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.emf.type.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index c746d5f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.emf.type.ui; singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.emf.type.ui.TestPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.emf.type.ui;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.type.ui.internal.providers;x-internal:=true
-Eclipse-LazyStart: true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.0.0,2.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.tests.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes;bundle-version="[1.0.0,2.0.0)"

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/about.html b/org.eclipse.gmf.tests.runtime.emf.type.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/build.properties b/org.eclipse.gmf.tests.runtime.emf.type.ui/build.properties
deleted file mode 100644
index 373b94c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               icons/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = icons/,\
-               test.xml

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/icons/icon.gif b/org.eclipse.gmf.tests.runtime.emf.type.ui/icons/icon.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/icons/icon.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/plugin.properties b/org.eclipse.gmf.tests.runtime.emf.type.ui/plugin.properties
deleted file mode 100644
index c01044c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF EMF Type Tests
-Plugin.providerName = Eclipse.org
-# ====================================================================
-

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/plugin.xml b/org.eclipse.gmf.tests.runtime.emf.type.ui/plugin.xml
deleted file mode 100644
index 69f5b27..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/plugin.xml
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2006  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-<plugin>
-   <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-        <specializationType
-                id="org.eclipse.gmf.tests.runtime.emf.type.ui.iconType"     
-                name="Icon"
-                icon="icons/icon.gif">
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.tests.runtime.emf.type.ui.platformIconType"     
-                name="Icon"
-                icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.geoshapes/icons/IconCircle.gif">
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-        </specializationType>
-   </extension>
-</plugin>

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/AllTests.java b/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/AllTests.java
deleted file mode 100644
index fc8e7c3..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/AllTests.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.type.ui;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.emf.type.ui.internal.providers.ElementTypeIconProviderTest;
-
-public class AllTests
-	extends TestCase
-	implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTest(ElementTypeIconProviderTest.suite());
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args)
-		throws Exception {
-		TestRunner.run(suite());
-		return Arrays
-			.asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/TestPlugin.java b/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/TestPlugin.java
deleted file mode 100644
index 61949a6..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/TestPlugin.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.tests.runtime.emf.type.ui;
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * Plug-in lifecycle class, required for correct bundle activation.
- *
- * @author Linda Damus
- */
-public class TestPlugin
-	extends Plugin {
-
-	/**
-	 * Initializes me.
-	 */
-	public TestPlugin() {
-		super();
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/internal/providers/ElementTypeIconProviderTest.java b/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/internal/providers/ElementTypeIconProviderTest.java
deleted file mode 100644
index 681f9cb..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/src/org/eclipse/gmf/tests/runtime/emf/type/ui/internal/providers/ElementTypeIconProviderTest.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.type.ui.internal.providers;
-
-import java.net.URL;
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.ui.internal.providers.ElementTypeIconProvider;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.osgi.framework.Bundle;
-
-public class ElementTypeIconProviderTest
-	extends TestCase {
-
-	private ElementTypeIconProvider fixture;
-
-	public ElementTypeIconProviderTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ElementTypeIconProviderTest.class);
-	}
-
-	protected ElementTypeIconProvider getFixture() {
-		return fixture;
-	}
-
-	protected void setFixture(ElementTypeIconProvider fixture) {
-		this.fixture = fixture;
-	}
-
-	public void test_getIcon() {
-
-		Bundle bundle = Platform
-			.getBundle("org.eclipse.gmf.tests.runtime.emf.type.ui"); //$NON-NLS-1$
-		URL iconURL = bundle.getEntry("icons/icon.gif"); //$NON-NLS-1$
-		ImageDescriptor iconImageDescriptor = ImageDescriptor
-			.createFromURL(iconURL);
-        Image icon = iconImageDescriptor.createImage();
-        byte[] iconData = icon.getImageData().data;
-
-		setFixture(new ElementTypeIconProvider());
-
-		IElementType iconType = ElementTypeRegistry.getInstance().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.ui.iconType"); //$NON-NLS-1$
-		byte[] providerIconData = getFixture().getIcon(iconType, 0).getImageData().data;
- 
-		assertTrue(Arrays.equals(iconData, providerIconData));
-        
-        icon.dispose();
-	}
-	
-	/**
-	 * Tests that a platform URI can be specified as the location of an element
-	 * type icon.
-	 */
-	public void test_getIconFromPlatformURI_144906() {
-
-		Bundle bundle = Platform
-			.getBundle("org.eclipse.gmf.runtime.diagram.ui.geoshapes"); //$NON-NLS-1$
-		URL iconURL = bundle.getEntry("icons/IconCircle.gif"); //$NON-NLS-1$
-		ImageDescriptor iconImageDescriptor = ImageDescriptor
-			.createFromURL(iconURL);
-        Image expectedIcon = iconImageDescriptor.createImage();
-        byte[] iconData = expectedIcon.getImageData().data;
-
-		setFixture(new ElementTypeIconProvider());
-
-		IElementType iconType = ElementTypeRegistry.getInstance().getType(
-			"org.eclipse.gmf.tests.runtime.emf.type.ui.platformIconType"); //$NON-NLS-1$
-		Image actualIcon = getFixture().getIcon(iconType, 0);
-		
-		assertNotNull(actualIcon);
-		
-		byte[] providerIconData = actualIcon.getImageData().data;
- 
-		assertTrue(Arrays.equals(iconData, providerIconData));
-        
-		expectedIcon.dispose();
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.type.ui/test.xml b/org.eclipse.gmf.tests.runtime.emf.type.ui/test.xml
deleted file mode 100644
index 1a9ad70..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.emf.type.ui"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.emf.type.ui.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/.classpath b/org.eclipse.gmf.tests.runtime.emf.ui.properties/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.emf.ui.properties/.cvsignore b/org.eclipse.gmf.tests.runtime.emf.ui.properties/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/.project b/org.eclipse.gmf.tests.runtime.emf.ui.properties/.project
deleted file mode 100644
index f52f1c3..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.emf.ui.properties</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/org.eclipse.gmf.tests.runtime.emf.ui.properties/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.emf.ui.properties/META-INF/MANIFEST.MF
deleted file mode 100644
index a31f3fa..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.emf.ui.properties
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.emf.ui.properties;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)"
-Eclipse-LazyStart: false

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/about.html b/org.eclipse.gmf.tests.runtime.emf.ui.properties/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/build.properties b/org.eclipse.gmf.tests.runtime.emf.ui.properties/build.properties
deleted file mode 100644
index 3272503..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/plugin.properties b/org.eclipse.gmf.tests.runtime.emf.ui.properties/plugin.properties
deleted file mode 100644
index afcf34e..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/plugin.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF EMF MSL UI Properties Tests
-Plugin.providerName = Eclipse.org
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/src/org/eclipse/gmf/tests/runtime/emf/ui/properties/AllTests.java b/org.eclipse.gmf.tests.runtime.emf.ui.properties/src/org/eclipse/gmf/tests/runtime/emf/ui/properties/AllTests.java
deleted file mode 100644
index 8065cee..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/src/org/eclipse/gmf/tests/runtime/emf/ui/properties/AllTests.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.ui.properties;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * @author gvaradar
- *
- */
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/test.xml b/org.eclipse.gmf.tests.runtime.emf.ui.properties/test.xml
deleted file mode 100644
index a0e29be..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.emf.ui.properties"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.emf.ui.properties.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/.classpath b/org.eclipse.gmf.tests.runtime.emf.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.emf.ui/.cvsignore b/org.eclipse.gmf.tests.runtime.emf.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/.project b/org.eclipse.gmf.tests.runtime.emf.ui/.project
deleted file mode 100644
index 484752e..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.emf.ui</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/org.eclipse.gmf.tests.runtime.emf.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.emf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 841af16..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.emf.ui
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.emf.ui.Activator
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.emf.ui;x-internal:=true,
- org.eclipse.gmf.tests.runtime.emf.ui.services.action;x-internal:=true
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.gmf.tests.runtime.common.core;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/about.html b/org.eclipse.gmf.tests.runtime.emf.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/build.properties b/org.eclipse.gmf.tests.runtime.emf.ui/build.properties
deleted file mode 100644
index f5f6cf2..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               *.jar,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/plugin.properties b/org.eclipse.gmf.tests.runtime.emf.ui/plugin.properties
deleted file mode 100644
index 70184f4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF MSL UI Tests
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/Activator.java b/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/Activator.java
deleted file mode 100644
index a16ca7a..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/Activator.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.emf.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Linda Damus
- */
-public class Activator extends AbstractUIPlugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/AllTests.java b/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/AllTests.java
deleted file mode 100644
index 8bea95c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/AllTests.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.ui;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.gmf.tests.runtime.emf.ui.action.AbstractModelActionDelegateTest;
-import org.eclipse.gmf.tests.runtime.emf.ui.action.AbstractModelActionHandlerTest;
-import org.eclipse.gmf.tests.runtime.emf.ui.services.action.AbstractModelActionFilterProviderTest;
-
-
-/**
- * @author Anthony Hunter 
- * <a href="mailto:anthonyh@ca.ibm.com">mailto:anthonyh@ca.ibm.com</a>
- */
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-        suite.addTestSuite(AbstractModelActionDelegateTest.class);
-        suite.addTestSuite(AbstractModelActionHandlerTest.class);
-        suite.addTestSuite(AbstractModelActionFilterProviderTest.class);
-		suite.addTestSuite(ModelingAssistantServiceTests.class);
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/ModelingAssistantServiceTests.java b/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/ModelingAssistantServiceTests.java
deleted file mode 100644
index 0a95f75..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/ModelingAssistantServiceTests.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.ui;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.IProviderPolicy;
-import org.eclipse.gmf.runtime.common.core.service.ProviderPriority;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.emf.type.core.ElementType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantProvider;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService;
-import org.eclipse.gmf.tests.runtime.common.core.internal.util.TestingConfigurationElement;
-
-/**
- * Tests for the Modeling Assistant Service.
- * 
- * @author cmahoney
- * 
- */
-public class ModelingAssistantServiceTests
-	extends TestCase {
-
-	/**
-	 * Override to make some methods and classes available.
-	 */
-	protected static class MyModelingAssistantService
-		extends ModelingAssistantService {
-
-		/**
-		 * Override to allow passing in of the provider, instead of initializing
-		 * via the <code>ConfigurationElement</code>.
-		 */
-		protected static class ProviderDescriptor
-			extends ModelingAssistantService.ProviderDescriptor {
-
-			public boolean areActivitiesEnabled = true;
-
-			protected ProviderDescriptor(IProvider provider) {
-				super(new TestingConfigurationElement());
-				this.provider = provider;
-				provider.addProviderChangeListener(this);
-			}
-
-			public IProvider getProvider() {
-				return provider;
-			}
-
-			protected IProviderPolicy getPolicy() {
-				return null;
-			}
-
-			public boolean provides(IOperation operation) {
-				return areActivitiesEnabled;
-			}
-
-			public void setActivitiesEnabled(boolean b) {
-				areActivitiesEnabled = b;
-			}
-		}
-
-		protected MyModelingAssistantService() {
-			super();
-		}
-
-		protected void addModelingAssistantProvider(ProviderPriority priority,
-				ProviderDescriptor provider) {
-
-			super.addProvider(priority, provider);
-		}
-
-		protected void removeModelingAssistantProvider(
-				Service.ProviderDescriptor provider) {
-
-			super.removeProvider(provider);
-		}
-
-	}
-
-	/**
-	 * A concrete element type class.
-	 */
-	class MyElementType
-		extends ElementType {
-
-		public MyElementType(String id) {
-			super(id, null, id);
-		}
-
-		public IEditHelper getEditHelper() {
-			return null;
-		}
-
-	}
-
-	/**
-	 * A dummy modeling assistant provider that takes the list of types to be
-	 * returned.
-	 */
-	public class MyModelingAssistantProvider
-		extends ModelingAssistantProvider {
-
-		private List types;
-
-		public MyModelingAssistantProvider(List types) {
-			super();
-			this.types = types;
-		}
-
-		public List getTypesForPopupBar(IAdaptable host) {
-			return types;
-		}
-	}
-
-	private MyModelingAssistantService modelingAssistantService = null;
-
-	public ModelingAssistantServiceTests(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ModelingAssistantServiceTests.class);
-	}
-
-	protected void setUp()
-		throws Exception {
-		super.setUp();
-		setModelingAssistantService(new MyModelingAssistantService());
-	}
-
-	public MyModelingAssistantService getModelingAssistantService() {
-		return modelingAssistantService;
-	}
-
-	public void setModelingAssistantService(MyModelingAssistantService service) {
-		modelingAssistantService = service;
-	}
-
-	/**
-	 * Tests that the UI contributions made by a provider affected by a
-	 * capability will be shown/hidden as the capability is enabled/disabled.
-	 * 
-	 * @throws Exception
-	 */
-	public void testCapabilityFiltering()
-		throws Exception {
-
-		// set up provider1
-		MyElementType TYPE1 = new MyElementType("TYPE1"); //$NON-NLS-1$	
-		MyModelingAssistantService.ProviderDescriptor provider1Descriptor = new MyModelingAssistantService.ProviderDescriptor(
-			new MyModelingAssistantProvider(Collections.singletonList(TYPE1)));
-		getModelingAssistantService().addModelingAssistantProvider(
-			ProviderPriority.LOW, provider1Descriptor);
-
-		// set up provider2
-		MyElementType TYPE2 = new MyElementType("TYPE2"); //$NON-NLS-1$
-		MyModelingAssistantService.ProviderDescriptor provider2Descriptor = new MyModelingAssistantService.ProviderDescriptor(
-			new MyModelingAssistantProvider(Collections.singletonList(TYPE2)));
-		getModelingAssistantService().addModelingAssistantProvider(
-			ProviderPriority.HIGH, provider2Descriptor);
-
-		// test service
-		List allTypes = getModelingAssistantService()
-			.getTypesForPopupBar(null);
-		assertEquals(2, allTypes.size());
-
-		provider1Descriptor.setActivitiesEnabled(false);
-		assertEquals(1, getModelingAssistantService()
-			.getTypesForPopupBar(null).size());
-
-		provider1Descriptor.setActivitiesEnabled(true);
-		List allTypesAgain = getModelingAssistantService()
-			.getTypesForPopupBar(null);
-		assertEquals(2, allTypesAgain.size());
-		assertTrue(Arrays.equals(allTypes.toArray(), allTypesAgain.toArray()));
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/action/AbstractModelActionDelegateTest.java b/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/action/AbstractModelActionDelegateTest.java
deleted file mode 100644
index b6e29d6..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/action/AbstractModelActionDelegateTest.java
+++ /dev/null

@@ -1,263 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.ui.action;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourceAttributes;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator;
-import org.eclipse.gmf.runtime.common.core.internal.command.BaseModificationValidator;
-import org.eclipse.gmf.runtime.emf.ui.action.AbstractModelActionDelegate;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.operations.UndoActionHandler;
-
-/**
- * Tests the AbstractModelActionDelegate.
- * 
- * @author ldamus
- */
-public class AbstractModelActionDelegateTest extends TestCase {
-
-	private IProject project;
-
-	private IFile file;
-
-	private IOperationHistory history;
-
-	private TransactionalEditingDomain editingDomain;
-
-	private IWorkbenchPartSite site;
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-
-		// avoid UI prompting from validator
-		FileModificationValidator
-				.setModificationValidator(new BaseModificationValidator());
-
-		site = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage().getActivePart().getSite();
-
-		editingDomain = TransactionalEditingDomain.Factory.INSTANCE
-				.createEditingDomain();
-		history = OperationHistoryFactory.getOperationHistory();
-
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			project = root.getProject("FileModificationApproverTest"); //$NON-NLS-1$
-
-			project.create(null);
-			project.open(null);
-
-			file = project.getFile("AbstractModelActionDelegateTest.txt"); //$NON-NLS-1$
-			InputStream contents = new ByteArrayInputStream(new byte[0]);
-
-			file.create(contents, false, new NullProgressMonitor());
-
-		} catch (CoreException e) {
-			fail(e);
-		}
-	}
-
-	protected void tearDown() throws Exception {
-
-		super.tearDown();
-
-		file.delete(true, new NullProgressMonitor());
-		project.close(new NullProgressMonitor());
-		project.delete(true, true, new NullProgressMonitor());
-		project = null;
-		file = null;
-		site = null;
-	}
-
-	private void fail(Exception e) {
-		e.printStackTrace();
-		fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-	}
-
-	private void setReadOnly(boolean b) {
-		try {
-			ResourceAttributes resourceAttributes = file
-					.getResourceAttributes();
-			resourceAttributes.setReadOnly(b);
-			file.setResourceAttributes(resourceAttributes);
-
-		} catch (CoreException e) {
-			fail(e);
-		}
-	}
-
-	/**
-	 * Tests that validation is done for file modification when commands that
-	 * change the model are executed through an AbstractModelActionDelegate.
-	 */
-	public void test_fileModificationValidation_155418() {
-
-		TestModelActionDelegate action = new TestModelActionDelegate();
-
-		// create an undo action handler for the undo context so that we can
-		// test that the history is flushed correctly
-		UndoActionHandler undoAction = new UndoActionHandler(site, action
-				.getUndoContext());
-		undoAction.setPruneHistory(true);
-
-		// execute fails when file is read-only
-		setReadOnly(true);
-		action.run(new NullProgressMonitor());
-		assertFalse(action.getCommand().isExecuted());
-		assertFalse(history.canUndo(action.getUndoContext()));
-
-		// execute succeeds when file is read-write
-		setReadOnly(false);
-		action.run(new NullProgressMonitor());
-		assertTrue(action.getCommandStatus().isOK());
-		assertTrue(action.getCommand().isExecuted());
-		assertTrue(history.canUndo(action.getUndoContext()));
-
-		// undo fails and history flushed when file is read-only
-		setReadOnly(true);
-		try {
-			history.undo(action.getUndoContext(), new NullProgressMonitor(),
-					null);
-		} catch (ExecutionException e) {
-			fail(e);
-		}
-		assertFalse(action.getCommand().isUndone());
-
-		// give the undo action a chance to run it's async exec to flush the
-		// history
-		Display display = PlatformUI.getWorkbench().getDisplay();
-		while (display.readAndDispatch()) {
-			// spin
-		}
-
-		assertFalse(history.canUndo(action.getUndoContext()));
-
-		undoAction.dispose();
-	}
-
-	// test fixtures
-
-	private class TestModelActionDelegate extends AbstractModelActionDelegate {
-
-		private TestCommand command;
-
-		private IUndoContext undoContext;
-
-		public TestModelActionDelegate() {
-			super();
-			setAction(new Action("TestModelActionDelegate") { //$NON-NLS-1$
-				// nothing
-			});
-		}
-
-		protected TransactionalEditingDomain getEditingDomain() {
-			return editingDomain;
-		}
-
-		protected void doRun(IProgressMonitor progressMonitor) {
-			execute(getCommand(), progressMonitor, null);
-		}
-
-		public TestCommand getCommand() {
-			if (command == null) {
-				command = new TestCommand();
-				command.addContext(getUndoContext());
-			}
-			return command;
-		}
-
-		public IUndoContext getUndoContext() {
-			if (undoContext == null) {
-				undoContext = new UndoContext();
-			}
-			return undoContext;
-		}
-
-		public IStatus getCommandStatus() {
-			return super.getStatus();
-		}
-	}
-
-	private class TestCommand extends AbstractCommand {
-
-		private boolean executed = false;
-
-		private boolean undone = false;
-
-		private boolean redone = false;
-
-		public TestCommand() {
-			super("AbstractModelActionDelegateTest", //$NON-NLS-1$
-					Collections.singletonList(file));
-		}
-
-		protected CommandResult doExecuteWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			this.executed = true;
-			return CommandResult.newOKCommandResult();
-		}
-
-		protected CommandResult doRedoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			this.undone = true;
-			return CommandResult.newOKCommandResult();
-		}
-
-		protected CommandResult doUndoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			this.redone = true;
-			return CommandResult.newOKCommandResult();
-		}
-
-		public boolean isExecuted() {
-			return executed;
-		}
-
-		public boolean isUndone() {
-			return undone;
-		}
-
-		public boolean isRedone() {
-			return redone;
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/action/AbstractModelActionHandlerTest.java b/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/action/AbstractModelActionHandlerTest.java
deleted file mode 100644
index 45e045a..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/action/AbstractModelActionHandlerTest.java
+++ /dev/null

@@ -1,269 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.ui.action;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourceAttributes;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator;
-import org.eclipse.gmf.runtime.common.core.internal.command.BaseModificationValidator;
-import org.eclipse.gmf.runtime.emf.ui.action.AbstractModelActionHandler;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.operations.UndoActionHandler;
-
-/**
- * Tests the AbstractModelActionHandler.
- * 
- * @author ldamus
- */
-public class AbstractModelActionHandlerTest extends TestCase {
-
-	private IProject project;
-
-	private IFile file;
-
-	private IOperationHistory history;
-
-	private TransactionalEditingDomain editingDomain;
-	
-	private IWorkbenchPart part;
-
-	private IWorkbenchPartSite site;
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-
-		// avoid UI prompting from validator
-		FileModificationValidator
-				.setModificationValidator(new BaseModificationValidator());
-
-		part = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage().getActivePart();
-
-		site = part.getSite();
-
-		editingDomain = TransactionalEditingDomain.Factory.INSTANCE
-				.createEditingDomain();
-		history = OperationHistoryFactory.getOperationHistory();
-
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			project = root.getProject("FileModificationApproverTest"); //$NON-NLS-1$
-
-			project.create(null);
-			project.open(null);
-
-			file = project.getFile("AbstractModelActionHandlerTest.txt"); //$NON-NLS-1$
-			InputStream contents = new ByteArrayInputStream(new byte[0]);
-
-			file.create(contents, false, new NullProgressMonitor());
-
-		} catch (CoreException e) {
-			fail(e);
-		}
-	}
-
-	protected void tearDown() throws Exception {
-
-		super.tearDown();
-
-		file.delete(true, new NullProgressMonitor());
-		project.close(new NullProgressMonitor());
-		project.delete(true, true, new NullProgressMonitor());
-		project = null;
-		file = null;
-		site = null;
-	}
-
-	private void fail(Exception e) {
-		e.printStackTrace();
-		fail("Should not have thrown: " + e.getLocalizedMessage()); //$NON-NLS-1$
-	}
-
-	private void setReadOnly(boolean b) {
-		try {
-			ResourceAttributes resourceAttributes = file
-					.getResourceAttributes();
-			resourceAttributes.setReadOnly(b);
-			file.setResourceAttributes(resourceAttributes);
-
-		} catch (CoreException e) {
-			fail(e);
-		}
-	}
-
-	/**
-	 * Tests that validation is done for file modification when commands that
-	 * change the model are executed through an AbstractModelActionHandler.
-	 */
-	public void test_fileModificationValidation_155418() {
-
-		TestModelActionHandler action = new TestModelActionHandler(part);
-
-		// create an undo action handler for the undo context so that we can
-		// test that the history is flushed correctly
-		UndoActionHandler undoAction = new UndoActionHandler(site, action
-				.getUndoContext());
-		undoAction.setPruneHistory(true);
-
-		// execute fails when file is read-only
-		setReadOnly(true);
-		action.run(new NullProgressMonitor());
-		assertFalse(action.getCommand().isExecuted());
-		assertFalse(history.canUndo(action.getUndoContext()));
-
-		// execute succeeds when file is read-write
-		setReadOnly(false);
-		action.run(new NullProgressMonitor());
-		assertTrue(action.getCommandStatus().isOK());
-		assertTrue(action.getCommand().isExecuted());
-		assertTrue(history.canUndo(action.getUndoContext()));
-
-		// undo fails and history flushed when file is read-only
-		setReadOnly(true);
-		try {
-			history.undo(action.getUndoContext(), new NullProgressMonitor(),
-					null);
-		} catch (ExecutionException e) {
-			fail(e);
-		}
-		assertFalse(action.getCommand().isUndone());
-
-		// give the undo action a chance to run it's async exec to flush the
-		// history
-		Display display = PlatformUI.getWorkbench().getDisplay();
-		while (display.readAndDispatch()) {
-			// spin
-		}
-
-		assertFalse(history.canUndo(action.getUndoContext()));
-
-		undoAction.dispose();
-	}
-
-	// test fixtures
-
-	private class TestModelActionHandler extends AbstractModelActionHandler {
-
-		private TestCommand command;
-
-		private IUndoContext undoContext;
-
-		public TestModelActionHandler(IWorkbenchPart part) {
-			super(part);
-			setText("TestModelActionHandler"); //$NON-NLS-1$
-		}
-
-		protected TransactionalEditingDomain getEditingDomain() {
-			return editingDomain;
-		}
-
-		protected void doRun(IProgressMonitor progressMonitor) {
-			execute(getCommand(), progressMonitor, null);
-		}
-
-		public TestCommand getCommand() {
-			if (command == null) {
-				command = new TestCommand();
-				command.addContext(getUndoContext());
-			}
-			return command;
-		}
-
-		public IUndoContext getUndoContext() {
-			if (undoContext == null) {
-				undoContext = new UndoContext();
-			}
-			return undoContext;
-		}
-
-		public IStatus getCommandStatus() {
-			return super.getStatus();
-		}
-		
-		public void refresh() {
-			// do nothing
-		}
-	}
-
-	private class TestCommand extends AbstractCommand {
-
-		private boolean executed = false;
-
-		private boolean undone = false;
-
-		private boolean redone = false;
-
-		public TestCommand() {
-			super("AbstractModelActionHandlerTest", //$NON-NLS-1$
-					Collections.singletonList(file));
-		}
-
-		protected CommandResult doExecuteWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			this.executed = true;
-			return CommandResult.newOKCommandResult();
-		}
-
-		protected CommandResult doRedoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			this.undone = true;
-			return CommandResult.newOKCommandResult();
-		}
-
-		protected CommandResult doUndoWithResult(
-				IProgressMonitor progressMonitor, IAdaptable info)
-				throws ExecutionException {
-			this.redone = true;
-			return CommandResult.newOKCommandResult();
-		}
-
-		public boolean isExecuted() {
-			return executed;
-		}
-
-		public boolean isUndone() {
-			return undone;
-		}
-
-		public boolean isRedone() {
-			return redone;
-		}
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/services/action/AbstractModelActionFilterProviderTest.java b/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/services/action/AbstractModelActionFilterProviderTest.java
deleted file mode 100644
index d0fcca8..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/services/action/AbstractModelActionFilterProviderTest.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.emf.ui.services.action;
-
-import junit.framework.TestCase;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.emf.ui.services.action.AbstractModelActionFilterProvider;
-
-/**
- * Tests the AbstractModelActionFilterProvider.
- * 
- * @author ldamus
- */
-public class AbstractModelActionFilterProviderTest
-    extends TestCase {
-
-    protected static class MyModelActionFilterProvider
-        extends AbstractModelActionFilterProvider {
-
-        private boolean testedAttribute = false;
-
-        private TransactionalEditingDomain editingDomain = TransactionalEditingDomain.Factory.INSTANCE
-            .createEditingDomain();
-
-        protected boolean doTestAttribute(Object target, String name,
-                String value) {
-            
-            testedAttribute = true;
-            return true;
-        }
-
-        protected boolean doProvides(IOperation operation) {
-            return true;
-        }
-
-        protected TransactionalEditingDomain getEditingDomain(Object target) {
-            return editingDomain;
-        }
-
-        public boolean didTestAttribute() {
-            return testedAttribute;
-        }
-    }
-
-    /**
-     * Tests that subclasses of AbstractModelActionFilterProviderTest can
-     * override the editing domain getter method.
-     */
-    public void test_editingDomainOverride_130758() {
-
-        MyModelActionFilterProvider provider = new MyModelActionFilterProvider();
-
-        // pass in an object that will return null in the superclass
-        // getEditingDomain implementation
-        boolean result = provider.testAttribute(Boolean.FALSE,
-            StringStatics.BLANK, null);
-
-        assertTrue(result);
-        assertTrue(provider.didTestAttribute());
-    }
-}

diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/test.xml b/org.eclipse.gmf.tests.runtime.emf.ui/test.xml
deleted file mode 100644
index 9bd8e6e..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.emf.ui"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.emf.ui.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/.classpath b/org.eclipse.gmf.tests.runtime.gef.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?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/org.eclipse.gmf.tests.runtime.gef.ui/.cvsignore b/org.eclipse.gmf.tests.runtime.gef.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/.project b/org.eclipse.gmf.tests.runtime.gef.ui/.project
deleted file mode 100644
index 1eb4c21..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/.project
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.gef.ui</name>
-	<comment></comment>
-	<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/org.eclipse.gmf.tests.runtime.gef.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.gef.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index c193e62..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.tests.runtime.gef.ui
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.gmf.tests.runtime.gef.ui.Activator
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.tests.runtime.gef.ui;x-internal:=true
-Require-Bundle: org.eclipse.gmf.runtime.gef.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/about.html b/org.eclipse.gmf.tests.runtime.gef.ui/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/build.properties b/org.eclipse.gmf.tests.runtime.gef.ui/build.properties
deleted file mode 100644
index d3350e8..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.properties,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/plugin.properties b/org.eclipse.gmf.tests.runtime.gef.ui/plugin.properties
deleted file mode 100644
index 7851da1..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-Plugin.name = GMF GEF Tests
-Plugin.providerName = Eclipse.org

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/Activator.java b/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/Activator.java
deleted file mode 100644
index 1e2c064..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/Activator.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-package org.eclipse.gmf.tests.runtime.gef.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Linda Damus
- */
-public class Activator extends AbstractUIPlugin {
-	/**
-	 * Empty block
-	 */
-}

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/AllTests.java b/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/AllTests.java
deleted file mode 100644
index 4d37cf7..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/AllTests.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2003 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.gef.ui; 
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-public class AllTests extends TestCase implements IPlatformRunnable {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite( "All Shapes GEF Tests" ); //$NON-NLS-1$
-
-		suite.addTestSuite( FigureSlidableAnchorTests.class );
-		
-        return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object run(Object args) throws Exception {
-		TestRunner.run(suite());
-		return Arrays.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/FigureSlidableAnchorTests.java b/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/FigureSlidableAnchorTests.java
deleted file mode 100644
index 5911f34..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/FigureSlidableAnchorTests.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.tests.runtime.gef.ui;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.internal.figures.DiamondFigure;
-
-/**
- * @author oboyko
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FigureSlidableAnchorTests
-	extends TestCase {
-	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testStraightlineTolerance() {
-		NodeFigure fig = new NodeFigure();
-		fig.setBounds(new Rectangle(100,100, 100, 100));
-		
-		// default anchor test 
-		Point p1 = new Point(150,150); 
-		Point p2 = new Point(148,300); 
-		ConnectionAnchor anchor = fig.getSourceConnectionAnchorAt(p1);
-		Point reference = anchor.getLocation(p2);
-		assertTrue(reference.x==p2.x);
-
-		// Slidable anchor test inside figure's bounds
-		p1 = new Point(110,200); 
-		p2 = new Point(112,300); 
-		anchor = fig.getSourceConnectionAnchorAt(p1);
-		reference = anchor.getLocation(p2);
-		assertTrue(reference.x==p2.x);
-	}
-	
-	public void testGetLocationFromReferenceOnBorder() {
-		NodeFigure fig = new NodeFigure();
-		fig.setBounds(new Rectangle(100,100, 100, 100));
-		
-		Point p1 = new Point(200,150); 
-		ConnectionAnchor anchor = fig.getSourceConnectionAnchorAt(p1);
-		
-		// verify when reference point is on or close to border, the returned location
-		// is the same point.
-		Point p2 = new Point(200, 175); 
-		Point reference = anchor.getLocation(new Point(200, 175));
-		assertTrue(reference.y == p2.y);
-	}
-	
-	public void testAnchorPosition() {
-		NodeFigure fig = new NodeFigure();
-		fig.setBounds(new Rectangle(-10,-10, 20, 20));
-		
-		// default anchor test 
-		Point p = new Point(3,3); 
-		ConnectionAnchor anchor = fig.getSourceConnectionAnchorAt(p);
-		Point reference = anchor.getReferencePoint();
-		assertTrue(reference.x==0 && reference.y==0);
-
-		// Slidable anchor test inside figure's bounds
-		p = new Point(8,8); 
-		anchor = fig.getSourceConnectionAnchorAt(p);
-		reference = anchor.getReferencePoint();
-		assertTrue(reference.x==p.x && reference.y==p.y);
-
-		// Slidable anchor test outside figure's bounds
-		p = new Point(12,12); 
-		anchor = fig.getSourceConnectionAnchorAt(p);
-		reference = anchor.getReferencePoint();
-		assertTrue(reference.x==10 && reference.y==10);
-		
-		p = new Point(15,0); 
-		anchor = fig.getSourceConnectionAnchorAt(p);
-		reference = anchor.getReferencePoint();
-		assertTrue(reference.x==10 && reference.y==0);
-	}
-	
-	public void testAnchorLocationOnPolygonFigure() {
-		DiamondFigure fig = new DiamondFigure(new Dimension(1058, 1058));
-		fig.setBounds(Rectangle.SINGLETON);
-		fig.getBounds().setLocation(-10,-10);
-		fig.getBounds().setSize(20,20);
-		Point reference = new Point(20,0);
-		
-		// Default anchor location
-		Point position = new Point(2,2);
-		ConnectionAnchor anchor = fig.getSourceConnectionAnchorAt(position);
-		Point location = anchor.getLocation(reference);
-		assertTrue(location.x==10 && location.y==0);
-		
-		// Slidable anchor location inside the figure
-		position = new Point(-8,0);
-		anchor = fig.getSourceConnectionAnchorAt(position);
-		location = anchor.getLocation(reference);
-		assertTrue(location.x==10 && location.y==0);
-		
-		// Slidable anchor location outside the figure
-		position = new Point(10,5);
-		anchor = fig.getSourceConnectionAnchorAt(position);
-		location = anchor.getLocation(reference);
-		assertTrue(location.x==10 && location.y==0);
-
-		// Reference inside the figure
-		reference = new Point(-2,5);
-		location = anchor.getLocation(reference);
-		assertTrue(location.x==-5 && location.y==5);
-		
-		// Reference and anchor's position are equal
-		reference = new Point(10,5);
-		location = anchor.getLocation(reference);
-		assertTrue(location.x==7 && location.y==3);
-		
-		// Rference point is at the center of the figure as well as the anchors position
-		reference = new Point(0,0);
-		position = new Point (0,0);
-		anchor = fig.getSourceConnectionAnchorAt(position);
-		location = anchor.getLocation(reference);
-		assertTrue(location.x==0 && location.y==0);
-	}
-}

diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/test.xml b/org.eclipse.gmf.tests.runtime.gef.ui/test.xml
deleted file mode 100644
index 6c69746..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/test.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2005  IBM Corporation and others.                       -->
-<!-- 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:                                                         -->
-<!--    IBM Corporation - initial API and implementation                   -->
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.gmf.tests.runtime.gef.ui"/>
-  <property name="classname" value="org.eclipse.gmf.tests.runtime.gef.ui.AllTests"/>
-  <property name="library-file" value="${baseLocation}/plugins/org.eclipse.test_${testPluginVersion}/library.xml"/>
-	
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="test-folder" value="${eclipse-home}/test_folder"/>
-    <delete dir="${test-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${test-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="os" value="${baseos}"/>
-      <property name="ws" value="${basews}"/>
-      <property name="arch" value="${basearch}"/>
-      <property name="report" value="${plugin-name}"/>
-      <property name="classname" value="${classname}"/>
-      <property name="vmargs" value="-ea -XX:MaxPermSize=128m -Xmx1024m"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.gmf/.classpath b/org.eclipse.gmf/.classpath
deleted file mode 100644
index acad1c2..0000000
--- a/org.eclipse.gmf/.classpath
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.gmf/.project b/org.eclipse.gmf/.project
deleted file mode 100644
index 8a8841c..0000000
--- a/org.eclipse.gmf/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf</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/org.eclipse.gmf/META-INF/MANIFEST.MF b/org.eclipse.gmf/META-INF/MANIFEST.MF
deleted file mode 100644
index fd59433..0000000
--- a/org.eclipse.gmf/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.gmf
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true

diff --git a/org.eclipse.gmf/about.html b/org.eclipse.gmf/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/org.eclipse.gmf/about.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.gmf/about.ini b/org.eclipse.gmf/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/org.eclipse.gmf/about.ini
+++ /dev/null

@@ -1,17 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-welcomePage=$nl$/welcome.xml

diff --git a/org.eclipse.gmf/about.mappings b/org.eclipse.gmf/about.mappings
deleted file mode 100644
index 529ce23..0000000
--- a/org.eclipse.gmf/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@buildId@

diff --git a/org.eclipse.gmf/about.properties b/org.eclipse.gmf/about.properties
deleted file mode 100644
index 5f49d91..0000000
--- a/org.eclipse.gmf/about.properties
+++ /dev/null

@@ -1,46 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2005 Borland Software Corporation and others.
-#  * 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:
-#  *   Borland - Initial API and implementation
-#  *
-#  * </copyright>
-#  */
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-featureName=Graphical Modeling Framework (GMF)
-
-featureText=Eclipse Graphical Modeling Framework (GMF) \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2005.  All rights reserved.\n\
-\n\
-GMF is a framework for generating graphical applications based on EMF and GEF.\n\
-Visit http://www.eclipse.org/gmf
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================

diff --git a/org.eclipse.gmf/build.properties b/org.eclipse.gmf/build.properties
deleted file mode 100644
index b1aad93..0000000
--- a/org.eclipse.gmf/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Borland Software Corporation and others.
-# 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:
-#     Borland Software Corporation - initial API and implementation
-###############################################################################
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png

diff --git a/org.eclipse.gmf/modeling32.png b/org.eclipse.gmf/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/org.eclipse.gmf/modeling32.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.gmf/plugin.properties b/org.eclipse.gmf/plugin.properties
deleted file mode 100644
index c5cae8c..0000000
--- a/org.eclipse.gmf/plugin.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Borland Software Corporation and others.
-# 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:
-#     Borland Software Corporation - initial API and implementation
-###############################################################################
-pluginName = Graphical Modeling Framework
-providerName = Eclipse.org
commit	4d1ec07a80d41ae7a78cb0de70edf155abff04d8	[log] [tgz]
author	ahunter <ahunter>	Wed May 02 17:38:40 2007 +0000
committer	ahunter <ahunter>	Wed May 02 17:38:40 2007 +0000
tree	aee11a63de061d3d0d3cc80337013ca5e9e6b79a
parent	2ca737bd1aa4bb85a0df5eec7c983fad558c459b [diff]